diff options
| author | Oliver Bolte <obo@openoffice.org> | 2006-03-22 14:17:31 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2006-03-22 14:17:31 +0000 |
| commit | ca27bac90efea9505aadcd08bd3de18c6595e3c9 (patch) | |
| tree | 31d6ad4029a30bd627995abac64233d15381042c /vcl/source/gdi/outdev.cxx | |
| parent | 4f6ae0622b3b45c8326ee8b603d8b081261640f7 (diff) | |
INTEGRATION: CWS gcnolk (1.34.70); FILE MERGED
2006/02/21 16:42:54 hdu 1.34.70.4: #i50546# request new fonts when old fonts are released
2006/02/17 15:44:34 hdu 1.34.70.3: RESYNC: (1.37-1.38); FILE MERGED
2005/11/25 17:20:56 hdu 1.34.70.2: RESYNC: (1.34-1.37); FILE MERGED
2005/08/09 09:18:20 hdu 1.34.70.1: #i50546# release physical fonts when done
Diffstat (limited to 'vcl/source/gdi/outdev.cxx')
| -rw-r--r-- | vcl/source/gdi/outdev.cxx | 43 |
1 files changed, 30 insertions, 13 deletions
diff --git a/vcl/source/gdi/outdev.cxx b/vcl/source/gdi/outdev.cxx index a210a31b9e5d..6e4d61e13d86 100644 --- a/vcl/source/gdi/outdev.cxx +++ b/vcl/source/gdi/outdev.cxx @@ -4,9 +4,9 @@ * * $RCSfile: outdev.cxx,v $ * - * $Revision: 1.39 $ + * $Revision: 1.40 $ * - * last change: $Author: vg $ $Date: 2006-03-16 12:54:58 $ + * last change: $Author: obo $ $Date: 2006-03-22 15:17:31 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -724,6 +724,34 @@ void OutputDevice::ImplReleaseGraphics( BOOL bRelease ) if ( !mpGraphics ) return; + // release the fonts of the physically released graphics device + if( bRelease ) + { + mpGraphics->ReleaseFonts(); + + mbNewFont = true; + mbInitFont = true; + + if ( mpFontEntry ) + { + mpFontCache->Release( mpFontEntry ); + mpFontEntry = NULL; + } + + if ( mpGetDevFontList ) + { + delete mpGetDevFontList; + mpGetDevFontList = NULL; + } + + if ( mpGetDevSizeList ) + { + delete mpGetDevSizeList; + mpGetDevSizeList = NULL; + } + } + + ImplSVData* pSVData = ImplGetSVData(); if ( meOutDevType == OUTDEV_WINDOW ) { @@ -794,17 +822,6 @@ void OutputDevice::ImplReleaseGraphics( BOOL bRelease ) mpGraphics = NULL; mpPrevGraphics = NULL; mpNextGraphics = NULL; - - if ( mpGetDevFontList ) - { - delete mpGetDevFontList; - mpGetDevFontList = NULL; - } - if ( mpGetDevSizeList ) - { - delete mpGetDevSizeList; - mpGetDevSizeList = NULL; - } } // ----------------------------------------------------------------------- |