#i103496#: split svtools; improve ConfitItems

24 files changed, 42 insertions, 42 deletions

diff --git a/xmloff/inc/pch/precompiled_xmloff.hxx b/xmloff/inc/pch/precompiled_xmloff.hxx
index 907f3682fe58..1346445acacc 100644
--- a/xmloff/inc/pch/precompiled_xmloff.hxx
+++ b/xmloff/inc/pch/precompiled_xmloff.hxx
@@ -436,15 +436,15 @@
 
 #include "sot/clsids.hxx"
 
-#include "svtools/cntnrsrt.hxx"
-#include "svtools/itemset.hxx"
+#include "svl/cntnrsrt.hxx"
+#include "svl/itemset.hxx"
 #include "unotools/moduleoptions.hxx"
-#include "svtools/nfsymbol.hxx"
-#include "svtools/numuno.hxx"
-#include "svtools/poolitem.hxx"
-#include "svtools/svarray.hxx"
-#include "svtools/svstdarr.hxx"
-#include "svtools/urihelper.hxx"
+#include "svl/nfsymbol.hxx"
+#include "svl/numuno.hxx"
+#include "svl/poolitem.hxx"
+#include "svl/svarray.hxx"
+#include "svl/svstdarr.hxx"
+#include "svl/urihelper.hxx"
 
 
 #include "tools/bigint.hxx"
diff --git a/xmloff/inc/xmlcnitm.hxx b/xmloff/inc/xmlcnitm.hxx
index 93777391b9bc..0da5b64369a9 100644
--- a/xmloff/inc/xmlcnitm.hxx
+++ b/xmloff/inc/xmlcnitm.hxx
@@ -31,7 +31,7 @@
 #ifndef _XMLOFF_XMLCNITM_HXX
 #define _XMLOFF_XMLCNITM_HXX
 
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
 
 class SvXMLNamespaceMap;
 namespace rtl { class OUString; }
diff --git a/xmloff/inc/xmloff/xmlcnimp.hxx b/xmloff/inc/xmloff/xmlcnimp.hxx
index d964e73a3fed..d0b6ab4d7a63 100644
--- a/xmloff/inc/xmloff/xmlcnimp.hxx
+++ b/xmloff/inc/xmloff/xmlcnimp.hxx
@@ -35,11 +35,11 @@
 #include "xmloff/dllapi.h"
 #include "sal/types.h"
 #include <com/sun/star/container/XNameAccess.hpp>
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
 #include <xmloff/nmspmap.hxx>
 
 #define _SVSTDARR_USHORTS
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 
 namespace rtl { class OUString; }
 
diff --git a/xmloff/source/core/i18nmap.cxx b/xmloff/source/core/i18nmap.cxx
index e5ef3c394aea..0f8f49d83ece 100644
--- a/xmloff/source/core/i18nmap.cxx
+++ b/xmloff/source/core/i18nmap.cxx
@@ -32,7 +32,7 @@
 #include "precompiled_xmloff.hxx"
 #include <rtl/ustring.hxx>
 #include <tools/debug.hxx>
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
 #include "i18nmap.hxx"
 
 using namespace rtl;
diff --git a/xmloff/source/core/xmlexp.cxx b/xmloff/source/core/xmlexp.cxx
index f3fbb722ca12..2028ad26db25 100644
--- a/xmloff/source/core/xmlexp.cxx
+++ b/xmloff/source/core/xmlexp.cxx
@@ -86,7 +86,7 @@
 #include <comphelper/extract.hxx>
 #include "PropertySetMerger.hxx"
 
-#include "svtools/urihelper.hxx"
+#include "svl/urihelper.hxx"
 #include "xformsexport.hxx"
 
 #include <unotools/docinfohelper.hxx>
diff --git a/xmloff/source/core/xmlimp.cxx b/xmloff/source/core/xmlimp.cxx
index 0bb03ca19b01..b6958c3202bf 100644
--- a/xmloff/source/core/xmlimp.cxx
+++ b/xmloff/source/core/xmlimp.cxx
@@ -36,7 +36,7 @@
 #include <osl/mutex.hxx>
 #include <rtl/uuid.h>
 #include <rtl/memory.h>
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
 #include "unointerfacetouniqueidentifiermapper.hxx"
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/xmluconv.hxx>
diff --git a/xmloff/source/core/xmltkmap.cxx b/xmloff/source/core/xmltkmap.cxx
index 30a791865f7b..297249e4b8c5 100644
--- a/xmloff/source/core/xmltkmap.cxx
+++ b/xmloff/source/core/xmltkmap.cxx
@@ -32,7 +32,7 @@
 #include "precompiled_xmloff.hxx"
 #include <tools/debug.hxx>
 #include <rtl/ustring.hxx>
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
 #include <xmloff/xmltkmap.hxx>
 #include <xmloff/xmltoken.hxx>
 
diff --git a/xmloff/source/draw/ximpstyl.cxx b/xmloff/source/draw/ximpstyl.cxx
index 35c1bafbec94..67ee2d044851 100644
--- a/xmloff/source/draw/ximpstyl.cxx
+++ b/xmloff/source/draw/ximpstyl.cxx
@@ -52,7 +52,7 @@
 #include <xmloff/xmlprcon.hxx>
 #include <xmloff/families.hxx>
 #include <com/sun/star/container/XNameContainer.hpp>
-#include <svtools/zforlist.hxx>
+#include <svl/zforlist.hxx>
 #include "PropertySetMerger.hxx"
 #include "sdpropls.hxx"
 #include "layerimp.hxx"
diff --git a/xmloff/source/style/XMLFontAutoStylePool.cxx b/xmloff/source/style/XMLFontAutoStylePool.cxx
index b114d988a729..e823b13c474c 100644
--- a/xmloff/source/style/XMLFontAutoStylePool.cxx
+++ b/xmloff/source/style/XMLFontAutoStylePool.cxx
@@ -31,7 +31,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_xmloff.hxx"
 #include <tools/debug.hxx>
-#include <svtools/cntnrsrt.hxx>
+#include <svl/cntnrsrt.hxx>
 #include <vcl/vclenum.hxx>
 #include "xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
diff --git a/xmloff/source/style/impastpl.hxx b/xmloff/source/style/impastpl.hxx
index d63384a71068..39507689fcc1 100644
--- a/xmloff/source/style/impastpl.hxx
+++ b/xmloff/source/style/impastpl.hxx
@@ -33,7 +33,7 @@
 
 #include <sal/types.h>
 #include <tools/list.hxx>
-#include <svtools/cntnrsrt.hxx>
+#include <svl/cntnrsrt.hxx>
 #include <rtl/ustring.hxx>
 #include <vector>
 #include <com/sun/star/uno/Reference.h>
diff --git a/xmloff/source/style/numehelp.cxx b/xmloff/source/style/numehelp.cxx
index 55ec5ad9abc8..c75207d9e094 100644
--- a/xmloff/source/style/numehelp.cxx
+++ b/xmloff/source/style/numehelp.cxx
@@ -40,7 +40,7 @@
 #include <xmloff/xmlexp.hxx>
 #include <com/sun/star/uno/Reference.h>
 #include <rtl/ustring.hxx>
-#include <svtools/zforlist.hxx>
+#include <svl/zforlist.hxx>
 #include <com/sun/star/util/NumberFormat.hpp>
 #include <rtl/math.hxx>
 #include <tools/debug.hxx>
diff --git a/xmloff/source/style/styleexp.cxx b/xmloff/source/style/styleexp.cxx
index f822239d3106..f03c0ac9a78b 100644
--- a/xmloff/source/style/styleexp.cxx
+++ b/xmloff/source/style/styleexp.cxx
@@ -33,7 +33,7 @@
 #include <tools/debug.hxx>
 #ifndef _SVSTDARR_STRINGSSORTDTOR_DECL
 #define _SVSTDARR_STRINGSSORTDTOR
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 #endif
 #include <xmloff/nmspmap.hxx>
 #include "xmlnmspe.hxx"
diff --git a/xmloff/source/style/xmlexppr.cxx b/xmloff/source/style/xmlexppr.cxx
index cece11f6fc31..05d85e74d1a7 100644
--- a/xmloff/source/style/xmlexppr.cxx
+++ b/xmloff/source/style/xmlexppr.cxx
@@ -54,7 +54,7 @@
 
 #ifndef _SVSTDARR_USHORTS
 #define _SVSTDARR_USHORTS
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 #endif
 
 using ::rtl::OUString;
diff --git a/xmloff/source/style/xmlnumfe.cxx b/xmloff/source/style/xmlnumfe.cxx
index 3b1330211024..aa5aa2315c3e 100644
--- a/xmloff/source/style/xmlnumfe.cxx
+++ b/xmloff/source/style/xmlnumfe.cxx
@@ -34,10 +34,10 @@
 #define _SVSTDARR_ULONGS
 #define _ZFORLIST_DECLARE_TABLE
 
-#include <svtools/svstdarr.hxx>
-#include <svtools/zforlist.hxx>
-#include <svtools/zformat.hxx>
-#include <svtools/numuno.hxx>
+#include <svl/svstdarr.hxx>
+#include <svl/zforlist.hxx>
+#include <svl/zformat.hxx>
+#include <svl/numuno.hxx>
 #include <i18npool/mslangid.hxx>
 #include <tools/debug.hxx>
 #include <rtl/math.hxx>
@@ -60,8 +60,8 @@
 #include <xmloff/xmlnumfi.hxx>      // SvXMLNumFmtDefaults
 
 #define _SVSTDARR_USHORTS
-#include <svtools/svstdarr.hxx>
-#include <svtools/nfsymbol.hxx>
+#include <svl/svstdarr.hxx>
+#include <svl/nfsymbol.hxx>
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmlexp.hxx>
 
diff --git a/xmloff/source/style/xmlnumfi.cxx b/xmloff/source/style/xmlnumfi.cxx
index 875676bef356..89b300bd0bc0 100644
--- a/xmloff/source/style/xmlnumfi.cxx
+++ b/xmloff/source/style/xmlnumfi.cxx
@@ -31,13 +31,13 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_xmloff.hxx"
 
-#include <svtools/syslocale.hxx>
+#include <unotools/syslocale.hxx>
 
 #define _ZFORLIST_DECLARE_TABLE
-#include <svtools/zforlist.hxx>
+#include <svl/zforlist.hxx>
 
-#include <svtools/zformat.hxx>
-#include <svtools/numuno.hxx>
+#include <svl/zformat.hxx>
+#include <svl/numuno.hxx>
 #include <rtl/math.hxx>
 #include <i18npool/mslangid.hxx>
 #include <tools/debug.hxx>
diff --git a/xmloff/source/style/xmlnumi.cxx b/xmloff/source/style/xmlnumi.cxx
index 74e1c3dd704c..1fcbe0024193 100644
--- a/xmloff/source/style/xmlnumi.cxx
+++ b/xmloff/source/style/xmlnumi.cxx
@@ -73,7 +73,7 @@
 #include <xmloff/xmlnumi.hxx>
 
 #define _SVSTDARR_USHORTS
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 using ::rtl::OUString;
 using ::rtl::OUStringBuffer;
 
diff --git a/xmloff/source/style/xmlstyle.cxx b/xmloff/source/style/xmlstyle.cxx
index 24522797bb3c..17a7c0206988 100644
--- a/xmloff/source/style/xmlstyle.cxx
+++ b/xmloff/source/style/xmlstyle.cxx
@@ -46,8 +46,8 @@
 #endif
 #include <tools/debug.hxx>
 #include <tools/list.hxx>
-#include <svtools/cntnrsrt.hxx>
-#include <svtools/itemset.hxx>
+#include <svl/cntnrsrt.hxx>
+#include <svl/itemset.hxx>
 #include <xmloff/nmspmap.hxx>
 #include "xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
diff --git a/xmloff/source/style/xmltabi.cxx b/xmloff/source/style/xmltabi.cxx
index a32c606532be..4f7672289523 100644
--- a/xmloff/source/style/xmltabi.cxx
+++ b/xmloff/source/style/xmltabi.cxx
@@ -44,7 +44,7 @@
 #include "xmltabi.hxx"
 
 #define _SVSTDARR_USHORTS
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 
 using ::rtl::OUString;
 using ::rtl::OUStringBuffer;
diff --git a/xmloff/source/text/XMLTextColumnsContext.cxx b/xmloff/source/text/XMLTextColumnsContext.cxx
index aa85549cc812..eeea34ce1cae 100644
--- a/xmloff/source/text/XMLTextColumnsContext.cxx
+++ b/xmloff/source/text/XMLTextColumnsContext.cxx
@@ -43,7 +43,7 @@
 #include <xmloff/xmltoken.hxx>
 #include "XMLTextColumnsContext.hxx"
 #define _SVSTDARR_USHORTS
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 
 using ::rtl::OUString;
 using ::rtl::OUStringBuffer;
diff --git a/xmloff/source/text/XMLTextListAutoStylePool.cxx b/xmloff/source/text/XMLTextListAutoStylePool.cxx
index 3710c16dddb3..509459b96880 100644
--- a/xmloff/source/text/XMLTextListAutoStylePool.cxx
+++ b/xmloff/source/text/XMLTextListAutoStylePool.cxx
@@ -31,7 +31,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_xmloff.hxx"
 #include <tools/debug.hxx>
-#include <svtools/cntnrsrt.hxx>
+#include <svl/cntnrsrt.hxx>
 #include <com/sun/star/ucb/XAnyCompareFactory.hpp>
 #include <com/sun/star/container/XNamed.hpp>
 #include <com/sun/star/container/XIndexReplace.hpp>
diff --git a/xmloff/source/text/txtimp.cxx b/xmloff/source/text/txtimp.cxx
index 613a4688389f..5349cccc4a91 100644
--- a/xmloff/source/text/txtimp.cxx
+++ b/xmloff/source/text/txtimp.cxx
@@ -34,7 +34,7 @@
 #include <tools/debug.hxx>
 #ifndef _SVSTDARR_STRINGSDTOR_DECL
 #define _SVSTDARR_STRINGSDTOR
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 #endif
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
diff --git a/xmloff/source/text/txtparae.cxx b/xmloff/source/text/txtparae.cxx
index bf48c5337283..9f36ca5b3523 100644
--- a/xmloff/source/text/txtparae.cxx
+++ b/xmloff/source/text/txtparae.cxx
@@ -34,9 +34,9 @@
 #include <tools/debug.hxx>
 #ifndef _SVSTDARR_LONGS_DECL
 #define _SVSTDARR_LONGS
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 #endif
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <sal/types.h>
 
diff --git a/xmloff/source/text/txtparai.cxx b/xmloff/source/text/txtparai.cxx
index dda2c3d49030..aaac42d14597 100644
--- a/xmloff/source/text/txtparai.cxx
+++ b/xmloff/source/text/txtparai.cxx
@@ -36,7 +36,7 @@
 #include <tools/debug.hxx>
 
 #include <tools/string.hxx>
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
 #include <com/sun/star/text/XTextFrame.hpp>
 #include <com/sun/star/text/XTextCursor.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
diff --git a/xmloff/source/text/txtparaimphint.hxx b/xmloff/source/text/txtparaimphint.hxx
index f3c8da0bcf03..62582e634c29 100644
--- a/xmloff/source/text/txtparaimphint.hxx
+++ b/xmloff/source/text/txtparaimphint.hxx
@@ -33,7 +33,7 @@
 #include <rtl/ustring.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <tools/debug.hxx>
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
 #include <xmloff/xmlimp.hxx>
 #include "XMLTextFrameContext.hxx"
 #include <xmloff/XMLEventsImportContext.hxx>