for testing allow disabling configmgr for time critical paths

Change-Id: I08021f18d53e1748927f8847649994f95252bbc2
Reviewed-on: https://gerrit.libreoffice.org/17844
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

2 files changed, 23 insertions, 8 deletions

diff --git a/svx/source/svdraw/svdetc.cxx b/svx/source/svdraw/svdetc.cxx
index 76e75f886405..c18754d1c18c 100644
--- a/svx/source/svdraw/svdetc.cxx
+++ b/svx/source/svdraw/svdetc.cxx
@@ -45,9 +45,11 @@
 #include <svx/xflgrit.hxx>
 #include <svx/svdoole2.hxx>
 #include <svl/itempool.hxx>
+#include <unotools/configmgr.hxx>
 #include <unotools/localedatawrapper.hxx>
 #include <i18nlangtag/lang.h>
 #include <unotools/syslocale.hxx>
+#include <unotools/configmgr.hxx>
 #include <svx/xflbckit.hxx>
 #include <svx/extrusionbar.hxx>
 #include <svx/fontworkbar.hxx>
@@ -74,9 +76,11 @@ SdrGlobalData::SdrGlobalData() :
     pResMgr(NULL),
     nExchangeFormat(0)
 {
-
-    svx::ExtrusionBar::RegisterInterface();
-    svx::FontworkBar::RegisterInterface();
+    if (!utl::ConfigManager::IsAvoidConfig())
+    {
+        svx::ExtrusionBar::RegisterInterface();
+        svx::FontworkBar::RegisterInterface();
+    }
 }
 
 const SvtSysLocale*         SdrGlobalData::GetSysLocale()
@@ -104,7 +108,10 @@ SdrGlobalData & GetSdrGlobalData() {
 
 OLEObjCache::OLEObjCache()
 {
-    nSize = officecfg::Office::Common::Cache::DrawingEngine::OLE_Objects::get();
+    if (!utl::ConfigManager::IsAvoidConfig())
+        nSize = officecfg::Office::Common::Cache::DrawingEngine::OLE_Objects::get();
+    else
+        nSize = 100;
     pTimer = new AutoTimer();
     Link<Timer *, void> aLink = LINK(this, OLEObjCache, UnloadCheckHdl);
 
diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx
index 8baffe4db637..ff9004e7cba1 100644
--- a/svx/source/svdraw/svdmodel.cxx
+++ b/svx/source/svdraw/svdmodel.cxx
@@ -31,6 +31,7 @@
 #include <com/sun/star/embed/ElementModes.hpp>
 
 #include <unotools/ucbstreamhelper.hxx>
+#include <unotools/configmgr.hxx>
 
 #include <svl/whiter.hxx>
 #include <svx/xit.hxx>
@@ -174,9 +175,12 @@ void SdrModel::ImpCtor(SfxItemPool* pPool, ::comphelper::IEmbeddedHelper* _pEmbe
 
     mbDisableTextEditUsesCommonUndoManager = false;
 
-    mnCharCompressType =
-        officecfg::Office::Common::AsianLayout::CompressCharacterDistance::
-        get();
+    if (!utl::ConfigManager::IsAvoidConfig())
+        mnCharCompressType =
+            officecfg::Office::Common::AsianLayout::CompressCharacterDistance::
+            get();
+    else
+        mnCharCompressType = 0;
 
 #ifdef OSL_LITENDIAN
     nStreamNumberFormat=SvStreamEndian::LITTLE;
@@ -714,7 +718,11 @@ void SdrModel::SetTextDefaults( SfxItemPool* pItemPool, sal_uIntPtr nDefTextHgt
     SvxFontItem aSvxFontItem( EE_CHAR_FONTINFO) ;
     SvxFontItem aSvxFontItemCJK(EE_CHAR_FONTINFO_CJK);
     SvxFontItem aSvxFontItemCTL(EE_CHAR_FONTINFO_CTL);
-    sal_uInt16 nLanguage(Application::GetSettings().GetLanguageTag().getLanguageType());
+    sal_uInt16 nLanguage;
+    if (!utl::ConfigManager::IsAvoidConfig())
+        nLanguage = Application::GetSettings().GetLanguageTag().getLanguageType();
+    else
+        nLanguage = LANGUAGE_ENGLISH_US;
 
     // get DEFAULTFONT_LATIN_TEXT and set at pool as dynamic default
     vcl::Font aFont(OutputDevice::GetDefaultFont(DefaultFontType::LATIN_TEXT, nLanguage, GetDefaultFontFlags::OnlyOne, 0));