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

[Bjoern Michaelsen]

 include/svtools/colorcfg.hxx                   |    1 +
 svtools/source/config/accessibilityoptions.cxx |    4 +++-
 svtools/source/config/colorcfg.cxx             |    5 +++++
 3 files changed, 9 insertions(+), 1 deletion(-)

New commits:
commit 7f7a0275be241b8a5e1d1cda0a1da613e3af61d3
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Thu Jan 16 23:21:53 2014 +0100

    fdo#71511: reload ColorConfig after tweaking relevant a11y settings
    
    note that the autodetect HC option is somewhat broken anyway:
    it resets the icon theme hard, so there are not simple roundtrips
    enableing/disabling it for that, but those havent been there before
    either.
    
    Change-Id: Ia35a41717224dfb7437054bb885c61d7e0b189d7

diff --git a/include/svtools/colorcfg.hxx b/include/svtools/colorcfg.hxx
index 2872f4c..ddc8485 100644
--- a/include/svtools/colorcfg.hxx
+++ b/include/svtools/colorcfg.hxx
@@ -105,6 +105,7 @@ public:
     // instead of the automatic color
     ColorConfigValue        GetColorValue(ColorConfigEntry eEntry, sal_Bool bSmart = sal_True)const;
     static Color            GetDefaultColor(ColorConfigEntry eEntry);
+    void Reload();
 };
 
 class SVT_DLLPUBLIC EditableColorConfig
diff --git a/svtools/source/config/accessibilityoptions.cxx b/svtools/source/config/accessibilityoptions.cxx
index 4294e7c..84f0e1c 100644
--- a/svtools/source/config/accessibilityoptions.cxx
+++ b/svtools/source/config/accessibilityoptions.cxx
@@ -31,6 +31,8 @@
 
 #include <svl/smplhint.hxx>
 
+#include <svtools/colorcfg.hxx>
+
 #include <vcl/settings.hxx>
 #include <vcl/svapp.hxx>
 #include <rtl/instance.hxx>
@@ -386,7 +388,7 @@ void SvtAccessibilityOptions_Impl::SetAutoDetectSystemHC(sal_Bool bSet)
         {
             xNode->setPropertyValue(s_sAutoDetectSystemHC, css::uno::makeAny(bSet));
             ::comphelper::ConfigurationHelper::flush(m_xCfg);
-
+            svtools::ColorConfig().Reload();
             bIsModified = sal_True;
         }
     }
diff --git a/svtools/source/config/colorcfg.cxx b/svtools/source/config/colorcfg.cxx
index 81a1b20..a8e5ba8 100644
--- a/svtools/source/config/colorcfg.cxx
+++ b/svtools/source/config/colorcfg.cxx
@@ -510,6 +510,11 @@ ColorConfigValue ColorConfig::GetColorValue(ColorConfigEntry eEntry, sal_Bool bS
     return aRet;
 }
 
+void ColorConfig::Reload()
+{
+    m_pImpl->Load(OUString());
+}
+
 EditableColorConfig::EditableColorConfig() :
     m_pImpl(new ColorConfig_Impl),
     m_bModified(sal_False)