[Libreoffice-commits] core.git: svtools/source

Caolán McNamara caolanm at redhat.com
Mon Aug 31 05:31:48 PDT 2015


 svtools/source/config/colorcfg.cxx |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 9c99c64e34a2e546211398ec0caaa259e8a39bcc
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Aug 31 13:29:22 2015 +0100

    config-less fallback
    
    Change-Id: I695260d6d0c727c3ba7a67886e535569292b15e5

diff --git a/svtools/source/config/colorcfg.cxx b/svtools/source/config/colorcfg.cxx
index e199fc5..5408aa1 100644
--- a/svtools/source/config/colorcfg.cxx
+++ b/svtools/source/config/colorcfg.cxx
@@ -408,6 +408,8 @@ ColorConfig::ColorConfig()
 
 ColorConfig::~ColorConfig()
 {
+    if (utl::ConfigManager::IsAvoidConfig())
+        return;
     ::osl::MutexGuard aGuard( ColorMutex_Impl::get() );
     m_pImpl->RemoveListener(this);
     if(!--nColorRefCount_Impl)


More information about the Libreoffice-commits mailing list