#i103496#: split svtools; improve ConfitItems

15 files changed, 32 insertions, 28 deletions

diff --git a/svx/source/form/ParseContext.cxx b/svx/source/form/ParseContext.cxx
index 2723e11ddc..f38c341847 100644
--- a/svx/source/form/ParseContext.cxx
+++ b/svx/source/form/ParseContext.cxx
@@ -37,7 +37,7 @@
 
 #include <svx/dialmgr.hxx>
 
-#include <svtools/syslocale.hxx>
+#include <unotools/syslocale.hxx>
 #include <vcl/svapp.hxx>
 #include <tools/debug.hxx>
 #include <vos/mutex.hxx>
diff --git a/svx/source/form/databaselocationinput.cxx b/svx/source/form/databaselocationinput.cxx
index b7d117b3de..215e74d72f 100644
--- a/svx/source/form/databaselocationinput.cxx
+++ b/svx/source/form/databaselocationinput.cxx
@@ -45,7 +45,7 @@
 #include <rtl/ustrbuf.hxx>
 #include <sfx2/filedlghelper.hxx>
 #include <svtools/urlcontrol.hxx>
-#include <svtools/filenotation.hxx>
+#include <svl/filenotation.hxx>
 #include <tools/diagnose_ex.h>
 #include <unotools/confignode.hxx>
 #include <unotools/ucbhelper.hxx>
diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx
index 7f9680e879..70b7de5662 100644
--- a/svx/source/form/datanavi.cxx
+++ b/svx/source/form/datanavi.cxx
@@ -46,7 +46,7 @@
 #include <svtools/miscopt.hxx>
 #include <unotools/pathoptions.hxx>
 #include <unotools/viewoptions.hxx>
-#include <svtools/svtools.hrc>
+#include <svl/svtools.hrc>
 #include <sfx2/app.hxx>
 #include <sfx2/filedlghelper.hxx>
 #include <sfx2/objitem.hxx>
diff --git a/svx/source/form/fmexch.cxx b/svx/source/form/fmexch.cxx
index 55d92e07a0..e511a2e0ba 100644
--- a/svx/source/form/fmexch.cxx
+++ b/svx/source/form/fmexch.cxx
@@ -33,7 +33,7 @@
 #include "fmexch.hxx"
 
 #include <sot/storage.hxx>
-#include <svtools/itempool.hxx>
+#include <svl/itempool.hxx>
 
 #ifndef _SVX_DBEXCH_HRC
 #include <dbexch.hrc>
@@ -43,7 +43,7 @@
 #include <tools/diagnose_ex.h>
 
 #define _SVSTDARR_ULONGS
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 
 //........................................................................
 namespace svxform
diff --git a/svx/source/form/fmshell.cxx b/svx/source/form/fmshell.cxx
index a0c7541f48..355b2114a0 100644
--- a/svx/source/form/fmshell.cxx
+++ b/svx/source/form/fmshell.cxx
@@ -56,10 +56,10 @@
 #include <sfx2/viewfrm.hxx>
 #include <vcl/wrkwin.hxx>
 #include <vcl/msgbox.hxx>
-#include <svtools/whiter.hxx>
+#include <svl/whiter.hxx>
 #include <sfx2/app.hxx>
-#include <svtools/intitem.hxx>
-#include <svtools/visitem.hxx>
+#include <svl/intitem.hxx>
+#include <svl/visitem.hxx>
 #include <unotools/moduleoptions.hxx>
 #include <sfx2/objface.hxx>
 #include <sfx2/request.hxx>
@@ -79,7 +79,7 @@
 #endif
 #include "fmexch.hxx"
 #include <svx/fmglob.hxx>
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
 #include <tools/shl.hxx>
 #include <svx/svdpage.hxx>
 #include <svx/fmmodel.hxx>
@@ -91,7 +91,7 @@
 #include <vcl/sound.hxx>
 #include "fmexpl.hxx"
 #include "formcontrolling.hxx"
-#include <svtools/numuno.hxx>
+#include <svl/numuno.hxx>
 #include <connectivity/dbtools.hxx>
 #include <comphelper/types.hxx>
 #include <comphelper/processfactory.hxx>
diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx
index 645787b518..fc2fe241a3 100644
--- a/svx/source/form/fmshimp.cxx
+++ b/svx/source/form/fmshimp.cxx
@@ -3919,6 +3919,10 @@ void FmXFormShell::Notify( const com::sun::star::uno::Sequence< rtl::OUString >&
         }
 }
 
+void FmXFormShell::Commit()
+{
+}
+
 //------------------------------------------------------------------------
 void FmXFormShell::SetWizardUsing(sal_Bool _bUseThem)
 {
diff --git a/svx/source/form/fmsrccfg.cxx b/svx/source/form/fmsrccfg.cxx
index 58ad4d641e..c986ba991c 100644
--- a/svx/source/form/fmsrccfg.cxx
+++ b/svx/source/form/fmsrccfg.cxx
@@ -31,7 +31,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
 #include "fmsrccfg.hxx"
-#include <svtools/filerec.hxx>
+#include <svl/filerec.hxx>
 #include <com/sun/star/i18n/TransliterationModules.hpp>
 #include <comphelper/processfactory.hxx>
 
diff --git a/svx/source/form/fmsrcimp.cxx b/svx/source/form/fmsrcimp.cxx
index 66acca4748..b6a11292f1 100644
--- a/svx/source/form/fmsrcimp.cxx
+++ b/svx/source/form/fmsrcimp.cxx
@@ -73,7 +73,7 @@
 #include "fmsearch.hrc"
 #endif
 #include <comphelper/numbers.hxx>
-#include <svtools/syslocale.hxx>
+#include <unotools/syslocale.hxx>
 
 #define EQUAL_BOOKMARKS(a, b) a == b
 
diff --git a/svx/source/form/fmtextcontroldialogs.cxx b/svx/source/form/fmtextcontroldialogs.cxx
index 15a843ee88..32a245120f 100644
--- a/svx/source/form/fmtextcontroldialogs.cxx
+++ b/svx/source/form/fmtextcontroldialogs.cxx
@@ -48,10 +48,10 @@
 #endif
 
 #include "flagsdef.hxx"
-#include <svtools/intitem.hxx>
+#include <svl/intitem.hxx>
 
 #include <com/sun/star/uno/Sequence.hxx>
-#include <svtools/cjkoptions.hxx>
+#include <svl/cjkoptions.hxx>
 
 //........................................................................
 namespace svx
diff --git a/svx/source/form/fmtextcontrolshell.cxx b/svx/source/form/fmtextcontrolshell.cxx
index 7555b3d30d..7dafa98b75 100644
--- a/svx/source/form/fmtextcontrolshell.cxx
+++ b/svx/source/form/fmtextcontrolshell.cxx
@@ -66,12 +66,12 @@
 #include <sfx2/request.hxx>
 #include <sfx2/sfxuno.hxx>
 #include <sfx2/viewfrm.hxx>
-#include <svtools/eitem.hxx>
-#include <svtools/intitem.hxx>
-#include <svtools/itempool.hxx>
-#include <svtools/languageoptions.hxx>
+#include <svl/eitem.hxx>
+#include <svl/intitem.hxx>
+#include <svl/itempool.hxx>
+#include <svl/languageoptions.hxx>
 #include <svtools/stringtransfer.hxx>
-#include <svtools/whiter.hxx>
+#include <svl/whiter.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
 #include <tools/diagnose_ex.h>
 #include <vcl/msgbox.hxx>
diff --git a/svx/source/form/fmtools.cxx b/svx/source/form/fmtools.cxx
index 6f3c9f5a75..c81875174e 100644
--- a/svx/source/form/fmtools.cxx
+++ b/svx/source/form/fmtools.cxx
@@ -91,8 +91,8 @@
 #include "fmprop.hrc"
 #endif
 #include <sfx2/bindings.hxx>
-#include <svtools/eitem.hxx>
-#include <svtools/stritem.hxx>
+#include <svl/eitem.hxx>
+#include <svl/stritem.hxx>
 #include <cppuhelper/servicefactory.hxx>
 #include <comphelper/types.hxx>
 #include <comphelper/property.hxx>
diff --git a/svx/source/form/fmundo.cxx b/svx/source/form/fmundo.cxx
index 2fc7022f73..32e3b85930 100644
--- a/svx/source/form/fmundo.cxx
+++ b/svx/source/form/fmundo.cxx
@@ -56,7 +56,7 @@
 #include <svx/dialmgr.hxx>
 #include "fmpgeimp.hxx"
 #include "svx/dbtoolsclient.hxx"
-#include <svtools/macitem.hxx>
+#include <svl/macitem.hxx>
 #include <tools/shl.hxx>
 #include <tools/diagnose_ex.h>
 #include <sfx2/objsh.hxx>
diff --git a/svx/source/form/formcontrolfactory.cxx b/svx/source/form/formcontrolfactory.cxx
index 4e28c62a83..dfd7ff7b33 100644
--- a/svx/source/form/formcontrolfactory.cxx
+++ b/svx/source/form/formcontrolfactory.cxx
@@ -57,7 +57,7 @@
 
 #include <comphelper/componentcontext.hxx>
 #include <comphelper/numbers.hxx>
-#include <svtools/syslocale.hxx>
+#include <unotools/syslocale.hxx>
 #include <tools/gen.hxx>
 #include <tools/diagnose_ex.h>
 
diff --git a/svx/source/form/tbxform.cxx b/svx/source/form/tbxform.cxx
index c5a5eb2391..6d9a24d070 100644
--- a/svx/source/form/tbxform.cxx
+++ b/svx/source/form/tbxform.cxx
@@ -33,9 +33,9 @@
 #include <string> // HACK: prevent conflict between STLPORT and Workshop headers
 #include <tools/ref.hxx>
 #include <tools/shl.hxx>
-#include <svtools/intitem.hxx>
-#include <svtools/eitem.hxx>
-#include <svtools/stritem.hxx>
+#include <svl/intitem.hxx>
+#include <svl/eitem.hxx>
+#include <svl/stritem.hxx>
 #include <sfx2/dispatch.hxx>
 #include <vcl/toolbox.hxx>
 #include <vcl/fixed.hxx>
diff --git a/svx/source/form/typemap.cxx b/svx/source/form/typemap.cxx
index 0898dcdb2b..5a8baa8086 100644
--- a/svx/source/form/typemap.cxx
+++ b/svx/source/form/typemap.cxx
@@ -32,8 +32,8 @@
 #include "precompiled_svx.hxx"
 #include <sfx2/objitem.hxx>
 #include <sfx2/msg.hxx>
-#include <svtools/stritem.hxx>
-#include <svtools/intitem.hxx>
+#include <svl/stritem.hxx>
+#include <svl/intitem.hxx>
 #include <svx/wghtitem.hxx>
 #include <svx/udlnitem.hxx>
 #include <svx/crsditem.hxx>