diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2006-05-04 14:11:08 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2006-05-04 14:11:08 +0000 |
| commit | 9509315c45bf8b834475d0f60425330b31dd1786 (patch) | |
| tree | 251c806210a37bdf865a2f20caa1b0c4a51f241b /vcl/source | |
| parent | 3ce362df52d51d584137f0fa91413c927c8e147b (diff) | |
INTEGRATION: CWS perform07 (1.57.28); FILE MERGED
2006/03/31 15:42:18 mt 1.57.28.3: RESYNC: (1.57-1.58); FILE MERGED
2005/11/03 15:34:58 pl 1.57.28.2: #i56265# bye bye FontSubstConfigItem, welcome FontSubstConfiguration
2005/11/03 12:20:02 pl 1.57.28.1: #i56265# bye bye DefaultFontConfigItem, welcome DefaultFontConfiguration
Diffstat (limited to 'vcl/source')
| -rw-r--r-- | vcl/source/app/svmain.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/vcl/source/app/svmain.cxx b/vcl/source/app/svmain.cxx index ee1f536f1e80..1bafb6daae88 100644 --- a/vcl/source/app/svmain.cxx +++ b/vcl/source/app/svmain.cxx @@ -4,9 +4,9 @@ * * $RCSfile: svmain.cxx,v $ * - * $Revision: 1.58 $ + * $Revision: 1.59 $ * - * last change: $Author: obo $ $Date: 2006-03-24 13:47:42 $ + * last change: $Author: rt $ $Date: 2006-05-04 15:11:08 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -371,10 +371,10 @@ void DeInitVCL() if( pSVData->mpSettingsConfigItem ) delete pSVData->mpSettingsConfigItem, pSVData->mpSettingsConfigItem = NULL; - if( pSVData->maGDIData.mpDefFontConfig ) - delete pSVData->maGDIData.mpDefFontConfig, pSVData->maGDIData.mpDefFontConfig = NULL; - if( pSVData->maGDIData.mpFontSubstConfig ) - delete pSVData->maGDIData.mpFontSubstConfig, pSVData->maGDIData.mpFontSubstConfig = NULL; + if( pSVData->maGDIData.mpDefaultFontConfiguration ) + delete pSVData->maGDIData.mpDefaultFontConfiguration, pSVData->maGDIData.mpDefaultFontConfiguration = NULL; + if( pSVData->maGDIData.mpFontSubstConfiguration ) + delete pSVData->maGDIData.mpFontSubstConfiguration, pSVData->maGDIData.mpFontSubstConfiguration = NULL; if ( pSVData->maAppData.mpIdleMgr ) delete pSVData->maAppData.mpIdleMgr; |