summaryrefslogtreecommitdiff
path: root/unotools
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2015-08-20 14:14:11 +0100
committerCaolán McNamara <caolanm@redhat.com>2015-08-20 16:12:22 +0100
commit77dc6b346ad56b38ec41dc39887388d86548b712 (patch)
treea3ea7e1c2497e9ce9ed40a396a8b4fb705a82ed1 /unotools
parent27dec7c2b1ce0a25ff42465bd4db8ecfc912ec73 (diff)
tweak config-less sysconfig path
Change-Id: I9b93b740aab2e6e2a19612d8ec41e699c1032e9e
Diffstat (limited to 'unotools')
-rw-r--r--unotools/source/config/syslocaleoptions.cxx4
-rw-r--r--unotools/source/misc/syslocale.cxx11
2 files changed, 3 insertions, 12 deletions
diff --git a/unotools/source/config/syslocaleoptions.cxx b/unotools/source/config/syslocaleoptions.cxx
index f72c1c00cf7f..c349f2e5dc0f 100644
--- a/unotools/source/config/syslocaleoptions.cxx
+++ b/unotools/source/config/syslocaleoptions.cxx
@@ -516,8 +516,8 @@ SvtSysLocaleOptions::SvtSysLocaleOptions()
if ( !pOptions )
{
pOptions = new SvtSysLocaleOptions_Impl;
-
- ItemHolder1::holdConfigItem(E_SYSLOCALEOPTIONS);
+ if (!utl::ConfigManager::IsAvoidConfig())
+ ItemHolder1::holdConfigItem(E_SYSLOCALEOPTIONS);
}
++nRefCount;
pOptions->AddListener(this);
diff --git a/unotools/source/misc/syslocale.cxx b/unotools/source/misc/syslocale.cxx
index 117d5d854380..b8e6d5678b9d 100644
--- a/unotools/source/misc/syslocale.cxx
+++ b/unotools/source/misc/syslocale.cxx
@@ -55,13 +55,7 @@ private:
SvtSysLocale_Impl::SvtSysLocale_Impl() : pCharClass(NULL)
{
- if (utl::ConfigManager::IsAvoidConfig())
- {
- pLocaleData = NULL;
- return;
- }
-
- pLocaleData = new LocaleDataWrapper(aSysLocaleOptions.GetRealLanguageTag());
+ pLocaleData = new LocaleDataWrapper( aSysLocaleOptions.GetRealLanguageTag() );
setDateAcceptancePatternsConfig();
// listen for further changes
@@ -121,9 +115,6 @@ void SvtSysLocale_Impl::setDateAcceptancePatternsConfig()
SvtSysLocale::SvtSysLocale()
{
- if (utl::ConfigManager::IsAvoidConfig())
- return;
-
MutexGuard aGuard( GetMutex() );
if ( !pImpl )
pImpl = new SvtSysLocale_Impl;