From fb6f5ee5ee09d9f281f2989dc43eba4fcda1d64e Mon Sep 17 00:00:00 2001
From: Mathias Bauer <mba@openoffice.org>
Date: Fri, 16 Oct 2009 00:05:16 +0200
Subject: #i103496#: split svtools; improve ConfitItems

---
 extensions/inc/extensio.hrc                          |  2 +-
 extensions/inc/pch/precompiled_extensions.hxx        |  4 ++--
 extensions/source/abpilot/abpfinalpage.cxx           |  2 +-
 extensions/source/bibliography/bibconfig.cxx         |  6 +++++-
 extensions/source/bibliography/bibconfig.hxx         |  1 +
 extensions/source/bibliography/bibload.cxx           |  4 ++--
 extensions/source/bibliography/bibmod.cxx            |  2 +-
 extensions/source/bibliography/datman.cxx            |  2 +-
 extensions/source/bibliography/framectr.hxx          |  2 +-
 extensions/source/bibliography/menu.src              |  2 +-
 extensions/source/bibliography/toolbar.hxx           |  2 +-
 extensions/source/dbpilots/commonpagesdbp.cxx        |  2 +-
 extensions/source/inc/componentmodule.cxx            |  2 +-
 extensions/source/oooimprovecore/core.cxx            |  4 ++--
 extensions/source/preload/oemwiz.cxx                 |  4 ++--
 extensions/source/preload/oemwiz.hxx                 |  2 +-
 extensions/source/propctrlr/eventhandler.cxx         |  4 ++--
 extensions/source/propctrlr/formcomponenthandler.cxx | 12 ++++++------
 extensions/source/propctrlr/formhelpid.hrc           |  4 ++--
 extensions/source/propctrlr/propertyhandler.cxx      |  2 +-
 extensions/source/propctrlr/propresid.hrc            |  2 +-
 extensions/source/propctrlr/standardcontrol.cxx      |  2 +-
 extensions/source/propctrlr/usercontrol.cxx          |  4 ++--
 extensions/source/propctrlr/xsdvalidationhelper.cxx  |  2 +-
 24 files changed, 40 insertions(+), 35 deletions(-)

(limited to 'extensions')

diff --git a/extensions/inc/extensio.hrc b/extensions/inc/extensio.hrc
index 6af1dc5b04fb..f763ce8f81c6 100644
--- a/extensions/inc/extensio.hrc
+++ b/extensions/inc/extensio.hrc
@@ -30,7 +30,7 @@
 #ifndef EXTENSIONS_INC_EXTENSIO_HRC
 #define EXTENSIONS_INC_EXTENSIO_HRC
 
-#include <svtools/solar.hrc>
+#include <svl/solar.hrc>
 
 // -----------------------------------------------------------------------
 // - resource id areas
diff --git a/extensions/inc/pch/precompiled_extensions.hxx b/extensions/inc/pch/precompiled_extensions.hxx
index f667c6bdfdfb..dc490b49c28e 100644
--- a/extensions/inc/pch/precompiled_extensions.hxx
+++ b/extensions/inc/pch/precompiled_extensions.hxx
@@ -507,11 +507,11 @@
 
 
 
-#include "svtools/filenotation.hxx"
+#include "svl/filenotation.hxx"
 #include "svtools/imgdef.hxx"
 #include "svtools/miscopt.hxx"
 #include "unotools/moduleoptions.hxx"
-#include "svtools/numuno.hxx"
+#include "svl/numuno.hxx"
 
 #include "svx/flagsdef.hxx"
 
diff --git a/extensions/source/abpilot/abpfinalpage.cxx b/extensions/source/abpilot/abpfinalpage.cxx
index 6569c475f640..a12003e5d1a9 100644
--- a/extensions/source/abpilot/abpfinalpage.cxx
+++ b/extensions/source/abpilot/abpfinalpage.cxx
@@ -39,7 +39,7 @@
 #include <sfx2/filedlghelper.hxx>
 #include <unotools/pathoptions.hxx>
 #ifndef SVTOOLS_FILENOTATION_HXX_
-#include <svtools/filenotation.hxx>
+#include <svl/filenotation.hxx>
 #endif
 #include <sfx2/docfilt.hxx>
 #include <vcl/msgbox.hxx>
diff --git a/extensions/source/bibliography/bibconfig.cxx b/extensions/source/bibliography/bibconfig.cxx
index 4cab6ef50526..218d15455cbd 100644
--- a/extensions/source/bibliography/bibconfig.cxx
+++ b/extensions/source/bibliography/bibconfig.cxx
@@ -32,7 +32,7 @@
 #include "precompiled_extensions.hxx"
 
 #include <bibconfig.hxx>
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
 #include <tools/debug.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
 #include <com/sun/star/uno/Any.hxx>
@@ -244,6 +244,10 @@ void BibConfig::SetBibliographyURL(const BibDBDescriptor& rDesc)
     SetModified();
 };
 //---------------------------------------------------------------------------
+void BibConfig::Notify( const com::sun::star::uno::Sequence<rtl::OUString>& )
+{
+}
+
 void    BibConfig::Commit()
 {
     const Sequence<OUString> aPropertyNames = GetPropertyNames();
diff --git a/extensions/source/bibliography/bibconfig.hxx b/extensions/source/bibliography/bibconfig.hxx
index 178da765818f..7237b0a12695 100644
--- a/extensions/source/bibliography/bibconfig.hxx
+++ b/extensions/source/bibliography/bibconfig.hxx
@@ -114,6 +114,7 @@ public:
     ~BibConfig();
 
     virtual void    Commit();
+    virtual void            Notify( const com::sun::star::uno::Sequence<rtl::OUString>& aPropertyNames);
 
     BibDBDescriptor         GetBibliographyURL();
     void                    SetBibliographyURL(const BibDBDescriptor& rDesc);
diff --git a/extensions/source/bibliography/bibload.cxx b/extensions/source/bibliography/bibload.cxx
index 3d9667b94f06..e73c13b55814 100644
--- a/extensions/source/bibliography/bibload.cxx
+++ b/extensions/source/bibliography/bibload.cxx
@@ -36,9 +36,9 @@
 #include <tools/urlobj.hxx>
 #include <tools/diagnose_ex.h>
 #include <cppuhelper/weak.hxx>
-#include <svtools/itemprop.hxx>
+#include <svl/itemprop.hxx>
 #include <uno/environment.h>
-#include <svtools/urihelper.hxx>
+#include <svl/urihelper.hxx>
 #ifndef _TOOLKIT_UNOHLP_HXX
 #include <toolkit/helper/vclunohelper.hxx>
 #endif
diff --git a/extensions/source/bibliography/bibmod.cxx b/extensions/source/bibliography/bibmod.cxx
index 573c5756132b..3b9d7e53b8d7 100644
--- a/extensions/source/bibliography/bibmod.cxx
+++ b/extensions/source/bibliography/bibmod.cxx
@@ -34,7 +34,7 @@
 
 #include <tools/resmgr.hxx>
 #include <tools/urlobj.hxx>
-#include <svtools/urihelper.hxx>
+#include <svl/urihelper.hxx>
 #include <com/sun/star/container/XNameAccess.hpp>
 #include <com/sun/star/util/XLocalizedAliases.hpp>
 #include <com/sun/star/lang/XLocalizable.hpp>
diff --git a/extensions/source/bibliography/datman.cxx b/extensions/source/bibliography/datman.cxx
index 5a901447865f..0c47c2917e46 100644
--- a/extensions/source/bibliography/datman.cxx
+++ b/extensions/source/bibliography/datman.cxx
@@ -60,7 +60,7 @@
 #include <ucbhelper/content.hxx>
 #include <ucbhelper/contentidentifier.hxx>
 #include <comphelper/container.hxx>
-#include <svtools/urihelper.hxx>
+#include <svl/urihelper.hxx>
 #include <svtools/svtabbx.hxx>
 #include <svtools/headbar.hxx>
 #include <vcl/dialog.hxx>
diff --git a/extensions/source/bibliography/framectr.hxx b/extensions/source/bibliography/framectr.hxx
index ac7ce58a8f49..99304c394021 100644
--- a/extensions/source/bibliography/framectr.hxx
+++ b/extensions/source/bibliography/framectr.hxx
@@ -38,7 +38,7 @@
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/frame/XDispatchInformationProvider.hpp>
 #include <cppuhelper/implbase5.hxx>
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
 
 #include "bibmod.hxx"
 class BibDataManager;
diff --git a/extensions/source/bibliography/menu.src b/extensions/source/bibliography/menu.src
index d06cce2e4361..6b68a97afa3d 100644
--- a/extensions/source/bibliography/menu.src
+++ b/extensions/source/bibliography/menu.src
@@ -28,7 +28,7 @@
  *
  ************************************************************************/
 
-#include <svtools/solar.hrc>
+#include <svl/solar.hrc>
 #include <svx/svxids.hrc>
 #ifndef _GLOBLMN_HRC
 #include <svx/globlmn.hrc>
diff --git a/extensions/source/bibliography/toolbar.hxx b/extensions/source/bibliography/toolbar.hxx
index 899154682264..f3a322f038e8 100644
--- a/extensions/source/bibliography/toolbar.hxx
+++ b/extensions/source/bibliography/toolbar.hxx
@@ -39,7 +39,7 @@
 #include <vcl/lstbox.hxx>
 #include <vcl/edit.hxx>
 #include <vcl/fixed.hxx>
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
 #include <vcl/timer.hxx>
 #include <cppuhelper/implbase1.hxx> // helper for implementations
 
diff --git a/extensions/source/dbpilots/commonpagesdbp.cxx b/extensions/source/dbpilots/commonpagesdbp.cxx
index c9e657dd2f69..efc79f53744d 100644
--- a/extensions/source/dbpilots/commonpagesdbp.cxx
+++ b/extensions/source/dbpilots/commonpagesdbp.cxx
@@ -53,7 +53,7 @@
 #include <unotools/pathoptions.hxx>
 #include <sfx2/filedlghelper.hxx>
 #ifndef SVTOOLS_FILENOTATION_HXX_
-#include <svtools/filenotation.hxx>
+#include <svl/filenotation.hxx>
 #endif
 //.........................................................................
 namespace dbp
diff --git a/extensions/source/inc/componentmodule.cxx b/extensions/source/inc/componentmodule.cxx
index 33bc61be819a..653006035eae 100644
--- a/extensions/source/inc/componentmodule.cxx
+++ b/extensions/source/inc/componentmodule.cxx
@@ -31,7 +31,7 @@
 #include "componentmodule.hxx"
 #include <tools/resmgr.hxx>
 #ifndef _SOLAR_HRC
-#include <svtools/solar.hrc>
+#include <svl/solar.hrc>
 #endif
 #include <comphelper/sequence.hxx>
 #include <tools/debug.hxx>
diff --git a/extensions/source/oooimprovecore/core.cxx b/extensions/source/oooimprovecore/core.cxx
index 2d6fc581f3a6..1893b1579dc2 100644
--- a/extensions/source/oooimprovecore/core.cxx
+++ b/extensions/source/oooimprovecore/core.cxx
@@ -46,8 +46,8 @@
 #include <svx/svxdlg.hxx>
 #include <vcl/svapp.hxx>
 #include <vos/mutex.hxx>
-#include <svtools/itemset.hxx>
-#include <svtools/stritem.hxx>
+#include <svl/itemset.hxx>
+#include <svl/stritem.hxx>
 #include <sfx2/app.hxx>
 #include <svx/dialogs.hrc>
 #include <sfx2/sfxsids.hrc>
diff --git a/extensions/source/preload/oemwiz.cxx b/extensions/source/preload/oemwiz.cxx
index 3121b6b07bc5..0279dbc3f4ab 100644
--- a/extensions/source/preload/oemwiz.cxx
+++ b/extensions/source/preload/oemwiz.cxx
@@ -34,8 +34,8 @@
 #include "componentmodule.hxx"
 #include <tools/debug.hxx>
 #include <sfx2/docfile.hxx>
-#include <svtools/itemset.hxx>
-#include <svtools/itempool.hxx>
+#include <svl/itemset.hxx>
+#include <svl/itempool.hxx>
 #include <vcl/msgbox.hxx>
 #include <unotools/pathoptions.hxx>
 #ifndef _EXTENSIONS_PRELOAD_PRELOAD_HRC_
diff --git a/extensions/source/preload/oemwiz.hxx b/extensions/source/preload/oemwiz.hxx
index 49b43114d20e..cde464dd88cb 100644
--- a/extensions/source/preload/oemwiz.hxx
+++ b/extensions/source/preload/oemwiz.hxx
@@ -40,7 +40,7 @@
 #include <vcl/tabpage.hxx>
 #include <vcl/fixed.hxx>
 #include <svtools/svmedit.hxx>
-#include <svtools/lstner.hxx>
+#include <svl/lstner.hxx>
 #include <vcl/scrbar.hxx>
 
 //.........................................................................
diff --git a/extensions/source/propctrlr/eventhandler.cxx b/extensions/source/propctrlr/eventhandler.cxx
index 05d0984349b4..56a4c0685c8d 100644
--- a/extensions/source/propctrlr/eventhandler.cxx
+++ b/extensions/source/propctrlr/eventhandler.cxx
@@ -71,8 +71,8 @@
 #include <rtl/ref.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <sfx2/app.hxx>
-#include <svtools/eitem.hxx>
-#include <svtools/itemset.hxx>
+#include <svl/eitem.hxx>
+#include <svl/itemset.hxx>
 #include <svx/svxdlg.hxx>
 #include <svx/svxids.hrc>
 #include <tools/diagnose_ex.h>
diff --git a/extensions/source/propctrlr/formcomponenthandler.cxx b/extensions/source/propctrlr/formcomponenthandler.cxx
index d77b8dc7d0c2..8d7429ce63de 100644
--- a/extensions/source/propctrlr/formcomponenthandler.cxx
+++ b/extensions/source/propctrlr/formcomponenthandler.cxx
@@ -89,14 +89,14 @@
 #include <sfx2/basedlgs.hxx>
 #include <sfx2/docfilt.hxx>
 #include <sfx2/filedlghelper.hxx>
-#include <svtools/ctloptions.hxx>
+#include <svl/ctloptions.hxx>
 #include <svtools/colrdlg.hxx>
-#include <svtools/filenotation.hxx>
-#include <svtools/intitem.hxx>
-#include <svtools/itemset.hxx>
+#include <svl/filenotation.hxx>
+#include <svl/intitem.hxx>
+#include <svl/itemset.hxx>
 #include <unotools/moduleoptions.hxx>
-#include <svtools/numuno.hxx>
-#include <svtools/urihelper.hxx>
+#include <svl/numuno.hxx>
+#include <svl/urihelper.hxx>
 #include <svx/dialogs.hrc>
 #include <svx/numinf.hxx>
 #include <svx/svxdlg.hxx>
diff --git a/extensions/source/propctrlr/formhelpid.hrc b/extensions/source/propctrlr/formhelpid.hrc
index 529c3b30d97b..e6f4aebee5dd 100644
--- a/extensions/source/propctrlr/formhelpid.hrc
+++ b/extensions/source/propctrlr/formhelpid.hrc
@@ -32,10 +32,10 @@
 #define _EXTENSIONS_FORMCTRLR_FORMHELPID_HRC_
 
 #ifndef _SOLAR_HRC
-#include <svtools/solar.hrc>
+#include <svl/solar.hrc>
 #endif
 
-// TODO: create a new help id range in <svtools/solar.hrc>
+// TODO: create a new help id range in <svl/solar.hrc>
 // at the moment, the help ids are ripped from svx/inc/fmhelper.hrc
 // (the old property browser was implemented in svx)
 
diff --git a/extensions/source/propctrlr/propertyhandler.cxx b/extensions/source/propctrlr/propertyhandler.cxx
index 8d730d3e8c9c..d81966e39257 100644
--- a/extensions/source/propctrlr/propertyhandler.cxx
+++ b/extensions/source/propctrlr/propertyhandler.cxx
@@ -45,7 +45,7 @@
 #include <tools/debug.hxx>
 #include <unotools/confignode.hxx>
 #include <unotools/localedatawrapper.hxx>
-#include <svtools/syslocale.hxx>
+#include <unotools/syslocale.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
 
 #include <algorithm>
diff --git a/extensions/source/propctrlr/propresid.hrc b/extensions/source/propctrlr/propresid.hrc
index 705638accf98..338b0eebab88 100644
--- a/extensions/source/propctrlr/propresid.hrc
+++ b/extensions/source/propctrlr/propresid.hrc
@@ -31,7 +31,7 @@
 #ifndef EXTENSIONS_PROPRESID_HRC
 #define EXTENSIONS_PROPRESID_HRC
 
-// TODO: create a new resource range in <svtools/solar.hrc>
+// TODO: create a new resource range in <svl/solar.hrc>
 
 #define RID_PROPCONTROLLER_START        1000
     // arbitrary at the moment
diff --git a/extensions/source/propctrlr/standardcontrol.cxx b/extensions/source/propctrlr/standardcontrol.cxx
index 26d46aa7dec9..dac5ccca77d5 100644
--- a/extensions/source/propctrlr/standardcontrol.cxx
+++ b/extensions/source/propctrlr/standardcontrol.cxx
@@ -55,7 +55,7 @@
 #include <vcl/floatwin.hxx>
 #include <svtools/svmedit.hxx>
 #include <svtools/colorcfg.hxx>
-#include <svtools/syslocale.hxx>
+#include <unotools/syslocale.hxx>
 #include <unotools/datetime.hxx>
 #include <i18npool/mslangid.hxx>
 #ifndef _SV_BUTTON_HXX
diff --git a/extensions/source/propctrlr/usercontrol.cxx b/extensions/source/propctrlr/usercontrol.cxx
index 005659f3576a..b27afa750fa6 100644
--- a/extensions/source/propctrlr/usercontrol.cxx
+++ b/extensions/source/propctrlr/usercontrol.cxx
@@ -36,10 +36,10 @@
 #include <com/sun/star/inspection/PropertyControlType.hpp>
 #include <com/sun/star/inspection/PropertyControlType.hpp>
 /** === end UNO includes === **/
-#include <svtools/numuno.hxx>
+#include <svl/numuno.hxx>
 #include <rtl/math.hxx>
 #include <tools/debug.hxx>
-#include <svtools/zformat.hxx>
+#include <svl/zformat.hxx>
 #include <connectivity/dbconversion.hxx>
 #include <com/sun/star/util/Time.hpp>
 #include "modulepcr.hxx"
diff --git a/extensions/source/propctrlr/xsdvalidationhelper.cxx b/extensions/source/propctrlr/xsdvalidationhelper.cxx
index 70759e9c5ad7..ea34b2678d14 100644
--- a/extensions/source/propctrlr/xsdvalidationhelper.cxx
+++ b/extensions/source/propctrlr/xsdvalidationhelper.cxx
@@ -42,7 +42,7 @@
 #include <com/sun/star/util/XNumberFormatsSupplier.hpp>
 #include <com/sun/star/xforms/XDataTypeRepository.hpp>
 /** === end UNO includes === **/
-#include <svtools/syslocale.hxx>
+#include <unotools/syslocale.hxx>
 #include <tools/diagnose_ex.h>
 
 //........................................................................
-- 
cgit