add ppt to fftester

Change-Id: I49162355ce5a58c6aaadfcfb9f45471e5c2a1424

2 files changed, 9 insertions, 8 deletions

diff --git a/svtools/source/config/accessibilityoptions.cxx b/svtools/source/config/accessibilityoptions.cxx
index 30e565819678..5d3f9718cac3 100644
--- a/svtools/source/config/accessibilityoptions.cxx
+++ b/svtools/source/config/accessibilityoptions.cxx
@@ -572,6 +572,7 @@ void SvtAccessibilityOptions_Impl::SetVCLSettings()
 
 SvtAccessibilityOptions::SvtAccessibilityOptions()
 {
+    if (!utl::ConfigManager::IsAvoidConfig())
     {
         ::osl::MutexGuard aGuard( SingletonMutex::get() );
         if(!sm_pSingleImplConfig)
@@ -584,8 +585,6 @@ SvtAccessibilityOptions::SvtAccessibilityOptions()
     //StartListening( *sm_pSingleImplConfig, sal_True );
 }
 
-
-
 SvtAccessibilityOptions::~SvtAccessibilityOptions()
 {
     //EndListening( *sm_pSingleImplConfig, sal_True );
@@ -598,8 +597,6 @@ SvtAccessibilityOptions::~SvtAccessibilityOptions()
     }
 }
 
-
-
 void SvtAccessibilityOptions::Notify( SfxBroadcaster&, const SfxHint& rHint )
 {
     NotifyListeners(0);
diff --git a/svtools/source/config/colorcfg.cxx b/svtools/source/config/colorcfg.cxx
index b02556293b1d..e199fc5a23ef 100644
--- a/svtools/source/config/colorcfg.cxx
+++ b/svtools/source/config/colorcfg.cxx
@@ -392,10 +392,10 @@ void ColorConfig_Impl::ImplUpdateApplicationSettings()
     }
 }
 
-
-
 ColorConfig::ColorConfig()
 {
+    if (utl::ConfigManager::IsAvoidConfig())
+        return;
     ::osl::MutexGuard aGuard( ColorMutex_Impl::get() );
     if ( !m_pImpl )
     {
@@ -506,8 +506,12 @@ Color ColorConfig::GetDefaultColor(ColorConfigEntry eEntry)
 
 ColorConfigValue ColorConfig::GetColorValue(ColorConfigEntry eEntry, bool bSmart) const
 {
-    ColorConfigValue aRet = m_pImpl->GetColorConfigValue(eEntry);
-    if(bSmart)
+    ColorConfigValue aRet;
+
+    if (m_pImpl)
+        aRet = m_pImpl->GetColorConfigValue(eEntry);
+
+    if (bSmart)
     {
         if(COL_AUTO == sal::static_int_cast<ColorData>(aRet.nColor))
             aRet.nColor = ColorConfig::GetDefaultColor(eEntry).GetColor();