strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

INTEGRATION: CWS asyncdialogs (1.24.92); FILE MERGED

Browse source 
2006/08/30 15:40:29 pb 1.24.92.4: RESYNC: (1.25-1.26); FILE MERGED
2006/06/01 05:24:11 pb 1.24.92.3: fix: #i57125# pFontList moved to pImpl
2006/05/31 13:57:02 pb 1.24.92.2: RESYNC: (1.24-1.25); FILE MERGED
2006/03/01 09:47:41 pb 1.24.92.1: fix: #i57125# use DocShell_Impl*
This commit is contained in:
Vladimir Glazounov 2006-11-22 09:45:44 +00:00
parent 649cd4c832
commit 02a08de056
1 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
sc/source/ui/docshell/docsh3.cxx
View file

@ -4,9 +4,9 @@
*
* $RCSfile: docsh3.cxx,v $
*
* $Revision: 1.26 $
* $Revision: 1.27 $
*
* last change: $Author: kz $ $Date: 2006-07-21 13:38:39 $
* last change: $Author: vg $ $Date: 2006-11-22 10:45:44 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@ -65,6 +65,7 @@
#endif
#include "docsh.hxx"
#include "docshimp.hxx"
#include "scmod.hxx"
#include "tabvwsh.hxx"
#include "viewdata.hxx"
@ -457,10 +458,10 @@ SfxPrinter* ScDocShell::GetPrinter(BOOL bCreateIfNotExist)
void ScDocShell::UpdateFontList()
{
delete pFontList;
// pFontList = new FontList( GetPrinter(), Application::GetDefaultDevice() );
pFontList = new FontList( GetRefDevice(), NULL, FALSE ); // FALSE or TRUE???
SvxFontListItem aFontListItem( pFontList, SID_ATTR_CHAR_FONTLIST );
delete pImpl->pFontList;
// pImpl->pFontList = new FontList( GetPrinter(), Application::GetDefaultDevice() );
pImpl->pFontList = new FontList( GetRefDevice(), NULL, FALSE ); // FALSE or TRUE???
SvxFontListItem aFontListItem( pImpl->pFontList, SID_ATTR_CHAR_FONTLIST );
PutItem( aFontListItem );
CalcOutputFactor();
@ -482,9 +483,9 @@ USHORT ScDocShell::SetPrinter( SfxPrinter* pNewPrinter, USHORT nDiffFlags )
// MT: Use UpdateFontList: Will use Printer fonts only if needed!
/*
delete pFontList;
pFontList = new FontList( pNewPrinter, Application::GetDefaultDevice() );
SvxFontListItem aFontListItem( pFontList, SID_ATTR_CHAR_FONTLIST );
delete pImpl->pFontList;
pImpl->pFontList = new FontList( pNewPrinter, Application::GetDefaultDevice() );
SvxFontListItem aFontListItem( pImpl->pFontList, SID_ATTR_CHAR_FONTLIST );
PutItem( aFontListItem );
CalcOutputFactor();