cws tl76: merge with DEV300_m68

28 files changed, 135 insertions, 128 deletions

diff --git a/starmath/inc/action.hxx b/starmath/inc/action.hxx
index 6e2375331de9..6a816a447d8c 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 6528c81b45ac..ecf30b244f80 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 fac4f1b0faa4..94bffbaad48d 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 05375f8a73e0..6b9b5ad650b5 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 4b493c0cbca7..722efd82595c 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 6d117bcc9524..0f93e6551cc9 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 d39376c30ed0..9d0707a19690 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 768280af9747..f868756f5990 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 ddbf0f2fc185..ddbf0f2fc185 100644
--- a/starmath/sdi/svxitems.sdi
+++ b/starmath/sdi/smitems.sdi
diff --git a/starmath/sdi/smslots.sdi b/starmath/sdi/smslots.sdi
index 40b9da78d7ff..88bd108bddff 100644
--- a/starmath/sdi/smslots.sdi
+++ b/starmath/sdi/smslots.sdi
@@ -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 f258d7f31176..823e5bbd926e 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 7199583dd4ff..07217bee9f1a 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 175c41c173eb..e9a816fc76a4 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 4c028039ea5e..a56a503d7bfd 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 b778571a5c0f..284a7898499d 100644
--- a/starmath/source/config.cxx
+++ b/starmath/source/config.cxx
@@ -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 20af2f38b3ee..95b2e0c36aad 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 ab467fc034e3..b9064a78a5f5 100644
--- a/starmath/source/document.cxx
+++ b/starmath/source/document.cxx
@@ -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 );
diff --git a/starmath/source/edit.cxx b/starmath/source/edit.cxx
index 8435b7b5f35a..6f69f52539aa 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 5ea88307fb2d..6dba5ec80379 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 9ddabab9c325..c9b12abcdb90 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 22ba1b30dc94..56b35a96c6ff 100644
--- a/starmath/source/mathmlimport.cxx
+++ b/starmath/source/mathmlimport.cxx
@@ -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>
@@ -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;
@@ -3187,3 +3187,4 @@ void SmXMLImport::SetConfigurationSettings(const Sequence<PropertyValue>& aConfP
 
 ////////////////////////////////////////////////////////////
 
+
diff --git a/starmath/source/parse.cxx b/starmath/source/parse.cxx
index 83662e50b123..727d595b40ea 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 f65b7fcdc764..f7008403cddf 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 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()
diff --git a/starmath/source/toolbox.cxx b/starmath/source/toolbox.cxx
index 487bd6155fc9..c775f9be038b 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 d0e796533e3f..bc61839af470 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 ed6e5b6bd23f..6a4a65b7e228 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 5492553e46fe..855831fc9e9f 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 );