cws tl76: merge with DEV300_m68

28 files changed, 206 insertions, 199 deletions

diff --git a/starmath/inc/action.hxx b/starmath/inc/action.hxx
index 221b3a579d..33e5a7f4f5 100644
--- a/starmath/inc/action.hxx
+++ b/starmath/inc/action.hxx
@@ -30,7 +30,7 @@
 #ifndef ACTION_HXX
 #define ACTION_HXX
 
-#include <svtools/undo.hxx>
+#include <svl/undo.hxx>
 #include "format.hxx"
 
 class SmDocShell;
diff --git a/starmath/inc/config.hxx b/starmath/inc/config.hxx
index 7bc3b848ac..2af382d399 100644
--- a/starmath/inc/config.hxx
+++ b/starmath/inc/config.hxx
@@ -30,8 +30,8 @@
 #ifndef CONFIG_HXX
 #define CONFIG_HXX
 
-#include <svtools/brdcst.hxx>
-#include <svtools/lstner.hxx>
+#include <svl/brdcst.hxx>
+#include <svl/lstner.hxx>
 #include "format.hxx"
 
 #include "cfgitem.hxx"
diff --git a/starmath/inc/document.hxx b/starmath/inc/document.hxx
index 3f015a924e..145d4cf616 100644
--- a/starmath/inc/document.hxx
+++ b/starmath/inc/document.hxx
@@ -35,7 +35,7 @@
 #include <sot/storage.hxx>
 #include <sot/sotref.hxx>
 #include <sfx2/objsh.hxx>
-#include <svtools/lstner.hxx>
+#include <svl/lstner.hxx>
 #include <sfx2/docfac.hxx>
 #include <vcl/virdev.hxx>
 #include "format.hxx"
diff --git a/starmath/inc/format.hxx b/starmath/inc/format.hxx
index 326b2159cb..4d30b5252e 100644
--- a/starmath/inc/format.hxx
+++ b/starmath/inc/format.hxx
@@ -31,8 +31,8 @@
 #define FORMAT_HXX
 
 
-#include <svtools/smplhint.hxx>
-#include <svtools/brdcst.hxx>
+#include <svl/smplhint.hxx>
+#include <svl/brdcst.hxx>
 #include "utility.hxx"
 #include <types.hxx>
 
diff --git a/starmath/inc/smmod.hxx b/starmath/inc/smmod.hxx
index ced91cc7f6..e7d947cf27 100644
--- a/starmath/inc/smmod.hxx
+++ b/starmath/inc/smmod.hxx
@@ -34,7 +34,7 @@
 #ifndef _SV_RESARY_HXX
 #include <tools/resary.hxx>
 #endif
-#include <svtools/lstner.hxx>
+#include <svl/lstner.hxx>
 #include <svtools/colorcfg.hxx>
 
 #include <tools/shl.hxx>
@@ -44,6 +44,8 @@
 #include "starmath.hrc"
 #endif
 
+#include <unotools/options.hxx>
+
 class SvxErrorHandler;
 class SfxObjectFactory;
 class SmConfig;
@@ -124,7 +126,7 @@ public:
 
 /////////////////////////////////////////////////////////////////
 
-class SmModule : public SfxModule, public SfxListener
+class SmModule : public SfxModule, utl::ConfigurationListener
 {
     svtools::ColorConfig        *pColorConfig;
     SmConfig                *pConfig;
@@ -145,8 +147,7 @@ public:
     SmModule(SfxObjectFactory* pObjFact);
     virtual ~SmModule();
 
-    // SfxListener
-    virtual void        Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
+    virtual void ConfigurationChanged( utl::ConfigurationBroadcaster*, sal_uInt32 );
 
     svtools::ColorConfig &  GetColorConfig();
 
diff --git a/starmath/inc/starmath.hrc b/starmath/inc/starmath.hrc
index 854584e11d..d6a894258a 100644
--- a/starmath/inc/starmath.hrc
+++ b/starmath/inc/starmath.hrc
@@ -31,7 +31,7 @@
 #define _STARMATH_HRC
 
 #ifndef _SVX_SVXIDS_HRC
-#include <svtools/solar.hrc>
+#include <svl/solar.hrc>
 #endif
 #ifndef _SFXSIDS_HRC //autogen
 #include <sfx2/sfxsids.hrc>
diff --git a/starmath/inc/symbol.hxx b/starmath/inc/symbol.hxx
index 2be59e453c..f2949aa5f5 100644
--- a/starmath/inc/symbol.hxx
+++ b/starmath/inc/symbol.hxx
@@ -37,8 +37,8 @@
 #include <tools/list.hxx>
 #include <tools/debug.hxx>
 #include <tools/dynary.hxx>
-#include <svtools/lstner.hxx>
-#include <svtools/svarray.hxx>
+#include <svl/lstner.hxx>
+#include <svl/svarray.hxx>
 #include "utility.hxx"
 #include <smmod.hxx>
 
diff --git a/starmath/sdi/makefile.mk b/starmath/sdi/makefile.mk
index 768280af97..f868756f59 100644
--- a/starmath/sdi/makefile.mk
+++ b/starmath/sdi/makefile.mk
@@ -1,7 +1,7 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
+#
 # Copyright 2008 by Sun Microsystems, Inc.
 #
 # OpenOffice.org - a multi-platform office productivity suite
@@ -46,8 +46,12 @@ SVSDIINC=$(PRJ)$/inc
 SDI1NAME=$(TARGET)
 
 SVSDI1DEPEND= \
-    $(SOLARINCDIR)$/svxslots.ilb \
-    smath.sdi \
+        $(SOLARINCXDIR)$/sfx2/sfx.sdi \
+        $(SOLARINCXDIR)$/sfx2/sfxitems.sdi \
+        $(SOLARINCXDIR)$/svx/svx.sdi \
+        $(SOLARINCXDIR)$/svx/svxitems.sdi \
+        $(SOLARINCXDIR)$/svx/xoitems.sdi \
+        smath.sdi \
     smslots.sdi \
     $(SVSDIINC)$/starmath.hrc
 
diff --git a/starmath/sdi/svxitems.sdi b/starmath/sdi/smitems.sdi
index a071a52f83..a071a52f83 100644
--- a/starmath/sdi/svxitems.sdi
+++ b/starmath/sdi/smitems.sdi
diff --git a/starmath/sdi/smslots.sdi b/starmath/sdi/smslots.sdi
index d0ae79a7f5..88bd108bdd 100644
--- a/starmath/sdi/smslots.sdi
+++ b/starmath/sdi/smslots.sdi
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -28,8 +28,6 @@
  *
  ************************************************************************/
 
-import "svxslots.ilb"
-
 module
 "312C4240-35E7-101C-B12A-04021C007002"
 "58216740-35E7-101C-B12A-04021C007002"
@@ -39,9 +37,13 @@ StarMath
     SlotIdFile ( "starmath.hrc" )
     SlotIdFile ( "sfx2/sfxsids.hrc" )
     SlotIdFile ( "svx/svxids.hrc" )
-    TypeLibFile ( "smslots.tlb" )
 ]
 {
+    include "sfx2/sfxitems.sdi"
+    include "sfx2/sfx.sdi"
+    include "svx/svxitems.sdi"
+    include "svx/xoitems.sdi"
+    include "svx/svx.sdi"
     include "smath.sdi"
     interface StarMath
     [
@@ -59,7 +61,7 @@ shell SmModule
     import StarMath[Automation];
 }
 
-interface FormulaDocument : OfficeDocument
+interface FormulaDocument
 [
     uuid ( "815CBB20-2FC3-11CF-89CA-008029E4B0B1" )
 ]
@@ -149,13 +151,13 @@ interface FormulaDocument : OfficeDocument
     ]
 }
 
-shell SmDocShell : SfxObjectShell
+shell SmDocShell
 {
     import FormulaDocument[Automation];
 }
 
 
-interface FormulaView : View
+interface FormulaView
 [
     uuid ( "CE1A6C00-2FC3-11CF-89CA-008029E4B0B1" )
 ]
@@ -323,7 +325,7 @@ interface FormulaView : View
         ]
 }
 
-shell SmViewShell : SfxViewShell
+shell SmViewShell
 {
     import FormulaView[Automation];
 }
diff --git a/starmath/source/accessibility.cxx b/starmath/source/accessibility.cxx
index 355a2baab2..ec5c005d68 100644
--- a/starmath/source/accessibility.cxx
+++ b/starmath/source/accessibility.cxx
@@ -51,7 +51,7 @@
 #include <vcl/unohelp2.hxx>
 #include <tools/gen.hxx>
 #include <vos/mutex.hxx>
-#include <svtools/itemset.hxx>
+#include <svl/itemset.hxx>
 
 #include <svx/editobj.hxx>
 #include <svx/editdata.hxx>
diff --git a/starmath/source/accessibility.hxx b/starmath/source/accessibility.hxx
index 335551aa5d..3c0c3fcc63 100644
--- a/starmath/source/accessibility.hxx
+++ b/starmath/source/accessibility.hxx
@@ -52,7 +52,7 @@
 #include <cppuhelper/interfacecontainer.h>
 #include <cppuhelper/implbase5.hxx>
 #include <cppuhelper/implbase6.hxx>
-#include <svtools/brdcst.hxx>
+#include <svl/brdcst.hxx>
 
 #include <svx/editeng.hxx>
 #include <svx/unoedsrc.hxx> // SvxEditSource, SvxTextForwarder, SvxViewForwarder, SvxEditViewForwarder
diff --git a/starmath/source/cfgitem.cxx b/starmath/source/cfgitem.cxx
index 9d34209aff..693fe32fa2 100644
--- a/starmath/source/cfgitem.cxx
+++ b/starmath/source/cfgitem.cxx
@@ -1279,6 +1279,8 @@ void SmMathConfig::SetShowFormulaCursor( BOOL bVal )
     SetOtherIfNotEqual( pOther->bFormulaCursor, bVal );
 }
 
+void SmMathConfig::Notify( const com::sun::star::uno::Sequence< rtl::OUString >& )
+{}
 
 /////////////////////////////////////////////////////////////////
 
diff --git a/starmath/source/cfgitem.hxx b/starmath/source/cfgitem.hxx
index 7b5029f990..bc62a7a6d3 100644
--- a/starmath/source/cfgitem.hxx
+++ b/starmath/source/cfgitem.hxx
@@ -44,7 +44,7 @@
 #include <tools/solar.h>
 #include <rtl/ustring.hxx>
 #include <unotools/configitem.hxx>
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
 #include <vcl/timer.hxx>
 
 #include <symbol.hxx>
@@ -174,7 +174,7 @@ public:
     virtual ~SmMathConfig();
 
     // utl::ConfigItem
-    //virtual void    Notify( const com::sun::star::uno::Sequence< rtl::OUString > &rPropertyNames );
+    virtual void    Notify( const com::sun::star::uno::Sequence< rtl::OUString > &rPropertyNames );
     virtual void    Commit();
 
     // make some protected functions of utl::ConfigItem public
diff --git a/starmath/source/config.cxx b/starmath/source/config.cxx
index 1ebd6d65bf..3a8034f51f 100644
--- a/starmath/source/config.cxx
+++ b/starmath/source/config.cxx
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -32,15 +32,15 @@
 #include "precompiled_starmath.hxx"
 
 
-#include <svtools/itemset.hxx>
-#include <svtools/hint.hxx>
-#include <svtools/smplhint.hxx>
-#include <svtools/pathoptions.hxx>
+#include <svl/itemset.hxx>
+#include <svl/hint.hxx>
+#include <svl/smplhint.hxx>
+#include <unotools/pathoptions.hxx>
 #include <sfx2/sfxsids.hrc>
-#include <svtools/eitem.hxx>
-#include <svtools/itempool.hxx>
-#include <svtools/stritem.hxx>
-#include <svtools/intitem.hxx>
+#include <svl/eitem.hxx>
+#include <svl/itempool.hxx>
+#include <svl/stritem.hxx>
+#include <svl/intitem.hxx>
 #include <tools/stream.hxx>
 
 
diff --git a/starmath/source/dialog.cxx b/starmath/source/dialog.cxx
index 6b9a0ced72..fe16822b6e 100644
--- a/starmath/source/dialog.cxx
+++ b/starmath/source/dialog.cxx
@@ -34,9 +34,9 @@
 
 #define SMDLL 1
 #include "tools/rcid.h"
-#include <svtools/eitem.hxx>
-#include <svtools/intitem.hxx>
-#include <svtools/stritem.hxx>
+#include <svl/eitem.hxx>
+#include <svl/intitem.hxx>
+#include <svl/stritem.hxx>
 #include <sfx2/app.hxx>
 #include <vcl/msgbox.hxx>
 #include <svtools/ctrltool.hxx>
@@ -396,9 +396,9 @@ void SmFontDialog::InitColor_Impl()
 #endif
     ColorData   nBgCol  = COL_WHITE,
                 nTxtCol = COL_BLACK;
-    if (GetDisplayBackground().GetColor().IsDark())
+    const StyleSettings &rS = GetSettings().GetStyleSettings();
+    if (rS.GetHighContrastMode())
     {
-        const StyleSettings &rS = GetSettings().GetStyleSettings();
         nBgCol  = rS.GetFieldColor().GetColor();
         nTxtCol = rS.GetFieldTextColor().GetColor();
     }
@@ -967,7 +967,7 @@ SmDistanceDialog::~SmDistanceDialog()
 
 void SmDistanceDialog::ApplyImages()
 {
-    BOOL bHighContrast = GetDisplayBackground().GetColor().IsDark() != 0;
+    BOOL bHighContrast = GetSettings().GetStyleSettings().GetHighContrastMode();
     for (int i = 0;  i < NOCATEGORIES;  ++i)
     {
         SmCategoryDesc *pCat = Categories[i];
@@ -1551,9 +1551,9 @@ void SmSymbolDialog::InitColor_Impl()
 #endif
     ColorData   nBgCol  = COL_WHITE,
                 nTxtCol = COL_BLACK;
-    if (GetDisplayBackground().GetColor().IsDark())
+    const StyleSettings &rS = GetSettings().GetStyleSettings();
+    if (rS.GetHighContrastMode())
     {
-        const StyleSettings &rS = GetSettings().GetStyleSettings();
         nBgCol  = rS.GetFieldColor().GetColor();
         nTxtCol = rS.GetFieldTextColor().GetColor();
     }
@@ -2180,7 +2180,7 @@ void SmSymDefineDialog::InitColor_Impl()
 #endif
     ColorData   nBgCol  = COL_WHITE,
                 nTxtCol = COL_BLACK;
-    BOOL bHighContrast = GetDisplayBackground().GetColor().IsDark() != 0;
+    BOOL bHighContrast = GetSettings().GetStyleSettings().GetHighContrastMode();
     if (bHighContrast)
     {
         const StyleSettings &rS = GetSettings().GetStyleSettings();
diff --git a/starmath/source/document.cxx b/starmath/source/document.cxx
index 48e5f8f71f..cc85df6aa7 100644
--- a/starmath/source/document.cxx
+++ b/starmath/source/document.cxx
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -55,22 +55,22 @@
 #include <sot/exchange.hxx>
 #include <sot/formats.hxx>
 #include <sot/storage.hxx>
-#include <svtools/eitem.hxx>
-#include <svtools/fstathelper.hxx>
-#include <svtools/intitem.hxx>
-#include <svtools/itempool.hxx>
-#include <svtools/lingucfg.hxx>
-#include <svtools/linguprops.hxx>
-#include <svtools/pathoptions.hxx>
-#include <svtools/ptitem.hxx>
+#include <svl/eitem.hxx>
+#include <svl/fstathelper.hxx>
+#include <svl/intitem.hxx>
+#include <svl/itempool.hxx>
+#include <unotools/lingucfg.hxx>
+#include <unotools/linguprops.hxx>
+#include <unotools/pathoptions.hxx>
+#include <svl/ptitem.hxx>
 #include <svtools/sfxecode.hxx>
-#include <svtools/slstitm.hxx>
-#include <svtools/smplhint.hxx>
-#include <svtools/stritem.hxx>
+#include <svl/slstitm.hxx>
+#include <svl/smplhint.hxx>
+#include <svl/stritem.hxx>
 #include <svtools/transfer.hxx>
-#include <svtools/undo.hxx>
-#include <svtools/urihelper.hxx>
-#include <svtools/whiter.hxx>
+#include <svl/undo.hxx>
+#include <svl/urihelper.hxx>
+#include <svl/whiter.hxx>
 #include <svx/editeng.hxx>
 #include <svx/editstat.hxx>
 #include <svx/eeitem.hxx>
@@ -467,7 +467,7 @@ void SmDocShell::Draw(OutputDevice &rDev, Point &rPosition)
     ULONG nOldDrawMode = DRAWMODE_DEFAULT;
     BOOL bRestoreDrawMode = FALSE;
     if (OUTDEV_WINDOW == rDev.GetOutDevType() &&
-        ((Window &) rDev).GetDisplayBackground().GetColor().IsDark())
+        ((Window &) rDev).GetSettings().GetStyleSettings().GetHighContrastMode())
     {
         nOldDrawMode = rDev.GetDrawMode();
         rDev.SetDrawMode( DRAWMODE_DEFAULT );
@@ -823,7 +823,7 @@ BOOL SmDocShell::Load( SfxMedium& rMedium )
              xStorage->isStreamElement( C2S( "content.xml" ) )
             ) ||
             (
-             xAccess->hasByName( C2S( "Content.xml" ) ) && 
+             xAccess->hasByName( C2S( "Content.xml" ) ) &&
              xStorage->isStreamElement( C2S( "Content.xml" ) )
             )
            )
diff --git a/starmath/source/edit.cxx b/starmath/source/edit.cxx
index 0e4542b96e..6e9a1827f3 100644
--- a/starmath/source/edit.cxx
+++ b/starmath/source/edit.cxx
@@ -52,13 +52,13 @@
 #include <svx/editstat.hxx>
 #include <svx/eeitem.hxx>
 #include <sfx2/dispatch.hxx>
-#include <svtools/intitem.hxx>
-#include <svtools/itempool.hxx>
-#include <svtools/stritem.hxx>
+#include <svl/intitem.hxx>
+#include <svl/itempool.hxx>
+#include <svl/stritem.hxx>
 #include <svx/fhgtitem.hxx>
 #include <svx/wghtitem.hxx>
 #include <svx/lrspitem.hxx>
-#include <svtools/itemset.hxx>
+#include <svl/itemset.hxx>
 #include <svx/fontitem.hxx>
 #include <sfx2/viewfrm.hxx>
 
diff --git a/starmath/source/math_pch.cxx b/starmath/source/math_pch.cxx
index 89d129b81c..7a58e8aa62 100644
--- a/starmath/source/math_pch.cxx
+++ b/starmath/source/math_pch.cxx
@@ -48,11 +48,11 @@
 #include <tools/rtti.hxx>
 #include <tools/ref.hxx>
 #include <tools/link.hxx>
-#include <svtools/brdcst.hxx>
-#include <svtools/svarray.hxx>
+#include <svl/brdcst.hxx>
+#include <svl/svarray.hxx>
 #include <tools/debug.hxx>
-#include <svtools/hint.hxx>
-#include <svtools/smplhint.hxx>
+#include <svl/hint.hxx>
+#include <svl/smplhint.hxx>
 #include <sot/sotref.hxx>
 #include <tools/globname.hxx>
 #include <sot/factory.hxx>
@@ -130,9 +130,9 @@
 #include <smdll.hxx>
 #include <sfx2/sfxsids.hrc>
 #include <chaos/cntids.hrc>
-#include <svtools/cntwids.hrc>
-#include <svtools/solar.hrc>
-#include <svtools/lstner.hxx>
+#include <svl/cntwids.hrc>
+#include <svl/solar.hrc>
+#include <svl/lstner.hxx>
 #include <starmath.hrc>
 #include <basic/sbx.hxx>
 #include <basic/sbxform.hxx>
@@ -143,7 +143,7 @@
 #include <basic/sbxmeth.hxx>
 #include <tools/unqid.hxx>
 #include <tools/unqidx.hxx>
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
 #include <svtools/args.hxx>
 #include <smmod.hxx>
 #include <vos/thread.hxx>
@@ -156,7 +156,7 @@
 #include <vcl/timer.hxx>
 #include <sfx2/app.hxx>
 #include <sfx2/sfx.hrc>
-#include <svtools/memberid.hrc>
+#include <svl/memberid.hrc>
 #include <vcl/syswin.hxx>
 #include <vcl/virdev.hxx>
 #include <tools/datetime.hxx>
@@ -736,7 +736,7 @@
 #endif
 #include <usr/refl.hxx>
 #include <sfx2/msg.hxx>
-#include <svtools/itemset.hxx>
+#include <svl/itemset.hxx>
 #include <sfx2/basedlgs.hxx>
 #include <vcl/floatwin.hxx>
 #include <vcl/dialog.hxx>
@@ -745,10 +745,10 @@
 #include <sfx2/frame.hxx>
 #include <sfx2/objface.hxx>
 #include <vcl/event.hxx>
-#include <svtools/eitem.hxx>
-#include <svtools/intitem.hxx>
+#include <svl/eitem.hxx>
+#include <svl/intitem.hxx>
 #include <symbol.hxx>
-#include <svtools/itempool.hxx>
+#include <svl/itempool.hxx>
 #include <vcl/image.hxx>
 #include <vcl/metric.hxx>
 #include <sfx2/inimgr.hxx>
@@ -756,14 +756,14 @@
 #include <tools/pstm.hxx>
 #include <tools/table.hxx>
 #include <sfx2/docfac.hxx>
-#include <svtools/ownlist.hxx>
+#include <svl/ownlist.hxx>
 #include <sfx2/objsh.hxx>
-#include <svtools/stritem.hxx>
+#include <svl/stritem.hxx>
 #include <vcl/mapmod.hxx>
 #include <sfx2/ipfrm.hxx>
 #include <vcl/dialog.hxx>
 #include <sfx2/dispatch.hxx>
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 #include <sfx2/bindings.hxx>
 #include <dialog.hxx>
 #include <vcl/button.hxx>
@@ -822,9 +822,9 @@
 #include <vcl/toolbox.hxx>
 #include <vcl/dockwin.hxx>
 #include <smslots.hxx>
-#include <svtools/undo.hxx>
+#include <svl/undo.hxx>
 #include <sfx2/request.hxx>
-#include <svtools/whiter.hxx>
+#include <svl/whiter.hxx>
 #include <vcl/prntypes.hxx>
 #include <vcl/jobset.hxx>
 #include <vcl/gdimtf.hxx>
diff --git a/starmath/source/mathmlexport.cxx b/starmath/source/mathmlexport.cxx
index 9ddabab9c3..c9b12abcdb 100644
--- a/starmath/source/mathmlexport.cxx
+++ b/starmath/source/mathmlexport.cxx
@@ -1,7 +1,7 @@
 /*************************************************************************

  *

  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.

- * 

+ *

  * Copyright 2008 by Sun Microsystems, Inc.

  *

  * OpenOffice.org - a multi-platform office productivity suite

@@ -61,9 +61,9 @@
 #include <tools/debug.hxx>

 #include <tools/urlobj.hxx>

 #include <svtools/sfxecode.hxx>

-#include <svtools/saveopt.hxx>

-#include <svtools/stritem.hxx>

-#include <svtools/itemprop.hxx>

+#include <unotools/saveopt.hxx>

+#include <svl/stritem.hxx>

+#include <svl/itemprop.hxx>

 #include <unotools/processfactory.hxx>

 #include <unotools/streamwrap.hxx>

 #include <xmloff/xmlnmspe.hxx>

@@ -403,8 +403,8 @@ SmXMLExport::SmXMLExport(
 {

 }

 

-sal_Int64 SAL_CALL SmXMLExport::getSomething( 

-    const uno::Sequence< sal_Int8 >& rId ) 

+sal_Int64 SAL_CALL SmXMLExport::getSomething(

+    const uno::Sequence< sal_Int8 >& rId )

 throw(uno::RuntimeException)

 {

     if ( rId.getLength() == 16 &&

@@ -833,7 +833,7 @@ void SmXMLExport::ExportTable(const SmNode *pNode, int nLevel)
     if (nSize >= 1 && pNode->GetSubNode(nSize-1)->GetNumSubNodes() == 0)

         --nSize;

 

-    // try to avoid creating a mtable element when the formula consists only 

+    // try to avoid creating a mtable element when the formula consists only

     // of a single output line

     if (nLevel || (nSize >1))

         pTable = new SvXMLElementExport(*this, XML_NAMESPACE_MATH, XML_MTABLE, sal_True, sal_True);

@@ -902,7 +902,7 @@ void SmXMLExport::ExportText(const SmNode *pNode, int /*nLevel*/)
 

 void SmXMLExport::ExportBlank(const SmNode * /*pNode*/, int /*nLevel*/)

 {

-    //!! exports an empty <mi> tag since for example "~_~" is allowed in 

+    //!! exports an empty <mi> tag since for example "~_~" is allowed in

     //!! Math (so it has no sense at all) but must not result in an empty

     //!! <msub> tag in MathML !!

 

@@ -910,7 +910,7 @@ void SmXMLExport::ExportBlank(const SmNode * /*pNode*/, int /*nLevel*/)
     //const SmBlankNode *pTemp = static_cast<const SmBlankNode *>(pNode);

 

     pText = new SvXMLElementExport(*this, XML_NAMESPACE_MATH, XML_MI, sal_True, sal_False);

-    

+

     GetDocHandler()->characters( OUString() );

     delete pText;

 }

@@ -1203,10 +1203,10 @@ void SmXMLExport::ExportAttributes(const SmNode *pNode, int nLevel)
 

 static bool lcl_HasEffectOnMathvariant( const SmTokenType eType )

 {

-    return  eType == TBOLD || eType == TNBOLD || 

+    return  eType == TBOLD || eType == TNBOLD ||

             eType == TITALIC || eType == TNBOLD ||

             eType == TSANS || eType == TSERIF || eType == TFIXED;

-}    

+}

 

 void SmXMLExport::ExportFont(const SmNode *pNode, int nLevel)

 {

@@ -1480,7 +1480,7 @@ void SmXMLExport::ExportNodes(const SmNode *pNode, int nLevel)
                     // thus at least it will not vanish into nothing

                     ExportText(pNode, nLevel);

                 }

-                else    

+                else

                 {

                     //To fully handle generic MathML we need to implement the full

                     //operator dictionary, we will generate MathML with explicit

diff --git a/starmath/source/mathmlimport.cxx b/starmath/source/mathmlimport.cxx
index e7f0c6d7c5..56b35a96c6 100644
--- a/starmath/source/mathmlimport.cxx
+++ b/starmath/source/mathmlimport.cxx
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -57,9 +57,9 @@ one go*/
 #include <tools/debug.hxx>
 #include <tools/urlobj.hxx>
 #include <svtools/sfxecode.hxx>
-#include <svtools/saveopt.hxx>
-#include <svtools/stritem.hxx>
-#include <svtools/itemprop.hxx>
+#include <unotools/saveopt.hxx>
+#include <svl/stritem.hxx>
+#include <svl/itemprop.hxx>
 #include <unotools/processfactory.hxx>
 #include <unotools/streamwrap.hxx>
 #include <xmloff/xmlnmspe.hxx>
@@ -337,7 +337,7 @@ ULONG SmXMLImportWrapper::ReadThroughComponent(
         packages::zip::ZipIOException aBrokenPackage;
         if ( aSaxEx.WrappedException >>= aBrokenPackage )
             return ERRCODE_IO_BROKENPACKAGE;
-        
+
         if ( bEncrypted )
             nError = ERRCODE_SFX_WRONGPASSWORD;
     }
@@ -346,7 +346,7 @@ ULONG SmXMLImportWrapper::ReadThroughComponent(
         packages::zip::ZipIOException aBrokenPackage;
         if ( r.WrappedException >>= aBrokenPackage )
             return ERRCODE_IO_BROKENPACKAGE;
- 
+
         if ( bEncrypted )
             nError = ERRCODE_SFX_WRONGPASSWORD;
     }
@@ -553,8 +553,8 @@ rtl::OUString SAL_CALL SmXMLImport::getImplementationName()
 }
 
 
-sal_Int64 SAL_CALL SmXMLImport::getSomething( 
-    const uno::Sequence< sal_Int8 >&rId ) 
+sal_Int64 SAL_CALL SmXMLImport::getSomething(
+    const uno::Sequence< sal_Int8 >&rId )
 throw(uno::RuntimeException)
 {
     if ( rId.getLength() == 16 &&
@@ -625,17 +625,17 @@ public:
     SmXMLImportContext( SmXMLImport &rImport, sal_uInt16 nPrfx,
         const OUString& rLName)
         : SvXMLImportContext(rImport, nPrfx, rLName) {}
-    
+
     const SmXMLImport& GetSmImport() const
     {
         return (const SmXMLImport&)GetImport();
     }
-    
+
     SmXMLImport& GetSmImport()
     {
         return (SmXMLImport&)GetImport();
     }
-    
+
     virtual void TCharacters(const OUString & /*rChars*/);
     virtual void Characters(const OUString &rChars);
     virtual SvXMLImportContext *CreateChildContext(sal_uInt16 /*nPrefix*/, const OUString& /*rLocalName*/, const uno::Reference< xml::sax::XAttributeList > & /*xAttrList*/);
@@ -644,7 +644,7 @@ public:
 void SmXMLImportContext::TCharacters(const OUString & /*rChars*/)
 {
 }
-    
+
 void SmXMLImportContext::Characters(const OUString &rChars)
 {
     /*
@@ -678,10 +678,10 @@ struct SmXMLContext_Helper
     OUString sColor;
 
     SmXMLImportContext rContext;
-    
-    SmXMLContext_Helper(SmXMLImportContext &rImport) : 
+
+    SmXMLContext_Helper(SmXMLImportContext &rImport) :
         nIsBold(-1), nIsItalic(-1), nFontSize(0.0), rContext(rImport)  {}
-    
+
     void RetrieveAttrs(const uno::Reference< xml::sax::XAttributeList > &xAttrList );
     void ApplyAttrs();
 };
@@ -845,9 +845,9 @@ public:
     SmXMLDocContext_Impl( SmXMLImport &rImport, sal_uInt16 nPrfx,
         const OUString& rLName)
         : SmXMLImportContext(rImport,nPrfx,rLName) {}
-    
+
     virtual SvXMLImportContext *CreateChildContext(sal_uInt16 nPrefix, const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList > &xAttrList);
-    
+
     void EndElement();
 };
 
@@ -864,13 +864,13 @@ public:
         const OUString& rLName)
         : SmXMLDocContext_Impl(rImport,nPrefix,rLName)
         { nElementCount = GetSmImport().GetNodeStack().Count(); }
-    
+
     virtual SvXMLImportContext *CreateChildContext(sal_uInt16 nPrefix, const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList > &xAttrList);
-    
+
     SvXMLImportContext *StrictCreateChildContext(sal_uInt16 nPrefix,
         const OUString& rLocalName,
         const uno::Reference< xml::sax::XAttributeList > &xAttrList);
-    
+
     void EndElement();
 };
 
@@ -882,7 +882,7 @@ public:
     SmXMLFracContext_Impl(SmXMLImport &rImport,sal_uInt16 nPrefix,
         const OUString& rLName)
         : SmXMLRowContext_Impl(rImport,nPrefix,rLName) {}
-    
+
     void EndElement();
 };
 
@@ -894,7 +894,7 @@ public:
     SmXMLSqrtContext_Impl(SmXMLImport &rImport,sal_uInt16 nPrefix,
         const OUString& rLName)
         : SmXMLRowContext_Impl(rImport,nPrefix,rLName) {}
-    
+
     void EndElement();
 };
 
@@ -906,7 +906,7 @@ public:
     SmXMLRootContext_Impl(SmXMLImport &rImport,sal_uInt16 nPrefix,
         const OUString& rLName)
         : SmXMLRowContext_Impl(rImport,nPrefix,rLName) {}
-    
+
     void EndElement();
 };
 
@@ -922,7 +922,7 @@ public:
     SmXMLStyleContext_Impl(SmXMLImport &rImport,sal_uInt16 nPrefix,
         const OUString& rLName) : SmXMLRowContext_Impl(rImport,nPrefix,rLName),
         aStyleHelper(*this) {}
-    
+
     void EndElement();
     void StartElement(const uno::Reference< xml::sax::XAttributeList > &xAttrList );
 };
@@ -1100,7 +1100,7 @@ public:
     SmXMLPaddedContext_Impl(SmXMLImport &rImport,sal_uInt16 nPrefix,
         const OUString& rLName)
         : SmXMLRowContext_Impl(rImport,nPrefix,rLName) {}
-    
+
     void EndElement();
 };
 
@@ -1124,7 +1124,7 @@ public:
     SmXMLPhantomContext_Impl(SmXMLImport &rImport,sal_uInt16 nPrefix,
         const OUString& rLName)
         : SmXMLRowContext_Impl(rImport,nPrefix,rLName) {}
-    
+
     void EndElement();
 };
 
@@ -1164,7 +1164,7 @@ public:
         const OUString& rLName)
         : SmXMLRowContext_Impl(rImport,nPrefix,rLName),
         cBegin('('), cEnd(')') {}
-    
+
     void StartElement(const uno::Reference< xml::sax::XAttributeList > & xAttrList );
     void EndElement();
 };
@@ -1255,7 +1255,7 @@ public:
     SmXMLErrorContext_Impl(SmXMLImport &rImport,sal_uInt16 nPrefix,
         const OUString& rLName)
         : SmXMLRowContext_Impl(rImport,nPrefix,rLName) {}
-    
+
     void EndElement();
 };
 
@@ -1293,9 +1293,9 @@ public:
         aToken.nLevel = 5;
         aToken.eType = TNUMBER;
     }
-    
+
     virtual void TCharacters(const OUString &rChars);
-    
+
     void EndElement();
 };
 
@@ -1319,9 +1319,9 @@ public:
     SmXMLAnnotationContext_Impl(SmXMLImport &rImport,sal_uInt16 nPrefix,
         const OUString& rLName)
         : SmXMLImportContext(rImport,nPrefix,rLName), bIsStarMath(sal_False) {}
-    
+
     virtual void Characters(const OUString &rChars);
-    
+
     void StartElement(const uno::Reference<xml::sax::XAttributeList > & xAttrList );
 };
 
@@ -1374,9 +1374,9 @@ public:
         aToken.nLevel = 5;
         aToken.eType = TTEXT;
     }
-    
+
     virtual void TCharacters(const OUString &rChars);
-    
+
     void EndElement();
 };
 
@@ -1407,9 +1407,9 @@ public:
         aToken.nLevel = 5;
         aToken.eType = TTEXT;
     }
-    
+
     virtual void TCharacters(const OUString &rChars);
-    
+
     void EndElement();
 };
 
@@ -1454,9 +1454,9 @@ public:
         aToken.nLevel = 5;
         aToken.eType = TIDENT;
     }
-    
+
     void TCharacters(const OUString &rChars);
-    void StartElement(const uno::Reference< xml::sax::XAttributeList > & xAttrList ) 
+    void StartElement(const uno::Reference< xml::sax::XAttributeList > & xAttrList )
     {
         aStyleHelper.RetrieveAttrs(xAttrList);
     };
@@ -1519,7 +1519,7 @@ public:
         aToken.eType = TSPECIAL;
         aToken.nLevel = 5;
     }
-    
+
     void TCharacters(const OUString &rChars);
     void StartElement(const uno::Reference< xml::sax::XAttributeList > &xAttrList );
     void EndElement();
@@ -1578,7 +1578,7 @@ public:
     SmXMLSpaceContext_Impl(SmXMLImport &rImport,sal_uInt16 nPrefix,
         const OUString& rLName)
         : SmXMLImportContext(rImport,nPrefix,rLName) {}
-    
+
     void StartElement(const uno::Reference< xml::sax::XAttributeList >& xAttrList );
 };
 
@@ -1606,10 +1606,10 @@ public:
     SmXMLSubContext_Impl(SmXMLImport &rImport,sal_uInt16 nPrefix,
         const OUString& rLName)
         : SmXMLRowContext_Impl(rImport,nPrefix,rLName) {}
-    
-    void EndElement() 
-    { 
-        GenericEndElement(TRSUB,RSUB); 
+
+    void EndElement()
+    {
+        GenericEndElement(TRSUB,RSUB);
     }
 };
 
@@ -1647,7 +1647,7 @@ public:
     SmXMLSupContext_Impl(SmXMLImport &rImport,sal_uInt16 nPrefix,
         const OUString& rLName)
         : SmXMLSubContext_Impl(rImport,nPrefix,rLName) {}
-    
+
     void EndElement()
     {
         GenericEndElement(TRSUP,RSUP);
@@ -1665,9 +1665,9 @@ public:
     SmXMLSubSupContext_Impl(SmXMLImport &rImport,sal_uInt16 nPrefix,
         const OUString& rLName)
         : SmXMLRowContext_Impl(rImport,nPrefix,rLName) {}
-    
-    void EndElement() 
-    { 
+
+    void EndElement()
+    {
         GenericEndElement(TRSUB,RSUB,RSUP);
     }
 };
@@ -1711,7 +1711,7 @@ public:
     SmXMLUnderContext_Impl(SmXMLImport &rImport,sal_uInt16 nPrefix,
         const OUString& rLName)
         : SmXMLSubContext_Impl(rImport,nPrefix,rLName) {}
-    
+
     void StartElement(const uno::Reference< xml::sax::XAttributeList > &xAttrList );
     void EndElement();
     void HandleAccent();
@@ -1782,7 +1782,7 @@ public:
     SmXMLOverContext_Impl(SmXMLImport &rImport,sal_uInt16 nPrefix,
         const OUString& rLName)
         : SmXMLSubContext_Impl(rImport,nPrefix,rLName), nAttrCount(0) {}
-    
+
     void EndElement();
     void StartElement(const uno::Reference< xml::sax::XAttributeList > &xAttrList );
     void HandleAccent();
@@ -1836,9 +1836,9 @@ public:
     SmXMLUnderOverContext_Impl(SmXMLImport &rImport,sal_uInt16 nPrefix,
         const OUString& rLName)
         : SmXMLSubSupContext_Impl(rImport,nPrefix,rLName) {}
-    
-    void EndElement() 
-    { 
+
+    void EndElement()
+    {
         GenericEndElement(TCSUB,CSUB,CSUP);
     }
 };
@@ -1854,7 +1854,7 @@ public:
         const OUString& rLName) :
         SmXMLSubSupContext_Impl(rImport,nPrefix,rLName),
         bHasPrescripts(FALSE) {}
-    
+
     void EndElement();
     void MiddleElement();
     SvXMLImportContext *CreateChildContext(sal_uInt16 nPrefix,
@@ -1870,7 +1870,7 @@ public:
     SmXMLNoneContext_Impl(SmXMLImport &rImport,sal_uInt16 nPrefix,
         const OUString& rLName)
         : SmXMLImportContext(rImport,nPrefix,rLName) {}
-    
+
     void EndElement();
 };
 
@@ -1906,7 +1906,7 @@ public:
         const OUString& rLName) :
         SmXMLRowContext_Impl(rImport,nPrefix,rLName)
         {}
-    
+
     SvXMLImportContext *CreateChildContext(sal_uInt16 nPrefix,
         const OUString& rLocalName,
         const uno::Reference< xml::sax::XAttributeList > &xAttrList);
@@ -1922,7 +1922,7 @@ public:
         const OUString& rLName) :
         SmXMLTableRowContext_Impl(rImport,nPrefix,rLName)
         {}
-    
+
     void EndElement();
     SvXMLImportContext *CreateChildContext(sal_uInt16 nPrefix,
         const OUString& rLocalName,
@@ -1950,9 +1950,9 @@ public:
         const OUString& rLName) :
         SmXMLRowContext_Impl(rImport,nPrefix,rLName)
         {}
-    
+
     /*Don't do anything with alignment for now*/
-    void EndElement() 
+    void EndElement()
     {
     }
 };
@@ -1966,7 +1966,7 @@ public:
         const OUString& rLName) :
         SmXMLRowContext_Impl(rImport,nPrefix,rLName)
         {}
-    
+
     void EndElement();
 };
 
@@ -1980,7 +1980,7 @@ public:
     SmXMLOfficeContext_Impl( SmXMLImport &rImport, sal_uInt16 nPrfx,
         const OUString& rLName)
         : SvXMLImportContext(rImport,nPrfx,rLName) {}
-    
+
     virtual SvXMLImportContext *CreateChildContext(sal_uInt16 nPrefix, const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList > &xAttrList);
 };
 
@@ -1990,10 +1990,10 @@ SvXMLImportContext *SmXMLOfficeContext_Impl::CreateChildContext(sal_uInt16 nPref
 {
     SvXMLImportContext *pContext = 0;
     if ( XML_NAMESPACE_OFFICE == nPrefix &&
-        rLocalName == GetXMLToken(XML_META) ) 
+        rLocalName == GetXMLToken(XML_META) )
     {
         DBG_WARNING("XML_TOK_DOC_META: should not have come here, maybe document is invalid?");
-    } 
+    }
     else if ( XML_NAMESPACE_OFFICE == nPrefix &&
         rLocalName == GetXMLToken(XML_SETTINGS) )
     {
@@ -2049,8 +2049,8 @@ SvXMLImportContext *SmXMLFlatDocContext_Impl::CreateChildContext(
     {
         return SvXMLMetaDocumentContext::CreateChildContext(
                     i_nPrefix, i_rLocalName, i_xAttrList );
-    } 
-    else 
+    }
+    else
     {
         return SmXMLOfficeContext_Impl::CreateChildContext(
                     i_nPrefix, i_rLocalName, i_xAttrList );
@@ -2382,7 +2382,7 @@ void SmXMLRootContext_Impl::EndElement()
         "Root tag is missing component");
 
     SmToken aToken;
-    aToken.cMathChar = MS_SQRT;  //Temporary: alert, based on OpenSymbol font
+    aToken.cMathChar = MS_SQRT;  //Temporary: alert, based on StarSymbol font
     aToken.nGroup = 0;
     aToken.nLevel = 0;
     aToken.eType = TNROOT;
@@ -2406,7 +2406,7 @@ void SmXMLSqrtContext_Impl::EndElement()
         SmXMLRowContext_Impl::EndElement();
 
     SmToken aToken;
-    aToken.cMathChar = MS_SQRT;  //Temporary: alert, based on OpenSymbol font
+    aToken.cMathChar = MS_SQRT;  //Temporary: alert, based on StarSymbol font
     aToken.nGroup = 0;
     aToken.nLevel = 0;
     aToken.eType = TSQRT;
@@ -2837,10 +2837,10 @@ SvXMLImportContext *SmXMLImport::CreateContext(sal_uInt16 nPrefix,
     const OUString &rLocalName,
     const uno::Reference <xml::sax::XAttributeList> & /*xAttrList*/)
 {
-    if ( XML_NAMESPACE_OFFICE == nPrefix ) 
+    if ( XML_NAMESPACE_OFFICE == nPrefix )
     {
         if ( (IsXMLToken(rLocalName, XML_DOCUMENT) ||
-              IsXMLToken(rLocalName, XML_DOCUMENT_META))) 
+              IsXMLToken(rLocalName, XML_DOCUMENT_META)))
         {
             uno::Reference<xml::sax::XDocumentHandler> xDocBuilder(
                 mxServiceFactory->createInstance(
@@ -2856,12 +2856,12 @@ SvXMLImportContext *SmXMLImport::CreateContext(sal_uInt16 nPrefix,
                 // flat OpenDocument file format -- this has not been tested...
                 : new SmXMLFlatDocContext_Impl( *this, nPrefix, rLocalName,
                             xDPS->getDocumentProperties(), xDocBuilder);
-        } 
-        else 
+        }
+        else
         {
             return new SmXMLOfficeContext_Impl( *this,nPrefix,rLocalName);
         }
-    } 
+    }
     else
         return new SmXMLDocContext_Impl(*this,nPrefix,rLocalName);
 }
@@ -3187,3 +3187,4 @@ void SmXMLImport::SetConfigurationSettings(const Sequence<PropertyValue>& aConfP
 
 ////////////////////////////////////////////////////////////
 
+
diff --git a/starmath/source/parse.cxx b/starmath/source/parse.cxx
index 87f3d17049..b48e7541aa 100644
--- a/starmath/source/parse.cxx
+++ b/starmath/source/parse.cxx
@@ -40,7 +40,7 @@
 #include <i18npool/lang.h>
 #include <unotools/charclass.hxx>
 #include <svx/unolingu.hxx>
-#include <svtools/syslocale.hxx>
+#include <unotools/syslocale.hxx>
 #include "parse.hxx"
 #ifndef _STARMATH_HRC
 #include "starmath.hrc"
diff --git a/starmath/source/smdetect.cxx b/starmath/source/smdetect.cxx
index 8898721237..0fcc3f61da 100644
--- a/starmath/source/smdetect.cxx
+++ b/starmath/source/smdetect.cxx
@@ -60,10 +60,10 @@
 
 #include <rtl/ustring.h>
 #include <rtl/logfile.hxx>
-#include <svtools/itemset.hxx>
+#include <svl/itemset.hxx>
 #include <vcl/window.hxx>
-#include <svtools/eitem.hxx>
-#include <svtools/stritem.hxx>
+#include <svl/eitem.hxx>
+#include <svl/stritem.hxx>
 #include <tools/urlobj.hxx>
 #include <vos/mutex.hxx>
 #include <svtools/sfxecode.hxx>
diff --git a/starmath/source/smmod.cxx b/starmath/source/smmod.cxx
index 6351b7ba75..bc6c0ba57d 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()
diff --git a/starmath/source/toolbox.cxx b/starmath/source/toolbox.cxx
index a462fd6949..64be515246 100644
--- a/starmath/source/toolbox.cxx
+++ b/starmath/source/toolbox.cxx
@@ -33,9 +33,9 @@
 
 
 #include <rtl/logfile.hxx>
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
 #include <sfx2/app.hxx>
-#include <svtools/intitem.hxx>
+#include <svl/intitem.hxx>
 #include <svtools/imgdef.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/imgmgr.hxx>
@@ -222,7 +222,7 @@ const ImageList * SmToolBoxWindow::GetImageList( USHORT nResId, BOOL bHighContra
 
 void SmToolBoxWindow::ApplyImageLists( USHORT nCategoryRID )
 {
-    BOOL bHighContrast = GetDisplayBackground().GetColor().IsDark() != 0;
+    BOOL bHighContrast = GetSettings().GetStyleSettings().GetHighContrastMode();
         
     // set image list for toolbox 'catalog'
     const ImageList *pImageList = GetImageList( bHighContrast ? RID_ILH_CATALOG : RID_IL_CATALOG, bHighContrast );
diff --git a/starmath/source/typemap.cxx b/starmath/source/typemap.cxx
index e4b4c7e37f..a76a819f7d 100644
--- a/starmath/source/typemap.cxx
+++ b/starmath/source/typemap.cxx
@@ -141,10 +141,10 @@
 #define SvxCellVerJustifyEnumItem SfxVoidItem
 #define SvxCellOrientationEnumItem SfxVoidItem
 #include <sfx2/msg.hxx>
-#include <svtools/stritem.hxx>
-#include <svtools/eitem.hxx>
+#include <svl/stritem.hxx>
+#include <svl/eitem.hxx>
 #include <svx/zoomitem.hxx>
-#include <svtools/slstitm.hxx>
+#include <svl/slstitm.hxx>
 
 #define SFX_TYPEMAP
 #include "smslots.hxx"
diff --git a/starmath/source/unomodel.cxx b/starmath/source/unomodel.cxx
index 8339e4ed66..1747670204 100644
--- a/starmath/source/unomodel.cxx
+++ b/starmath/source/unomodel.cxx
@@ -37,7 +37,7 @@
 #include <sfx2/printer.hxx>
 #include <vcl/svapp.hxx>
 #include <svtools/ctrltool.hxx>
-#include <svtools/itemprop.hxx>
+#include <svl/itemprop.hxx>
 #include <unotools/localedatawrapper.hxx>
 #include <unotools/processfactory.hxx>
 #include <svx/paperinf.hxx>
diff --git a/starmath/source/view.cxx b/starmath/source/view.cxx
index 888bbcd96c..4c409a7f8f 100644
--- a/starmath/source/view.cxx
+++ b/starmath/source/view.cxx
@@ -51,15 +51,15 @@
 #include <sfx2/objface.hxx>
 #include <sfx2/printer.hxx>
 #include <sfx2/request.hxx>
-#include <svtools/eitem.hxx>
-#include <svtools/intitem.hxx>
-#include <svtools/itemset.hxx>
-#include <svtools/poolitem.hxx>
-#include <svtools/ptitem.hxx>
-#include <svtools/stritem.hxx>
+#include <svl/eitem.hxx>
+#include <svl/intitem.hxx>
+#include <svl/itemset.hxx>
+#include <svl/poolitem.hxx>
+#include <svl/ptitem.hxx>
+#include <svl/stritem.hxx>
 #include <svtools/transfer.hxx>
-#include <svtools/undo.hxx>
-#include <svtools/whiter.hxx>
+#include <svl/undo.hxx>
+#include <svl/whiter.hxx>
 #include <svx/dialogs.hrc>
 #include <svx/editeng.hxx>
 #include <svx/svxdlg.hxx>
@@ -1653,7 +1653,7 @@ void SmViewShell::Execute(SfxRequest& rReq)
                     SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
                     if(pFact)
                     {
-                        pDlg = pFact->CreateSvxZoomDialog(&GetViewFrame()->GetWindow(), aSet, RID_SVXDLG_ZOOM);
+                        pDlg = pFact->CreateSvxZoomDialog(&GetViewFrame()->GetWindow(), aSet);
                         DBG_ASSERT(pDlg, "Dialogdiet fail!");//CHINA001
                     }
                     pDlg->SetLimits( MINZOOM, MAXZOOM );