Automated merge with http://hg.services.openoffice.org/cws/dba33e

42 files changed, 69 insertions, 92 deletions

diff --git a/reportdesign/inc/RptResId.hrc b/reportdesign/inc/RptResId.hrc
index c9cc382ca253..9b5c2795dfaf 100644
--- a/reportdesign/inc/RptResId.hrc
+++ b/reportdesign/inc/RptResId.hrc
@@ -34,7 +34,7 @@
 // include     -----------------------------------------------------------
 
 #ifndef _SOLAR_HRC
-#include <svtools/solar.hrc>
+#include <svl/solar.hrc>
 #endif
 
 #define RID_DIALOG_START                RID_RPT_START
diff --git a/reportdesign/inc/UndoActions.hxx b/reportdesign/inc/UndoActions.hxx
index 0408cb2379d7..00828f22b4d5 100644
--- a/reportdesign/inc/UndoActions.hxx
+++ b/reportdesign/inc/UndoActions.hxx
@@ -50,7 +50,7 @@
 #include <cppuhelper/implbase3.hxx>
 #include <comphelper/uno3.hxx>
 #include <comphelper/sequence.hxx>
-#include <svtools/lstner.hxx>
+#include <svl/lstner.hxx>
 #include <svx/svdouno.hxx>
 #include "RptModel.hxx"
 
diff --git a/reportdesign/inc/UndoEnv.hxx b/reportdesign/inc/UndoEnv.hxx
index af02366b3ff6..a569422bb2a6 100644
--- a/reportdesign/inc/UndoEnv.hxx
+++ b/reportdesign/inc/UndoEnv.hxx
@@ -35,7 +35,7 @@
 #include <com/sun/star/container/XContainerListener.hpp>
 #include <com/sun/star/report/XReportDefinition.hpp>
 #include <memory>
-#include <svtools/lstner.hxx>
+#include <svl/lstner.hxx>
 
 namespace rptui
 {
diff --git a/reportdesign/inc/helpids.hrc b/reportdesign/inc/helpids.hrc
index b60f66823623..7bfa73b78ecd 100644
--- a/reportdesign/inc/helpids.hrc
+++ b/reportdesign/inc/helpids.hrc
@@ -31,7 +31,7 @@
 #define RTPUI_REPORTDESIGN_HELPID_HRC
 
 #ifndef _SOLAR_HRC
-#include <svtools/solar.hrc>    // HID_RPT_DBACCESS_START
+#include <svl/solar.hrc>    // HID_RPT_DBACCESS_START
 #endif
 
 #define UID_RPT_RPT_APP_VIEW        (HID_RPT_START +  0)
diff --git a/reportdesign/source/core/api/ReportComponent.cxx b/reportdesign/source/core/api/ReportComponent.cxx
index 1eae3724ce23..6255bcdf8433 100644
--- a/reportdesign/source/core/api/ReportComponent.cxx
+++ b/reportdesign/source/core/api/ReportComponent.cxx
@@ -44,8 +44,8 @@
 #include <com/sun/star/style/ParagraphAdjust.hpp>
 #include <com/sun/star/i18n/ScriptType.hpp>
 #include <svx/unolingu.hxx>
-#include <svtools/syslocale.hxx>
-#include <svtools/lingucfg.hxx>
+#include <unotools/syslocale.hxx>
+#include <unotools/lingucfg.hxx>
 #include <i18npool/mslangid.hxx>
 
 // =============================================================================
diff --git a/reportdesign/source/core/api/ReportDefinition.cxx b/reportdesign/source/core/api/ReportDefinition.cxx
index 603f54bd3f6c..b505f16ff751 100644
--- a/reportdesign/source/core/api/ReportDefinition.cxx
+++ b/reportdesign/source/core/api/ReportDefinition.cxx
@@ -102,7 +102,7 @@
 #include <boost/mem_fn.hpp>
 #include <boost/bind.hpp>
 #include <boost/utility.hpp>
-#include <svtools/saveopt.hxx>
+#include <unotools/saveopt.hxx>
 #include "RptModel.hxx"
 #include "UndoEnv.hxx"
 #include "FormattedField.hxx"
@@ -110,8 +110,8 @@
 #include "ImageControl.hxx"
 #include "Shape.hxx"
 #include "ReportHelperImpl.hxx"
-#include <svtools/itempool.hxx>
-#include <svtools/moduleoptions.hxx>
+#include <svl/itempool.hxx>
+#include <unotools/moduleoptions.hxx>
 #include <osl/thread.hxx>
 
 #include <svx/paperinf.hxx>
@@ -1508,23 +1508,6 @@ void SAL_CALL OReportDefinition::storeToStorage( const uno::Reference< embed::XS
     } // if ( aSaveOpt.IsSaveRelFSys() )
     const ::rtl::OUString sHierarchicalDocumentName( aDescriptor.getUnpackedValueOrDefault(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HierarchicalDocumentName")),::rtl::OUString()) );
     xInfoSet->setPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("StreamRelPath")), uno::makeAny(sHierarchicalDocumentName));
-    ::rtl::OUString aVersion;
-    SvtSaveOptions::ODFDefaultVersion nDefVersion = aSaveOpt.GetODFDefaultVersion();
-
-    // older versions can not have this property set, it exists only starting from ODF1.2
-    if ( nDefVersion >= SvtSaveOptions::ODFVER_012 )
-        aVersion = ODFVER_012_TEXT;
-
-    if ( aVersion.getLength() )
-    {
-        try
-        {
-            xInfoSet->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Version" )), uno::makeAny( aVersion ) );
-        }
-        catch( uno::Exception& )
-        {
-        }
-    }
 
 
     sal_Int32 nArgsLen = aDelegatorArguments.getLength();
diff --git a/reportdesign/source/core/api/ReportEngineJFree.cxx b/reportdesign/source/core/api/ReportEngineJFree.cxx
index 03c5307e8f25..3c1e2540636b 100644
--- a/reportdesign/source/core/api/ReportEngineJFree.cxx
+++ b/reportdesign/source/core/api/ReportEngineJFree.cxx
@@ -51,7 +51,7 @@
 
 #include <tools/debug.hxx>
 #include <tools/urlobj.hxx>
-#include <svtools/useroptions.hxx>
+#include <unotools/useroptions.hxx>
 #include <unotools/tempfile.hxx>
 #include <unotools/sharedunocomponent.hxx>
 
diff --git a/reportdesign/source/core/inc/core_resource.hrc b/reportdesign/source/core/inc/core_resource.hrc
index bf70cb4e8afd..ed3b25c99de0 100644
--- a/reportdesign/source/core/inc/core_resource.hrc
+++ b/reportdesign/source/core/inc/core_resource.hrc
@@ -32,7 +32,7 @@
 #define REPORTDESIGN_CORE_RESOURCE_HRC_
 
 #ifndef _SOLAR_HRC
-#include <svtools/solar.hrc>
+#include <svl/solar.hrc>
 #endif
 
 //------------------------------------------------------------------------------
diff --git a/reportdesign/source/core/resource/core_resource.cxx b/reportdesign/source/core/resource/core_resource.cxx
index 4a2faace77a8..ddb97fad8dcd 100644
--- a/reportdesign/source/core/resource/core_resource.cxx
+++ b/reportdesign/source/core/resource/core_resource.cxx
@@ -42,7 +42,7 @@
 #include <rtl/uri.hxx>
 
 #ifndef _SOLAR_HRC
-#include <svtools/solar.hrc>
+#include <svl/solar.hrc>
 #endif
 #include "ModuleHelper.hxx"
 //.........................................................................
diff --git a/reportdesign/source/core/sdr/ModuleHelper.cxx b/reportdesign/source/core/sdr/ModuleHelper.cxx
index c1096cd47c0a..68c16dc7e804 100644
--- a/reportdesign/source/core/sdr/ModuleHelper.cxx
+++ b/reportdesign/source/core/sdr/ModuleHelper.cxx
@@ -37,7 +37,7 @@
 #include <rtl/uri.hxx>
 #include <tools/debug.hxx>
 #ifndef _SOLAR_HRC
-#include <svtools/solar.hrc>
+#include <svl/solar.hrc>
 #endif
 
 #define EXPAND_PROTOCOL     "vnd.sun.star.expand:"
diff --git a/reportdesign/source/core/sdr/RptModel.cxx b/reportdesign/source/core/sdr/RptModel.cxx
index 7da6e8697de5..aed7e9547784 100644
--- a/reportdesign/source/core/sdr/RptModel.cxx
+++ b/reportdesign/source/core/sdr/RptModel.cxx
@@ -33,7 +33,7 @@
 #include "RptPage.hxx"
 #include <dbaccess/singledoccontroller.hxx>
 #include <tools/debug.hxx>
-#include <svtools/pathoptions.hxx>
+#include <unotools/pathoptions.hxx>
 
 #include "UndoActions.hxx"
 #include "UndoEnv.hxx"
diff --git a/reportdesign/source/core/sdr/UndoActions.cxx b/reportdesign/source/core/sdr/UndoActions.cxx
index 7c2bb2bd98e5..ee98e78d69c2 100644
--- a/reportdesign/source/core/sdr/UndoActions.cxx
+++ b/reportdesign/source/core/sdr/UndoActions.cxx
@@ -51,7 +51,7 @@
 /** === end UNO includes === **/
 
 #include <connectivity/dbtools.hxx>
-#include <svtools/smplhint.hxx>
+#include <svl/smplhint.hxx>
 #include <tools/diagnose_ex.h>
 #include <comphelper/stl_types.hxx>
 #include <vcl/svapp.hxx>
diff --git a/reportdesign/source/core/sdr/UndoEnv.cxx b/reportdesign/source/core/sdr/UndoEnv.cxx
index ee3bf30f8388..f6e4631a787b 100644
--- a/reportdesign/source/core/sdr/UndoEnv.cxx
+++ b/reportdesign/source/core/sdr/UndoEnv.cxx
@@ -50,7 +50,7 @@
 /** === end UNO includes === **/
 
 #include <connectivity/dbtools.hxx>
-#include <svtools/smplhint.hxx>
+#include <svl/smplhint.hxx>
 #include <tools/diagnose_ex.h>
 #include <comphelper/stl_types.hxx>
 #include <vcl/svapp.hxx>
diff --git a/reportdesign/source/core/sdr/formatnormalizer.cxx b/reportdesign/source/core/sdr/formatnormalizer.cxx
index 7ce45cb06f7a..c4cfbf1a9d41 100644
--- a/reportdesign/source/core/sdr/formatnormalizer.cxx
+++ b/reportdesign/source/core/sdr/formatnormalizer.cxx
@@ -39,7 +39,7 @@
 /** === end UNO includes === **/
 
 #include <dbaccess/singledoccontroller.hxx>
-#include <svtools/syslocale.hxx>
+#include <unotools/syslocale.hxx>
 #include <connectivity/statementcomposer.hxx>
 #include <connectivity/dbtools.hxx>
 #include <tools/diagnose_ex.h>
diff --git a/reportdesign/source/filter/xml/dbloader2.hxx b/reportdesign/source/filter/xml/dbloader2.hxx
index 4af8752d896e..0676725e3306 100644
--- a/reportdesign/source/filter/xml/dbloader2.hxx
+++ b/reportdesign/source/filter/xml/dbloader2.hxx
@@ -69,7 +69,7 @@
 #include <osl/file.hxx>
 #include <ucbhelper/contentbroker.hxx>
 #include <sfx2/docfile.hxx>
-#include <svtools/moduleoptions.hxx>
+#include <unotools/moduleoptions.hxx>
 #include <comphelper/stl_types.hxx>
 #include <comphelper/storagehelper.hxx>
 #include <com/sun/star/task/XJobExecutor.hpp>
diff --git a/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx b/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx
index 73df0a049241..0ec419df836b 100644
--- a/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx
+++ b/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx
@@ -41,7 +41,7 @@
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmlement.hxx>
 #include <xmloff/xmluconv.hxx>
-#include <svtools/saveopt.hxx>
+#include <unotools/saveopt.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <connectivity/dbtools.hxx>
 #include <rtl/ustrbuf.hxx>
diff --git a/reportdesign/source/filter/xml/xmlImage.cxx b/reportdesign/source/filter/xml/xmlImage.cxx
index b1341a35c365..aaefd993ef01 100644
--- a/reportdesign/source/filter/xml/xmlImage.cxx
+++ b/reportdesign/source/filter/xml/xmlImage.cxx
@@ -40,7 +40,7 @@
 #include "xmlControlProperty.hxx"
 #include "xmlHelper.hxx"
 #include <tools/debug.hxx>
-#include <svtools/pathoptions.hxx>
+#include <unotools/pathoptions.hxx>
 
 #include <comphelper/componentcontext.hxx>
 #include <com/sun/star/awt/ImageScaleMode.hpp>
diff --git a/reportdesign/source/ui/dlg/Condition.cxx b/reportdesign/source/ui/dlg/Condition.cxx
index d23f5946e85c..db7326fccd41 100644
--- a/reportdesign/source/ui/dlg/Condition.cxx
+++ b/reportdesign/source/ui/dlg/Condition.cxx
@@ -56,7 +56,7 @@
 #include <svx/tbxcolorupdate.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
 #include <svtools/imgdef.hxx>
-#include <svtools/pathoptions.hxx>
+#include <unotools/pathoptions.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/bmpacc.hxx>
 #include <tools/diagnose_ex.h>
diff --git a/reportdesign/source/ui/dlg/DateTime.cxx b/reportdesign/source/ui/dlg/DateTime.cxx
index 1075e12500c4..126edd9b0f76 100644
--- a/reportdesign/source/ui/dlg/DateTime.cxx
+++ b/reportdesign/source/ui/dlg/DateTime.cxx
@@ -54,7 +54,7 @@
 #include <svx/svxids.hrc>
 #endif
 #include <connectivity/dbconversion.hxx>
-#include <svtools/syslocale.hxx>
+#include <unotools/syslocale.hxx>
 #ifndef RPTUI_TOOLS_HXX
 #include "UITools.hxx"
 #endif
diff --git a/reportdesign/source/ui/dlg/Formula.cxx b/reportdesign/source/ui/dlg/Formula.cxx
index 7328b1c628eb..014720bd4dea 100644
--- a/reportdesign/source/ui/dlg/Formula.cxx
+++ b/reportdesign/source/ui/dlg/Formula.cxx
@@ -38,7 +38,7 @@
 #include <vcl/mnemonic.hxx>
 #include <vcl/msgbox.hxx>
 #include <unotools/charclass.hxx>
-#include <svtools/viewoptions.hxx>
+#include <unotools/viewoptions.hxx>
 #include <tools/urlobj.hxx>
 #include <formula/formdata.hxx>
 #include <formula/funcutl.hxx>
diff --git a/reportdesign/source/ui/dlg/Navigator.cxx b/reportdesign/source/ui/dlg/Navigator.cxx
index 7932c5c04371..8ea1675a3dd7 100644
--- a/reportdesign/source/ui/dlg/Navigator.cxx
+++ b/reportdesign/source/ui/dlg/Navigator.cxx
@@ -55,7 +55,7 @@
 #include "cppuhelper/basemutex.hxx"
 #include "comphelper/SelectionMultiplex.hxx"
 #include <svtools/svtreebx.hxx>
-#include <svtools/solar.hrc>
+#include <svl/solar.hrc>
 #include "ReportVisitor.hxx"
 #include "ModuleHelper.hxx"
 #include <rtl/ref.hxx>
@@ -73,7 +73,7 @@
 namespace rptui
 {
 using namespace ::com::sun::star;
-using namespace svt;
+using namespace utl;
 using namespace ::comphelper;
 
 USHORT lcl_getImageId(const uno::Reference< report::XReportComponent>& _xElement)
diff --git a/reportdesign/source/ui/dlg/Navigator.src b/reportdesign/source/ui/dlg/Navigator.src
index a2b87bff80b9..292d9ff3986f 100644
--- a/reportdesign/source/ui/dlg/Navigator.src
+++ b/reportdesign/source/ui/dlg/Navigator.src
@@ -36,7 +36,7 @@
 #ifndef _SBASLTID_HRC
 #include <svx/svxids.hrc>
 #endif
-#include <svtools/solar.hrc>
+#include <svl/solar.hrc>
 
 #define RID_SVXIMG_COLLAPSEDNODE                    (RID_FORMS_START + 2)
 #define RID_SVXIMG_EXPANDEDNODE                     (RID_FORMS_START + 3)
diff --git a/reportdesign/source/ui/dlg/dlgpage.cxx b/reportdesign/source/ui/dlg/dlgpage.cxx
index 45ee50a1ee4f..7661413c4fab 100644
--- a/reportdesign/source/ui/dlg/dlgpage.cxx
+++ b/reportdesign/source/ui/dlg/dlgpage.cxx
@@ -38,9 +38,9 @@
 #include "dlgpage.hxx"
 #include "ModuleHelper.hxx"
 #include "RptResId.hrc"
-#include <svtools/intitem.hxx> //add CHINA001
-#include <svtools/cjkoptions.hxx>
-#include <svtools/aeitem.hxx>
+#include <svl/intitem.hxx> //add CHINA001
+#include <svl/cjkoptions.hxx>
+#include <svl/aeitem.hxx>
 
 namespace rptui
 {
diff --git a/reportdesign/source/ui/inc/DataProvider.hxx b/reportdesign/source/ui/inc/DataProvider.hxx
index c1a10fc86bf6..2a265b5b80bf 100644
--- a/reportdesign/source/ui/inc/DataProvider.hxx
+++ b/reportdesign/source/ui/inc/DataProvider.hxx
@@ -31,7 +31,7 @@
 #ifndef RPT_DATAPROVIDER_HXX
 #define RPT_DATAPROVIDER_HXX
 
-#include <svtools/lstner.hxx>
+#include <svl/lstner.hxx>
 #include <com/sun/star/chart2/data/XDataProvider.hpp>
 #include <com/sun/star/chart2/data/XRangeXMLConversion.hpp>
 #include <com/sun/star/chart2/data/XDataSource.hpp>
@@ -49,7 +49,7 @@
 // #endif
 #include <cppuhelper/implbase3.hxx>
 #include <rtl/ustring.hxx>
-#include <svtools/itemprop.hxx>
+#include <svl/itemprop.hxx>
 
 #include <map>
 #include <list>
diff --git a/reportdesign/source/ui/inc/DesignView.hxx b/reportdesign/source/ui/inc/DesignView.hxx
index cd42b1e85007..07167df69ae4 100644
--- a/reportdesign/source/ui/inc/DesignView.hxx
+++ b/reportdesign/source/ui/inc/DesignView.hxx
@@ -41,8 +41,8 @@
 #include <tools/link.hxx>
 #include <tools/gen.hxx>
 #include <vcl/timer.hxx>
-#include <svtools/hint.hxx>
-#include <svtools/brdcst.hxx>
+#include <svl/hint.hxx>
+#include <svl/brdcst.hxx>
 #include <comphelper/stl_types.hxx>
 #include "ReportDefines.hxx"
 #include <svtools/colorcfg.hxx>
diff --git a/reportdesign/source/ui/inc/ReportController.hxx b/reportdesign/source/ui/inc/ReportController.hxx
index f685723b418c..03ccda9d2209 100644
--- a/reportdesign/source/ui/inc/ReportController.hxx
+++ b/reportdesign/source/ui/inc/ReportController.hxx
@@ -52,7 +52,7 @@
 #include <com/sun/star/embed/XVisualObject.hpp>
 #include <cppuhelper/implbase5.hxx>
 #include <svtools/transfer.hxx>
-#include <svtools/lstner.hxx>
+#include <svl/lstner.hxx>
 #include <svx/svdedtv.hxx>
 #include <svx/zoomitem.hxx>
 #include "ModuleHelper.hxx"
diff --git a/reportdesign/source/ui/inc/ReportControllerObserver.hxx b/reportdesign/source/ui/inc/ReportControllerObserver.hxx
index 87468d61e303..2c6d0b457712 100644
--- a/reportdesign/source/ui/inc/ReportControllerObserver.hxx
+++ b/reportdesign/source/ui/inc/ReportControllerObserver.hxx
@@ -39,7 +39,7 @@
 #include <dllapi.h>
 #include <vector>
 
-// #include <svtools/lstner.hxx>
+// #include <svl/lstner.hxx>
 #include <vcl/svapp.hxx>
 #include <tools/link.hxx>
 
diff --git a/reportdesign/source/ui/inc/ViewsWindow.hxx b/reportdesign/source/ui/inc/ViewsWindow.hxx
index 88c557213631..b9fd640b307e 100644
--- a/reportdesign/source/ui/inc/ViewsWindow.hxx
+++ b/reportdesign/source/ui/inc/ViewsWindow.hxx
@@ -41,7 +41,7 @@
 #include <com/sun/star/beans/NamedValue.hpp>
 #include <svx/svdedtv.hxx>
 #include <SectionView.hxx>
-
+#include <unotools/options.hxx>
 #include <list>
 #include <vector>
 #include <boost/shared_ptr.hpp>
@@ -117,7 +117,7 @@ namespace rptui
     };
 
     class OViewsWindow :    public Window
-                        ,   public SfxListener
+                        ,   public utl::ConfigurationListener
                         ,   public IMarkedSection
     {
         typedef ::std::multimap<Rectangle,::std::pair<SdrObject*,OSectionView*>,RectangleLess>      TRectangleMap;
@@ -161,10 +161,9 @@ namespace rptui
         // windows overload
         virtual void MouseButtonDown( const MouseEvent& rMEvt );
         virtual void MouseButtonUp( const MouseEvent& rMEvt );
-        using Window::Notify;
+
         virtual void Paint( const Rectangle& rRect );
-        // SfxListener
-        virtual void Notify(SfxBroadcaster & rBc, SfxHint const & rHint);
+        virtual void ConfigurationChanged( utl::ConfigurationBroadcaster*, sal_uInt32 );
     public:
         OViewsWindow(
             OReportWindow* _pReportWindow);
diff --git a/reportdesign/source/ui/inc/propbrw.hxx b/reportdesign/source/ui/inc/propbrw.hxx
index 7db71d29cbd3..3894e6aabff6 100644
--- a/reportdesign/source/ui/inc/propbrw.hxx
+++ b/reportdesign/source/ui/inc/propbrw.hxx
@@ -37,8 +37,8 @@
 #include <com/sun/star/frame/XFrame.hpp>
 #include <com/sun/star/inspection/XObjectInspector.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
-#include <svtools/brdcst.hxx>
-#include <svtools/lstner.hxx>
+#include <svl/brdcst.hxx>
+#include <svl/lstner.hxx>
 #include <vcl/dockwin.hxx>
 #include <svx/svdmark.hxx>
 #include "ModuleHelper.hxx"
diff --git a/reportdesign/source/ui/inspection/DataProviderHandler.cxx b/reportdesign/source/ui/inspection/DataProviderHandler.cxx
index 3a9ebf033e03..51cf2ccd2ccd 100644
--- a/reportdesign/source/ui/inspection/DataProviderHandler.cxx
+++ b/reportdesign/source/ui/inspection/DataProviderHandler.cxx
@@ -35,7 +35,7 @@
 #include <comphelper/types.hxx>
 #include "uistrings.hrc"
 #include <toolkit/helper/vclunohelper.hxx>
-#include <svtools/syslocale.hxx>
+#include <unotools/syslocale.hxx>
 #include <com/sun/star/inspection/PropertyControlType.hpp>
 #include <com/sun/star/inspection/PropertyLineElement.hpp>
 #include <com/sun/star/chart/ChartDataRowSource.hpp>
diff --git a/reportdesign/source/ui/inspection/GeometryHandler.cxx b/reportdesign/source/ui/inspection/GeometryHandler.cxx
index c2d9f067ff75..77a78965a0c0 100644
--- a/reportdesign/source/ui/inspection/GeometryHandler.cxx
+++ b/reportdesign/source/ui/inspection/GeometryHandler.cxx
@@ -42,7 +42,7 @@
 #include <unotools/configmgr.hxx>
 
 #include <toolkit/helper/vclunohelper.hxx>
-#include <svtools/syslocale.hxx>
+#include <unotools/syslocale.hxx>
 #include <tools/diagnose_ex.h>
 #include <tools/StringListResource.hxx>
 #include <com/sun/star/lang/XInitialization.hpp>
@@ -84,8 +84,8 @@
 #include <boost/bind.hpp>
 #include <tools/string.hxx>
 #include "metadata.hxx"
-#include <svtools/itempool.hxx>
-#include <svtools/itemset.hxx>
+#include <svl/itempool.hxx>
+#include <svl/itemset.hxx>
 
 #define ITEMID_COLOR_TABLE      SID_COLOR_TABLE
 #define ITEMID_DASH_LIST        SID_DASH_LIST
diff --git a/reportdesign/source/ui/inspection/ReportComponentHandler.cxx b/reportdesign/source/ui/inspection/ReportComponentHandler.cxx
index f5da42aecbab..b8e5e94b61fb 100644
--- a/reportdesign/source/ui/inspection/ReportComponentHandler.cxx
+++ b/reportdesign/source/ui/inspection/ReportComponentHandler.cxx
@@ -36,7 +36,7 @@
 #endif
 #include <comphelper/types.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
-#include <svtools/syslocale.hxx>
+#include <unotools/syslocale.hxx>
 #include <com/sun/star/inspection/PropertyControlType.hpp>
 #include <com/sun/star/report/XReportDefinition.hpp>
 #include <com/sun/star/report/XSection.hpp>
diff --git a/reportdesign/source/ui/misc/ColorListener.cxx b/reportdesign/source/ui/misc/ColorListener.cxx
index 04a9b9892bb7..c9e71383ca18 100644
--- a/reportdesign/source/ui/misc/ColorListener.cxx
+++ b/reportdesign/source/ui/misc/ColorListener.cxx
@@ -29,7 +29,7 @@
  ************************************************************************/
 #include "precompiled_reportdesign.hxx"
 #include "ColorListener.hxx"
-#include <svtools/smplhint.hxx>
+#include <svl/smplhint.hxx>
 #ifndef REPORTDESIGN_SHARED_UISTRINGS_HRC
 #include "uistrings.hrc"
 #endif
diff --git a/reportdesign/source/ui/misc/UITools.cxx b/reportdesign/source/ui/misc/UITools.cxx
index 1706139d4004..b488eded2a0e 100644
--- a/reportdesign/source/ui/misc/UITools.cxx
+++ b/reportdesign/source/ui/misc/UITools.cxx
@@ -85,10 +85,10 @@
 #include <svx/svxdlg.hxx>
 #include <svx/unoprov.hxx>
 
-#include <svtools/pathoptions.hxx>
+#include <unotools/pathoptions.hxx>
 #include <svtools/ctrltool.hxx>
-#include <svtools/itempool.hxx>
-#include <svtools/itemset.hxx>
+#include <svl/itempool.hxx>
+#include <svl/itemset.hxx>
 
 #include <comphelper/propmultiplex.hxx>
 #include <comphelper/namedvaluecollection.hxx>
@@ -776,7 +776,7 @@ bool openAreaDialog( const uno::Reference<report::XShape >& _xShape,const uno::R
 
         {   // want the dialog to be destroyed before our set
             SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
-            ::std::auto_ptr<AbstractSvxAreaTabDialog> pDialog(pFact->CreateSvxAreaTabDialog( pParent,pDescriptor.get(),pModel.get(),RID_SVXDLG_AREA ));
+            ::std::auto_ptr<AbstractSvxAreaTabDialog> pDialog(pFact->CreateSvxAreaTabDialog( pParent,pDescriptor.get(),pModel.get() ));
             // #i74099# by default, the dialog deletes the current color table if a different one is loaded
             // (see SwDrawShell::ExecDrawDlg)
             const SvxColorTableItem* pColorItem = static_cast<const SvxColorTableItem*>( pDescriptor->GetItem(SID_COLOR_TABLE) );
diff --git a/reportdesign/source/ui/misc/toolboxcontroller.cxx b/reportdesign/source/ui/misc/toolboxcontroller.cxx
index d66eca097fc1..55a1bb3776e9 100644
--- a/reportdesign/source/ui/misc/toolboxcontroller.cxx
+++ b/reportdesign/source/ui/misc/toolboxcontroller.cxx
@@ -43,7 +43,7 @@
 #include <vcl/svapp.hxx>
 #include <vcl/toolbox.hxx>
 #include <svtools/miscopt.hxx>
-#include <svtools/moduleoptions.hxx>
+#include <unotools/moduleoptions.hxx>
 #include <svtools/menuoptions.hxx>
 #include <vos/mutex.hxx>
 #include <svx/svxids.hrc>
diff --git a/reportdesign/source/ui/report/DesignView.cxx b/reportdesign/source/ui/report/DesignView.cxx
index f6ad0b90a14d..3709d8f6cf16 100644
--- a/reportdesign/source/ui/report/DesignView.cxx
+++ b/reportdesign/source/ui/report/DesignView.cxx
@@ -33,8 +33,8 @@
 #include <tools/debug.hxx>
 #include "ReportController.hxx"
 #include <comphelper/types.hxx>
-#include <svtools/syslocale.hxx>
-#include <svtools/viewoptions.hxx>
+#include <unotools/syslocale.hxx>
+#include <unotools/viewoptions.hxx>
 #include "RptDef.hxx"
 #include "UITools.hxx"
 #include "RptObject.hxx"
diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx
index d3030fe274bd..817f88adf3cb 100644
--- a/reportdesign/source/ui/report/ReportController.cxx
+++ b/reportdesign/source/ui/report/ReportController.cxx
@@ -138,12 +138,12 @@
 #include "dlgpage.hxx"
 #include "RptResId.hrc"
 
-#include <svtools/itempool.hxx>
-#include <svtools/itemset.hxx>
-#include <svtools/aeitem.hxx> //CHINA001
+#include <svl/itempool.hxx>
+#include <svl/itemset.hxx>
+#include <svl/aeitem.hxx> //CHINA001
 #include <svtools/cliplistener.hxx>
-#include <svtools/syslocale.hxx>
-#include <svtools/viewoptions.hxx>
+#include <unotools/syslocale.hxx>
+#include <unotools/viewoptions.hxx>
 
 #include <vos/mutex.hxx>
 #include "PropertyForward.hxx"
@@ -4285,7 +4285,7 @@ void OReportController::openZoomDialog()
             aZoomItem.SetValueSet(SVX_ZOOM_ENABLE_100|SVX_ZOOM_ENABLE_WHOLEPAGE|SVX_ZOOM_ENABLE_PAGEWIDTH);
             pDescriptor->Put(aZoomItem);
 
-            ::std::auto_ptr<AbstractSvxZoomDialog> pDlg( pFact->CreateSvxZoomDialog(NULL, *pDescriptor.get(), RID_SVXDLG_ZOOM) );
+            ::std::auto_ptr<AbstractSvxZoomDialog> pDlg( pFact->CreateSvxZoomDialog(NULL, *pDescriptor.get()) );
             pDlg->SetLimits( 20, 400 );
             bool bCancel = ( RET_CANCEL == pDlg->Execute() );
 
diff --git a/reportdesign/source/ui/report/ReportControllerObserver.cxx b/reportdesign/source/ui/report/ReportControllerObserver.cxx
index 45b48f123658..fa0d5f4c4526 100644
--- a/reportdesign/source/ui/report/ReportControllerObserver.cxx
+++ b/reportdesign/source/ui/report/ReportControllerObserver.cxx
@@ -33,7 +33,7 @@
 
 #include <ReportControllerObserver.hxx>
 #include <ReportController.hxx>
-#include <svtools/smplhint.hxx>
+#include <svl/smplhint.hxx>
 #include <vos/mutex.hxx>
 #include <vcl/svapp.hxx>
 #include <com/sun/star/report/XFormattedField.hpp>
diff --git a/reportdesign/source/ui/report/ReportSection.cxx b/reportdesign/source/ui/report/ReportSection.cxx
index ea04c7c2d300..8cb729540990 100644
--- a/reportdesign/source/ui/report/ReportSection.cxx
+++ b/reportdesign/source/ui/report/ReportSection.cxx
@@ -67,7 +67,7 @@
 #include <vcl/lineinfo.hxx>
 #include "ColorChanger.hxx"
 
-#include <svtools/itempool.hxx>
+#include <svl/itempool.hxx>
 #include <svtools/extcolorcfg.hxx>
 #include <unotools/confignode.hxx>
 #include <framework/imageproducer.hxx>
diff --git a/reportdesign/source/ui/report/ReportWindow.cxx b/reportdesign/source/ui/report/ReportWindow.cxx
index 39f1c9505672..6668e192ceff 100644
--- a/reportdesign/source/ui/report/ReportWindow.cxx
+++ b/reportdesign/source/ui/report/ReportWindow.cxx
@@ -37,8 +37,8 @@
 
 #include <tools/debug.hxx>
 #include <svtools/colorcfg.hxx>
-#include <svtools/itempool.hxx>
-#include <svtools/syslocale.hxx>
+#include <svl/itempool.hxx>
+#include <unotools/syslocale.hxx>
 
 #include "RptDef.hxx"
 #include "dlgedfunc.hxx"
diff --git a/reportdesign/source/ui/report/StartMarker.cxx b/reportdesign/source/ui/report/StartMarker.cxx
index 64effaf27632..7661b60a4bb0 100644
--- a/reportdesign/source/ui/report/StartMarker.cxx
+++ b/reportdesign/source/ui/report/StartMarker.cxx
@@ -41,8 +41,8 @@
 #include <vcl/gradient.hxx>
 #include <vcl/lineinfo.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
-#include <svtools/syslocale.hxx>
-#include <svtools/smplhint.hxx>
+#include <unotools/syslocale.hxx>
+#include <svl/smplhint.hxx>
 
 #define CORNER_SPACE     5
 
diff --git a/reportdesign/source/ui/report/ViewsWindow.cxx b/reportdesign/source/ui/report/ViewsWindow.cxx
index 999dcf79f915..e3838968de84 100644
--- a/reportdesign/source/ui/report/ViewsWindow.cxx
+++ b/reportdesign/source/ui/report/ViewsWindow.cxx
@@ -190,13 +190,13 @@ OViewsWindow::OViewsWindow( OReportWindow* _pReportWindow)
     SetPaintTransparent(TRUE);
     SetUniqueId(UID_RPT_VIEWSWINDOW);
     SetMapMode( MapMode( MAP_100TH_MM ) );
-    StartListening(m_aColorConfig);
+    m_aColorConfig.AddListener(this);
     ImplInitSettings();
 }
 // -----------------------------------------------------------------------------
 OViewsWindow::~OViewsWindow()
 {
-    EndListening(m_aColorConfig);
+    m_aColorConfig.RemoveListener(this);
     m_aSections.clear();
 
     DBG_DTOR( rpt_OViewsWindow,NULL);
@@ -567,15 +567,10 @@ void OViewsWindow::unmarkAllObjects(OSectionView* _pSectionView)
 }
 */
 // -----------------------------------------------------------------------
-void OViewsWindow::Notify(SfxBroadcaster & /*rBc*/, SfxHint const & rHint)
+void OViewsWindow::ConfigurationChanged( utl::ConfigurationBroadcaster*, sal_uInt32)
 {
-    if (rHint.ISA(SfxSimpleHint)
-        && (static_cast< SfxSimpleHint const & >(rHint).GetId()
-            == SFX_HINT_COLORS_CHANGED))
-    {
         ImplInitSettings();
         Invalidate();
-    }
 }
 // -----------------------------------------------------------------------------
 void OViewsWindow::MouseButtonDown( const MouseEvent& rMEvt )