diff options
| author | Matúš Kukan <matus.kukan@gmail.com> | 2013-02-15 09:19:54 +0100 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@gmail.com> | 2013-02-18 08:52:37 +0100 |
| commit | 4282ce68d82f26fc76223380b6dbfc3cc472ea90 (patch) | |
| tree | c5a3a405a567f3f37019fe091d1dcac7d4765219 | |
| parent | 6cf422aebe8beca9366cc84fc2e7a3ad16803232 (diff) | |
remove always null pointers
| -rw-r--r-- | vcl/inc/svdata.hxx | 3 | ||||
| -rw-r--r-- | vcl/source/app/svdata.cxx | 6 | ||||
| -rw-r--r-- | vcl/source/app/svmain.cxx | 5 |
3 files changed, 0 insertions, 14 deletions
diff --git a/vcl/inc/svdata.hxx b/vcl/inc/svdata.hxx index b4b59b57bd2a..9ac111c0473a 100644 --- a/vcl/inc/svdata.hxx +++ b/vcl/inc/svdata.hxx @@ -93,7 +93,6 @@ class VclEventListeners2; class SalData; namespace vcl { class DisplayConnection; class SettingsConfigItem; class DeleteOnDeinitBase; } -namespace utl { class DefaultFontConfiguration; class FontSubstConfiguration; } // ----------------- // - ImplSVAppData - @@ -183,8 +182,6 @@ struct ImplSVGDIData long mnAppFontX; // AppFont X-Numenator for 40/tel Width + DialogScaleX long mnAppFontY; // AppFont Y-Numenator for 80/tel Height sal_Bool mbFontSubChanged; // sal_True: FontSubstitution was changed between Begin/End - utl::DefaultFontConfiguration* mpDefaultFontConfiguration; - utl::FontSubstConfiguration* mpFontSubstConfiguration; bool mbNativeFontConfig; // true: do not override UI font bool mbNoXORClipping; // true: do not use XOR to achieve clipping effects }; diff --git a/vcl/source/app/svdata.cxx b/vcl/source/app/svdata.cxx index 657c3ee3c237..801d5453bb49 100644 --- a/vcl/source/app/svdata.cxx +++ b/vcl/source/app/svdata.cxx @@ -27,7 +27,6 @@ #include <tools/debug.hxx> #include <tools/resary.hxx> #include <tools/gen.hxx> -#include <unotools/fontcfg.hxx> #include <cppuhelper/implbase1.hxx> #include <comphelper/string.hxx> #include <uno/current_context.hxx> @@ -115,11 +114,6 @@ void ImplDeInitSVData() if( pSVData->mpDockingManager ) delete pSVData->mpDockingManager; - if( pSVData->maGDIData.mpDefaultFontConfiguration ) - delete pSVData->maGDIData.mpDefaultFontConfiguration; - if( pSVData->maGDIData.mpFontSubstConfiguration ) - delete pSVData->maGDIData.mpFontSubstConfiguration; - if( pSVData->maCtrlData.mpFieldUnitStrings ) delete pSVData->maCtrlData.mpFieldUnitStrings, pSVData->maCtrlData.mpFieldUnitStrings = NULL; if( pSVData->maCtrlData.mpCleanUnitStrings ) diff --git a/vcl/source/app/svmain.cxx b/vcl/source/app/svmain.cxx index 9b83c6d3a26a..8db179a66ff3 100644 --- a/vcl/source/app/svmain.cxx +++ b/vcl/source/app/svmain.cxx @@ -30,7 +30,6 @@ #include "comphelper/processfactory.hxx" #include "unotools/syslocaleoptions.hxx" -#include "unotools/fontcfg.hxx" #include "vcl/svapp.hxx" #include "vcl/wrkwin.hxx" @@ -404,10 +403,6 @@ void DeInitVCL() if( pSVData->mpSettingsConfigItem ) delete pSVData->mpSettingsConfigItem, pSVData->mpSettingsConfigItem = 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; |