diff options
| -rw-r--r-- | unotools/source/config/moduleoptions.cxx | 8 | ||||
| -rw-r--r-- | unotools/source/config/syslocaleoptions.cxx | 2 |
2 files changed, 3 insertions, 7 deletions
diff --git a/unotools/source/config/moduleoptions.cxx b/unotools/source/config/moduleoptions.cxx index 98667f5dc243..e81f3ad7f955 100644 --- a/unotools/source/config/moduleoptions.cxx +++ b/unotools/source/config/moduleoptions.cxx @@ -322,7 +322,7 @@ class SvtModuleOptions_Impl : public ::utl::ConfigItem //--------------------------------------------------------------------------------------------------------- // constructor / destructor //--------------------------------------------------------------------------------------------------------- - SvtModuleOptions_Impl(SvtModuleOptions* pOutsideClass); + SvtModuleOptions_Impl(); ~SvtModuleOptions_Impl(); //--------------------------------------------------------------------------------------------------------- @@ -369,7 +369,6 @@ class SvtModuleOptions_Impl : public ::utl::ConfigItem private: FactoryInfoList m_lFactories; sal_Bool m_bReadOnlyStatesWellKnown; - SvtModuleOptions* m_pOutsideClass; }; /*-************************************************************************************************************//** @@ -386,10 +385,9 @@ class SvtModuleOptions_Impl : public ::utl::ConfigItem @onerror - @threadsafe no *//*-*************************************************************************************************************/ -SvtModuleOptions_Impl::SvtModuleOptions_Impl(SvtModuleOptions* pOutsideClass) +SvtModuleOptions_Impl::SvtModuleOptions_Impl() : ::utl::ConfigItem( ROOTNODE_FACTORIES ) , m_bReadOnlyStatesWellKnown( sal_False ) - , m_pOutsideClass( pOutsideClass ) { // First initialize list of factory infos! Otherwise we couldnt gurantee right working of these class. for( sal_Int32 nFactory=0; nFactory<FACTORYCOUNT; ++nFactory ) @@ -1021,7 +1019,7 @@ SvtModuleOptions::SvtModuleOptions() if( m_nRefCount == 1 ) { RTL_LOGFILE_CONTEXT(aLog, "unotools ( ??? ) ::SvtModuleOptions_Impl::ctor()"); - m_pDataContainer = new SvtModuleOptions_Impl(this); + m_pDataContainer = new SvtModuleOptions_Impl(); ItemHolder1::holdConfigItem(E_MODULEOPTIONS); } diff --git a/unotools/source/config/syslocaleoptions.cxx b/unotools/source/config/syslocaleoptions.cxx index 004b9e3eeb92..d790d48fdcef 100644 --- a/unotools/source/config/syslocaleoptions.cxx +++ b/unotools/source/config/syslocaleoptions.cxx @@ -77,7 +77,6 @@ class SvtSysLocaleOptions_Impl : public utl::ConfigItem OUString m_aLocaleString; // en-US or de-DE or empty for SYSTEM OUString m_aUILocaleString; // en-US or de-DE or empty for SYSTEM OUString m_aCurrencyString; // USD-en-US or EUR-de-DE - sal_uLong m_nBlockedHint; // pending hints sal_Bool m_bDecimalSeparator; //use decimal separator same as locale sal_Bool m_bROLocale; @@ -150,7 +149,6 @@ const Sequence< OUString > SvtSysLocaleOptions_Impl::GetPropertyNames() SvtSysLocaleOptions_Impl::SvtSysLocaleOptions_Impl() : ConfigItem( ROOTNODE_SYSLOCALE ) - , m_nBlockedHint( 0 ) , m_bDecimalSeparator( sal_True ) , m_bROLocale(CFG_READONLY_DEFAULT) , m_bROUILocale(CFG_READONLY_DEFAULT) |