Kaydet (Commit) abcca7ae authored tarafından Matúš Kukan's avatar Matúš Kukan

Remove unused variables.

Change-Id: I062936c50566ce25a652a50fec1ca948b5616415
üst 54ec7849
...@@ -93,7 +93,6 @@ class VclEventListeners2; ...@@ -93,7 +93,6 @@ class VclEventListeners2;
class SalData; class SalData;
namespace vcl { class DisplayConnection; class SettingsConfigItem; class DeleteOnDeinitBase; } namespace vcl { class DisplayConnection; class SettingsConfigItem; class DeleteOnDeinitBase; }
namespace utl { class DefaultFontConfiguration; class FontSubstConfiguration; }
class LocaleConfigurationListener : public utl::ConfigurationListener class LocaleConfigurationListener : public utl::ConfigurationListener
{ {
...@@ -176,8 +175,6 @@ struct ImplSVGDIData ...@@ -176,8 +175,6 @@ struct ImplSVGDIData
long mnAppFontX; // AppFont X-Numenator for 40/tel Width + DialogScaleX long mnAppFontX; // AppFont X-Numenator for 40/tel Width + DialogScaleX
long mnAppFontY; // AppFont Y-Numenator for 80/tel Height long mnAppFontY; // AppFont Y-Numenator for 80/tel Height
sal_Bool mbFontSubChanged; // sal_True: FontSubstitution was changed between Begin/End 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 mbNativeFontConfig; // true: do not override UI font
bool mbNoXORClipping; // true: do not use XOR to achieve clipping effects bool mbNoXORClipping; // true: do not use XOR to achieve clipping effects
}; };
......
...@@ -27,7 +27,6 @@ ...@@ -27,7 +27,6 @@
#include <tools/debug.hxx> #include <tools/debug.hxx>
#include <tools/resary.hxx> #include <tools/resary.hxx>
#include <tools/gen.hxx> #include <tools/gen.hxx>
#include <unotools/fontcfg.hxx>
#include <cppuhelper/implbase1.hxx> #include <cppuhelper/implbase1.hxx>
#include <uno/current_context.hxx> #include <uno/current_context.hxx>
...@@ -102,11 +101,6 @@ void ImplDeInitSVData() ...@@ -102,11 +101,6 @@ void ImplDeInitSVData()
if( pSVData->mpDockingManager ) if( pSVData->mpDockingManager )
delete 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 ) if( pSVData->maCtrlData.mpFieldUnitStrings )
delete pSVData->maCtrlData.mpFieldUnitStrings, pSVData->maCtrlData.mpFieldUnitStrings = NULL; delete pSVData->maCtrlData.mpFieldUnitStrings, pSVData->maCtrlData.mpFieldUnitStrings = NULL;
if( pSVData->maCtrlData.mpCleanUnitStrings ) if( pSVData->maCtrlData.mpCleanUnitStrings )
......
...@@ -30,8 +30,6 @@ ...@@ -30,8 +30,6 @@
#include "comphelper/processfactory.hxx" #include "comphelper/processfactory.hxx"
#include "unotools/syslocaleoptions.hxx" #include "unotools/syslocaleoptions.hxx"
#include "unotools/fontcfg.hxx"
#include "vcl/svapp.hxx" #include "vcl/svapp.hxx"
#include "vcl/wrkwin.hxx" #include "vcl/wrkwin.hxx"
#include "vcl/cvtgrf.hxx" #include "vcl/cvtgrf.hxx"
...@@ -401,10 +399,6 @@ void DeInitVCL() ...@@ -401,10 +399,6 @@ void DeInitVCL()
if( pSVData->mpSettingsConfigItem ) if( pSVData->mpSettingsConfigItem )
delete pSVData->mpSettingsConfigItem, pSVData->mpSettingsConfigItem = NULL; 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 ) if ( pSVData->maAppData.mpIdleMgr )
delete pSVData->maAppData.mpIdleMgr; delete pSVData->maAppData.mpIdleMgr;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment