#i103496#: split svtools; improve ConfitItems

92 files changed, 161 insertions, 152 deletions

diff --git a/sw/inc/PostItMgr.hxx b/sw/inc/PostItMgr.hxx
index e01041edafcd..36e9bdd08639 100644
--- a/sw/inc/PostItMgr.hxx
+++ b/sw/inc/PostItMgr.hxx
@@ -31,8 +31,6 @@
 #ifndef _POSTITMGR_HXX
 #define _POSTITMGR_HXX
 
-#include <svtools/lstner.hxx>
-
 #include <list>
 #include <vector>
 #include <svx/outlobj.hxx>
@@ -41,8 +39,10 @@
 #include <tools/debug.hxx>
 #include <swrect.hxx>
 #include <unotools/configitem.hxx>
+#include <unotools/options.hxx>
 #include <com/sun/star/util/SearchOptions.hpp>
 #include <com/sun/star/uno/Any.hxx>
+#include <svl/lstner.hxx>
 
 class SwWrtShell;
 class SwDoc;
@@ -139,6 +139,9 @@ class SwNoteProps: public utl::ConfigItem
                  }
                  return aNames;
             }
+
+    virtual void Commit();
+    virtual void Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& aPropertyNames );
 };
 
 class SwPostItMgr: public SfxListener
diff --git a/sw/inc/SwAppletImpl.hxx b/sw/inc/SwAppletImpl.hxx
index fcf9d727f05e..8ea953136e49 100644
--- a/sw/inc/SwAppletImpl.hxx
+++ b/sw/inc/SwAppletImpl.hxx
@@ -46,9 +46,9 @@
 #include <vcl/wrkwin.hxx>
 #endif
 #include <sot/storage.hxx>
-#include <svtools/itemset.hxx>
+#include <svl/itemset.hxx>
 
-#include <svtools/ownlist.hxx>
+#include <svl/ownlist.hxx>
 
 class SfxItemSet;
 
diff --git a/sw/inc/acmplwrd.hxx b/sw/inc/acmplwrd.hxx
index 964371ca40da..31041cd700dc 100644
--- a/sw/inc/acmplwrd.hxx
+++ b/sw/inc/acmplwrd.hxx
@@ -32,7 +32,7 @@
 
 
 #define _SVSTDARR_STRINGSISORTDTOR
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 
 class SwDoc;
 class SwAutoCompleteWord_Impl;
diff --git a/sw/inc/authfld.hxx b/sw/inc/authfld.hxx
index 1b209ac0b47c..8447210a2d01 100644
--- a/sw/inc/authfld.hxx
+++ b/sw/inc/authfld.hxx
@@ -35,7 +35,7 @@
 #include <toxe.hxx>
 
 #define _SVSTDARR_LONGS
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 
 class SwAuthDataArr;
 /* -----------------21.09.99 13:32-------------------
diff --git a/sw/inc/calc.hxx b/sw/inc/calc.hxx
index 91f1e538d355..e336a4fea524 100644
--- a/sw/inc/calc.hxx
+++ b/sw/inc/calc.hxx
@@ -30,7 +30,7 @@
 #ifndef _CALC_HXX
 #define _CALC_HXX
 
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
 
 #ifndef __SBX_SBXVALUE //autogen
 #include <basic/sbxvar.hxx>
diff --git a/sw/inc/ccoll.hxx b/sw/inc/ccoll.hxx
index cd25c3c6f892..fe8051c8465c 100644
--- a/sw/inc/ccoll.hxx
+++ b/sw/inc/ccoll.hxx
@@ -30,7 +30,7 @@
 #ifndef _CCOLL_HXX
 #define _CCOLL_HXX
 
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
 #include <tools/string.hxx>
 #include <sfx2/tabdlg.hxx>
 
diff --git a/sw/inc/cellatr.hxx b/sw/inc/cellatr.hxx
index 1ea47d89f8c9..6ce11b1e6cb8 100644
--- a/sw/inc/cellatr.hxx
+++ b/sw/inc/cellatr.hxx
@@ -31,8 +31,8 @@
 #ifndef _CELLATR_HXX
 #define _CELLATR_HXX
 
-#include <svtools/intitem.hxx>
-#include <svtools/zforlist.hxx>
+#include <svl/intitem.hxx>
+#include <svl/zforlist.hxx>
 #include "swdllapi.h"
 #include "format.hxx"
 #include "cellfml.hxx"
diff --git a/sw/inc/dbmgr.hxx b/sw/inc/dbmgr.hxx
index 0c359bd05cdb..dfb67a7025f9 100644
--- a/sw/inc/dbmgr.hxx
+++ b/sw/inc/dbmgr.hxx
@@ -33,7 +33,7 @@
 
 #include <tools/string.hxx>
 #include <tools/link.hxx>
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
 #include <com/sun/star/util/Date.hpp>
 #include "swdllapi.h"
 #include <swdbdata.hxx>
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index f92544f1139d..9d06ed4be52b 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -59,7 +59,7 @@
 class SwList;
 // <--
 #define _SVSTDARR_STRINGSDTOR
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 #include <com/sun/star/embed/XEmbeddedObject.hpp>
 #include <com/sun/star/embed/XStorage.hpp>
 #include <vcl/timer.hxx>
@@ -76,7 +76,7 @@ class SwList;
 #include <com/sun/star/linguistic2/XHyphenatedWord.hpp>
 #include <vos/ref.hxx>
 #include <svx/svdtypes.hxx>
-#include <svtools/style.hxx>
+#include <svl/style.hxx>
 #include <svx/numitem.hxx>
 #include "comphelper/implementationreference.hxx"
 #include <com/sun/star/chart2/data/XDataProvider.hpp>
diff --git a/sw/inc/docary.hxx b/sw/inc/docary.hxx
index c8ffcba549ab..d993c0949f2a 100644
--- a/sw/inc/docary.hxx
+++ b/sw/inc/docary.hxx
@@ -51,7 +51,7 @@ namespace com { namespace sun { namespace star { namespace i18n {
 #include <tools/table.hxx>
 #endif
 #include <swtypes.hxx>
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
 
 typedef SwFieldType* SwFldTypePtr;
 #define GROW_FLDTYPES   16
diff --git a/sw/inc/docsh.hxx b/sw/inc/docsh.hxx
index 6ed3f6d652bd..a0c7635029f0 100644
--- a/sw/inc/docsh.hxx
+++ b/sw/inc/docsh.hxx
@@ -39,7 +39,7 @@
 #include <swdll.hxx>
 #include <shellid.hxx>
 
-#include <svtools/lstner.hxx>
+#include <svl/lstner.hxx>
 #include <svtools/embedhlp.hxx>
 
 class SwDoc;
diff --git a/sw/inc/docstyle.hxx b/sw/inc/docstyle.hxx
index e93972690e66..f7e6019de511 100644
--- a/sw/inc/docstyle.hxx
+++ b/sw/inc/docstyle.hxx
@@ -34,10 +34,10 @@
 
 #ifndef _SVSTDARR_HXX
 #define _SVSTDARR_STRINGSDTOR
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 #endif
-#include <svtools/style.hxx>
-#include <svtools/itemset.hxx>
+#include <svl/style.hxx>
+#include <svl/itemset.hxx>
 #include "swdllapi.h"
 
 class SwDoc;
diff --git a/sw/inc/docufld.hxx b/sw/inc/docufld.hxx
index 88c4e650cfd0..360a84634991 100644
--- a/sw/inc/docufld.hxx
+++ b/sw/inc/docufld.hxx
@@ -35,7 +35,7 @@
 #include <tools/datetime.hxx>
 
 
-#include <svtools/macitem.hxx>
+#include <svl/macitem.hxx>
 
 #include "fldbas.hxx"
 #include "numrule.hxx"
diff --git a/sw/inc/edglbldc.hxx b/sw/inc/edglbldc.hxx
index b2c5d411f07a..be792453e485 100644
--- a/sw/inc/edglbldc.hxx
+++ b/sw/inc/edglbldc.hxx
@@ -30,7 +30,7 @@
 #ifndef _EDGLBLDC_HXX
 #define _EDGLBLDC_HXX
 
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
 
 class SwSection;
 class SwTOXBase;
diff --git a/sw/inc/edimp.hxx b/sw/inc/edimp.hxx
index 8cfa04648cf7..8b8a6c8bfde4 100644
--- a/sw/inc/edimp.hxx
+++ b/sw/inc/edimp.hxx
@@ -32,7 +32,7 @@
 #define _EDIMP_HXX
 
 #include <tools/solar.h>
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
 
 class SwPaM;
 class SwNodeIndex;
diff --git a/sw/inc/editsh.hxx b/sw/inc/editsh.hxx
index 1ce87e0df410..d802eb910cff 100644
--- a/sw/inc/editsh.hxx
+++ b/sw/inc/editsh.hxx
@@ -33,7 +33,7 @@
 #include <com/sun/star/text/HoriOrientation.hpp>
 #include <com/sun/star/embed/XEmbeddedObject.hpp>
 #include <tools/string.hxx>
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
 #include <vcl/font.hxx>
 #include <svx/swafopt.hxx>
 #include "swdllapi.h"
diff --git a/sw/inc/expfld.hxx b/sw/inc/expfld.hxx
index 83629f8cf6d5..00a7c57efb3b 100644
--- a/sw/inc/expfld.hxx
+++ b/sw/inc/expfld.hxx
@@ -30,7 +30,7 @@
 #ifndef _EXPFLD_HXX
 #define _EXPFLD_HXX
 
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
 #include "swdllapi.h"
 #include <fldbas.hxx>
 #include <cellfml.hxx>
diff --git a/sw/inc/extinput.hxx b/sw/inc/extinput.hxx
index c11c6b9ecaf0..05b88d1bd5a6 100644
--- a/sw/inc/extinput.hxx
+++ b/sw/inc/extinput.hxx
@@ -32,7 +32,7 @@
 
 #ifndef _SVSTDARR_HXX
 #define _SVSTDARR_USHORTS
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 #endif
 #include <pam.hxx>
 #include <i18npool/lang.h>
diff --git a/sw/inc/fchrfmt.hxx b/sw/inc/fchrfmt.hxx
index c34d6f484037..b201dddf4f05 100644
--- a/sw/inc/fchrfmt.hxx
+++ b/sw/inc/fchrfmt.hxx
@@ -31,7 +31,7 @@
 #define _FCHRFMT_HXX
 
 
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
 #include <calbck.hxx>
 #include <format.hxx>
 
diff --git a/sw/inc/flypos.hxx b/sw/inc/flypos.hxx
index 287e6544712b..0ac8b016d24d 100644
--- a/sw/inc/flypos.hxx
+++ b/sw/inc/flypos.hxx
@@ -31,7 +31,7 @@
 #define _FLYPOS_HXX
 
 
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
 #include <swdllapi.h>
 
 class SwFrmFmt;
diff --git a/sw/inc/fmtanchr.hxx b/sw/inc/fmtanchr.hxx
index fd6975205347..d74ed247e0cc 100644
--- a/sw/inc/fmtanchr.hxx
+++ b/sw/inc/fmtanchr.hxx
@@ -34,7 +34,7 @@
 #include <hintids.hxx>
 #include <swtypes.hxx>
 #include <format.hxx>
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
 
 struct SwPosition;
 class IntlWrapper;
diff --git a/sw/inc/fmtautofmt.hxx b/sw/inc/fmtautofmt.hxx
index 1d4df2210f15..b39475c8a54c 100644
--- a/sw/inc/fmtautofmt.hxx
+++ b/sw/inc/fmtautofmt.hxx
@@ -31,7 +31,7 @@
 #define _FMTAUTOFMT_HXX
 
 
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
 #include <format.hxx>
 #include <boost/shared_ptr.hpp>
 
diff --git a/sw/inc/fmtclbl.hxx b/sw/inc/fmtclbl.hxx
index c10898ca5716..58d87a06ae42 100644
--- a/sw/inc/fmtclbl.hxx
+++ b/sw/inc/fmtclbl.hxx
@@ -31,7 +31,7 @@
 #define _FMTCLBL_HXX
 
 
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
 #include <hintids.hxx>
 #include <format.hxx>
 #include "swdllapi.h"
diff --git a/sw/inc/fmtclds.hxx b/sw/inc/fmtclds.hxx
index 3a4069f22acb..c50bfd5bc1a2 100644
--- a/sw/inc/fmtclds.hxx
+++ b/sw/inc/fmtclds.hxx
@@ -31,7 +31,7 @@
 #define _FMTCLDS_HXX
 
 #include <tools/color.hxx>
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
 #include "swdllapi.h"
 #include <hintids.hxx>
 #include <format.hxx>
diff --git a/sw/inc/fmtcnct.hxx b/sw/inc/fmtcnct.hxx
index d229f91b8b78..20e33fbe7439 100644
--- a/sw/inc/fmtcnct.hxx
+++ b/sw/inc/fmtcnct.hxx
@@ -31,7 +31,7 @@
 #define _FMTCNCT_HXX
 
 #include <hintids.hxx>
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
 #include <format.hxx>
 #include <calbck.hxx>
 
diff --git a/sw/inc/fmtcntnt.hxx b/sw/inc/fmtcntnt.hxx
index c5b262331e44..f5a5443c14be 100644
--- a/sw/inc/fmtcntnt.hxx
+++ b/sw/inc/fmtcntnt.hxx
@@ -30,7 +30,7 @@
 #ifndef _FMTCNTNT_HXX
 #define _FMTCNTNT_HXX
 
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
 #include <hintids.hxx>
 #include <format.hxx>
 
diff --git a/sw/inc/fmtcol.hxx b/sw/inc/fmtcol.hxx
index d06a64cf9bfd..8b4d3cb285b7 100644
--- a/sw/inc/fmtcol.hxx
+++ b/sw/inc/fmtcol.hxx
@@ -30,7 +30,7 @@
 #ifndef _FMTCOL_HXX
 #define _FMTCOL_HXX
 
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
 #include "swdllapi.h"
 #include <format.hxx>
 #include <swtypes.hxx>      // fuer MAXLEVEL
diff --git a/sw/inc/fmteiro.hxx b/sw/inc/fmteiro.hxx
index a45e9fafc495..b7ab6bc01543 100644
--- a/sw/inc/fmteiro.hxx
+++ b/sw/inc/fmteiro.hxx
@@ -31,7 +31,7 @@
 #define _FMTEIRO_HXX
 
 
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
 #include <hintids.hxx>
 #include <format.hxx>
 #include "swdllapi.h"
diff --git a/sw/inc/fmtflcnt.hxx b/sw/inc/fmtflcnt.hxx
index c018e8c31c14..3bb498aee050 100644
--- a/sw/inc/fmtflcnt.hxx
+++ b/sw/inc/fmtflcnt.hxx
@@ -31,7 +31,7 @@
 #define _FMTFLCNT_HXX
 
 
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
 
 class SwFrmFmt;
 class SwTxtFlyCnt;
diff --git a/sw/inc/fmtfld.hxx b/sw/inc/fmtfld.hxx
index 2ca982e80c0b..58fbe2c05699 100644
--- a/sw/inc/fmtfld.hxx
+++ b/sw/inc/fmtfld.hxx
@@ -30,9 +30,9 @@
 #ifndef _FMTFLD_HXX
 #define _FMTFLD_HXX
 
-#include <svtools/poolitem.hxx>
-#include <svtools/brdcst.hxx>
-#include <svtools/smplhint.hxx>
+#include <svl/poolitem.hxx>
+#include <svl/brdcst.hxx>
+#include <svl/smplhint.hxx>
 
 #include "swdllapi.h"
 #include <calbck.hxx>
diff --git a/sw/inc/fmtfollowtextflow.hxx b/sw/inc/fmtfollowtextflow.hxx
index a33cf8a16475..c049b9e9eaa0 100644
--- a/sw/inc/fmtfollowtextflow.hxx
+++ b/sw/inc/fmtfollowtextflow.hxx
@@ -31,7 +31,7 @@
 #define _FMTFOLLOWTEXTFLOW_HXX
 
 
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
 #include <hintids.hxx>
 #include <format.hxx>
 #include "swdllapi.h"
diff --git a/sw/inc/fmtfordr.hxx b/sw/inc/fmtfordr.hxx
index 93107807d1cd..7227d719c51c 100644
--- a/sw/inc/fmtfordr.hxx
+++ b/sw/inc/fmtfordr.hxx
@@ -30,7 +30,7 @@
 #ifndef _FMTFORDR_HXX
 #define _FMTFORDR_HXX
 
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
 #include <hintids.hxx>
 #include <format.hxx>
 
diff --git a/sw/inc/fmtfsize.hxx b/sw/inc/fmtfsize.hxx
index b28e3ac94be1..f2486aa916f0 100644
--- a/sw/inc/fmtfsize.hxx
+++ b/sw/inc/fmtfsize.hxx
@@ -31,7 +31,7 @@
 #define _FMTFSIZE_HXX
 
 #include <tools/gen.hxx>
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
 #include "swdllapi.h"
 #include <hintids.hxx>
 #include <swtypes.hxx>
diff --git a/sw/inc/fmtftn.hxx b/sw/inc/fmtftn.hxx
index e31001ced75f..ca04985bff76 100644
--- a/sw/inc/fmtftn.hxx
+++ b/sw/inc/fmtftn.hxx
@@ -31,7 +31,7 @@
 #define _FMTFTN_HXX
 
 #include <tools/string.hxx>
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
 #include "swdllapi.h"
 
 class SwDoc;
diff --git a/sw/inc/fmtftntx.hxx b/sw/inc/fmtftntx.hxx
index 8e95c4e7128a..b5cbfbfdc6bf 100644
--- a/sw/inc/fmtftntx.hxx
+++ b/sw/inc/fmtftntx.hxx
@@ -30,7 +30,7 @@
 #ifndef _FMTFTNTX_HXX
 #define _FMTFTNTX_HXX
 
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
 #include <hintids.hxx>
 #include <format.hxx>
 #include <numrule.hxx>
diff --git a/sw/inc/fmthdft.hxx b/sw/inc/fmthdft.hxx
index d6661c9d4ddc..1f8e8289ee86 100644
--- a/sw/inc/fmthdft.hxx
+++ b/sw/inc/fmthdft.hxx
@@ -32,7 +32,7 @@
 
 #include <hintids.hxx>
 #include <format.hxx>
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
 #include <calbck.hxx>
 
 class SwFrmFmt;
diff --git a/sw/inc/fmtinfmt.hxx b/sw/inc/fmtinfmt.hxx
index 8efd538ca6e3..4d030da66a7c 100644
--- a/sw/inc/fmtinfmt.hxx
+++ b/sw/inc/fmtinfmt.hxx
@@ -31,7 +31,7 @@
 #define _FMTINFMT_HXX
 
 #include <tools/string.hxx>
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
 #include "swdllapi.h"
 
 class SvxMacro;
diff --git a/sw/inc/fmtline.hxx b/sw/inc/fmtline.hxx
index 357e6cd743b3..db8a694063c3 100644
--- a/sw/inc/fmtline.hxx
+++ b/sw/inc/fmtline.hxx
@@ -31,7 +31,7 @@
 #define SW_FMTLINE_HXX
 
 
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
 #include <hintids.hxx>
 #include <format.hxx>
 #include "swdllapi.h"
diff --git a/sw/inc/fmtlsplt.hxx b/sw/inc/fmtlsplt.hxx
index 43e7ef090df5..0b14626b518e 100644
--- a/sw/inc/fmtlsplt.hxx
+++ b/sw/inc/fmtlsplt.hxx
@@ -30,7 +30,7 @@
 #ifndef _FMTTSPLT_HXX
 #define _FMTTSPLT_HXX
 
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
 #include <hintids.hxx>
 #include <format.hxx>
 #include "swdllapi.h"
diff --git a/sw/inc/fmtmeta.hxx b/sw/inc/fmtmeta.hxx
index 952181d0498c..f676469b908f 100644
--- a/sw/inc/fmtmeta.hxx
+++ b/sw/inc/fmtmeta.hxx
@@ -31,7 +31,7 @@
 #ifndef SW_FMTMETA_HXX
 #define SW_FMTMETA_HXX
 
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
 #include <sfx2/Metadatable.hxx>
 
 #include <boost/shared_ptr.hpp>
diff --git a/sw/inc/fmtornt.hxx b/sw/inc/fmtornt.hxx
index 8c2dcaff59bd..bdd03264e45c 100644
--- a/sw/inc/fmtornt.hxx
+++ b/sw/inc/fmtornt.hxx
@@ -37,7 +37,7 @@
 #include <hintids.hxx>
 #include <swtypes.hxx>
 #include <format.hxx>
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
 
 
 class IntlWrapper;
diff --git a/sw/inc/fmtpdsc.hxx b/sw/inc/fmtpdsc.hxx
index 2c3f88f962b2..0cf3f4a82523 100644
--- a/sw/inc/fmtpdsc.hxx
+++ b/sw/inc/fmtpdsc.hxx
@@ -31,7 +31,7 @@
 #define _FMTPDSC_HXX
 
 
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
 #include "swdllapi.h"
 #include <hintids.hxx>
 #include <format.hxx>
diff --git a/sw/inc/fmtrfmrk.hxx b/sw/inc/fmtrfmrk.hxx
index cb12e38cf582..0be58da182aa 100644
--- a/sw/inc/fmtrfmrk.hxx
+++ b/sw/inc/fmtrfmrk.hxx
@@ -32,7 +32,7 @@
 
 
 #include <tools/string.hxx>
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
 
 class SwTxtRefMark;
 
diff --git a/sw/inc/fmtrowsplt.hxx b/sw/inc/fmtrowsplt.hxx
index b398721e6246..6e15073813ab 100644
--- a/sw/inc/fmtrowsplt.hxx
+++ b/sw/inc/fmtrowsplt.hxx
@@ -30,7 +30,7 @@
 #ifndef _FMTROWSPLT_HXX
 #define _FMTROWSPLT_HXX
 
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
 #include "swdllapi.h"
 #include <hintids.hxx>
 #include <format.hxx>
diff --git a/sw/inc/fmtruby.hxx b/sw/inc/fmtruby.hxx
index 516d5c3d8eed..b7a461427477 100644
--- a/sw/inc/fmtruby.hxx
+++ b/sw/inc/fmtruby.hxx
@@ -32,7 +32,7 @@
 
 
 #include <tools/string.hxx>
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
 
 class SwTxtRuby;
 
diff --git a/sw/inc/fmtsrnd.hxx b/sw/inc/fmtsrnd.hxx
index ec6abe89e936..32b0e7d8e9bf 100644
--- a/sw/inc/fmtsrnd.hxx
+++ b/sw/inc/fmtsrnd.hxx
@@ -33,7 +33,7 @@
 #include "swdllapi.h"
 #include <hintids.hxx>
 #include <format.hxx>
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
 
 // --> OD 2006-08-15 #i68520# - refactoring
 // separate enumeration <SwSurround> in own header file
diff --git a/sw/inc/fmturl.hxx b/sw/inc/fmturl.hxx
index bfc82fd4913a..b4bd47a68e9b 100644
--- a/sw/inc/fmturl.hxx
+++ b/sw/inc/fmturl.hxx
@@ -30,7 +30,7 @@
 #ifndef _FMTURL_HXX
 #define _FMTURL_HXX
 
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
 #include "swdllapi.h"
 #include <hintids.hxx>
 #include <format.hxx>
diff --git a/sw/inc/fmtwrapinfluenceonobjpos.hxx b/sw/inc/fmtwrapinfluenceonobjpos.hxx
index b9ece15840e7..098c42cafc01 100644
--- a/sw/inc/fmtwrapinfluenceonobjpos.hxx
+++ b/sw/inc/fmtwrapinfluenceonobjpos.hxx
@@ -32,7 +32,7 @@
 
 #include <hintids.hxx>
 #include <format.hxx>
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
 #include <com/sun/star/text/WrapInfluenceOnPosition.hpp>
 
 class SW_DLLPUBLIC SwFmtWrapInfluenceOnObjPos: public SfxPoolItem
diff --git a/sw/inc/ftnidx.hxx b/sw/inc/ftnidx.hxx
index 15ab804b5ee0..a06ed6b61769 100644
--- a/sw/inc/ftnidx.hxx
+++ b/sw/inc/ftnidx.hxx
@@ -32,7 +32,7 @@
 
 
 #define _SVSTDARR_USHORTS
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 
 class SwTxtFtn;
 class SwNodeIndex;
diff --git a/sw/inc/grfatr.hxx b/sw/inc/grfatr.hxx
index f9a232bae0ef..377f1edbada3 100644
--- a/sw/inc/grfatr.hxx
+++ b/sw/inc/grfatr.hxx
@@ -32,8 +32,8 @@
 
 #include <hintids.hxx>      // fuer die WhichIds @@@ must be included first @@@
 #include <tools/gen.hxx>
-#include <svtools/eitem.hxx>
-#include <svtools/intitem.hxx>
+#include <svl/eitem.hxx>
+#include <svl/intitem.hxx>
 #include <svx/grfcrop.hxx>
 #include "swdllapi.h"
 #include <swatrset.hxx>     // fuer inlines
diff --git a/sw/inc/helpid.h b/sw/inc/helpid.h
index f709c95038f0..6bab531ad1c5 100644
--- a/sw/inc/helpid.h
+++ b/sw/inc/helpid.h
@@ -28,7 +28,7 @@
  *
  ************************************************************************/
 #ifndef _SOLAR_HRC
-#include <svtools/solar.hrc>
+#include <svl/solar.hrc>
 #endif
 
 #define HID_BASE                    HID_APP_START
diff --git a/sw/inc/hfspacingitem.hxx b/sw/inc/hfspacingitem.hxx
index 17b62c0d4760..032f4de88fd4 100644
--- a/sw/inc/hfspacingitem.hxx
+++ b/sw/inc/hfspacingitem.hxx
@@ -31,7 +31,7 @@
 #define _SW_HF_EAT_SPACINGITEM_HXX
 
 
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
 #include <hintids.hxx>
 #include <format.hxx>
 
diff --git a/sw/inc/istyleaccess.hxx b/sw/inc/istyleaccess.hxx
index 8a770d5b012c..52ce6ea2e4ec 100644
--- a/sw/inc/istyleaccess.hxx
+++ b/sw/inc/istyleaccess.hxx
@@ -31,7 +31,7 @@
 #define _ISTYLEACCESS_HXX
 
 #include <vector>
-#include <svtools/stylepool.hxx>
+#include <svl/stylepool.hxx>
 
 /*--------------------------------------------------------------------
     Management of (automatic) styles
diff --git a/sw/inc/modcfg.hxx b/sw/inc/modcfg.hxx
index d17311027111..b800cb3dfc8e 100644
--- a/sw/inc/modcfg.hxx
+++ b/sw/inc/modcfg.hxx
@@ -33,7 +33,7 @@
 #include <tools/string.hxx>
 #include <vcl/wintypes.hxx>
 #include <vcl/field.hxx>
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
 #include <unotools/configitem.hxx>
 #include "swdllapi.h"
 #include "authratr.hxx"
@@ -78,6 +78,7 @@ class SwRevisionConfig : public utl::ConfigItem
         ~SwRevisionConfig();
 
     virtual void            Commit();
+    virtual void Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& aPropertyNames );
     void                    Load();
     void                    SetModified(){ConfigItem::SetModified();}
 };
@@ -108,6 +109,7 @@ class SwInsertConfig : public utl::ConfigItem
         ~SwInsertConfig();
 
     virtual void            Commit();
+    virtual void Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& aPropertyNames );
     void                    Load();
     void                    SetModified(){ConfigItem::SetModified();}
 };
@@ -134,6 +136,7 @@ class SwTableConfig : public utl::ConfigItem
         ~SwTableConfig();
 
     virtual void            Commit();
+    virtual void Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& aPropertyNames );
     void                    Load();
     void                    SetModified(){ConfigItem::SetModified();}
 };
@@ -163,6 +166,7 @@ class SwMiscConfig : public utl::ConfigItem
         ~SwMiscConfig();
 
     virtual void            Commit();
+    virtual void Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& aPropertyNames );
     void                    Load();
     void                    SetModified(){ConfigItem::SetModified();}
 };
diff --git a/sw/inc/ndarr.hxx b/sw/inc/ndarr.hxx
index 6bbd72778498..9f27b1885fe1 100644
--- a/sw/inc/ndarr.hxx
+++ b/sw/inc/ndarr.hxx
@@ -32,7 +32,7 @@
 #define _NDARR_HXX
 
 #include <com/sun/star/embed/XEmbeddedObject.hpp>
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
 
 #ifndef _BPARR_HXX
 #include <bparr.hxx>
diff --git a/sw/inc/ndhints.hxx b/sw/inc/ndhints.hxx
index f1ff004d4cf8..67cb84367515 100644
--- a/sw/inc/ndhints.hxx
+++ b/sw/inc/ndhints.hxx
@@ -31,7 +31,7 @@
 #define _NDHINTS_HXX
 
 
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
 #include <tools/mempool.hxx>
 
 #include "swtypes.hxx"
diff --git a/sw/inc/paratr.hxx b/sw/inc/paratr.hxx
index 3f65056e1cd5..e1b2ced1b513 100644
--- a/sw/inc/paratr.hxx
+++ b/sw/inc/paratr.hxx
@@ -29,8 +29,8 @@
  ************************************************************************/
 #ifndef _PARATR_HXX
 #define _PARATR_HXX
-#include <svtools/eitem.hxx>
-#include <svtools/stritem.hxx>
+#include <svl/eitem.hxx>
+#include <svl/stritem.hxx>
 #include "swdllapi.h"
 #include <hintids.hxx>
 #include <calbck.hxx>
diff --git a/sw/inc/pch/precompiled_sw.hxx b/sw/inc/pch/precompiled_sw.hxx
index 8322f6128e0b..50723355d298 100644
--- a/sw/inc/pch/precompiled_sw.hxx
+++ b/sw/inc/pch/precompiled_sw.hxx
@@ -611,61 +611,61 @@
 #include "sot/storinfo.hxx"
 
 #include "svtools/FilterConfigItem.hxx"
-#include "svtools/PasswordHelper.hxx"
+#include "svl/PasswordHelper.hxx"
 #include "svtools/accessibilityoptions.hxx"
-#include "svtools/aeitem.hxx"
-#include "svtools/cjkoptions.hxx"
+#include "svl/aeitem.hxx"
+#include "svl/cjkoptions.hxx"
 #include "unotools/cmdoptions.hxx"
-#include "svtools/cntnrsrt.hxx"
+#include "svl/cntnrsrt.hxx"
 #include "svtools/collatorres.hxx"
 #include "svtools/colorcfg.hxx"
 #include "unotools/compatibility.hxx"
 #include "svtools/controldims.hrc"
-#include "svtools/ctloptions.hxx"
+#include "svl/ctloptions.hxx"
 #include "svtools/ctrlbox.hxx"
 #include "svtools/ctrltool.hxx"
 #include "svtools/editbrowsebox.hxx"
 #include "svtools/ehdl.hxx"
-#include "svtools/eitem.hxx"
+#include "svl/eitem.hxx"
 #include "svtools/embedhlp.hxx"
 #include "svtools/embedtransfer.hxx"
 #include "svtools/filter.hxx"
-#include "svtools/flagitem.hxx"
+#include "svl/flagitem.hxx"
 #include "unotools/fltrcfg.hxx"
-#include "svtools/fstathelper.hxx"
-#include "svtools/globalnameitem.hxx"
+#include "svl/fstathelper.hxx"
+#include "svl/globalnameitem.hxx"
 #include "svtools/headbar.hxx"
 #include "svtools/htmlkywd.hxx"
 #include "svtools/htmltokn.h"
-#include "svtools/imageitm.hxx"
+#include "svl/imageitm.hxx"
 #include "svtools/imap.hxx"
 #include "svtools/indexentryres.hxx"
-#include "svtools/inethist.hxx"
+#include "svl/inethist.hxx"
 #include "svtools/inetimg.hxx"
 #include "svtools/insdlg.hxx"
-#include "svtools/intitem.hxx"
-#include "svtools/isethint.hxx"
-#include "svtools/itemiter.hxx"
-#include "svtools/itempool.hxx"
-#include "svtools/itemprop.hxx"
-#include "svtools/itemset.hxx"
-#include "svtools/languageoptions.hxx"
-#include "svtools/lckbitem.hxx"
+#include "svl/intitem.hxx"
+#include "svl/isethint.hxx"
+#include "svl/itemiter.hxx"
+#include "svl/itempool.hxx"
+#include "svl/itemprop.hxx"
+#include "svl/itemset.hxx"
+#include "svl/languageoptions.hxx"
+#include "svl/lckbitem.hxx"
 #include "unotools/lingucfg.hxx"
 #include "unotools/linguprops.hxx"
-#include "svtools/lstner.hxx"
-#include "svtools/misccfg.hxx"
+#include "svl/lstner.hxx"
+#include "unotools/misccfg.hxx"
 #include "unotools/moduleoptions.hxx"
-#include "svtools/numuno.hxx"
-#include "svtools/ownlist.hxx"
+#include "svl/numuno.hxx"
+#include "svl/ownlist.hxx"
 #include "svtools/parhtml.hxx"
 #include "unotools/pathoptions.hxx"
-#include "svtools/poolitem.hxx"
+#include "svl/poolitem.hxx"
 #include "svtools/prgsbar.hxx"
 #include "svtools/printdlg.hxx"
 #include "svtools/prnsetup.hxx"
-#include "svtools/ptitem.hxx"
-#include "svtools/rectitem.hxx"
+#include "svl/ptitem.hxx"
+#include "svl/rectitem.hxx"
 #include "svtools/rtfkeywd.hxx"
 #include "svtools/rtfout.hxx"
 #include "svtools/rtftoken.h"
@@ -673,37 +673,37 @@
 #include "unotools/saveopt.hxx"
 #include "svtools/scriptedtext.hxx"
 #include "svtools/sfxecode.hxx"
-#include "svtools/slstitm.hxx"
-#include "svtools/smplhint.hxx"
+#include "svl/slstitm.hxx"
+#include "svl/smplhint.hxx"
 #include "svtools/soerr.hxx"
-#include "svtools/solar.hrc"
+#include "svl/solar.hrc"
 #include "unotools/sourceviewconfig.hxx"
 #include "svtools/stdctrl.hxx"
-#include "svtools/stritem.hxx"
-#include "svtools/style.hrc"
-#include "svtools/style.hxx"
-#include "svtools/svarray.hxx"
+#include "svl/stritem.hxx"
+#include "svl/style.hrc"
+#include "svl/style.hxx"
+#include "svl/svarray.hxx"
 #include "svtools/svmedit.hxx"
 #include "svtools/svparser.hxx"
-#include "svtools/svstdarr.hxx"
+#include "svl/svstdarr.hxx"
 #include "svtools/svtabbx.hxx"
 #include "svtools/svtreebx.hxx"
-#include "svtools/syslocale.hxx"
+#include "unotools/syslocale.hxx"
 #include "svtools/templdlg.hxx"
 #include "svtools/textview.hxx"
 #include "svtools/transfer.hxx"
 #include "svtools/txtattr.hxx"
 #include "svtools/txtcmp.hxx"
-#include "svtools/undo.hxx"
+#include "svl/undo.hxx"
 #include "unotools/undoopt.hxx"
 #include "svtools/unoevent.hxx"
 #include "svtools/unoimap.hxx"
-#include "svtools/urihelper.hxx"
-#include "svtools/urlbmk.hxx"
+#include "svl/urihelper.hxx"
+#include "svl/urlbmk.hxx"
 #include "unotools/useroptions.hxx"
 #include "svtools/valueset.hxx"
-#include "svtools/visitem.hxx"
-#include "svtools/whiter.hxx"
+#include "svl/visitem.hxx"
+#include "svl/whiter.hxx"
 #include "svtools/xtextedt.hxx"
 
 #include "svx/IAccessibleParent.hxx"
diff --git a/sw/inc/postithelper.hxx b/sw/inc/postithelper.hxx
index 3f36c6015f6c..19ec6ed6084f 100644
--- a/sw/inc/postithelper.hxx
+++ b/sw/inc/postithelper.hxx
@@ -35,7 +35,7 @@
 #include <redline.hxx>
 #include <vector>
 #include <vcl/window.hxx>
-#include <svtools/brdcst.hxx>
+#include <svl/brdcst.hxx>
 
 class SwTxtFld;
 class SwRootFrm;
diff --git a/sw/inc/redline.hxx b/sw/inc/redline.hxx
index ebf6e8cd9325..a35caaaae3f0 100644
--- a/sw/inc/redline.hxx
+++ b/sw/inc/redline.hxx
@@ -34,12 +34,12 @@
 #include <tools/string.hxx>
 
 #define _SVSTDARR_USHORTS
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 #include <pam.hxx>
 
 #include <IDocumentRedlineAccess.hxx>
 
-#include <svtools/smplhint.hxx>
+#include <svl/smplhint.hxx>
 
 class SfxItemSet;
 class SwView;
diff --git a/sw/inc/rolbck.hxx b/sw/inc/rolbck.hxx
index 15a349c7a599..1f225aeeb8b0 100644
--- a/sw/inc/rolbck.hxx
+++ b/sw/inc/rolbck.hxx
@@ -34,9 +34,9 @@
 #ifndef _SVSTDARR_HXX
 #define _SVSTDARR_USHORTS
 #define _SVSTDARR_USHORTSSORT
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 #endif
-#include <svtools/itemset.hxx>
+#include <svl/itemset.hxx>
 
 //Nur die History anziehen, um das docnew.cxx gegen die CLOOK's zu behaupten.
 
diff --git a/sw/inc/rubylist.hxx b/sw/inc/rubylist.hxx
index a175159fc418..41d1d7f890b1 100644
--- a/sw/inc/rubylist.hxx
+++ b/sw/inc/rubylist.hxx
@@ -30,7 +30,7 @@
 #ifndef _RUBYLIST_HXX
 #define _RUBYLIST_HXX
 
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
 #include <swtypes.hxx>
 #include <fmtruby.hxx>
 
diff --git a/sw/inc/section.hxx b/sw/inc/section.hxx
index c530c8280870..1310325575cd 100644
--- a/sw/inc/section.hxx
+++ b/sw/inc/section.hxx
@@ -38,7 +38,7 @@
 #ifndef _TOOLS_REF_HXX
 #include <tools/ref.hxx>
 #endif
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
 #include <frmfmt.hxx>
 
 // Forward Deklaration
diff --git a/sw/inc/shellres.hxx b/sw/inc/shellres.hxx
index 4c7bb09ebe45..8ee5d0c3e991 100644
--- a/sw/inc/shellres.hxx
+++ b/sw/inc/shellres.hxx
@@ -39,7 +39,7 @@
 
 #ifndef _SVSTDARR_HXX
 #define _SVSTDARR_STRINGSDTOR
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 #endif
 
 struct SW_DLLPUBLIC ShellResource : public Resource
diff --git a/sw/inc/sortopt.hxx b/sw/inc/sortopt.hxx
index 103b58ed71b9..5b93f92e298d 100644
--- a/sw/inc/sortopt.hxx
+++ b/sw/inc/sortopt.hxx
@@ -31,7 +31,7 @@
 #define _SORTOPT_HXX
 
 
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
 #include <tools/string.hxx>
 #include "swdllapi.h"
 
diff --git a/sw/inc/swatrset.hxx b/sw/inc/swatrset.hxx
index 3042f1def0c9..eccfc1a5b347 100644
--- a/sw/inc/swatrset.hxx
+++ b/sw/inc/swatrset.hxx
@@ -31,8 +31,8 @@
 #define _SWATRSET_HXX
 #include <tools/solar.h>
 #include <tools/mempool.hxx>
-#include <svtools/itemset.hxx>
-#include <svtools/itempool.hxx>
+#include <svl/itemset.hxx>
+#include <svl/itempool.hxx>
 #include <swdllapi.h>
 
 class SwModify;
diff --git a/sw/inc/swfltopt.hxx b/sw/inc/swfltopt.hxx
index 8b7e9c2ea451..d2556a31bccf 100644
--- a/sw/inc/swfltopt.hxx
+++ b/sw/inc/swfltopt.hxx
@@ -40,6 +40,8 @@ public:
 
     void GetValues( sal_uInt16 nCnt, const sal_Char** ppNames,
                      sal_uInt32* pValues );
+    virtual void Commit();
+    virtual void Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& aPropertyNames );
 };
 
 #endif
diff --git a/sw/inc/swhints.hxx b/sw/inc/swhints.hxx
index c4090cbe54f3..6c7b69eff7a6 100644
--- a/sw/inc/swhints.hxx
+++ b/sw/inc/swhints.hxx
@@ -30,7 +30,7 @@
 #ifndef SW_HINTS_HXX
 #define SW_HINTS_HXX
 
-#include <svtools/smplhint.hxx>
+#include <svl/smplhint.hxx>
 
 #define SW_BROADCASTID_START            SFX_HINT_USER00
 #define SW_BROADCAST_DRAWVIEWS_CREATED  SW_BROADCASTID_START
diff --git a/sw/inc/swmodule.hxx b/sw/inc/swmodule.hxx
index f84d27c0b206..553ee20d9bc1 100644
--- a/sw/inc/swmodule.hxx
+++ b/sw/inc/swmodule.hxx
@@ -32,12 +32,12 @@
 #include <tools/link.hxx>
 #include <tools/string.hxx>
 #include <vcl/fldunit.hxx>
-#include <svtools/lstner.hxx>
+#include <svl/lstner.hxx>
 #include <unotools/options.hxx>
 #include <sfx2/module.hxx>
 
 #include <tools/shl.hxx>
-#include <svtools/lstner.hxx>
+#include <svl/lstner.hxx>
 #include "swdllapi.h"
 #include "shellid.hxx"
 #include <fldupde.hxx>
@@ -127,7 +127,7 @@ class SW_DLLPUBLIC SwModule: public SfxModule, public SfxListener, public utl::C
     // Hint abfangen fuer DocInfo
     virtual void        Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
 
-    virtual void        ConfigurationChanged( utl::ConfigurationBroadcaster* );
+    virtual void        ConfigurationChanged( utl::ConfigurationBroadcaster*, sal_uInt32 );
 
 protected:
     // Briefumschlaege, Etiketten
diff --git a/sw/inc/swregion.hxx b/sw/inc/swregion.hxx
index 0b1e42070101..793746877d9f 100644
--- a/sw/inc/swregion.hxx
+++ b/sw/inc/swregion.hxx
@@ -30,7 +30,7 @@
 #ifndef _SWREGION_HXX
 #define _SWREGION_HXX
 
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
 
 #include "swrect.hxx"
 
diff --git a/sw/inc/swtable.hxx b/sw/inc/swtable.hxx
index c5e70fe30f11..1699cf439030 100644
--- a/sw/inc/swtable.hxx
+++ b/sw/inc/swtable.hxx
@@ -33,7 +33,7 @@
 #ifndef _TOOLS_REF_HXX
 #include <tools/ref.hxx>
 #endif
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
 #include <tblenum.hxx>
 #include <swtypes.hxx>
 #include <calbck.hxx>
diff --git a/sw/inc/swundo.hxx b/sw/inc/swundo.hxx
index ce997cc3f43d..1ce8f7318131 100644
--- a/sw/inc/swundo.hxx
+++ b/sw/inc/swundo.hxx
@@ -30,7 +30,7 @@
 #ifndef _SWUNDO_HXX
 #define _SWUNDO_HXX
 
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
 
 // die Ids fuer StdAktionen
 enum SwUndoId
diff --git a/sw/inc/tabcol.hxx b/sw/inc/tabcol.hxx
index 092d6b12f22b..10eff5c1f33f 100644
--- a/sw/inc/tabcol.hxx
+++ b/sw/inc/tabcol.hxx
@@ -33,7 +33,7 @@
 #ifndef _SVSTDARR_HXX
 #define _SVSTDARR_LONGS
 #define _SVSTDARR_BOOLS
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 #endif
 
 #ifndef INCLUDED_VECTOR
diff --git a/sw/inc/tblafmt.hxx b/sw/inc/tblafmt.hxx
index 0b26219ab7e1..3ca914531882 100644
--- a/sw/inc/tblafmt.hxx
+++ b/sw/inc/tblafmt.hxx
@@ -47,7 +47,7 @@ JP 20.07.95:
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 **************************************************************************/
 
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
 #include "hintids.hxx"          //_immmer_ vor den solar-items!
 #include <svx/algitem.hxx>
 #include <svx/fontitem.hxx>
@@ -65,7 +65,7 @@ JP 20.07.95:
 #include <svx/brshitem.hxx>
 #include <svx/adjitem.hxx>
 #include <svx/rotmodit.hxx>
-#include <svtools/intitem.hxx>
+#include <svl/intitem.hxx>
 #include <svx/bolnitem.hxx>
 #include "swdllapi.h"
 
diff --git a/sw/inc/tblsel.hxx b/sw/inc/tblsel.hxx
index d87768664fe5..9bd5ef390da1 100644
--- a/sw/inc/tblsel.hxx
+++ b/sw/inc/tblsel.hxx
@@ -30,7 +30,7 @@
 #ifndef _TBLSEL_HXX
 #define _TBLSEL_HXX
 
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
 #include <swtable.hxx>
 #include <swrect.hxx>
 #include "swdllapi.h"
diff --git a/sw/inc/tgrditem.hxx b/sw/inc/tgrditem.hxx
index c502454efcea..659b05207aa9 100644
--- a/sw/inc/tgrditem.hxx
+++ b/sw/inc/tgrditem.hxx
@@ -31,7 +31,7 @@
 #define SW_TGRDITEM_HXX
 
 #include <tools/color.hxx>
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
 #include "swdllapi.h"
 #include <hintids.hxx>
 #include <format.hxx>
diff --git a/sw/inc/tox.hxx b/sw/inc/tox.hxx
index 9223ffa2d9df..65a4879485b7 100644
--- a/sw/inc/tox.hxx
+++ b/sw/inc/tox.hxx
@@ -34,8 +34,8 @@
 #include <tools/string.hxx>
 
 #include <svx/svxenum.hxx>
-#include <svtools/svarray.hxx>
-#include <svtools/poolitem.hxx>
+#include <svl/svarray.hxx>
+#include <svl/poolitem.hxx>
 #include "swdllapi.h"
 #include <swtypes.hxx>
 #include <toxe.hxx>
diff --git a/sw/inc/txatbase.hxx b/sw/inc/txatbase.hxx
index 2a49460a05ca..e96b8e3efe16 100644
--- a/sw/inc/txatbase.hxx
+++ b/sw/inc/txatbase.hxx
@@ -31,7 +31,7 @@
 #define _TXATBASE_HXX
 
 #include <tools/solar.h>
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
 #include <hintids.hxx>
 #include <errhdl.hxx>
 
diff --git a/sw/inc/txatritr.hxx b/sw/inc/txatritr.hxx
index e50eb2dbda77..a087ebcb087d 100644
--- a/sw/inc/txatritr.hxx
+++ b/sw/inc/txatritr.hxx
@@ -32,7 +32,7 @@
 
 #include <tools/solar.h>
 #include <sal/types.h>
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
 #include <svx/langitem.hxx>
 #include <hintids.hxx>
 
diff --git a/sw/inc/undobj.hxx b/sw/inc/undobj.hxx
index 9d47f2e8bc9f..e5875ac37e8e 100644
--- a/sw/inc/undobj.hxx
+++ b/sw/inc/undobj.hxx
@@ -36,9 +36,9 @@
 #define _SVSTDARR_BOOLS
 #define _SVSTDARR_BYTES
 #define _SVSTDARR_USHORTSSORT
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 #endif
-#include <svtools/itemset.hxx>
+#include <svl/itemset.hxx>
 #include <com/sun/star/uno/Sequence.h>
 #include <numrule.hxx>
 #include <itabenum.hxx>
diff --git a/sw/inc/unoatxt.hxx b/sw/inc/unoatxt.hxx
index b115919a5623..87e896d76046 100644
--- a/sw/inc/unoatxt.hxx
+++ b/sw/inc/unoatxt.hxx
@@ -41,8 +41,8 @@
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/document/XEventsSupplier.hpp>
-#include <svtools/itemprop.hxx>
-#include <svtools/lstner.hxx>
+#include <svl/itemprop.hxx>
+#include <svl/lstner.hxx>
 #include <cppuhelper/implbase3.hxx> // helper for implementations
 #include <cppuhelper/implbase4.hxx> // helper for implementations
 #include <cppuhelper/implbase5.hxx> // helper for implementations
diff --git a/sw/inc/unodraw.hxx b/sw/inc/unodraw.hxx
index 05857bbc6fe1..5b277af11a49 100644
--- a/sw/inc/unodraw.hxx
+++ b/sw/inc/unodraw.hxx
@@ -48,7 +48,7 @@
 #include <com/sun/star/container/XEnumerationAccess.hpp>
 #include <com/sun/star/drawing/HomogenMatrix3.hpp>
 // <--
-#include <svtools/itemprop.hxx>
+#include <svl/itemprop.hxx>
 
 class SdrMarkList;
 class SdrView;
diff --git a/sw/inc/unoevent.hxx b/sw/inc/unoevent.hxx
index 40beb04943e5..6cb39ac5c481 100644
--- a/sw/inc/unoevent.hxx
+++ b/sw/inc/unoevent.hxx
@@ -31,7 +31,7 @@
 #define _UNOEVENT_HXX
 
 #include <svtools/unoevent.hxx>
-#include <svtools/macitem.hxx>
+#include <svl/macitem.hxx>
 
 
 class SvxMacroItem;
diff --git a/sw/inc/unoevtlstnr.hxx b/sw/inc/unoevtlstnr.hxx
index 5b5dceac47e3..38b70b308bd0 100644
--- a/sw/inc/unoevtlstnr.hxx
+++ b/sw/inc/unoevtlstnr.hxx
@@ -30,7 +30,7 @@
 #ifndef _UNOEVTLSTNR_HXX
 #define _UNOEVTLSTNR_HXX
 
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
 #include <com/sun/star/uno/Reference.h>
 
 namespace com{namespace sun{namespace star{
diff --git a/sw/inc/unomailmerge.hxx b/sw/inc/unomailmerge.hxx
index 3dbe497b2e3c..2e31ed8766de 100644
--- a/sw/inc/unomailmerge.hxx
+++ b/sw/inc/unomailmerge.hxx
@@ -43,7 +43,7 @@
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/beans/PropertyChangeEvent.hpp>
 #include <com/sun/star/text/XMailMergeBroadcaster.hpp>
-#include <svtools/itemprop.hxx>
+#include <svl/itemprop.hxx>
 #include <sfx2/objsh.hxx>   // SfxObjectShellRef
 
 #include <functional>
diff --git a/sw/inc/unomap.hxx b/sw/inc/unomap.hxx
index e569383a335e..e550e42bcca9 100644
--- a/sw/inc/unomap.hxx
+++ b/sw/inc/unomap.hxx
@@ -30,7 +30,7 @@
 #ifndef _UNOMAP_HXX
 #define _UNOMAP_HXX
 
-#include <svtools/itemprop.hxx>
+#include <svl/itemprop.hxx>
 
 #define PROPERTY_NONE 0
 
diff --git a/sw/inc/unoobj.hxx b/sw/inc/unoobj.hxx
index b7a6c54d2bd2..0447c39920df 100644
--- a/sw/inc/unoobj.hxx
+++ b/sw/inc/unoobj.hxx
@@ -34,8 +34,8 @@
 #include <unoevtlstnr.hxx>
 #include <unobaseclass.hxx>
 #include <unocrsr.hxx>
-#include <svtools/itemprop.hxx>
-#include <svtools/svarray.hxx>
+#include <svl/itemprop.hxx>
+#include <svl/svarray.hxx>
 #include <frmfmt.hxx>
 #include <flyenum.hxx>
 #include <fldbas.hxx>
diff --git a/sw/inc/unoport.hxx b/sw/inc/unoport.hxx
index ef20027994cf..acf21fc501f3 100644
--- a/sw/inc/unoport.hxx
+++ b/sw/inc/unoport.hxx
@@ -48,7 +48,7 @@
 #include <com/sun/star/lang/XUnoTunnel.hpp>
 #include <cppuhelper/implbase8.hxx>
 #include <cppuhelper/implbase3.hxx>
-#include <svtools/itemprop.hxx>
+#include <svl/itemprop.hxx>
 
 #include <memory>
 #include <deque>
diff --git a/sw/inc/unosett.hxx b/sw/inc/unosett.hxx
index bc9cd02a3ac7..81f5710b811b 100644
--- a/sw/inc/unosett.hxx
+++ b/sw/inc/unosett.hxx
@@ -44,7 +44,7 @@
 #include <cppuhelper/implbase4.hxx>
 #include <cppuhelper/implbase5.hxx>
 #include <tools/string.hxx>
-#include <svtools/itemprop.hxx>
+#include <svl/itemprop.hxx>
 
 class SwDoc;
 class SwFmtCol;
diff --git a/sw/inc/unostyle.hxx b/sw/inc/unostyle.hxx
index 7c9e00f6671f..fbadd2da1618 100644
--- a/sw/inc/unostyle.hxx
+++ b/sw/inc/unostyle.hxx
@@ -31,8 +31,8 @@
 #define _UNOSTYLE_HXX
 
 #include <boost/shared_ptr.hpp>
-#include <svtools/style.hxx>
-#include <svtools/lstner.hxx>
+#include <svl/style.hxx>
+#include <svl/lstner.hxx>
 #include <unocoll.hxx>
 #include <unomap.hxx>
 #include <com/sun/star/style/XStyle.hpp>
diff --git a/sw/inc/unotxdoc.hxx b/sw/inc/unotxdoc.hxx
index 5ebe07e7f633..7bb2af6393d1 100644
--- a/sw/inc/unotxdoc.hxx
+++ b/sw/inc/unotxdoc.hxx
@@ -30,7 +30,7 @@
 #ifndef _UNOTXDOC_HXX
 #define _UNOTXDOC_HXX
 #include "swdllapi.h"
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
 #include <sfx2/sfxbasemodel.hxx>
 #include <com/sun/star/beans/PropertyValues.hpp>
 #include <com/sun/star/style/XStyleFamiliesSupplier.hpp>
@@ -70,7 +70,7 @@
 #include <com/sun/star/text/XFlatParagraphIteratorProvider.hpp>
 #include <com/sun/star/document/XDocumentLanguages.hpp>
 #include <com/sun/star/util/XCloneable.hpp>
-#include <svtools/itemprop.hxx>
+#include <svl/itemprop.hxx>
 #include <svx/fmdmod.hxx>
 #include <svx/UnoForbiddenCharsTable.hxx>
 #include <cppuhelper/weak.hxx>
diff --git a/sw/inc/viewsh.hxx b/sw/inc/viewsh.hxx
index 7a8d0eb0c273..f12b3ecbe9bc 100644
--- a/sw/inc/viewsh.hxx
+++ b/sw/inc/viewsh.hxx
@@ -32,7 +32,7 @@
 #include <com/sun/star/embed/XClassifiedObject.hpp>
 #include <com/sun/star/embed/XEmbeddedObject.hpp>
 #include <tools/rtti.hxx>
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
 #include "swdllapi.h"
 #include <swtypes.hxx>
 #include <ring.hxx>