1 files changed, 7 insertions, 10 deletions
diff --git a/starmath/source/smmod.cxx b/starmath/source/smmod.cxx
index 20cfc284d006..8ad99121acfa 100644
--- a/starmath/source/smmod.cxx
+++ b/starmath/source/smmod.cxx
@@ -37,7 +37,7 @@
 #include <sfx2/msg.hxx>
 #include <sfx2/app.hxx>
 #include <sfx2/objface.hxx>
-#include <svtools/whiter.hxx>
+#include <svl/whiter.hxx>
 #include <sfx2/request.hxx>
 #include <sfx2/sfx.hrc>
 #include <sfx2/viewsh.hxx>
@@ -47,7 +47,7 @@
 #endif
 #include <vcl/msgbox.hxx>
 #include <vcl/virdev.hxx>
-#include <svtools/syslocale.hxx>
+#include <unotools/syslocale.hxx>
 #include <tools/rtti.hxx>
 #include "smmod.hxx"
 #include "symbol.hxx"
@@ -251,6 +251,8 @@ SmModule::SmModule(SfxObjectFactory* pObjFact) :
 SmModule::~SmModule()
 {
     delete pConfig;
+    if (pColorConfig)
+        pColorConfig->RemoveListener(this);
     delete pColorConfig;
     delete pLocSymbolData;
     delete pSysLocale;
@@ -295,19 +297,14 @@ svtools::ColorConfig & SmModule::GetColorConfig()
     {
         pColorConfig = new svtools::ColorConfig;
         ApplyColorConfigValues( *pColorConfig );
-        StartListening( *pColorConfig );
+        pColorConfig->AddListener(this);
     }
     return *pColorConfig;
 }
 
-void SmModule::Notify( SfxBroadcaster & /*rBC*/, const SfxHint &rHint )
+void SmModule::ConfigurationChanged( utl::ConfigurationBroadcaster*, sal_uInt32 )
 {
-    if (rHint.ISA(SfxSimpleHint))
-    {
-        ULONG nHintId = ((SfxSimpleHint&)rHint).GetId();
-        if (SFX_HINT_COLORS_CHANGED == nHintId)
-            ApplyColorConfigValues(*pColorConfig);
-    }
+    ApplyColorConfigValues(*pColorConfig);
 }
 
 SmConfig * SmModule::GetConfig()