#103496#: move VCL free ConfigItems to unotools

67 files changed, 131 insertions, 116 deletions

diff --git a/sw/source/core/bastyp/calc.cxx b/sw/source/core/bastyp/calc.cxx
index aba5dbc74283..6212c162b997 100644
--- a/sw/source/core/bastyp/calc.cxx
+++ b/sw/source/core/bastyp/calc.cxx
@@ -49,7 +49,7 @@
 #include <unotools/charclass.hxx>
 #include <svx/unolingu.hxx>
 #include <svx/scripttypeitem.hxx>
-#include <svtools/useroptions.hxx>
+#include <unotools/useroptions.hxx>
 #include <tools/datetime.hxx>
 #include <svtools/zforlist.hxx>
 #include <swmodule.hxx>
diff --git a/sw/source/core/doc/doclay.cxx b/sw/source/core/doc/doclay.cxx
index eb1a3f2f920d..b97d1fbcd642 100644
--- a/sw/source/core/doc/doclay.cxx
+++ b/sw/source/core/doc/doclay.cxx
@@ -31,8 +31,8 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sw.hxx"
 
-#include <svtools/linguprops.hxx>
-#include <svtools/lingucfg.hxx>
+#include <unotools/linguprops.hxx>
+#include <unotools/lingucfg.hxx>
 #include <com/sun/star/embed/EmbedStates.hpp>
 #include <hintids.hxx>
 #include <com/sun/star/util/XCloseable.hpp>
diff --git a/sw/source/core/doc/docnew.cxx b/sw/source/core/doc/docnew.cxx
index 3312c82c0331..fb9c1252b3a8 100644
--- a/sw/source/core/doc/docnew.cxx
+++ b/sw/source/core/doc/docnew.cxx
@@ -53,8 +53,8 @@
 #include <svx/linkmgr.hxx>
 #include <svx/forbiddencharacterstable.hxx>
 #include <svtools/zforlist.hxx>
-#include <svtools/compatibility.hxx>
-#include <svtools/lingucfg.hxx>
+#include <unotools/compatibility.hxx>
+#include <unotools/lingucfg.hxx>
 #include <svx/svdpage.hxx>
 #include <paratr.hxx>
 #include <fchrfmt.hxx>
diff --git a/sw/source/core/doc/number.cxx b/sw/source/core/doc/number.cxx
index 46766dd31694..026b0b01844b 100644
--- a/sw/source/core/doc/number.cxx
+++ b/sw/source/core/doc/number.cxx
@@ -64,7 +64,7 @@
 #include <algorithm>
 // <--
 // --> OD 2008-06-06 #i89178#
-#include <svtools/saveopt.hxx>
+#include <unotools/saveopt.hxx>
 // <--
 // --> OD 2008-07-08 #i91400#
 #include <IDocumentListsAccess.hxx>
diff --git a/sw/source/core/doc/tblafmt.cxx b/sw/source/core/doc/tblafmt.cxx
index 630979ff72ed..22b369c3eb0b 100644
--- a/sw/source/core/doc/tblafmt.cxx
+++ b/sw/source/core/doc/tblafmt.cxx
@@ -40,7 +40,7 @@
 #include <svtools/urihelper.hxx>
 #include <svtools/zforlist.hxx>
 #include <svtools/zformat.hxx>
-#include <svtools/pathoptions.hxx>
+#include <unotools/pathoptions.hxx>
 #include <sfx2/app.hxx>
 #include <svx/dialmgr.hxx>
 #ifndef _SVX_DIALOGS_HRC
diff --git a/sw/source/core/draw/dpage.cxx b/sw/source/core/draw/dpage.cxx
index a5d8ccd24e61..0c782bb2b404 100644
--- a/sw/source/core/draw/dpage.cxx
+++ b/sw/source/core/draw/dpage.cxx
@@ -33,7 +33,7 @@
 #include <basic/basmgr.hxx>
 #include <svtools/imapobj.hxx>
 #include <svtools/urihelper.hxx>
-#include <svtools/securityoptions.hxx>
+#include <unotools/securityoptions.hxx>
 #include <vcl/help.hxx>
 #include <svx/svdview.hxx>
 #include <fmturl.hxx>
diff --git a/sw/source/core/draw/drawdoc.cxx b/sw/source/core/draw/drawdoc.cxx
index 78ede2495f78..cdecf032b383 100644
--- a/sw/source/core/draw/drawdoc.cxx
+++ b/sw/source/core/draw/drawdoc.cxx
@@ -35,7 +35,7 @@
 #include <svx/svxids.hrc>
 #endif
 #include <tools/stream.hxx>
-#include <svtools/pathoptions.hxx>
+#include <unotools/pathoptions.hxx>
 #include <sot/storage.hxx>
 #include <svtools/intitem.hxx>
 #include <svx/forbiddencharacterstable.hxx>
diff --git a/sw/source/core/fields/docufld.cxx b/sw/source/core/fields/docufld.cxx
index 33e8c903179e..b0dfcb36218a 100644
--- a/sw/source/core/fields/docufld.cxx
+++ b/sw/source/core/fields/docufld.cxx
@@ -65,7 +65,7 @@
 #include <vcl/svapp.hxx>
 #endif
 #include <svtools/urihelper.hxx>
-#include <svtools/useroptions.hxx>
+#include <unotools/useroptions.hxx>
 #include <svtools/syslocale.hxx>
 
 #include <tools/time.hxx>
diff --git a/sw/source/core/frmedt/fecopy.cxx b/sw/source/core/frmedt/fecopy.cxx
index ccd2d86e4531..c0986ef9185b 100644
--- a/sw/source/core/frmedt/fecopy.cxx
+++ b/sw/source/core/frmedt/fecopy.cxx
@@ -37,7 +37,7 @@
 #include <vcl/graph.hxx>
 #include <sot/formats.hxx>
 #include <sot/storage.hxx>
-#include <svtools/pathoptions.hxx>
+#include <unotools/pathoptions.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/viewsh.hxx>
 #include <svx/xexch.hxx>
diff --git a/sw/source/core/frmedt/feflyole.cxx b/sw/source/core/frmedt/feflyole.cxx
index 71148c5dc018..69e0edf34b98 100644
--- a/sw/source/core/frmedt/feflyole.cxx
+++ b/sw/source/core/frmedt/feflyole.cxx
@@ -37,7 +37,7 @@
 #endif
 #include <sfx2/viewsh.hxx>
 #include <sfx2/app.hxx>
-#include <svtools/moduleoptions.hxx>
+#include <unotools/moduleoptions.hxx>
 #include <sfx2/viewfrm.hxx>
 
 #include <sot/exchange.hxx>
diff --git a/sw/source/core/text/inftxt.cxx b/sw/source/core/text/inftxt.cxx
index 2edc34df4a2d..2448b061bc1d 100644
--- a/sw/source/core/text/inftxt.cxx
+++ b/sw/source/core/text/inftxt.cxx
@@ -33,8 +33,8 @@
 
 
 #include <com/sun/star/uno/Sequence.h>
-#include <svtools/linguprops.hxx>
-#include <svtools/lingucfg.hxx>
+#include <unotools/linguprops.hxx>
+#include <unotools/lingucfg.hxx>
 #include <hintids.hxx>
 #include <sfx2/printer.hxx>
 #include <svx/hyznitem.hxx>
diff --git a/sw/source/filter/basflt/shellio.cxx b/sw/source/filter/basflt/shellio.cxx
index aaa640de0ef4..4af653ee9e59 100644
--- a/sw/source/filter/basflt/shellio.cxx
+++ b/sw/source/filter/basflt/shellio.cxx
@@ -37,7 +37,7 @@
 #ifndef SVTOOLS_FSTATHELPER_HXX
 #include <svtools/fstathelper.hxx>
 #endif
-#include <svtools/moduleoptions.hxx>
+#include <unotools/moduleoptions.hxx>
 #include <sfx2/docfile.hxx>
 #include <svx/lrspitem.hxx>
 #include <svx/ulspitem.hxx>
diff --git a/sw/source/filter/html/htmlfld.cxx b/sw/source/filter/html/htmlfld.cxx
index c9930c3ca8ef..e008fe8a62f5 100644
--- a/sw/source/filter/html/htmlfld.cxx
+++ b/sw/source/filter/html/htmlfld.cxx
@@ -39,7 +39,7 @@
 #include "docsh.hxx"
 #include <svtools/htmltokn.h>
 #include <svtools/zformat.hxx>
-#include <svtools/useroptions.hxx>
+#include <unotools/useroptions.hxx>
 #include <fmtfld.hxx>
 #include <ndtxt.hxx>
 #include <doc.hxx>
diff --git a/sw/source/filter/html/htmlgrin.cxx b/sw/source/filter/html/htmlgrin.cxx
index d18a2b762aa0..4aff2d42b5d1 100644
--- a/sw/source/filter/html/htmlgrin.cxx
+++ b/sw/source/filter/html/htmlgrin.cxx
@@ -53,7 +53,7 @@
 #include <svtools/imap.hxx>
 #include <svtools/htmltokn.h>
 #include <svtools/htmlkywd.hxx>
-#include <svtools/eventcfg.hxx>
+#include <unotools/eventcfg.hxx>
 
 #include <fmtornt.hxx>
 #include <fmturl.hxx>
diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx
index 8a44ff0e26ca..d3e2641a389f 100644
--- a/sw/source/filter/html/swhtml.cxx
+++ b/sw/source/filter/html/swhtml.cxx
@@ -48,7 +48,7 @@
 #include <svtools/htmltokn.h>
 #include <svtools/htmlkywd.hxx>
 #include <svtools/ctrltool.hxx>
-#include <svtools/pathoptions.hxx>
+#include <unotools/pathoptions.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/wrkwin.hxx>
 #include <sfx2/fcontnr.hxx>
diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx
index 022c14cfd579..379dc5551f45 100644
--- a/sw/source/filter/ww8/wrtww8.cxx
+++ b/sw/source/filter/ww8/wrtww8.cxx
@@ -48,7 +48,7 @@
 #define _SVSTDARR_BOOLS
 #include <svtools/svstdarr.hxx>
 
-#include <svtools/fltrcfg.hxx>
+#include <unotools/fltrcfg.hxx>
 #include <vcl/salbtype.hxx>
 #include <sot/storage.hxx>
 #include <svtools/zformat.hxx>
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index 241e339003d2..986b1a838de4 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -71,7 +71,7 @@
 #include <svx/svdogrp.hxx>
 #include <svx/xflclit.hxx>
 
-#include <svtools/fltrcfg.hxx>
+#include <unotools/fltrcfg.hxx>
 #include <fmtfld.hxx>
 #include <fmturl.hxx>
 #include <fmtinfmt.hxx>
diff --git a/sw/source/filter/ww8/ww8par3.cxx b/sw/source/filter/ww8/ww8par3.cxx
index aa2737da1fa4..ff8eeb1c26b7 100644
--- a/sw/source/filter/ww8/ww8par3.cxx
+++ b/sw/source/filter/ww8/ww8par3.cxx
@@ -95,7 +95,7 @@
 #include "ww8par2.hxx"  // wg. Listen-Attributen in Styles
 
 #include <IMark.hxx>
-#include <svtools/fltrcfg.hxx>
+#include <unotools/fltrcfg.hxx>
 
 #include <stdio.h>
 
diff --git a/sw/source/filter/xml/wrtxml.cxx b/sw/source/filter/xml/wrtxml.cxx
index 09b7bdd8ed30..c7b2251c0499 100644
--- a/sw/source/filter/xml/wrtxml.cxx
+++ b/sw/source/filter/xml/wrtxml.cxx
@@ -46,7 +46,7 @@
 #include <unotools/streamwrap.hxx>
 #include <svx/xmlgrhlp.hxx>
 #include <svx/xmleohlp.hxx>
-#include <svtools/saveopt.hxx>
+#include <unotools/saveopt.hxx>
 #include <tools/urlobj.hxx>
 #include <svtools/stritem.hxx>
 #include <sfx2/frame.hxx>
diff --git a/sw/source/filter/xml/xmlimp.cxx b/sw/source/filter/xml/xmlimp.cxx
index 8dd5f415f1f8..17b95cd310af 100644
--- a/sw/source/filter/xml/xmlimp.cxx
+++ b/sw/source/filter/xml/xmlimp.cxx
@@ -65,7 +65,7 @@
 #include <sfx2/printer.hxx>
 #include <ForbiddenCharactersEnum.hxx>
 #include <xmloff/xmluconv.hxx>
-#include <svtools/saveopt.hxx>
+#include <unotools/saveopt.hxx>
 #include <tools/diagnose_ex.h>
 #include <hash_set>
 #include <stringhash.hxx>
diff --git a/sw/source/ui/app/apphdl.cxx b/sw/source/ui/app/apphdl.cxx
index 7fe0d349e8a7..7cd9e75ac74c 100644
--- a/sw/source/ui/app/apphdl.cxx
+++ b/sw/source/ui/app/apphdl.cxx
@@ -39,8 +39,8 @@
 #define _SVSTDARR_STRINGSDTOR
 #include <svtools/svstdarr.hxx>
 #include <svtools/urihelper.hxx>
-#include <svtools/undoopt.hxx>
-#include <svtools/pathoptions.hxx>
+#include <unotools/undoopt.hxx>
+#include <unotools/pathoptions.hxx>
 #include <svtools/accessibilityoptions.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/event.hxx>
@@ -56,7 +56,7 @@
 #include <sfx2/fcontnr.hxx>
 #include <svtools/stritem.hxx>
 #include <svtools/ctloptions.hxx>
-#include <svtools/useroptions.hxx>
+#include <unotools/useroptions.hxx>
 #include <vcl/msgbox.hxx>
 #include <vcl/wrkwin.hxx>
 #include <svx/insctrl.hxx>
@@ -805,29 +805,6 @@ void SwModule::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint )
                 pObjSh = SfxObjectShell::GetNext(*pObjSh);
             }
         }
-        else if(SFX_HINT_USER_OPTIONS_CHANGED == nHintId)
-        {
-            bAuthorInitialised = FALSE;
-        }
-        else if(SFX_HINT_UNDO_OPTIONS_CHANGED == nHintId)
-        {
-            const int nNew = GetUndoOptions().GetUndoCount();
-            const int nOld = SwEditShell::GetUndoActionCount();
-            if(!nNew || !nOld)
-            {
-                sal_Bool bUndo = nNew != 0;
-                //ueber DocShells iterieren und Undo umschalten
-
-                TypeId aType(TYPE(SwDocShell));
-                SwDocShell* pDocShell = (SwDocShell*)SfxObjectShell::GetFirst(&aType);
-                while( pDocShell )
-                {
-                    pDocShell->GetDoc()->DoUndo( bUndo );
-                    pDocShell = (SwDocShell*)SfxObjectShell::GetNext(*pDocShell, &aType);
-                }
-            }
-            SwEditShell::SetUndoActionCount( static_cast< USHORT >(nNew));
-        }
         else if(SFX_HINT_DEINITIALIZING == nHintId)
         {
             DELETEZ(pWebUsrPref);
@@ -848,14 +825,41 @@ void SwModule::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint )
             DELETEZ(pAccessibilityOptions);
             EndListening(*pCTLOptions);
             DELETEZ(pCTLOptions);
-            EndListening(*pUserOptions);
+            pUserOptions->RemoveListener(this);
             DELETEZ(pUserOptions);
-            EndListening(*pUndoOptions);
+            pUndoOptions->RemoveListener(this);
             DELETEZ(pUndoOptions);
         }
     }
 }
 
+void SwModule::ConfigurationChanged( utl::ConfigurationBroadcaster* pBrdCst )
+{
+    if( pBrdCst == pUserOptions )
+    {
+        bAuthorInitialised = FALSE;
+    }
+    else if( pBrdCst == pUndoOptions )
+    {
+        const int nNew = GetUndoOptions().GetUndoCount();
+        const int nOld = SwEditShell::GetUndoActionCount();
+        if(!nNew || !nOld)
+        {
+            sal_Bool bUndo = nNew != 0;
+            //ueber DocShells iterieren und Undo umschalten
+
+            TypeId aType(TYPE(SwDocShell));
+            SwDocShell* pDocShell = (SwDocShell*)SfxObjectShell::GetFirst(&aType);
+            while( pDocShell )
+            {
+                pDocShell->GetDoc()->DoUndo( bUndo );
+                pDocShell = (SwDocShell*)SfxObjectShell::GetNext(*pDocShell, &aType);
+            }
+        }
+        SwEditShell::SetUndoActionCount( static_cast< USHORT >(nNew));
+    }
+}
+
 /* -----------------------------20.02.01 12:43--------------------------------
 
  ---------------------------------------------------------------------------*/
@@ -910,7 +914,7 @@ SvtUserOptions& SwModule::GetUserOptions()
     if(!pUserOptions)
     {
         pUserOptions = new SvtUserOptions;
-        StartListening(*pUserOptions);
+        pUserOptions->AddListener(this);
     }
     return *pUserOptions;
 }
@@ -922,7 +926,7 @@ SvtUndoOptions& SwModule::GetUndoOptions()
     if(!pUndoOptions)
     {
         pUndoOptions = new SvtUndoOptions;
-        StartListening(*pUndoOptions);
+        pUndoOptions->AddListener(this);
     }
     return *pUndoOptions;
 }
diff --git a/sw/source/ui/app/appopt.cxx b/sw/source/ui/app/appopt.cxx
index 9e3c33b54dcc..e1fbf4a40dae 100644
--- a/sw/source/ui/app/appopt.cxx
+++ b/sw/source/ui/app/appopt.cxx
@@ -87,7 +87,7 @@
 #include <glosdoc.hxx>
 #include <uiitems.hxx>
 #include <svx/langitem.hxx>
-#include <svtools/lingucfg.hxx>
+#include <unotools/lingucfg.hxx>
 #include <svx/unolingu.hxx>
 
 #ifndef _GLOBALS_HRC
diff --git a/sw/source/ui/app/docsh.cxx b/sw/source/ui/app/docsh.cxx
index 06289c10f38a..49a05a3fb054 100644
--- a/sw/source/ui/app/docsh.cxx
+++ b/sw/source/ui/app/docsh.cxx
@@ -44,7 +44,7 @@
 #include <svtools/stritem.hxx>
 #include <svx/adjitem.hxx>
 #include <basic/sbx.hxx>
-#include <svtools/moduleoptions.hxx>
+#include <unotools/moduleoptions.hxx>
 #include <sfx2/app.hxx>
 #include <sfx2/request.hxx>
 #include <svtools/misccfg.hxx>
@@ -111,8 +111,8 @@
 #include "warnpassword.hxx"
 
 #include <cfgid.h>
-#include <svtools/moduleoptions.hxx>
-#include <svtools/fltrcfg.hxx>
+#include <unotools/moduleoptions.hxx>
+#include <unotools/fltrcfg.hxx>
 #include <svx/htmlcfg.hxx>
 #include <sfx2/fcontnr.hxx>
 #include <sfx2/objface.hxx>
diff --git a/sw/source/ui/app/docsh2.cxx b/sw/source/ui/app/docsh2.cxx
index 3fd1e879b063..69412427a25e 100644
--- a/sw/source/ui/app/docsh2.cxx
+++ b/sw/source/ui/app/docsh2.cxx
@@ -56,7 +56,7 @@
 */
 #include <svtools/zforlist.hxx>
 #include <svtools/zformat.hxx>
-#include <svtools/pathoptions.hxx>
+#include <unotools/pathoptions.hxx>
 #include <svtools/transfer.hxx>
 #ifndef _SFXSIDS_HRC //autogen
 #include <sfx2/dialogs.hrc>
diff --git a/sw/source/ui/app/docshini.cxx b/sw/source/ui/app/docshini.cxx
index 8942fd624e3d..e0869546c284 100644
--- a/sw/source/ui/app/docshini.cxx
+++ b/sw/source/ui/app/docshini.cxx
@@ -42,7 +42,7 @@
 #include <sot/storage.hxx>
 #include <svtools/zforlist.hxx>
 #include <svtools/ctrltool.hxx>
-#include <svtools/lingucfg.hxx>
+#include <unotools/lingucfg.hxx>
 #include <sfx2/docfile.hxx>
 #ifndef _OFA_MISCCFG_HXX //autogen
 #include <svtools/misccfg.hxx>
diff --git a/sw/source/ui/app/swdll.cxx b/sw/source/ui/app/swdll.cxx
index 57f983a3852d..965708ca1579 100644
--- a/sw/source/ui/app/swdll.cxx
+++ b/sw/source/ui/app/swdll.cxx
@@ -51,7 +51,7 @@
 #include <dobjfac.hxx>
 #include <cfgid.h>
 
-#include <svtools/moduleoptions.hxx>
+#include <unotools/moduleoptions.hxx>
 
 #ifndef _FM_FMOBJFAC_HXX
 #include <svx/fmobjfac.hxx>
diff --git a/sw/source/ui/app/swmodul1.cxx b/sw/source/ui/app/swmodul1.cxx
index 863ef3c22f76..13bef2aa4cc2 100644
--- a/sw/source/ui/app/swmodul1.cxx
+++ b/sw/source/ui/app/swmodul1.cxx
@@ -36,7 +36,7 @@
 #include <sfx2/request.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/childwin.hxx>
-#include <svtools/useroptions.hxx>
+#include <unotools/useroptions.hxx>
 #include <cppuhelper/weak.hxx>
 #include <com/sun/star/frame/FrameSearchFlag.hpp>
 #include <com/sun/star/view/XSelectionSupplier.hpp>
diff --git a/sw/source/ui/app/swmodule.cxx b/sw/source/ui/app/swmodule.cxx
index c84273770667..d5b54c1ca846 100644
--- a/sw/source/ui/app/swmodule.cxx
+++ b/sw/source/ui/app/swmodule.cxx
@@ -154,7 +154,7 @@
 #include <svtools/colorcfg.hxx>
 
 #include <svx/acorrcfg.hxx>
-#include <svtools/moduleoptions.hxx>
+#include <unotools/moduleoptions.hxx>
 
 #ifndef _AVMEDIA_MEDIAPPLAYER_HXX
 #include <avmedia/mediaplayer.hxx>
diff --git a/sw/source/ui/config/fontcfg.cxx b/sw/source/ui/config/fontcfg.cxx
index 34ffa8f215b9..c841390361fd 100644
--- a/sw/source/ui/config/fontcfg.cxx
+++ b/sw/source/ui/config/fontcfg.cxx
@@ -35,7 +35,7 @@
 #include <fontcfg.hxx>
 #include <i18npool/mslangid.hxx>
 #include <vcl/outdev.hxx>
-#include <svtools/lingucfg.hxx>
+#include <unotools/lingucfg.hxx>
 #include <com/sun/star/uno/Any.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
 #include <com/sun/star/i18n/ScriptType.hpp>
diff --git a/sw/source/ui/config/uinums.cxx b/sw/source/ui/config/uinums.cxx
index bfe68b3d6b3a..da66dd9867e3 100644
--- a/sw/source/ui/config/uinums.cxx
+++ b/sw/source/ui/config/uinums.cxx
@@ -36,7 +36,7 @@
 
 #include <hintids.hxx>
 #include <svtools/urihelper.hxx>
-#include <svtools/pathoptions.hxx>
+#include <unotools/pathoptions.hxx>
 #include <tools/stream.hxx>
 #ifndef _SFX_INIMGR_HXX
 #endif
diff --git a/sw/source/ui/dbui/addresslistdialog.cxx b/sw/source/ui/dbui/addresslistdialog.cxx
index 91248fa1e422..0dec321a51c1 100644
--- a/sw/source/ui/dbui/addresslistdialog.cxx
+++ b/sw/source/ui/dbui/addresslistdialog.cxx
@@ -67,7 +67,7 @@
 #include <com/sun/star/frame/XStorable.hpp>
 #include <swunohelper.hxx>
 #include <vcl/waitobj.hxx>
-#include <svtools/pathoptions.hxx>
+#include <unotools/pathoptions.hxx>
 #include <svtools/urihelper.hxx>
 #include <addresslistdialog.hrc>
 #include <dbui.hrc>
diff --git a/sw/source/ui/dbui/createaddresslistdialog.cxx b/sw/source/ui/dbui/createaddresslistdialog.cxx
index 3f7484932010..dc96002db759 100644
--- a/sw/source/ui/dbui/createaddresslistdialog.cxx
+++ b/sw/source/ui/dbui/createaddresslistdialog.cxx
@@ -42,7 +42,7 @@
 #ifndef _SVT_CONTROLDIMS_HRC_
 #include <svtools/controldims.hrc>
 #endif
-#include <svtools/pathoptions.hxx>
+#include <unotools/pathoptions.hxx>
 #include <sfx2/filedlghelper.hxx>
 #include <sfx2/docfilt.hxx>
 #include <sfx2/fcontnr.hxx>
diff --git a/sw/source/ui/dbui/dbmgr.cxx b/sw/source/ui/dbui/dbmgr.cxx
index 603af1c31111..26d6dcafba9f 100644
--- a/sw/source/ui/dbui/dbmgr.cxx
+++ b/sw/source/ui/dbui/dbmgr.cxx
@@ -63,7 +63,7 @@
 #include <pagedesc.hxx>
 #include <vcl/lstbox.hxx>
 #include <unotools/tempfile.hxx>
-#include <svtools/pathoptions.hxx>
+#include <unotools/pathoptions.hxx>
 #include <svtools/urihelper.hxx>
 #ifndef _SVSTDARR_HXX
 #define _SVSTDARR_STRINGSDTOR
diff --git a/sw/source/ui/dbui/mmdocselectpage.cxx b/sw/source/ui/dbui/mmdocselectpage.cxx
index 7bef5c752be6..423185fb0ba3 100644
--- a/sw/source/ui/dbui/mmdocselectpage.cxx
+++ b/sw/source/ui/dbui/mmdocselectpage.cxx
@@ -35,7 +35,7 @@
 #endif
 
 
-#include <svtools/pathoptions.hxx>
+#include <unotools/pathoptions.hxx>
 #include <sfx2/filedlghelper.hxx>
 #include <sfx2/new.hxx>
 #include <sfx2/docfilt.hxx>
diff --git a/sw/source/ui/dialog/SwSpellDialogChildWindow.cxx b/sw/source/ui/dialog/SwSpellDialogChildWindow.cxx
index 8dca8ef1abf0..ae783c991799 100644
--- a/sw/source/ui/dialog/SwSpellDialogChildWindow.cxx
+++ b/sw/source/ui/dialog/SwSpellDialogChildWindow.cxx
@@ -47,8 +47,8 @@
 #include <svx/svdview.hxx>
 #include <svx/svditer.hxx>
 #include <svx/svdogrp.hxx>
-#include <svtools/linguprops.hxx>
-#include <svtools/lingucfg.hxx>
+#include <unotools/linguprops.hxx>
+#include <unotools/lingucfg.hxx>
 #include <doc.hxx>
 #ifndef _DOCSH_HXX
 #include <docsh.hxx>
diff --git a/sw/source/ui/dialog/ascfldlg.cxx b/sw/source/ui/dialog/ascfldlg.cxx
index 585151383893..e2313d54c87f 100644
--- a/sw/source/ui/dialog/ascfldlg.cxx
+++ b/sw/source/ui/dialog/ascfldlg.cxx
@@ -37,7 +37,7 @@
 #include <rtl/textenc.h>
 #include <i18npool/mslangid.hxx>
 #include <com/sun/star/i18n/ScriptType.hpp>
-#include <svtools/lingucfg.hxx>
+#include <unotools/lingucfg.hxx>
 #include <fontcfg.hxx>
 #include <swmodule.hxx>
 #include <svx/unolingu.hxx>
diff --git a/sw/source/ui/docvw/edtwin.cxx b/sw/source/ui/docvw/edtwin.cxx
index 905062e66c60..a30ec89edfa4 100644
--- a/sw/source/ui/docvw/edtwin.cxx
+++ b/sw/source/ui/docvw/edtwin.cxx
@@ -49,7 +49,7 @@
 #include <vcl/cmdevt.h>
 #include <sot/storage.hxx>
 #include <svtools/macitem.hxx>
-#include <svtools/securityoptions.hxx>
+#include <unotools/securityoptions.hxx>
 #ifndef __SBX_SBXVARIABLE_HXX //autogen
 #include <basic/sbxvar.hxx>
 #endif
diff --git a/sw/source/ui/docvw/edtwin2.cxx b/sw/source/ui/docvw/edtwin2.cxx
index 583758b50522..78c4c9dc5659 100644
--- a/sw/source/ui/docvw/edtwin2.cxx
+++ b/sw/source/ui/docvw/edtwin2.cxx
@@ -42,7 +42,7 @@
 #include <vcl/help.hxx>
 #endif
 #include <svtools/stritem.hxx>
-#include <svtools/securityoptions.hxx>
+#include <unotools/securityoptions.hxx>
 #include <tools/urlobj.hxx>
 #include <txtrfmrk.hxx>
 #include <fmtrfmrk.hxx>
diff --git a/sw/source/ui/docvw/postit.cxx b/sw/source/ui/docvw/postit.cxx
index e693f87e7a35..6abd085343a1 100644
--- a/sw/source/ui/docvw/postit.cxx
+++ b/sw/source/ui/docvw/postit.cxx
@@ -69,8 +69,8 @@
 
 #include <svtools/langtab.hxx>
 #include <svtools/slstitm.hxx>
-#include <svtools/securityoptions.hxx>
-#include <svtools/useroptions.hxx>
+#include <unotools/securityoptions.hxx>
+#include <unotools/useroptions.hxx>
 #include <svtools/languageoptions.hxx>
 #include <svtools/zforlist.hxx>
 #include <svtools/svmedit.hxx>
diff --git a/sw/source/ui/docvw/romenu.cxx b/sw/source/ui/docvw/romenu.cxx
index 50776ef80f11..04e0bf8bd2c6 100644
--- a/sw/source/ui/docvw/romenu.cxx
+++ b/sw/source/ui/docvw/romenu.cxx
@@ -39,7 +39,7 @@
 #include <sot/formats.hxx>
 #include <svtools/eitem.hxx>
 #include <svtools/stritem.hxx>
-#include <svtools/pathoptions.hxx>
+#include <unotools/pathoptions.hxx>
 #include <svtools/filter.hxx>
 #include <svtools/imap.hxx>
 #include <svtools/inetimg.hxx>
diff --git a/sw/source/ui/docvw/srcedtw.cxx b/sw/source/ui/docvw/srcedtw.cxx
index 19ba5aefdf25..0086e1f1520a 100644
--- a/sw/source/ui/docvw/srcedtw.cxx
+++ b/sw/source/ui/docvw/srcedtw.cxx
@@ -49,7 +49,7 @@
 #include <sfx2/app.hxx>
 #include <svtools/htmltokn.h>
 #include <svtools/txtattr.hxx>
-#include <svtools/sourceviewconfig.hxx>
+#include <unotools/sourceviewconfig.hxx>
 #include <svtools/colorcfg.hxx>
 #include <svx/flstitem.hxx>
 #include <vcl/metric.hxx>
@@ -248,7 +248,7 @@ SwSrcEditWindow::SwSrcEditWindow( Window* pParent, SwSrcView* pParentView ) :
     pVScrollbar(0),
 
     pSrcView(pParentView),
-    pSourceViewConfig(new svt::SourceViewConfig),
+    pSourceViewConfig(new utl::SourceViewConfig),
 
     nCurTextWidth(0),
     nStartLine(USHRT_MAX),
@@ -258,14 +258,14 @@ SwSrcEditWindow::SwSrcEditWindow( Window* pParent, SwSrcView* pParentView ) :
 {
     SetHelpId(HID_SOURCE_EDITWIN);
     CreateTextEngine();
-    StartListening(*pSourceViewConfig);
+    pSourceViewConfig->AddListener(this);
 }
 /*--------------------------------------------------------------------
     Beschreibung:
  --------------------------------------------------------------------*/
  SwSrcEditWindow::~SwSrcEditWindow()
 {
-    EndListening(*pSourceViewConfig);
+    pSourceViewConfig->RemoveListener(this);
     delete pSourceViewConfig;
     aSyntaxIdleTimer.Stop();
     if ( pTextEngine )
@@ -842,7 +842,11 @@ void SwSrcEditWindow::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
             DoDelayedSyntaxHighlight( (USHORT)rTextHint.GetValue() );
         }
     }
-    else if(&rBC == pSourceViewConfig)
+}
+
+void SwSrcEditWindow::ConfigurationChanged( utl::ConfigurationBroadcaster* pBrdCst )
+{
+    if( pBrdCst == pSourceViewConfig)
         SetFont();
 }
 
diff --git a/sw/source/ui/envelp/envimg.cxx b/sw/source/ui/envelp/envimg.cxx
index fa1744ca1ae5..19f80a30225c 100644
--- a/sw/source/ui/envelp/envimg.cxx
+++ b/sw/source/ui/envelp/envimg.cxx
@@ -38,7 +38,7 @@
 #include <sfx2/app.hxx>
 #include <svx/paperinf.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
-#include <svtools/useroptions.hxx>
+#include <unotools/useroptions.hxx>
 #include <tools/shl.hxx>
 #include <swmodule.hxx>
 #include <errhdl.hxx>
diff --git a/sw/source/ui/envelp/labimg.cxx b/sw/source/ui/envelp/labimg.cxx
index 6406861f114b..7add602db0a2 100644
--- a/sw/source/ui/envelp/labimg.cxx
+++ b/sw/source/ui/envelp/labimg.cxx
@@ -38,7 +38,7 @@
 #endif
 #include <com/sun/star/uno/Any.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
-#include <svtools/useroptions.hxx>
+#include <unotools/useroptions.hxx>
 #include <tools/shl.hxx>
 #include <swmodule.hxx>
 #include "labimg.hxx"
diff --git a/sw/source/ui/envelp/labprt.cxx b/sw/source/ui/envelp/labprt.cxx
index 54e2e99657bf..75afb901425a 100644
--- a/sw/source/ui/envelp/labprt.cxx
+++ b/sw/source/ui/envelp/labprt.cxx
@@ -37,7 +37,7 @@
 
 
 #include <svtools/prnsetup.hxx>
-#include <svtools/cmdoptions.hxx>
+#include <unotools/cmdoptions.hxx>
 #include <vcl/print.hxx>
 #include <wrtsh.hxx>
 #include <label.hxx>
diff --git a/sw/source/ui/envelp/mailmrge.cxx b/sw/source/ui/envelp/mailmrge.cxx
index fd9caec98c24..e21cf1dba3b9 100644
--- a/sw/source/ui/envelp/mailmrge.cxx
+++ b/sw/source/ui/envelp/mailmrge.cxx
@@ -39,7 +39,7 @@
 #include <vcl/svapp.hxx>
 #include <tools/urlobj.hxx>
 #include <svtools/urihelper.hxx>
-#include <svtools/pathoptions.hxx>
+#include <unotools/pathoptions.hxx>
 #include <goodies/mailenum.hxx>
 #include <svx/svxdlg.hxx>
 #include <svx/dialogs.hrc>
diff --git a/sw/source/ui/globdoc/globdoc.cxx b/sw/source/ui/globdoc/globdoc.cxx
index ae2c98507bbe..993c65d5d7b7 100644
--- a/sw/source/ui/globdoc/globdoc.cxx
+++ b/sw/source/ui/globdoc/globdoc.cxx
@@ -34,7 +34,7 @@
 
 
 #include <sot/clsids.hxx>
-#include <svtools/moduleoptions.hxx>
+#include <unotools/moduleoptions.hxx>
 
 #include <unomid.h>
 
diff --git a/sw/source/ui/inc/optcomp.hxx b/sw/source/ui/inc/optcomp.hxx
index b72f9f8d21e9..2742a97efd85 100644
--- a/sw/source/ui/inc/optcomp.hxx
+++ b/sw/source/ui/inc/optcomp.hxx
@@ -33,7 +33,7 @@
 #include <sfx2/tabdlg.hxx>
 #include <vcl/fixed.hxx>
 #include <vcl/lstbox.hxx>
-#include <svtools/compatibility.hxx>
+#include <unotools/compatibility.hxx>
 #include <svx/checklbx.hxx>
 
 // class SwCompatibilityOptPage ------------------------------------------
diff --git a/sw/source/ui/inc/srcedtw.hxx b/sw/source/ui/inc/srcedtw.hxx
index 9dbb5ba6fe31..91c2e65227ca 100644
--- a/sw/source/ui/inc/srcedtw.hxx
+++ b/sw/source/ui/inc/srcedtw.hxx
@@ -32,6 +32,7 @@
 
 #include <vcl/window.hxx>
 #include <svtools/lstner.hxx>
+#include <unotools/options.hxx>
 #include <vcl/timer.hxx>
 
 #ifndef _TABLE_HXX //autogen
@@ -46,6 +47,11 @@ class TextEngine;
 class ExtTextView;
 class DataChangedEvent;
 
+namespace utl
+{
+    class SourceViewConfig;
+};
+
 class TextViewOutWin : public Window
 {
     ExtTextView*    pTextView;
@@ -69,7 +75,7 @@ public:
 
 //------------------------------------------------------------
 namespace svt{ class SourceViewConfig;}
-class SwSrcEditWindow : public Window, public SfxListener
+class SwSrcEditWindow : public Window, public SfxListener, public utl::ConfigurationListener
 {
 private:
     ExtTextView*    pTextView;
@@ -80,7 +86,7 @@ private:
                     *pVScrollbar;
 
     SwSrcView*      pSrcView;
-    svt::SourceViewConfig* pSourceViewConfig;
+    utl::SourceViewConfig* pSourceViewConfig;
 
     long            nCurTextWidth;
     USHORT          nStartLine;
@@ -114,6 +120,7 @@ protected:
     void            DoSyntaxHighlight( USHORT nPara );
 
     virtual void    Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
+    virtual void    ConfigurationChanged( utl::ConfigurationBroadcaster* );
 
     DECL_LINK(ScrollHdl, ScrollBar*);
 
diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx
index 9eeaa42ccaa4..8c26435543ba 100644
--- a/sw/source/ui/index/cnttab.cxx
+++ b/sw/source/ui/index/cnttab.cxx
@@ -40,7 +40,7 @@
 #include <vcl/help.hxx>
 #include <svtools/stritem.hxx>
 #include <svtools/urihelper.hxx>
-#include <svtools/pathoptions.hxx>
+#include <unotools/pathoptions.hxx>
 #include <sfx2/request.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/dispatch.hxx>
diff --git a/sw/source/ui/lingu/olmenu.cxx b/sw/source/ui/lingu/olmenu.cxx
index 865908568cd6..815f03423b16 100644
--- a/sw/source/ui/lingu/olmenu.cxx
+++ b/sw/source/ui/lingu/olmenu.cxx
@@ -37,8 +37,8 @@
 #define _SVSTDARR_STRINGSDTOR
 #include <svtools/svstdarr.hxx>
 #endif
-#include <svtools/lingucfg.hxx>
-#include <svtools/linguprops.hxx>
+#include <unotools/lingucfg.hxx>
+#include <unotools/linguprops.hxx>
 #include <svtools/filter.hxx>
 #include <svx/impgrf.hxx>
 #include <svx/svxacorr.hxx>
@@ -69,7 +69,7 @@
 #include <svx/splwrap.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
-#include <svtools/lingucfg.hxx>
+#include <unotools/lingucfg.hxx>
 #include <svx/acorrcfg.hxx>
 #include <swmodule.hxx>
 #include <cmdid.h>
diff --git a/sw/source/ui/misc/glosbib.cxx b/sw/source/ui/misc/glosbib.cxx
index e5269a6f7dd7..3edbcc32889d 100644
--- a/sw/source/ui/misc/glosbib.cxx
+++ b/sw/source/ui/misc/glosbib.cxx
@@ -47,7 +47,7 @@
 #include <unotools/tempfile.hxx>
 
 #include <svtools/svstdarr.hxx>
-#include <svtools/pathoptions.hxx>
+#include <unotools/pathoptions.hxx>
 #include <swtypes.hxx>
 #include <glosbib.hxx>
 #include <gloshdl.hxx>
diff --git a/sw/source/ui/misc/glosdoc.cxx b/sw/source/ui/misc/glosdoc.cxx
index 94d2f04a9b0e..b8cdcee86305 100644
--- a/sw/source/ui/misc/glosdoc.cxx
+++ b/sw/source/ui/misc/glosdoc.cxx
@@ -48,7 +48,7 @@
 #ifndef SVTOOLS_FSTATHELPER_HXX
 #include <svtools/fstathelper.hxx>
 #endif
-#include <svtools/pathoptions.hxx>
+#include <unotools/pathoptions.hxx>
 #include <unotools/tempfile.hxx>
 #include <swtypes.hxx>
 #include <errhdl.hxx>       // ASSERT
diff --git a/sw/source/ui/misc/glossary.cxx b/sw/source/ui/misc/glossary.cxx
index ef368f680378..f7ccdaea5cef 100644
--- a/sw/source/ui/misc/glossary.cxx
+++ b/sw/source/ui/misc/glossary.cxx
@@ -53,8 +53,8 @@
 #include <svtools/svstdarr.hxx>
 #endif
 #include <svtools/stritem.hxx>
-#include <svtools/pathoptions.hxx>
-#include <svtools/lingucfg.hxx>
+#include <unotools/pathoptions.hxx>
+#include <unotools/lingucfg.hxx>
 #include <sfx2/request.hxx>
 #include <sfx2/fcontnr.hxx>
 
diff --git a/sw/source/ui/shells/annotsh.cxx b/sw/source/ui/shells/annotsh.cxx
index 1a34e2972956..7c6962f23efa 100755
--- a/sw/source/ui/shells/annotsh.cxx
+++ b/sw/source/ui/shells/annotsh.cxx
@@ -68,7 +68,7 @@
 #include <svtools/whiter.hxx>
 #include <svtools/cjkoptions.hxx>
 #include <svtools/ctloptions.hxx>
-#include <svtools/useroptions.hxx>
+#include <unotools/useroptions.hxx>
 #include <vcl/msgbox.hxx>
 #include <svx/flditem.hxx>
 #include <svx/editstat.hxx>
diff --git a/sw/source/ui/shells/tabsh.cxx b/sw/source/ui/shells/tabsh.cxx
index 7ba4d0b8e954..98818515a4d0 100644
--- a/sw/source/ui/shells/tabsh.cxx
+++ b/sw/source/ui/shells/tabsh.cxx
@@ -38,7 +38,7 @@
 #endif
 #include <svtools/stritem.hxx>
 #include <svtools/whiter.hxx>
-#include <svtools/moduleoptions.hxx>
+#include <unotools/moduleoptions.hxx>
 #include <svx/rulritem.hxx>
 #include <svx/srchitem.hxx>
 #include <svx/lrspitem.hxx>
diff --git a/sw/source/ui/shells/textfld.cxx b/sw/source/ui/shells/textfld.cxx
index 0dedb918aaf5..520d0635d52e 100644
--- a/sw/source/ui/shells/textfld.cxx
+++ b/sw/source/ui/shells/textfld.cxx
@@ -39,7 +39,7 @@
 #include <tools/urlobj.hxx>
 #include <vcl/msgbox.hxx>
 #include <svtools/itempool.hxx>
-#include <svtools/useroptions.hxx>
+#include <unotools/useroptions.hxx>
 #include <svtools/whiter.hxx>
 #include <svtools/eitem.hxx>
 #include <svtools/macitem.hxx>
diff --git a/sw/source/ui/shells/textsh.cxx b/sw/source/ui/shells/textsh.cxx
index 7e38c1297d0b..615e2464e991 100644
--- a/sw/source/ui/shells/textsh.cxx
+++ b/sw/source/ui/shells/textsh.cxx
@@ -45,7 +45,7 @@
 #include <svx/svdview.hxx>
 #include <svtools/ptitem.hxx>
 #include <svtools/stritem.hxx>
-#include <svtools/moduleoptions.hxx>
+#include <unotools/moduleoptions.hxx>
 #include <vcl/msgbox.hxx>
 #include <sfx2/fcontnr.hxx>
 #include <svx/hlnkitem.hxx>
diff --git a/sw/source/ui/shells/textsh1.cxx b/sw/source/ui/shells/textsh1.cxx
index 77de4c0821ff..b2fe47d4e052 100644
--- a/sw/source/ui/shells/textsh1.cxx
+++ b/sw/source/ui/shells/textsh1.cxx
@@ -117,7 +117,7 @@
 
 #include <sfx2/sfxdlg.hxx>
 #include <svtools/languageoptions.hxx>
-#include <svtools/lingucfg.hxx>
+#include <unotools/lingucfg.hxx>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/util/XChangesBatch.hpp>
 #include <com/sun/star/uno/Any.hxx>
diff --git a/sw/source/ui/uiview/srcview.cxx b/sw/source/ui/uiview/srcview.cxx
index d30e85c5ee71..e43fadfbdeb8 100644
--- a/sw/source/ui/uiview/srcview.cxx
+++ b/sw/source/ui/uiview/srcview.cxx
@@ -45,12 +45,12 @@
 #include <svtools/ctrltool.hxx>
 #include <svtools/intitem.hxx>
 #include <svtools/stritem.hxx>
-#include <svtools/pathoptions.hxx>
+#include <unotools/pathoptions.hxx>
 #include <svtools/undo.hxx>
 #include <svtools/txtcmp.hxx>
 #include <svtools/eitem.hxx>
 #include <svtools/whiter.hxx>
-#include <svtools/saveopt.hxx>
+#include <unotools/saveopt.hxx>
 #include <svtools/transfer.hxx>
 
 #include <svx/htmlcfg.hxx>
diff --git a/sw/source/ui/uiview/view.cxx b/sw/source/ui/uiview/view.cxx
index a13f25d8933e..d767faab54de 100644
--- a/sw/source/ui/uiview/view.cxx
+++ b/sw/source/ui/uiview/view.cxx
@@ -41,10 +41,10 @@
 #include <vcl/inputctx.hxx>
 #include <basic/sbxobj.hxx>
 #include <svtools/eitem.hxx>
-#include <svtools/undoopt.hxx>
-#include <svtools/lingucfg.hxx>
+#include <unotools/undoopt.hxx>
+#include <unotools/lingucfg.hxx>
 #include <svtools/printdlg.hxx>
-#include <svtools/useroptions.hxx>
+#include <unotools/useroptions.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/request.hxx>
 #include <sfx2/docfile.hxx>
diff --git a/sw/source/ui/uiview/view0.cxx b/sw/source/ui/uiview/view0.cxx
index 38f885657450..27f668796ced 100644
--- a/sw/source/ui/uiview/view0.cxx
+++ b/sw/source/ui/uiview/view0.cxx
@@ -39,8 +39,8 @@
 #include <svx/srchitem.hxx>
 #include <SwSpellDialogChildWindow.hxx>
 #include <svtools/eitem.hxx>
-#include <svtools/linguprops.hxx>
-#include <svtools/lingucfg.hxx>
+#include <unotools/linguprops.hxx>
+#include <unotools/lingucfg.hxx>
 #include <viewopt.hxx>
 #include <globals.h>
 #include <sfx2/app.hxx>
@@ -99,7 +99,7 @@
 using namespace ::com::sun::star;
 using ::rtl::OUString;
 
-#include <svtools/moduleoptions.hxx>
+#include <unotools/moduleoptions.hxx>
 
 #include <IDocumentSettingAccess.hxx>
 
diff --git a/sw/source/ui/uiview/viewstat.cxx b/sw/source/ui/uiview/viewstat.cxx
index 7563a7b5e779..d4f81540ffdd 100644
--- a/sw/source/ui/uiview/viewstat.cxx
+++ b/sw/source/ui/uiview/viewstat.cxx
@@ -68,7 +68,7 @@
 #endif
 #include <globdoc.hxx>
 #include <svtools/stritem.hxx>
-#include <svtools/moduleoptions.hxx>
+#include <unotools/moduleoptions.hxx>
 #include <svtools/visitem.hxx>
 
 #ifndef _CMDID_H
diff --git a/sw/source/ui/uno/dlelstnr.cxx b/sw/source/ui/uno/dlelstnr.cxx
index 3b066a66ce08..c883a03f23ee 100644
--- a/sw/source/ui/uno/dlelstnr.cxx
+++ b/sw/source/ui/uno/dlelstnr.cxx
@@ -41,7 +41,7 @@
 #include <com/sun/star/linguistic2/XProofreadingIterator.hpp>
 #include <com/sun/star/linguistic2/LinguServiceEventFlags.hpp>
 
-#include <svtools/lingucfg.hxx>
+#include <unotools/lingucfg.hxx>
 
 #include <com/sun/star/uno/Reference.h>
 #include <comphelper/processfactory.hxx>
diff --git a/sw/source/ui/uno/swdet2.cxx b/sw/source/ui/uno/swdet2.cxx
index aedd6e0f6c68..4d369d2b7ee2 100644
--- a/sw/source/ui/uno/swdet2.cxx
+++ b/sw/source/ui/uno/swdet2.cxx
@@ -49,7 +49,7 @@
 #include <web.hrc>
 #include <globdoc.hrc>
 
-#include <svtools/moduleoptions.hxx>
+#include <unotools/moduleoptions.hxx>
 
 #include <unomid.h>
 
diff --git a/sw/source/ui/uno/swdetect.cxx b/sw/source/ui/uno/swdetect.cxx
index 82da0914124a..ba56e294d0ed 100644
--- a/sw/source/ui/uno/swdetect.cxx
+++ b/sw/source/ui/uno/swdetect.cxx
@@ -72,7 +72,7 @@
 #include <sfx2/brokenpackageint.hxx>
 #include <svx/impgrf.hxx>
 #include <svtools/FilterConfigItem.hxx>
-#include <svtools/moduleoptions.hxx>
+#include <unotools/moduleoptions.hxx>
 #include <com/sun/star/util/XArchiver.hpp>
 #include <comphelper/ihwrapnofilter.hxx>
 
diff --git a/sw/source/ui/utlui/gloslst.cxx b/sw/source/ui/utlui/gloslst.cxx
index 7072cb254274..9dd1848cb3a2 100644
--- a/sw/source/ui/utlui/gloslst.cxx
+++ b/sw/source/ui/utlui/gloslst.cxx
@@ -50,7 +50,7 @@
 #ifndef SVTOOLS_FSTATHELPER_HXX
 #include <svtools/fstathelper.hxx>
 #endif
-#include <svtools/pathoptions.hxx>
+#include <unotools/pathoptions.hxx>
 #include <unotools/transliterationwrapper.hxx>
 #include <swtypes.hxx>
 #include <swmodule.hxx>
diff --git a/sw/source/ui/wrtsh/wrtsh1.cxx b/sw/source/ui/wrtsh/wrtsh1.cxx
index cd6bb82739ca..cc1fd37ec782 100644
--- a/sw/source/ui/wrtsh/wrtsh1.cxx
+++ b/sw/source/ui/wrtsh/wrtsh1.cxx
@@ -56,7 +56,7 @@
 #include <svtools/ehdl.hxx>
 #include <svtools/soerr.hxx>
 #include <tools/cachestr.hxx>
-#include <svtools/moduleoptions.hxx>
+#include <unotools/moduleoptions.hxx>
 #include <svx/sizeitem.hxx>
 #include <svx/brkitem.hxx>
 #include <svx/svxacorr.hxx>