diff options
105 files changed, 209 insertions, 220 deletions
diff --git a/dbaccess/inc/dbaccess_helpid.hrc b/dbaccess/inc/dbaccess_helpid.hrc index 28771fad05b1..8016124f894d 100644 --- a/dbaccess/inc/dbaccess_helpid.hrc +++ b/dbaccess/inc/dbaccess_helpid.hrc @@ -32,7 +32,7 @@ #define _DBA_DBACCESS_HELPID_HRC_ #ifndef _SOLAR_HRC -#include <svtools/solar.hrc> // HID_DBACCESS_START +#include <svl/solar.hrc> // HID_DBACCESS_START #endif #define HID_DSADMIN_CHARSET (HID_DBACCESS_START + 9) diff --git a/dbaccess/inc/pch/precompiled_dbaccess.hxx b/dbaccess/inc/pch/precompiled_dbaccess.hxx index 965b41ecfe64..d521b78d3396 100644 --- a/dbaccess/inc/pch/precompiled_dbaccess.hxx +++ b/dbaccess/inc/pch/precompiled_dbaccess.hxx @@ -457,8 +457,8 @@ #include "comphelper/classids.hxx" -#include "svtools/cjkoptions.hxx" -#include "svtools/filenotation.hxx" +#include "svl/cjkoptions.hxx" +#include "svl/filenotation.hxx" #include "unotools/historyoptions.hxx" #include "svtools/htmlkywd.hxx" #include "svtools/imgdef.hxx" @@ -467,7 +467,7 @@ #include "svtools/miscopt.hxx" #include "svtools/rtfkeywd.hxx" #include "svtools/rtftoken.h" -#include "svtools/solar.hrc" +#include "svl/solar.hrc" #include "svtools/toolboxcontroller.hxx" #include "unotools/viewoptions.hxx" diff --git a/dbaccess/inc/singledoccontroller.hxx b/dbaccess/inc/singledoccontroller.hxx index f63d1c02fdf2..1d6773961972 100644 --- a/dbaccess/inc/singledoccontroller.hxx +++ b/dbaccess/inc/singledoccontroller.hxx @@ -48,7 +48,7 @@ #include <comphelper/propertycontainer.hxx> #include <connectivity/dbmetadata.hxx> #include <cppuhelper/implbase1.hxx> -#include <svtools/undo.hxx> +#include <svl/undo.hxx> #include <memory> diff --git a/dbaccess/source/core/api/RowSet.cxx b/dbaccess/source/core/api/RowSet.cxx index 8f84d073f83e..f8ff9654f99e 100644 --- a/dbaccess/source/core/api/RowSet.cxx +++ b/dbaccess/source/core/api/RowSet.cxx @@ -181,7 +181,7 @@ #include <connectivity/dbconversion.hxx> #endif #ifndef INCLUDED_SVTOOLS_SYSLOCALE_HXX -#include <svtools/syslocale.hxx> +#include <unotools/syslocale.hxx> #endif #ifndef _RTL_LOGFILE_HXX_ #include <rtl/logfile.hxx> diff --git a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx index c8a8f9ba01d1..10878f599c4f 100644 --- a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx +++ b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx @@ -58,7 +58,7 @@ #include <comphelper/types.hxx> #include <cppuhelper/typeprovider.hxx> #include <rtl/logfile.hxx> -#include <svtools/syslocale.hxx> +#include <unotools/syslocale.hxx> #include <tools/debug.hxx> #include <tools/diagnose_ex.h> #include <unotools/configmgr.hxx> diff --git a/dbaccess/source/core/api/querycomposer.cxx b/dbaccess/source/core/api/querycomposer.cxx index 2e30ceaa7fe8..6b17ad97e12a 100644 --- a/dbaccess/source/core/api/querycomposer.cxx +++ b/dbaccess/source/core/api/querycomposer.cxx @@ -86,7 +86,7 @@ #include <com/sun/star/i18n/XLocaleData.hpp> #endif #ifndef INCLUDED_SVTOOLS_SYSLOCALE_HXX -#include <svtools/syslocale.hxx> +#include <unotools/syslocale.hxx> #endif #ifndef _COM_SUN_STAR_CONTAINER_XCHILD_HPP_ #include <com/sun/star/container/XChild.hpp> diff --git a/dbaccess/source/core/dataaccess/databasecontext.cxx b/dbaccess/source/core/dataaccess/databasecontext.cxx index b32d8841e8d0..4817c4a26b39 100644 --- a/dbaccess/source/core/dataaccess/databasecontext.cxx +++ b/dbaccess/source/core/dataaccess/databasecontext.cxx @@ -69,7 +69,7 @@ #include <cppuhelper/implbase1.hxx> #include <cppuhelper/typeprovider.hxx> #include <cppuhelper/exc_hlp.hxx> -#include <svtools/filenotation.hxx> +#include <svl/filenotation.hxx> #include <unotools/pathoptions.hxx> #include <tools/debug.hxx> #include <tools/diagnose_ex.h> diff --git a/dbaccess/source/core/inc/core_resource.hrc b/dbaccess/source/core/inc/core_resource.hrc index c3fcb7541c68..0b3e1315adcf 100644 --- a/dbaccess/source/core/inc/core_resource.hrc +++ b/dbaccess/source/core/inc/core_resource.hrc @@ -32,7 +32,7 @@ #define _DBA_CORE_RESOURCE_HRC_ #ifndef _SOLAR_HRC -#include <svtools/solar.hrc> +#include <svl/solar.hrc> #endif //------------------------------------------------------------------------------ diff --git a/dbaccess/source/core/resource/core_resource.cxx b/dbaccess/source/core/resource/core_resource.cxx index dea6ea6b9d9d..d6a63cc326b4 100644 --- a/dbaccess/source/core/resource/core_resource.cxx +++ b/dbaccess/source/core/resource/core_resource.cxx @@ -42,7 +42,7 @@ //--------------------------------------------------- #ifndef _SOLAR_HRC -#include <svtools/solar.hrc> +#include <svl/solar.hrc> #endif //......................................................................... diff --git a/dbaccess/source/ext/adabas/Acomponentmodule.cxx b/dbaccess/source/ext/adabas/Acomponentmodule.cxx index 963437d3b20a..9c8fbe7e09a8 100644 --- a/dbaccess/source/ext/adabas/Acomponentmodule.cxx +++ b/dbaccess/source/ext/adabas/Acomponentmodule.cxx @@ -37,7 +37,7 @@ #include <tools/resmgr.hxx> #endif #ifndef _SOLAR_HRC -#include <svtools/solar.hrc> +#include <svl/solar.hrc> #endif #ifndef _COMPHELPER_SEQUENCE_HXX_ #include <comphelper/sequence.hxx> diff --git a/dbaccess/source/ext/adabas/adabasui_resource.hrc b/dbaccess/source/ext/adabas/adabasui_resource.hrc index 70f2b7920c12..4bcc9f40274a 100644 --- a/dbaccess/source/ext/adabas/adabasui_resource.hrc +++ b/dbaccess/source/ext/adabas/adabasui_resource.hrc @@ -32,7 +32,7 @@ #define _ADABASUI_RESOURCE_HRC_ #ifndef _SOLAR_HRC -#include <svtools/solar.hrc> +#include <svl/solar.hrc> #endif #define RID_DIALOG_START RID_DB_EXTENSIONS_START diff --git a/dbaccess/source/ext/macromigration/dbmm_global.hrc b/dbaccess/source/ext/macromigration/dbmm_global.hrc index 3ce7577426c7..8afb08b919e2 100644 --- a/dbaccess/source/ext/macromigration/dbmm_global.hrc +++ b/dbaccess/source/ext/macromigration/dbmm_global.hrc @@ -31,7 +31,7 @@ #ifndef DBACCESS_DBMM_GLOBAL_HRC #define DBACCESS_DBMM_GLOBAL_HRC -#include <svtools/solar.hrc> +#include <svl/solar.hrc> //===================================================================== //= bases diff --git a/dbaccess/source/ext/macromigration/macromigrationdialog.cxx b/dbaccess/source/ext/macromigration/macromigrationdialog.cxx index 36ddf714f9bc..a1320d3ca24b 100644 --- a/dbaccess/source/ext/macromigration/macromigrationdialog.cxx +++ b/dbaccess/source/ext/macromigration/macromigrationdialog.cxx @@ -56,7 +56,7 @@ #include <cppuhelper/exc_hlp.hxx> #include <cppuhelper/implbase1.hxx> #include <rtl/ref.hxx> -#include <svtools/filenotation.hxx> +#include <svl/filenotation.hxx> #include <tools/diagnose_ex.h> #include <ucbhelper/content.hxx> #include <ucbhelper/contentbroker.hxx> diff --git a/dbaccess/source/filter/xml/xmlExport.cxx b/dbaccess/source/filter/xml/xmlExport.cxx index b1f5e9040690..489b0af7d718 100644 --- a/dbaccess/source/filter/xml/xmlExport.cxx +++ b/dbaccess/source/filter/xml/xmlExport.cxx @@ -103,7 +103,7 @@ #ifndef _COM_SUN_STAR_AWT_FONTDESCRIPTOR_HPP_ #include <com/sun/star/awt/FontDescriptor.hpp> #endif -#include <svtools/filenotation.hxx> +#include <svl/filenotation.hxx> #include <unotools/pathoptions.hxx> #include <tools/diagnose_ex.h> #include <connectivity/DriversConfig.hxx> diff --git a/dbaccess/source/filter/xml/xmlFileBasedDatabase.cxx b/dbaccess/source/filter/xml/xmlFileBasedDatabase.cxx index faea08399b42..35b4b84e8b90 100644 --- a/dbaccess/source/filter/xml/xmlFileBasedDatabase.cxx +++ b/dbaccess/source/filter/xml/xmlFileBasedDatabase.cxx @@ -58,7 +58,7 @@ #include <tools/diagnose_ex.h> #endif #include <comphelper/sequence.hxx> -#include <svtools/filenotation.hxx> +#include <svl/filenotation.hxx> #include <unotools/pathoptions.hxx> #include "dsntypes.hxx" namespace dbaxml diff --git a/dbaccess/source/sdbtools/inc/sdbt_resource.hrc b/dbaccess/source/sdbtools/inc/sdbt_resource.hrc index 6baefaad2942..b13a1ada7390 100644 --- a/dbaccess/source/sdbtools/inc/sdbt_resource.hrc +++ b/dbaccess/source/sdbtools/inc/sdbt_resource.hrc @@ -32,7 +32,7 @@ #define DBACCESS_SDBT_RESOURCE_HRC #ifndef _SOLAR_HRC -#include <svtools/solar.hrc> +#include <svl/solar.hrc> #endif //------------------------------------------------------------------------------ diff --git a/dbaccess/source/ui/app/AppController.cxx b/dbaccess/source/ui/app/AppController.cxx index ba8546a97332..57f38d324b5c 100644 --- a/dbaccess/source/ui/app/AppController.cxx +++ b/dbaccess/source/ui/app/AppController.cxx @@ -87,7 +87,7 @@ #include <tools/diagnose_ex.h> #endif #ifndef SVTOOLS_URIHELPER_HXX -#include <svtools/urihelper.hxx> +#include <svl/urihelper.hxx> #endif #ifndef _COMPHELPER_TYPES_HXX_ #include <comphelper/types.hxx> @@ -222,7 +222,7 @@ #include <unotools/historyoptions.hxx> #endif #ifndef SVTOOLS_FILENOTATION_HXX_ -#include <svtools/filenotation.hxx> +#include <svl/filenotation.hxx> #endif #ifndef _COMPHELPER_SEQUENCE_HXX_ #include <comphelper/sequence.hxx> diff --git a/dbaccess/source/ui/app/AppView.cxx b/dbaccess/source/ui/app/AppView.cxx index 7b059e258553..e8076eba2907 100644 --- a/dbaccess/source/ui/app/AppView.cxx +++ b/dbaccess/source/ui/app/AppView.cxx @@ -70,7 +70,7 @@ #include <com/sun/star/sdb/XQueriesSupplier.hpp> #endif #ifndef INCLUDED_SVTOOLS_SYSLOCALE_HXX -#include <svtools/syslocale.hxx> +#include <unotools/syslocale.hxx> #endif #ifndef DBAUI_TOOLS_HXX #include "UITools.hxx" diff --git a/dbaccess/source/ui/browser/genericcontroller.cxx b/dbaccess/source/ui/browser/genericcontroller.cxx index f8b5bd0ea7aa..dbbdd16c21cc 100644 --- a/dbaccess/source/ui/browser/genericcontroller.cxx +++ b/dbaccess/source/ui/browser/genericcontroller.cxx @@ -105,7 +105,7 @@ #include <tools/urlobj.hxx> #endif #ifndef SVTOOLS_URIHELPER_HXX -#include <svtools/urihelper.hxx> +#include <svl/urihelper.hxx> #endif #ifndef _DBAUI_DATASOURCECONNECTOR_HXX_ #include "datasourceconnector.hxx" diff --git a/dbaccess/source/ui/browser/sbagrid.cxx b/dbaccess/source/ui/browser/sbagrid.cxx index 1ca1a737dfd2..5440be1b5046 100644 --- a/dbaccess/source/ui/browser/sbagrid.cxx +++ b/dbaccess/source/ui/browser/sbagrid.cxx @@ -121,7 +121,7 @@ #endif #ifndef _SFXINTITEM_HXX -#include <svtools/intitem.hxx> +#include <svl/intitem.hxx> #endif #ifndef _SVX_ALGITEM_HXX //autogen @@ -137,19 +137,19 @@ #endif #ifndef _NUMUNO_HXX -#include <svtools/numuno.hxx> +#include <svl/numuno.hxx> #endif #ifndef _SFXITEMPOOL_HXX //autogen wg. SfxItemInfo -#include <svtools/itempool.hxx> +#include <svl/itempool.hxx> #endif #ifndef _SFXITEMSET_HXX //autogen wg. SfxItemSet -#include <svtools/itemset.hxx> +#include <svl/itemset.hxx> #endif #ifndef _SFXRNGITEM_HXX -#include <svtools/rngitem.hxx> +#include <svl/rngitem.hxx> #endif #ifndef _SV_WAITOBJ_HXX @@ -160,7 +160,7 @@ #endif #ifndef _ZFORLIST_HXX -#include <svtools/zforlist.hxx> +#include <svl/zforlist.hxx> #endif #ifndef _CPPUHELPER_QUERYINTERFACE_HXX_ #include <cppuhelper/queryinterface.hxx> diff --git a/dbaccess/source/ui/browser/unodatbr.cxx b/dbaccess/source/ui/browser/unodatbr.cxx index 34cfe666814e..51d5acd7d823 100644 --- a/dbaccess/source/ui/browser/unodatbr.cxx +++ b/dbaccess/source/ui/browser/unodatbr.cxx @@ -114,8 +114,8 @@ #include <sfx2/app.hxx> #include <sfx2/dispatch.hxx> #include <sot/storage.hxx> -#include <svtools/filenotation.hxx> -#include <svtools/intitem.hxx> +#include <svl/filenotation.hxx> +#include <svl/intitem.hxx> #include <unotools/moduleoptions.hxx> #include <svtools/svlbitm.hxx> #include <svtools/svtreebx.hxx> diff --git a/dbaccess/source/ui/control/ColumnControlWindow.cxx b/dbaccess/source/ui/control/ColumnControlWindow.cxx index 0b9da9cfd69e..c1331a69c10e 100644 --- a/dbaccess/source/ui/control/ColumnControlWindow.cxx +++ b/dbaccess/source/ui/control/ColumnControlWindow.cxx @@ -37,7 +37,7 @@ #include "FieldControls.hxx" #endif #ifndef INCLUDED_SVTOOLS_SYSLOCALE_HXX -#include <svtools/syslocale.hxx> +#include <unotools/syslocale.hxx> #endif #ifndef _CONNECTIVITY_DBTOOLS_HXX_ #include <connectivity/dbtools.hxx> diff --git a/dbaccess/source/ui/control/FieldDescControl.cxx b/dbaccess/source/ui/control/FieldDescControl.cxx index 4d9e81bc1f83..972d6c92c355 100644 --- a/dbaccess/source/ui/control/FieldDescControl.cxx +++ b/dbaccess/source/ui/control/FieldDescControl.cxx @@ -53,12 +53,12 @@ #include <svx/numfmtsh.hxx> #include <svx/svxids.hrc> #include <svx/algitem.hxx> -#include <svtools/itempool.hxx> -#define _ZFORLIST_DECLARE_TABLE // ohne das bekomme ich einen Compiler-Fehler in <svtools/zforlist.hxx> -#include <svtools/zforlist.hxx> -#include <svtools/rngitem.hxx> -#include <svtools/intitem.hxx> -#include <svtools/numuno.hxx> +#include <svl/itempool.hxx> +#define _ZFORLIST_DECLARE_TABLE // ohne das bekomme ich einen Compiler-Fehler in <svl/zforlist.hxx> +#include <svl/zforlist.hxx> +#include <svl/rngitem.hxx> +#include <svl/intitem.hxx> +#include <svl/numuno.hxx> #include <svtools/transfer.hxx> #include <com/sun/star/lang/XUnoTunnel.hpp> #include <com/sun/star/util/NumberFormat.hpp> diff --git a/dbaccess/source/ui/control/charsetlistbox.cxx b/dbaccess/source/ui/control/charsetlistbox.cxx index c2c893ec8d1a..05c19378d407 100644 --- a/dbaccess/source/ui/control/charsetlistbox.cxx +++ b/dbaccess/source/ui/control/charsetlistbox.cxx @@ -36,8 +36,8 @@ /** === begin UNO includes === **/ /** === end UNO includes === **/ -#include <svtools/itemset.hxx> -#include <svtools/stritem.hxx> +#include <svl/itemset.hxx> +#include <svl/stritem.hxx> //........................................................................ namespace dbaui diff --git a/dbaccess/source/ui/control/opendoccontrols.cxx b/dbaccess/source/ui/control/opendoccontrols.cxx index 5a99fdf226bc..f3f21d90d5df 100644 --- a/dbaccess/source/ui/control/opendoccontrols.cxx +++ b/dbaccess/source/ui/control/opendoccontrols.cxx @@ -81,7 +81,7 @@ #include <tools/urlobj.hxx> #endif #ifndef SVTOOLS_FILENOTATION_HXX -#include <svtools/filenotation.hxx> +#include <svl/filenotation.hxx> #endif //........................................................................ diff --git a/dbaccess/source/ui/control/sqledit.cxx b/dbaccess/source/ui/control/sqledit.cxx index 84d86948cf97..3889d091f737 100644 --- a/dbaccess/source/ui/control/sqledit.cxx +++ b/dbaccess/source/ui/control/sqledit.cxx @@ -40,7 +40,7 @@ #include "undosqledit.hxx" #include "QueryDesignView.hxx" -#include <svtools/smplhint.hxx> +#include <svl/smplhint.hxx> ////////////////////////////////////////////////////////////////////////// // OSqlEdit @@ -68,7 +68,7 @@ OSqlEdit::OSqlEdit( OQueryTextView* pParent, WinBits nWinStyle ) : ImplSetFont(); // listen for change of Font and Color Settings m_SourceViewConfig.AddListener( this ); - StartListening(m_ColorConfig); + m_ColorConfig.AddListener(this); //#i97044# EnableFocusSelectionHide( FALSE ); @@ -81,7 +81,7 @@ OSqlEdit::~OSqlEdit() if (m_timerUndoActionCreation.IsActive()) m_timerUndoActionCreation.Stop(); m_SourceViewConfig.RemoveListener(this); - EndListening(m_ColorConfig); + m_ColorConfig.RemoveListener(this); } //------------------------------------------------------------------------------ void OSqlEdit::KeyInput( const KeyEvent& rKEvt ) @@ -196,16 +196,12 @@ void OSqlEdit::startTimer() m_timerInvalidate.Start(); } -void OSqlEdit::Notify( SfxBroadcaster& rBC, const SfxHint& /*rHint*/ ) -{ - if (&rBC == &m_ColorConfig) - MultiLineEditSyntaxHighlight::UpdateData(); -} - -void OSqlEdit::ConfigurationChanged( utl::ConfigurationBroadcaster* pOption ) +void OSqlEdit::ConfigurationChanged( utl::ConfigurationBroadcaster* pOption, sal_uInt32 ) { if ( pOption == &m_SourceViewConfig ) ImplSetFont(); + else if ( pOption == &m_ColorConfig ) + MultiLineEditSyntaxHighlight::UpdateData(); } void OSqlEdit::ImplSetFont() diff --git a/dbaccess/source/ui/dlg/ConnectionHelper.cxx b/dbaccess/source/ui/dlg/ConnectionHelper.cxx index db8d2d4553d9..bae7abb63fc8 100644 --- a/dbaccess/source/ui/dlg/ConnectionHelper.cxx +++ b/dbaccess/source/ui/dlg/ConnectionHelper.cxx @@ -45,7 +45,7 @@ #include "dbu_misc.hrc" #endif #ifndef _SFXITEMSET_HXX -#include <svtools/itemset.hxx> +#include <svl/itemset.hxx> #endif #ifndef INCLUDED_SVTOOLS_MODULEOPTIONS_HXX #include <unotools/moduleoptions.hxx> @@ -57,13 +57,13 @@ #include <unotools/pathoptions.hxx> #endif #ifndef _SFXSTRITEM_HXX -#include <svtools/stritem.hxx> +#include <svl/stritem.hxx> #endif #ifndef _SFXENUMITEM_HXX -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> #endif #ifndef _SFXINTITEM_HXX -#include <svtools/intitem.hxx> +#include <svl/intitem.hxx> #endif #ifndef _DBAUI_DATASOURCEITEMS_HXX_ #include "dsitems.hxx" @@ -102,7 +102,7 @@ #include "dsselect.hxx" #endif #ifndef SVTOOLS_FILENOTATION_HXX_ -#include <svtools/filenotation.hxx> +#include <svl/filenotation.hxx> #endif #ifndef DBACCESS_SHARED_DBUSTRINGS_HRC #include "dbustrings.hrc" diff --git a/dbaccess/source/ui/dlg/ConnectionPage.cxx b/dbaccess/source/ui/dlg/ConnectionPage.cxx index dc714d6f751e..4bd644cc835b 100644 --- a/dbaccess/source/ui/dlg/ConnectionPage.cxx +++ b/dbaccess/source/ui/dlg/ConnectionPage.cxx @@ -44,19 +44,19 @@ #include "dsmeta.hxx" #endif #ifndef _SFXITEMSET_HXX -#include <svtools/itemset.hxx> +#include <svl/itemset.hxx> #endif #ifndef INCLUDED_SVTOOLS_PATHOPTIONS_HXX #include <unotools/pathoptions.hxx> #endif #ifndef _SFXSTRITEM_HXX -#include <svtools/stritem.hxx> +#include <svl/stritem.hxx> #endif #ifndef _SFXENUMITEM_HXX -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> #endif #ifndef _SFXINTITEM_HXX -#include <svtools/intitem.hxx> +#include <svl/intitem.hxx> #endif #ifndef INCLUDED_SVTOOLS_MODULEOPTIONS_HXX #include <unotools/moduleoptions.hxx> @@ -98,7 +98,7 @@ #include "dsselect.hxx" #endif #ifndef SVTOOLS_FILENOTATION_HXX_ -#include <svtools/filenotation.hxx> +#include <svl/filenotation.hxx> #endif #ifndef DBACCESS_SHARED_DBUSTRINGS_HRC #include "dbustrings.hrc" diff --git a/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx b/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx index 21b131c4a666..867d5a7fed50 100644 --- a/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx +++ b/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx @@ -44,19 +44,19 @@ #include "dbu_dlg.hrc" #endif #ifndef _SFXITEMSET_HXX -#include <svtools/itemset.hxx> +#include <svl/itemset.hxx> #endif #ifndef INCLUDED_SVTOOLS_PATHOPTIONS_HXX #include <unotools/pathoptions.hxx> #endif #ifndef _SFXSTRITEM_HXX -#include <svtools/stritem.hxx> +#include <svl/stritem.hxx> #endif #ifndef _SFXENUMITEM_HXX -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> #endif #ifndef _SFXINTITEM_HXX -#include <svtools/intitem.hxx> +#include <svl/intitem.hxx> #endif #ifndef _DBAUI_DATASOURCEITEMS_HXX_ #include "dsitems.hxx" @@ -98,7 +98,7 @@ #include "dsselect.hxx" #endif #ifndef SVTOOLS_FILENOTATION_HXX_ -#include <svtools/filenotation.hxx> +#include <svl/filenotation.hxx> #endif #ifndef DBACCESS_SHARED_DBUSTRINGS_HRC #include "dbustrings.hrc" diff --git a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx index 0d380585200d..ae80f8a337f9 100644 --- a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx +++ b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx @@ -46,16 +46,16 @@ #include "dbadminsetup.hrc" #endif #ifndef _SFXITEMSET_HXX -#include <svtools/itemset.hxx> +#include <svl/itemset.hxx> #endif #ifndef _SFXSTRITEM_HXX -#include <svtools/stritem.hxx> +#include <svl/stritem.hxx> #endif #ifndef _SFXENUMITEM_HXX -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> #endif #ifndef _SFXINTITEM_HXX -#include <svtools/intitem.hxx> +#include <svl/intitem.hxx> #endif #ifndef _DBAUI_DATASOURCEITEMS_HXX_ #include "dsitems.hxx" @@ -74,7 +74,7 @@ #include <vcl/mnemonic.hxx> #endif #ifndef _SVTOOLS_CJKOPTIONS_HXX -#include <svtools/cjkoptions.hxx> +#include <svl/cjkoptions.hxx> #endif #include <jvmaccess/virtualmachine.hxx> #ifndef _CONNECTIVITY_COMMONTOOLS_HXX_ @@ -100,7 +100,7 @@ #include <com/sun/star/sdbc/XDriverAccess.hpp> #include "dbustrings.hrc" #ifndef SVTOOLS_FILENOTATION_HXX_ -#include <svtools/filenotation.hxx> +#include <svl/filenotation.hxx> #endif #include <unotools/localfilehelper.hxx> diff --git a/dbaccess/source/ui/dlg/DbAdminImpl.cxx b/dbaccess/source/ui/dlg/DbAdminImpl.cxx index 28a9b83fca35..30f67e7fb5b1 100644 --- a/dbaccess/source/ui/dlg/DbAdminImpl.cxx +++ b/dbaccess/source/ui/dlg/DbAdminImpl.cxx @@ -35,19 +35,19 @@ #include "dsmeta.hxx" #ifndef _SFXPOOLITEM_HXX -#include <svtools/poolitem.hxx> +#include <svl/poolitem.hxx> #endif #ifndef _SFXITEMPOOL_HXX -#include <svtools/itempool.hxx> +#include <svl/itempool.hxx> #endif #ifndef _SFXSTRITEM_HXX -#include <svtools/stritem.hxx> +#include <svl/stritem.hxx> #endif #ifndef _SFXINTITEM_HXX -#include <svtools/intitem.hxx> +#include <svl/intitem.hxx> #endif #ifndef _SFXENUMITEM_HXX -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> #endif #ifndef _COMPHELPER_PROPERTY_HXX_ #include <comphelper/property.hxx> diff --git a/dbaccess/source/ui/dlg/DbAdminImpl.hxx b/dbaccess/source/ui/dlg/DbAdminImpl.hxx index a194ebc7b23c..9794e6e21bfb 100644 --- a/dbaccess/source/ui/dlg/DbAdminImpl.hxx +++ b/dbaccess/source/ui/dlg/DbAdminImpl.hxx @@ -59,12 +59,12 @@ #include "dsntypes.hxx" #endif #ifndef _SFXITEMSET_HXX -#include <svtools/itemset.hxx> +#include <svl/itemset.hxx> #endif #ifndef _COM_SUN_STAR_FRAME_XMODEL_HPP_ #include <com/sun/star/frame/XModel.hpp> #endif -#include <svtools/poolitem.hxx> +#include <svl/poolitem.hxx> class Window; //......................................................................... diff --git a/dbaccess/source/ui/dlg/DriverSettings.hxx b/dbaccess/source/ui/dlg/DriverSettings.hxx index 154013a11bda..015ded56a042 100644 --- a/dbaccess/source/ui/dlg/DriverSettings.hxx +++ b/dbaccess/source/ui/dlg/DriverSettings.hxx @@ -33,7 +33,7 @@ #ifndef _DBAUI_DSNTYPES_HXX_ #include "dsntypes.hxx" #endif -#include <svtools/poolitem.hxx> +#include <svl/poolitem.hxx> #include <vector> class SfxTabPage; diff --git a/dbaccess/source/ui/dlg/ExtensionNotPresent.cxx b/dbaccess/source/ui/dlg/ExtensionNotPresent.cxx index f9bd1e007341..33f65f50cb39 100644 --- a/dbaccess/source/ui/dlg/ExtensionNotPresent.cxx +++ b/dbaccess/source/ui/dlg/ExtensionNotPresent.cxx @@ -44,7 +44,7 @@ /** === end UNO includes === **/ #include <connectivity/dbconversion.hxx> -#include <svtools/syslocale.hxx> +#include <unotools/syslocale.hxx> #include <svx/globlmn.hrc> #include <svx/svxids.hrc> #include <tools/debug.hxx> diff --git a/dbaccess/source/ui/dlg/TextConnectionHelper.cxx b/dbaccess/source/ui/dlg/TextConnectionHelper.cxx index 89467a81ae38..ca73fabfe8ac 100644 --- a/dbaccess/source/ui/dlg/TextConnectionHelper.cxx +++ b/dbaccess/source/ui/dlg/TextConnectionHelper.cxx @@ -51,16 +51,16 @@ #endif #ifndef _SFXITEMSET_HXX -#include <svtools/itemset.hxx> +#include <svl/itemset.hxx> #endif #ifndef _SFXSTRITEM_HXX -#include <svtools/stritem.hxx> +#include <svl/stritem.hxx> #endif #ifndef _SFXENUMITEM_HXX -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> #endif #ifndef _SFXINTITEM_HXX -#include <svtools/intitem.hxx> +#include <svl/intitem.hxx> #endif #ifndef _DBAUI_DATASOURCEITEMS_HXX_ #include "dsitems.hxx" @@ -81,7 +81,7 @@ #include <vcl/mnemonic.hxx> #endif #ifndef _SVTOOLS_CJKOPTIONS_HXX -#include <svtools/cjkoptions.hxx> +#include <svl/cjkoptions.hxx> #endif #include <jvmaccess/virtualmachine.hxx> #ifndef _DBAUI_ADASTAT_HXX_ @@ -109,7 +109,7 @@ #endif #ifndef SVTOOLS_FILENOTATION_HXX_ -#include <svtools/filenotation.hxx> +#include <svl/filenotation.hxx> #endif #ifndef _UNOTOOLS_LOCALFILEHELPER_HXX diff --git a/dbaccess/source/ui/dlg/UserAdminDlg.cxx b/dbaccess/source/ui/dlg/UserAdminDlg.cxx index 204a57dc8758..0697124b69da 100644 --- a/dbaccess/source/ui/dlg/UserAdminDlg.cxx +++ b/dbaccess/source/ui/dlg/UserAdminDlg.cxx @@ -45,9 +45,9 @@ #include <comphelper/componentcontext.hxx> #include <connectivity/dbmetadata.hxx> #include <cppuhelper/exc_hlp.hxx> -#include <svtools/eitem.hxx> -#include <svtools/intitem.hxx> -#include <svtools/stritem.hxx> +#include <svl/eitem.hxx> +#include <svl/intitem.hxx> +#include <svl/stritem.hxx> #include <tools/diagnose_ex.h> #include <vcl/msgbox.hxx> #include <vcl/stdtext.hxx> diff --git a/dbaccess/source/ui/dlg/admincontrols.cxx b/dbaccess/source/ui/dlg/admincontrols.cxx index 8af119b127b0..5139b1e77895 100644 --- a/dbaccess/source/ui/dlg/admincontrols.cxx +++ b/dbaccess/source/ui/dlg/admincontrols.cxx @@ -32,9 +32,9 @@ #include "dsitems.hxx" #include "moduledbu.hxx" -#include <svtools/eitem.hxx> -#include <svtools/stritem.hxx> -#include <svtools/intitem.hxx> +#include <svl/eitem.hxx> +#include <svl/stritem.hxx> +#include <svl/intitem.hxx> //........................................................................ namespace dbaui diff --git a/dbaccess/source/ui/dlg/adminpages.cxx b/dbaccess/source/ui/dlg/adminpages.cxx index c67d34311147..b55e271a0988 100644 --- a/dbaccess/source/ui/dlg/adminpages.cxx +++ b/dbaccess/source/ui/dlg/adminpages.cxx @@ -41,13 +41,13 @@ #include "dbu_dlg.hrc" #endif #ifndef _SFXSTRITEM_HXX -#include <svtools/stritem.hxx> +#include <svl/stritem.hxx> #endif #ifndef _SFXENUMITEM_HXX -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> #endif #ifndef _SFXINTITEM_HXX -#include <svtools/intitem.hxx> +#include <svl/intitem.hxx> #endif #ifndef _DBAUI_DATASOURCEITEMS_HXX_ #include "dsitems.hxx" diff --git a/dbaccess/source/ui/dlg/advancedsettings.cxx b/dbaccess/source/ui/dlg/advancedsettings.cxx index 7f0b5ee16515..1540b562f9af 100644 --- a/dbaccess/source/ui/dlg/advancedsettings.cxx +++ b/dbaccess/source/ui/dlg/advancedsettings.cxx @@ -47,9 +47,9 @@ /** === begin UNO includes === **/ /** === end UNO includes === **/ -#include <svtools/eitem.hxx> -#include <svtools/intitem.hxx> -#include <svtools/stritem.hxx> +#include <svl/eitem.hxx> +#include <svl/intitem.hxx> +#include <svl/stritem.hxx> #include <vcl/msgbox.hxx> diff --git a/dbaccess/source/ui/dlg/dbadmin.cxx b/dbaccess/source/ui/dlg/dbadmin.cxx index 7aa91ef8ce2c..99decdadb5f3 100644 --- a/dbaccess/source/ui/dlg/dbadmin.cxx +++ b/dbaccess/source/ui/dlg/dbadmin.cxx @@ -45,13 +45,13 @@ #include "dsitems.hxx" #endif #ifndef _SFXSTRITEM_HXX -#include <svtools/stritem.hxx> +#include <svl/stritem.hxx> #endif #ifndef _SFXENUMITEM_HXX -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> #endif #ifndef _SFXINTITEM_HXX -#include <svtools/intitem.hxx> +#include <svl/intitem.hxx> #endif #ifndef _SV_MSGBOX_HXX #include <vcl/msgbox.hxx> diff --git a/dbaccess/source/ui/dlg/dbfindex.cxx b/dbaccess/source/ui/dlg/dbfindex.cxx index 12ee457f41ef..0dde529246bb 100644 --- a/dbaccess/source/ui/dlg/dbfindex.cxx +++ b/dbaccess/source/ui/dlg/dbfindex.cxx @@ -66,7 +66,7 @@ #include <ucbhelper/content.hxx> #endif #ifndef SVTOOLS_FILENOTATION_HXX_ -#include <svtools/filenotation.hxx> +#include <svl/filenotation.hxx> #endif diff --git a/dbaccess/source/ui/dlg/dbwiz.cxx b/dbaccess/source/ui/dlg/dbwiz.cxx index c0b460cbb329..8c84ba0a03d4 100644 --- a/dbaccess/source/ui/dlg/dbwiz.cxx +++ b/dbaccess/source/ui/dlg/dbwiz.cxx @@ -45,13 +45,13 @@ #endif #include "dsnItem.hxx" #ifndef _SFXSTRITEM_HXX -#include <svtools/stritem.hxx> +#include <svl/stritem.hxx> #endif #ifndef _SFXENUMITEM_HXX -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> #endif #ifndef _SFXINTITEM_HXX -#include <svtools/intitem.hxx> +#include <svl/intitem.hxx> #endif #ifndef _SV_MSGBOX_HXX #include <vcl/msgbox.hxx> diff --git a/dbaccess/source/ui/dlg/dbwizsetup.cxx b/dbaccess/source/ui/dlg/dbwizsetup.cxx index 3b86f2aef3db..149d0c2d2f7a 100644 --- a/dbaccess/source/ui/dlg/dbwizsetup.cxx +++ b/dbaccess/source/ui/dlg/dbwizsetup.cxx @@ -43,13 +43,13 @@ #include <unotools/pathoptions.hxx> #endif #ifndef _SFXSTRITEM_HXX -#include <svtools/stritem.hxx> +#include <svl/stritem.hxx> #endif #ifndef _SFXENUMITEM_HXX -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> #endif #ifndef _SFXINTITEM_HXX -#include <svtools/intitem.hxx> +#include <svl/intitem.hxx> #endif #ifndef _SV_MSGBOX_HXX #include <vcl/msgbox.hxx> @@ -169,7 +169,7 @@ /** === end UNO includes === **/ -#include <svtools/filenotation.hxx> +#include <svl/filenotation.hxx> #include <comphelper/interaction.hxx> #include <comphelper/namedvaluecollection.hxx> #include <comphelper/sequenceashashmap.hxx> diff --git a/dbaccess/source/ui/dlg/detailpages.cxx b/dbaccess/source/ui/dlg/detailpages.cxx index 69b91b2456a9..c6af345de4f8 100644 --- a/dbaccess/source/ui/dlg/detailpages.cxx +++ b/dbaccess/source/ui/dlg/detailpages.cxx @@ -46,16 +46,16 @@ #include "dbadmin.hrc" #ifndef _SFXITEMSET_HXX -#include <svtools/itemset.hxx> +#include <svl/itemset.hxx> #endif #ifndef _SFXSTRITEM_HXX -#include <svtools/stritem.hxx> +#include <svl/stritem.hxx> #endif #ifndef _SFXENUMITEM_HXX -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> #endif #ifndef _SFXINTITEM_HXX -#include <svtools/intitem.hxx> +#include <svl/intitem.hxx> #endif #ifndef _SV_MSGBOX_HXX #include <vcl/msgbox.hxx> @@ -64,7 +64,7 @@ #include <vcl/mnemonic.hxx> #endif #ifndef _SVTOOLS_CJKOPTIONS_HXX -#include <svtools/cjkoptions.hxx> +#include <svl/cjkoptions.hxx> #endif #include <jvmaccess/virtualmachine.hxx> #ifndef DBAUI_ADABASPAGE_HRC diff --git a/dbaccess/source/ui/dlg/dlgattr.cxx b/dbaccess/source/ui/dlg/dlgattr.cxx index b6f18fc77c45..c24ca75efc4e 100644 --- a/dbaccess/source/ui/dlg/dlgattr.cxx +++ b/dbaccess/source/ui/dlg/dlgattr.cxx @@ -66,16 +66,16 @@ #include "dbu_dlg.hrc" #endif #ifndef _SFXITEMSET_HXX -#include <svtools/itemset.hxx> +#include <svl/itemset.hxx> #endif #define _ZFORLIST_DECLARE_TABLE #ifndef _ZFORLIST_HXX -#include <svtools/zforlist.hxx> +#include <svl/zforlist.hxx> #endif #include <svx/svxids.hrc> //CHINA001 #include <svx/flagsdef.hxx> //CHINA001 #ifndef _SFXINTITEM_HXX //CHINA001 -#include <svtools/intitem.hxx> //CHINA001 +#include <svl/intitem.hxx> //CHINA001 #endif //CHINA001 #ifndef _DBAUI_MODULE_DBU_HXX_ #include "moduledbu.hxx" diff --git a/dbaccess/source/ui/dlg/dsnItem.hxx b/dbaccess/source/ui/dlg/dsnItem.hxx index fce1df04b3bc..a1b002190f2f 100644 --- a/dbaccess/source/ui/dlg/dsnItem.hxx +++ b/dbaccess/source/ui/dlg/dsnItem.hxx @@ -32,7 +32,7 @@ #ifndef _DBAUI_DSNITEM_HXX_ #define _DBAUI_DSNITEM_HXX_ -#include <svtools/poolitem.hxx> +#include <svl/poolitem.hxx> //......................................................................... namespace dbaccess diff --git a/dbaccess/source/ui/dlg/dsselect.cxx b/dbaccess/source/ui/dlg/dsselect.cxx index e21417ffdb0c..a15924e2fccd 100644 --- a/dbaccess/source/ui/dlg/dsselect.cxx +++ b/dbaccess/source/ui/dlg/dsselect.cxx @@ -84,16 +84,16 @@ #include "dsitems.hxx" #endif #ifndef _SFXSTRITEM_HXX -#include <svtools/stritem.hxx> +#include <svl/stritem.hxx> #endif #ifndef _SFXINTITEM_HXX -#include <svtools/intitem.hxx> +#include <svl/intitem.hxx> #endif #ifndef _SFXENUMITEM_HXX -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> #endif #ifndef _SFXITEMSET_HXX -#include <svtools/itemset.hxx> +#include <svl/itemset.hxx> #endif //......................................................................... diff --git a/dbaccess/source/ui/dlg/generalpage.cxx b/dbaccess/source/ui/dlg/generalpage.cxx index 4ee69888124a..da43d83d50a6 100644 --- a/dbaccess/source/ui/dlg/generalpage.cxx +++ b/dbaccess/source/ui/dlg/generalpage.cxx @@ -44,7 +44,7 @@ #include <vcl/stdtext.hxx> #include "localresaccess.hxx" #include <vcl/msgbox.hxx> -#include <svtools/stritem.hxx> +#include <svl/stritem.hxx> #include <vcl/waitobj.hxx> #include <com/sun/star/sdbc/XDriverAccess.hpp> #include <com/sun/star/beans/PropertyValue.hpp> diff --git a/dbaccess/source/ui/dlg/paramdialog.cxx b/dbaccess/source/ui/dlg/paramdialog.cxx index 9ebdb683e4a4..1b94bff730d5 100644 --- a/dbaccess/source/ui/dlg/paramdialog.cxx +++ b/dbaccess/source/ui/dlg/paramdialog.cxx @@ -72,7 +72,7 @@ #include "localresaccess.hxx" #endif #ifndef INCLUDED_SVTOOLS_SYSLOCALE_HXX -#include <svtools/syslocale.hxx> +#include <unotools/syslocale.hxx> #endif #define EF_VISITED 0x0001 diff --git a/dbaccess/source/ui/dlg/tablespage.cxx b/dbaccess/source/ui/dlg/tablespage.cxx index bbcd265c5f34..4625448be9fa 100644 --- a/dbaccess/source/ui/dlg/tablespage.cxx +++ b/dbaccess/source/ui/dlg/tablespage.cxx @@ -62,10 +62,10 @@ #include "stringlistitem.hxx" #endif #ifndef _SFXENUMITEM_HXX -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> #endif #ifndef _SFXSTRITEM_HXX -#include <svtools/stritem.hxx> +#include <svl/stritem.hxx> #endif #ifndef DBACCESS_SHARED_DBUSTRINGS_HRC #include "dbustrings.hrc" diff --git a/dbaccess/source/ui/inc/GeneralUndo.hxx b/dbaccess/source/ui/inc/GeneralUndo.hxx index 956709c00a23..91e128342161 100644 --- a/dbaccess/source/ui/inc/GeneralUndo.hxx +++ b/dbaccess/source/ui/inc/GeneralUndo.hxx @@ -31,7 +31,7 @@ #define DBAUI_GENERALUNDO_HXX #ifndef _UNDO_HXX -#include <svtools/undo.hxx> +#include <svl/undo.hxx> #endif #ifndef _DBAUI_MODULE_DBU_HXX_ #include "moduledbu.hxx" diff --git a/dbaccess/source/ui/inc/brwctrlr.hxx b/dbaccess/source/ui/inc/brwctrlr.hxx index 1e796fbed624..d94f76b8dcc9 100644 --- a/dbaccess/source/ui/inc/brwctrlr.hxx +++ b/dbaccess/source/ui/inc/brwctrlr.hxx @@ -56,7 +56,7 @@ #include <svtools/transfer.hxx> #include <osl/mutex.hxx> #include <vos/thread.hxx> -#include <svtools/cancel.hxx> +#include <svl/cancel.hxx> #include <cppuhelper/implbase9.hxx> #include <svtools/cliplistener.hxx> diff --git a/dbaccess/source/ui/inc/dbu_resource.hrc b/dbaccess/source/ui/inc/dbu_resource.hrc index 4686b540e936..e537f51df6bb 100644 --- a/dbaccess/source/ui/inc/dbu_resource.hrc +++ b/dbaccess/source/ui/inc/dbu_resource.hrc @@ -32,7 +32,7 @@ #define _DBU_RESOURCE_HRC_ #ifndef _SOLAR_HRC -#include <svtools/solar.hrc> +#include <svl/solar.hrc> #endif #define RID_DIALOG_START RID_DBACCESS_START diff --git a/dbaccess/source/ui/inc/propertysetitem.hxx b/dbaccess/source/ui/inc/propertysetitem.hxx index 7d104fcce714..70defabbb2e2 100644 --- a/dbaccess/source/ui/inc/propertysetitem.hxx +++ b/dbaccess/source/ui/inc/propertysetitem.hxx @@ -32,7 +32,7 @@ #define _DBAUI_PROPERTYSETITEM_HXX_ #ifndef _SFXPOOLITEM_HXX -#include <svtools/poolitem.hxx> +#include <svl/poolitem.hxx> #endif #ifndef _COM_SUN_STAR_BEANS_XPROPERTYSET_HPP_ #include <com/sun/star/beans/XPropertySet.hpp> diff --git a/dbaccess/source/ui/inc/querycontroller.hxx b/dbaccess/source/ui/inc/querycontroller.hxx index 70be5b60407a..6db721095c15 100644 --- a/dbaccess/source/ui/inc/querycontroller.hxx +++ b/dbaccess/source/ui/inc/querycontroller.hxx @@ -54,7 +54,7 @@ #include <connectivity/sqliterator.hxx> #include <connectivity/sqlnode.hxx> #include <connectivity/sqlparse.hxx> -#include <svtools/undo.hxx> +#include <svl/undo.hxx> class VCLXWindow; namespace dbaui diff --git a/dbaccess/source/ui/inc/sqledit.hxx b/dbaccess/source/ui/inc/sqledit.hxx index 603421e52d64..57bb75a0b927 100644 --- a/dbaccess/source/ui/inc/sqledit.hxx +++ b/dbaccess/source/ui/inc/sqledit.hxx @@ -31,14 +31,14 @@ #define DBAUI_SQLEDIT_HXX #include <svtools/editsyntaxhighlighter.hxx> -#include <svtools/lstner.hxx> +#include <svl/lstner.hxx> #include <svtools/colorcfg.hxx> #include <unotools/sourceviewconfig.hxx> namespace dbaui { class OQueryTextView; - class OSqlEdit : public MultiLineEditSyntaxHighlight, SfxListener, utl::ConfigurationListener + class OSqlEdit : public MultiLineEditSyntaxHighlight, utl::ConfigurationListener { private: Timer m_timerInvalidate; @@ -82,8 +82,7 @@ namespace dbaui void stopTimer(); void startTimer(); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); - virtual void ConfigurationChanged( utl::ConfigurationBroadcaster* ); + virtual void ConfigurationChanged( utl::ConfigurationBroadcaster*, sal_uInt32 ); using MultiLineEditSyntaxHighlight::Notify; }; } diff --git a/dbaccess/source/ui/inc/stringlistitem.hxx b/dbaccess/source/ui/inc/stringlistitem.hxx index 09a4792ceb63..3f27dc797e15 100644 --- a/dbaccess/source/ui/inc/stringlistitem.hxx +++ b/dbaccess/source/ui/inc/stringlistitem.hxx @@ -32,7 +32,7 @@ #define _DBAUI_STRINGLISTITEM_HXX_ #ifndef _SFXPOOLITEM_HXX -#include <svtools/poolitem.hxx> +#include <svl/poolitem.hxx> #endif #ifndef _COM_SUN_STAR_UNO_SEQUENCE_HXX_ diff --git a/dbaccess/source/ui/misc/DExport.cxx b/dbaccess/source/ui/misc/DExport.cxx index f533c719160e..6c750f40ee61 100644 --- a/dbaccess/source/ui/misc/DExport.cxx +++ b/dbaccess/source/ui/misc/DExport.cxx @@ -50,7 +50,7 @@ #include "dbu_misc.hrc" #include <connectivity/dbconversion.hxx> #include <sfx2/sfxhtml.hxx> -#include <svtools/numuno.hxx> +#include <svl/numuno.hxx> #include <connectivity/dbtools.hxx> #include <comphelper/extract.hxx> #include "TypeInfo.hxx" @@ -65,8 +65,8 @@ #include "WCopyTable.hxx" #include "WExtendPages.hxx" #include "WCPage.hxx" -#include <svtools/syslocale.hxx> -#include <svtools/zforlist.hxx> +#include <unotools/syslocale.hxx> +#include <svl/zforlist.hxx> #include <connectivity/dbexception.hxx> #include <connectivity/FValue.hxx> #include <com/sun/star/sdbc/SQLWarning.hpp> diff --git a/dbaccess/source/ui/misc/HtmlReader.cxx b/dbaccess/source/ui/misc/HtmlReader.cxx index b95423b77c24..4c9fb3ded1bb 100644 --- a/dbaccess/source/ui/misc/HtmlReader.cxx +++ b/dbaccess/source/ui/misc/HtmlReader.cxx @@ -63,7 +63,7 @@ #include "QEnumTypes.hxx" #include "WCPage.hxx" #include <tools/inetmime.hxx> -#include <svtools/inettype.hxx> +#include <svl/inettype.hxx> #include <rtl/tencinfo.h> #include "UITools.hxx" #include <vcl/svapp.hxx> diff --git a/dbaccess/source/ui/misc/TokenWriter.cxx b/dbaccess/source/ui/misc/TokenWriter.cxx index 02765c333c21..d872590b3763 100644 --- a/dbaccess/source/ui/misc/TokenWriter.cxx +++ b/dbaccess/source/ui/misc/TokenWriter.cxx @@ -55,7 +55,7 @@ #include <tools/color.hxx> #include <svtools/htmlout.hxx> #include <sfx2/frmhtmlw.hxx> -#include <svtools/numuno.hxx> +#include <svl/numuno.hxx> #include <vcl/svapp.hxx> #include "UITools.hxx" #include <toolkit/helper/vclunohelper.hxx> @@ -63,7 +63,7 @@ #include <svtools/rtfout.hxx> #include <svx/htmlcfg.hxx> #include <connectivity/formattedcolumnvalue.hxx> -#include <svtools/syslocale.hxx> +#include <unotools/syslocale.hxx> #include <comphelper/componentcontext.hxx> #include <rtl/logfile.hxx> diff --git a/dbaccess/source/ui/misc/UITools.cxx b/dbaccess/source/ui/misc/UITools.cxx index e876ef731023..6306f9bce622 100644 --- a/dbaccess/source/ui/misc/UITools.cxx +++ b/dbaccess/source/ui/misc/UITools.cxx @@ -198,7 +198,7 @@ #define ITEMID_NUMBERINFO SID_ATTR_NUMBERFORMAT_INFO #ifndef _SFXITEMPOOL_HXX -#include <svtools/itempool.hxx> +#include <svl/itempool.hxx> #endif #ifndef _STRING_HXX #include <tools/string.hxx> @@ -207,16 +207,16 @@ #include "dbaccess_helpid.hrc" #endif #ifndef _SFXITEMSET_HXX //autogen wg. SfxItemSet -#include <svtools/itemset.hxx> +#include <svl/itemset.hxx> #endif #ifndef DBACCESS_SBA_GRID_HRC #include "sbagrid.hrc" #endif #ifndef _SFXRNGITEM_HXX -#include <svtools/rngitem.hxx> +#include <svl/rngitem.hxx> #endif #ifndef _SFXINTITEM_HXX -#include <svtools/intitem.hxx> +#include <svl/intitem.hxx> #endif #ifndef _SVX_ALGITEM_HXX #include <svx/algitem.hxx> @@ -229,7 +229,7 @@ #include <svx/numinf.hxx> #endif #ifndef _ZFORLIST_HXX -#include <svtools/zforlist.hxx> +#include <svl/zforlist.hxx> #endif #ifndef DBAUI_SBATTRDLG_HXX #include "dlgattr.hxx" @@ -283,13 +283,13 @@ #include <tools/diagnose_ex.h> #endif #ifndef _NUMUNO_HXX -#include <svtools/numuno.hxx> +#include <svl/numuno.hxx> #endif #ifndef INCLUDED_SVTOOLS_PATHOPTIONS_HXX #include <unotools/pathoptions.hxx> #endif #ifndef SVTOOLS_FILENOTATION_HXX_ -#include <svtools/filenotation.hxx> +#include <svl/filenotation.hxx> #endif #ifndef _SVT_FILEVIEW_HXX #include <svtools/fileview.hxx> diff --git a/dbaccess/source/ui/misc/datasourceconnector.cxx b/dbaccess/source/ui/misc/datasourceconnector.cxx index 470ab5f08ba3..409e86150843 100644 --- a/dbaccess/source/ui/misc/datasourceconnector.cxx +++ b/dbaccess/source/ui/misc/datasourceconnector.cxx @@ -86,7 +86,7 @@ #include <vcl/button.hxx> #endif #ifndef SVTOOLS_FILENOTATION_HXX -#include <svtools/filenotation.hxx> +#include <svl/filenotation.hxx> #endif #ifndef TOOLS_DIAGNOSE_EX_H #include <tools/diagnose_ex.h> diff --git a/dbaccess/source/ui/misc/linkeddocuments.cxx b/dbaccess/source/ui/misc/linkeddocuments.cxx index 69ec1dcf4975..1a3a724fb157 100644 --- a/dbaccess/source/ui/misc/linkeddocuments.cxx +++ b/dbaccess/source/ui/misc/linkeddocuments.cxx @@ -92,7 +92,7 @@ #include "dbu_misc.hrc" #endif #ifndef SVTOOLS_FILENOTATION_HXX_ -#include <svtools/filenotation.hxx> +#include <svl/filenotation.hxx> #endif #ifndef DBACCESS_UI_BROWSER_ID_HXX #include "browserids.hxx" diff --git a/dbaccess/source/ui/misc/moduledbu.cxx b/dbaccess/source/ui/misc/moduledbu.cxx index 69845372114f..6d3cae9fc6ed 100644 --- a/dbaccess/source/ui/misc/moduledbu.cxx +++ b/dbaccess/source/ui/misc/moduledbu.cxx @@ -39,7 +39,7 @@ #include <tools/resmgr.hxx> #endif #ifndef _SOLAR_HRC -#include <svtools/solar.hrc> +#include <svl/solar.hrc> #endif #ifndef _TOOLS_DEBUG_HXX #include <tools/debug.hxx> diff --git a/dbaccess/source/ui/misc/propertystorage.cxx b/dbaccess/source/ui/misc/propertystorage.cxx index 0ae5631b5803..26172eab9364 100644 --- a/dbaccess/source/ui/misc/propertystorage.cxx +++ b/dbaccess/source/ui/misc/propertystorage.cxx @@ -36,9 +36,9 @@ /** === begin UNO includes === **/ /** === end UNO includes === **/ -#include <svtools/itemset.hxx> -#include <svtools/stritem.hxx> -#include <svtools/eitem.hxx> +#include <svl/itemset.hxx> +#include <svl/stritem.hxx> +#include <svl/eitem.hxx> #include <memory> diff --git a/dbaccess/source/ui/querydesign/JoinDesignView.cxx b/dbaccess/source/ui/querydesign/JoinDesignView.cxx index bd0a593cfe89..11eb8e36f3ee 100644 --- a/dbaccess/source/ui/querydesign/JoinDesignView.cxx +++ b/dbaccess/source/ui/querydesign/JoinDesignView.cxx @@ -40,7 +40,7 @@ #include "JoinController.hxx" #endif #ifndef _UNDO_HXX -#include <svtools/undo.hxx> +#include <svl/undo.hxx> #endif #ifndef DBAUI_QYDLGTAB_HXX #include "adtabdlg.hxx" diff --git a/dbaccess/source/ui/querydesign/JoinTableView.cxx b/dbaccess/source/ui/querydesign/JoinTableView.cxx index 16f4990cb5b5..c240363c69e7 100644 --- a/dbaccess/source/ui/querydesign/JoinTableView.cxx +++ b/dbaccess/source/ui/querydesign/JoinTableView.cxx @@ -70,7 +70,7 @@ #include "browserids.hxx" #endif #ifndef _URLBMK_HXX -#include <svtools/urlbmk.hxx> +#include <svl/urlbmk.hxx> #endif #ifndef _COM_SUN_STAR_SDBC_XDATABASEMETADATA_HPP_ #include <com/sun/star/sdbc/XDatabaseMetaData.hpp> diff --git a/dbaccess/source/ui/querydesign/QueryDesignView.cxx b/dbaccess/source/ui/querydesign/QueryDesignView.cxx index e489a0c2a585..3020e49578df 100644 --- a/dbaccess/source/ui/querydesign/QueryDesignView.cxx +++ b/dbaccess/source/ui/querydesign/QueryDesignView.cxx @@ -49,7 +49,7 @@ #include <vcl/split.hxx> #endif #ifndef _UNDO_HXX -#include <svtools/undo.hxx> +#include <svl/undo.hxx> #endif #ifndef TOOLS_DIAGNOSE_EX_H #include <tools/diagnose_ex.h> @@ -133,7 +133,7 @@ #include "sqlmessage.hxx" #endif #ifndef INCLUDED_SVTOOLS_SYSLOCALE_HXX -#include <svtools/syslocale.hxx> +#include <unotools/syslocale.hxx> #endif using namespace ::dbaui; diff --git a/dbaccess/source/ui/relationdesign/RelationDesignView.cxx b/dbaccess/source/ui/relationdesign/RelationDesignView.cxx index f95ee9561946..207513489d47 100644 --- a/dbaccess/source/ui/relationdesign/RelationDesignView.cxx +++ b/dbaccess/source/ui/relationdesign/RelationDesignView.cxx @@ -40,7 +40,7 @@ #include "RelationController.hxx" #endif #ifndef _UNDO_HXX -#include <svtools/undo.hxx> +#include <svl/undo.hxx> #endif #ifndef _SV_SVAPP_HXX #include <vcl/svapp.hxx> diff --git a/dbaccess/source/ui/relationdesign/RelationTableView.cxx b/dbaccess/source/ui/relationdesign/RelationTableView.cxx index cfd70afc2b95..ca533d84062a 100644 --- a/dbaccess/source/ui/relationdesign/RelationTableView.cxx +++ b/dbaccess/source/ui/relationdesign/RelationTableView.cxx @@ -78,7 +78,7 @@ #include <connectivity/dbexception.hxx> #include "RTableWindow.hxx" #include "JAccess.hxx" -#include <svtools/undo.hxx> +#include <svl/undo.hxx> #include <com/sun/star/accessibility/AccessibleEventId.hpp> using namespace dbaui; diff --git a/dbaccess/source/ui/tabledesign/TableDesignView.cxx b/dbaccess/source/ui/tabledesign/TableDesignView.cxx index c1b6ddb9978c..27fac41c5bdf 100644 --- a/dbaccess/source/ui/tabledesign/TableDesignView.cxx +++ b/dbaccess/source/ui/tabledesign/TableDesignView.cxx @@ -64,7 +64,7 @@ #include <com/sun/star/datatransfer/clipboard/XClipboard.hpp> #endif #ifndef INCLUDED_SVTOOLS_SYSLOCALE_HXX -#include <svtools/syslocale.hxx> +#include <unotools/syslocale.hxx> #endif #ifndef DBAUI_TOOLS_HXX #include "UITools.hxx" 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 010d0139f83b..6255bcdf8433 100644 --- a/reportdesign/source/core/api/ReportComponent.cxx +++ b/reportdesign/source/core/api/ReportComponent.cxx @@ -44,7 +44,7 @@ #include <com/sun/star/style/ParagraphAdjust.hpp> #include <com/sun/star/i18n/ScriptType.hpp> #include <svx/unolingu.hxx> -#include <svtools/syslocale.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 1a9d6bfce757..754f97bf0b4a 100644 --- a/reportdesign/source/core/api/ReportDefinition.cxx +++ b/reportdesign/source/core/api/ReportDefinition.cxx @@ -110,7 +110,7 @@ #include "ImageControl.hxx" #include "Shape.hxx" #include "ReportHelperImpl.hxx" -#include <svtools/itempool.hxx> +#include <svl/itempool.hxx> #include <unotools/moduleoptions.hxx> #include <osl/thread.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/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/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/Navigator.cxx b/reportdesign/source/ui/dlg/Navigator.cxx index 98835f27359f..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> 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 683e4cb78a3d..1378056fe0e9 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 d4e0a720807a..806bd857fae3 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 2b1f18a5b94a..48d772bdc627 100644 --- a/reportdesign/source/ui/misc/UITools.cxx +++ b/reportdesign/source/ui/misc/UITools.cxx @@ -87,8 +87,8 @@ #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> diff --git a/reportdesign/source/ui/report/DesignView.cxx b/reportdesign/source/ui/report/DesignView.cxx index b70aefefb8ef..ef1730f13843 100644 --- a/reportdesign/source/ui/report/DesignView.cxx +++ b/reportdesign/source/ui/report/DesignView.cxx @@ -33,7 +33,7 @@ #include <tools/debug.hxx> #include "ReportController.hxx" #include <comphelper/types.hxx> -#include <svtools/syslocale.hxx> +#include <unotools/syslocale.hxx> #include <unotools/viewoptions.hxx> #include "RptDef.hxx" #include "UITools.hxx" diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx index 47561953d74d..3205f0a7ef8d 100644 --- a/reportdesign/source/ui/report/ReportController.cxx +++ b/reportdesign/source/ui/report/ReportController.cxx @@ -138,11 +138,11 @@ #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 <unotools/syslocale.hxx> #include <unotools/viewoptions.hxx> #include <vos/mutex.hxx> 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 2055f1ee5358..3c76b8e56f01 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 98dd0d2390a7..281a5650b681 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 d87f7464a140..99a2543bf222 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 aebf42bfaa00..5cc1ff689490 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); @@ -588,15 +588,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 ) |