diff options
Diffstat (limited to 'svx/source')
310 files changed, 636 insertions, 595 deletions
diff --git a/svx/source/accessibility/AccessibleEmptyEditSource.cxx b/svx/source/accessibility/AccessibleEmptyEditSource.cxx index 15da06a17054..8bfc618dfbd9 100644 --- a/svx/source/accessibility/AccessibleEmptyEditSource.cxx +++ b/svx/source/accessibility/AccessibleEmptyEditSource.cxx @@ -36,7 +36,7 @@ // Global header // //------------------------------------------------------------------------ -#include <svtools/itemset.hxx> +#include <svl/itemset.hxx> #include <svx/editdata.hxx> #include <svx/outliner.hxx> #include <svx/svdmodel.hxx> diff --git a/svx/source/accessibility/AccessibleEmptyEditSource.hxx b/svx/source/accessibility/AccessibleEmptyEditSource.hxx index d4675b9b76f7..d2b775321dfe 100644 --- a/svx/source/accessibility/AccessibleEmptyEditSource.hxx +++ b/svx/source/accessibility/AccessibleEmptyEditSource.hxx @@ -31,8 +31,8 @@ #ifndef _SVX_ACCESSIBLEEMPTYEDITSOURCE_HXX #define _SVX_ACCESSIBLEEMPTYEDITSOURCE_HXX -#include <svtools/brdcst.hxx> -#include <svtools/lstner.hxx> +#include <svl/brdcst.hxx> +#include <svl/lstner.hxx> #include <memory> #include <svx/unoedsrc.hxx> diff --git a/svx/source/accessibility/GraphCtlAccessibleContext.cxx b/svx/source/accessibility/GraphCtlAccessibleContext.cxx index 9423e6719a40..7a51543b23ec 100644 --- a/svx/source/accessibility/GraphCtlAccessibleContext.cxx +++ b/svx/source/accessibility/GraphCtlAccessibleContext.cxx @@ -44,7 +44,7 @@ #include <rtl/uuid.h> #include <tools/debug.hxx> #include <tools/gen.hxx> -#include <svtools/smplhint.hxx> +#include <svl/smplhint.hxx> #include <toolkit/helper/convert.hxx> #include <svtools/colorcfg.hxx> #include <comphelper/accessibleeventnotifier.hxx> diff --git a/svx/source/cui/SpellDialog.cxx b/svx/source/cui/SpellDialog.cxx index aea58ffc6bd9..45323a755491 100644 --- a/svx/source/cui/SpellDialog.cxx +++ b/svx/source/cui/SpellDialog.cxx @@ -48,7 +48,7 @@ #include <SpellAttrib.hxx> #include <sfx2/dispatch.hxx> #include <sfx2/bindings.hxx> -#include <svtools/undo.hxx> +#include <svl/undo.hxx> #include <unotools/lingucfg.hxx> #include <svtools/textdata.hxx> #include <svtools/filter.hxx> diff --git a/svx/source/cui/acccfg.cxx b/svx/source/cui/acccfg.cxx index e99fe145c09b..4ad86794f6e7 100644 --- a/svx/source/cui/acccfg.cxx +++ b/svx/source/cui/acccfg.cxx @@ -43,7 +43,7 @@ #include <sfx2/app.hxx> #include <sfx2/filedlghelper.hxx> #include <sfx2/minfitem.hxx> -#include <svtools/stritem.hxx> +#include <svl/stritem.hxx> #include "svx/dialogs.hrc" #include "acccfg.hrc" diff --git a/svx/source/cui/acccfg.hxx b/svx/source/cui/acccfg.hxx index 245cc81e89aa..40ce17a36b8c 100644 --- a/svx/source/cui/acccfg.hxx +++ b/svx/source/cui/acccfg.hxx @@ -60,7 +60,7 @@ #include <sfx2/basedlgs.hxx> #define _SVSTDARR_STRINGSDTOR -#include <svtools/svstdarr.hxx> +#include <svl/svstdarr.hxx> #include <sfx2/minarray.hxx> diff --git a/svx/source/cui/align.cxx b/svx/source/cui/align.cxx index e6e65efc31f2..77be577eae0a 100644 --- a/svx/source/cui/align.cxx +++ b/svx/source/cui/align.cxx @@ -52,12 +52,12 @@ #include <sfx2/app.hxx> #include <sfx2/module.hxx> #include <sfx2/itemconnect.hxx> -#include <svtools/cjkoptions.hxx> -#include <svtools/languageoptions.hxx> +#include <svl/cjkoptions.hxx> +#include <svl/languageoptions.hxx> #include <svtools/localresaccess.hxx> #include <svx/svxids.hrc> //CHINA001 #include "flagsdef.hxx" //CHINA001 -#include <svtools/intitem.hxx> //CHINA001 +#include <svl/intitem.hxx> //CHINA001 #include <sfx2/request.hxx> //CHINA001 namespace svx { diff --git a/svx/source/cui/autocdlg.cxx b/svx/source/cui/autocdlg.cxx index 330459b224f1..6f167ae66c64 100644 --- a/svx/source/cui/autocdlg.cxx +++ b/svx/source/cui/autocdlg.cxx @@ -37,13 +37,13 @@ #define _SVSTDARR_STRINGSISORTDTOR #define _SVSTDARR_STRINGSDTOR -#include <svtools/svstdarr.hxx> +#include <svl/svstdarr.hxx> #include <vcl/msgbox.hxx> #include <vcl/field.hxx> #include <vcl/keycodes.hxx> #include <sot/exchange.hxx> #include <svtools/transfer.hxx> -#include <svtools/syslocale.hxx> +#include <unotools/syslocale.hxx> #include <sfx2/objsh.hxx> #include <sfx2/viewsh.hxx> #include <unotools/charclass.hxx> @@ -56,8 +56,8 @@ #include <sfx2/module.hxx> #include <sfx2/request.hxx> #include <sfx2/sfxsids.hrc> -#include <svtools/eitem.hxx> -#include <svtools/languageoptions.hxx> +#include <svl/eitem.hxx> +#include <svl/languageoptions.hxx> #include <svx/SmartTagMgr.hxx> #include <com/sun/star/smarttags/XSmartTagRecognizer.hpp> #include <com/sun/star/smarttags/XSmartTagAction.hpp> diff --git a/svx/source/cui/backgrnd.cxx b/svx/source/cui/backgrnd.cxx index 1c9c364e0b43..baf94dbeaa79 100644 --- a/svx/source/cui/backgrnd.cxx +++ b/svx/source/cui/backgrnd.cxx @@ -37,13 +37,13 @@ // include --------------------------------------------------------------- #include <unotools/pathoptions.hxx> -#include <svtools/intitem.hxx> +#include <svl/intitem.hxx> #include <vcl/msgbox.hxx> #include <tools/urlobj.hxx> #include <sfx2/objsh.hxx> #include <sfx2/docfile.hxx> #include <svtools/wallitem.hxx> -#include <svtools/cntwall.hxx> +#include <svl/cntwall.hxx> #ifndef _CNTIDS_HRC #include <sfx2/cntids.hrc> #endif @@ -77,7 +77,7 @@ #endif #include <svx/svxids.hrc> //CHINA001 #include "flagsdef.hxx" //CHINA001 -#include <svtools/intitem.hxx> //CHINA001 +#include <svl/intitem.hxx> //CHINA001 #include <sfx2/request.hxx> //CHINA001 using namespace ::com::sun::star; // static ---------------------------------------------------------------- diff --git a/svx/source/cui/border.cxx b/svx/source/cui/border.cxx index b2ed7bc9ef02..06038c2a7903 100644 --- a/svx/source/cui/border.cxx +++ b/svx/source/cui/border.cxx @@ -60,7 +60,7 @@ #include <svx/svxids.hrc> //CHINA001 #include "flagsdef.hxx" //CHINA001 #include <sfx2/request.hxx> -#include <svtools/intitem.hxx> //CHINA001 +#include <svl/intitem.hxx> //CHINA001 #include <sfx2/itemconnect.hxx> #include "borderconn.hxx" diff --git a/svx/source/cui/cfg.cxx b/svx/source/cui/cfg.cxx index 346fb0bb5d1e..38360e537d1a 100644 --- a/svx/source/cui/cfg.cxx +++ b/svx/source/cui/cfg.cxx @@ -62,7 +62,7 @@ #include <sfx2/objsh.hxx> #include <sfx2/request.hxx> #include <sfx2/filedlghelper.hxx> -#include <svtools/stritem.hxx> +#include <svl/stritem.hxx> #include <svtools/miscopt.hxx> #include <tools/diagnose_ex.h> #include <toolkit/unohlp.hxx> diff --git a/svx/source/cui/cfg.hxx b/svx/source/cui/cfg.hxx index c52b92ce2a0a..57dc9692f87c 100644 --- a/svx/source/cui/cfg.hxx +++ b/svx/source/cui/cfg.hxx @@ -54,7 +54,7 @@ #define _SVSTDARR_USHORTS #define _SVSTDARR_STRINGSDTOR -#include <svtools/svstdarr.hxx> // SvUShorts +#include <svl/svstdarr.hxx> // SvUShorts #include <sfx2/minarray.hxx> #include <sfx2/tabdlg.hxx> #include <vector> diff --git a/svx/source/cui/cfgchart.cxx b/svx/source/cui/cfgchart.cxx index 344bca7fbd10..d8f1a5dae69c 100644 --- a/svx/source/cui/cfgchart.cxx +++ b/svx/source/cui/cfgchart.cxx @@ -270,6 +270,10 @@ void SvxChartOptions::Commit() PutProperties( aNames, aValues ); } +void SvxChartOptions::Notify( const com::sun::star::uno::Sequence< rtl::OUString >& ) +{ +} + // -------------------- // class SvxChartColorTableItem // -------------------- diff --git a/svx/source/cui/cfgchart.hxx b/svx/source/cui/cfgchart.hxx index 86a2490a2cf8..89f18e621cff 100644 --- a/svx/source/cui/cfgchart.hxx +++ b/svx/source/cui/cfgchart.hxx @@ -36,7 +36,7 @@ // header for ConfigItem #include <unotools/configitem.hxx> // header for SfxPoolItem -#include <svtools/poolitem.hxx> +#include <svl/poolitem.hxx> // header for XColorEntry #include <svx/xtable.hxx> @@ -90,6 +90,7 @@ public: void SetDefaultColors( const SvxChartColorTable& aCol ); virtual void Commit(); + virtual void Notify( const com::sun::star::uno::Sequence< rtl::OUString >& _rPropertyNames); }; // ==================== diff --git a/svx/source/cui/cfgutil.cxx b/svx/source/cui/cfgutil.cxx index 6e1f115ebc53..f4baa85f8283 100644 --- a/svx/source/cui/cfgutil.cxx +++ b/svx/source/cui/cfgutil.cxx @@ -71,10 +71,10 @@ #include <comphelper/sequenceashashmap.hxx> #include <unotools/configmgr.hxx> #include "svx/dialmgr.hxx" -#include <svtools/stritem.hxx> +#include <svl/stritem.hxx> #define _SVSTDARR_STRINGSDTOR -#include <svtools/svstdarr.hxx> +#include <svl/svstdarr.hxx> using namespace ::com::sun::star; using namespace ::com::sun::star::uno; diff --git a/svx/source/cui/cfgutil.hxx b/svx/source/cui/cfgutil.hxx index c19a47495290..87b6bc8a1820 100644 --- a/svx/source/cui/cfgutil.hxx +++ b/svx/source/cui/cfgutil.hxx @@ -41,7 +41,7 @@ #include <com/sun/star/script/browse/XBrowseNode.hpp> #define _SVSTDARR_STRINGSDTOR -#include <svtools/svstdarr.hxx> +#include <svl/svstdarr.hxx> #include <vcl/timer.hxx> #include <svtools/svtabbx.hxx> diff --git a/svx/source/cui/chardlg.cxx b/svx/source/cui/chardlg.cxx index 9777c70dbc6a..435ce7033085 100644 --- a/svx/source/cui/chardlg.cxx +++ b/svx/source/cui/chardlg.cxx @@ -40,7 +40,7 @@ #include <vcl/svapp.hxx> #include <unotools/pathoptions.hxx> #include <svtools/ctrltool.hxx> -#include <svtools/sfontitm.hxx> +#include <svl/sfontitm.hxx> #include <sfx2/printer.hxx> #include <sfx2/objsh.hxx> #include <sfx2/viewsh.hxx> @@ -49,7 +49,7 @@ #include <vcl/msgbox.hxx> #define _SVX_CHARDLG_CXX -#include <svtools/languageoptions.hxx> +#include <svl/languageoptions.hxx> #include <svx/dialogs.hrc> #include <svx/svxitems.hrc> @@ -88,12 +88,12 @@ #include <svx/charreliefitem.hxx> #include <svx/twolinesitem.hxx> #include <charhiddenitem.hxx> -#include <svtools/stritem.hxx> +#include <svl/stritem.hxx> #include <svx/charscaleitem.hxx> #include <svx/charrotateitem.hxx> #include <svx/svxdlg.hxx> //CHINA001 #include <svx/dialogs.hrc> //CHINA001 -#include <svtools/intitem.hxx> //CHINA001 +#include <svl/intitem.hxx> //CHINA001 #include <sfx2/request.hxx> //CHINA001 #include "flagsdef.hxx" //CHINA001 diff --git a/svx/source/cui/connpoolconfig.cxx b/svx/source/cui/connpoolconfig.cxx index f787168f1f2d..c35d278a7f7e 100644 --- a/svx/source/cui/connpoolconfig.cxx +++ b/svx/source/cui/connpoolconfig.cxx @@ -38,10 +38,10 @@ #include "connpoolsettings.hxx" #include "connpooloptions.hxx" -#include <svtools/itemset.hxx> +#include <svl/itemset.hxx> #include <unotools/confignode.hxx> #include <comphelper/extract.hxx> -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> #include <comphelper/processfactory.hxx> #include "sdbcdriverenum.hxx" diff --git a/svx/source/cui/connpooloptions.cxx b/svx/source/cui/connpooloptions.cxx index d7874bc8d4cb..32c34e29a2d1 100644 --- a/svx/source/cui/connpooloptions.cxx +++ b/svx/source/cui/connpooloptions.cxx @@ -41,7 +41,7 @@ #include <svtools/editbrowsebox.hxx> #include <vcl/field.hxx> #include "connpoolsettings.hxx" -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> #include <svx/dialogs.hrc> #include "helpid.hrc" diff --git a/svx/source/cui/connpooloptions.hxx b/svx/source/cui/connpooloptions.hxx index 019061efdb2e..e22722a41e91 100644 --- a/svx/source/cui/connpooloptions.hxx +++ b/svx/source/cui/connpooloptions.hxx @@ -31,7 +31,7 @@ #ifndef _OFFAPP_CONNPOOLOPTIONS_HXX_ #define _OFFAPP_CONNPOOLOPTIONS_HXX_ -#include <svtools/solar.hrc> +#include <svl/solar.hrc> #include <sfx2/tabdlg.hxx> #include <vcl/fixed.hxx> #include <vcl/button.hxx> diff --git a/svx/source/cui/connpoolsettings.hxx b/svx/source/cui/connpoolsettings.hxx index 80ae105d0521..085732a6db74 100644 --- a/svx/source/cui/connpoolsettings.hxx +++ b/svx/source/cui/connpoolsettings.hxx @@ -33,7 +33,7 @@ #include <tools/string.hxx> #include <comphelper/stl_types.hxx> -#include <svtools/poolitem.hxx> +#include <svl/poolitem.hxx> //........................................................................ namespace offapp diff --git a/svx/source/cui/cuicharmap.cxx b/svx/source/cui/cuicharmap.cxx index a66c7b3c10a8..0c81cfb8e120 100644 --- a/svx/source/cui/cuicharmap.cxx +++ b/svx/source/cui/cuicharmap.cxx @@ -43,10 +43,10 @@ #include <vcl/svapp.hxx> #include <vcl/msgbox.hxx> #include <svtools/colorcfg.hxx> -#include <svtools/eitem.hxx> -#include <svtools/intitem.hxx> -#include <svtools/stritem.hxx> -#include <svtools/itempool.hxx> +#include <svl/eitem.hxx> +#include <svl/intitem.hxx> +#include <svl/stritem.hxx> +#include <svl/itempool.hxx> #include <rtl/textenc.h> #include <svx/ucsubset.hxx> @@ -570,7 +570,7 @@ IMPL_LINK( SvxCharMapData, DeleteHdl, PushButton *, EMPTYARG ) #include <sfx2/objsh.hxx> #include <vcl/msgbox.hxx> -#include <svtools/stritem.hxx> +#include <svl/stritem.hxx> IMPL_LINK( SvxCharMapData, AssignHdl, PushButton *, EMPTYARG ) { diff --git a/svx/source/cui/cuifmsearch.cxx b/svx/source/cui/cuifmsearch.cxx index b0c80f8297ef..0db866306f5d 100644 --- a/svx/source/cui/cuifmsearch.cxx +++ b/svx/source/cui/cuifmsearch.cxx @@ -52,7 +52,7 @@ #ifndef _SVX_DIALOGS_HRC #include <svx/dialogs.hrc> #endif -#include <svtools/filerec.hxx> +#include <svl/filerec.hxx> #include "fmsrcimp.hxx" #include "fmsrccfg.hxx" @@ -61,7 +61,7 @@ #endif // _FMSEARCH_HRC #include "cuifmsearch.hxx" #include "srchdlg.hxx" -#include <svtools/cjkoptions.hxx> +#include <svl/cjkoptions.hxx> #include <com/sun/star/i18n/TransliterationModules.hpp> #include <comphelper/processfactory.hxx> diff --git a/svx/source/cui/cuifmsearch.hxx b/svx/source/cui/cuifmsearch.hxx index 5d8533a7b0b6..2659054c2100 100644 --- a/svx/source/cui/cuifmsearch.hxx +++ b/svx/source/cui/cuifmsearch.hxx @@ -36,7 +36,7 @@ #include <svx/fmsearch.hxx> //CHINA001 #define _SVSTDARR_STRINGSDTOR -#include <svtools/svstdarr.hxx> +#include <svl/svstdarr.hxx> #ifndef _DIALOG_HXX //autogen #include <vcl/dialog.hxx> diff --git a/svx/source/cui/cuigaldlg.cxx b/svx/source/cui/cuigaldlg.cxx index 2b9b4440e866..64c7b2e3e5c2 100644 --- a/svx/source/cui/cuigaldlg.cxx +++ b/svx/source/cui/cuigaldlg.cxx @@ -50,11 +50,11 @@ #include "galbrws2.hxx" #include "galdlg.hxx" #include "cuigaldlg.hxx" //CHINA001 -#include <svtools/pickerhelper.hxx> +#include <svl/pickerhelper.hxx> #ifndef _SVX_HELPID_HRC #include "helpid.hrc" #endif -#include <svtools/syslocale.hxx> +#include <unotools/syslocale.hxx> #include <cppuhelper/implbase1.hxx> #include <com/sun/star/uno/Reference.hxx> #include <com/sun/star/lang/XInitialization.hpp> diff --git a/svx/source/cui/cuigaldlg.hxx b/svx/source/cui/cuigaldlg.hxx index 62a5b3dc405a..c4105055ed55 100644 --- a/svx/source/cui/cuigaldlg.hxx +++ b/svx/source/cui/cuigaldlg.hxx @@ -40,7 +40,7 @@ #include <vcl/menu.hxx> #include <vcl/edit.hxx> #include <vcl/combobox.hxx> -#include <svtools/slstitm.hxx> +#include <svl/slstitm.hxx> #include <svtools/transfer.hxx> #include <goodies/grfmgr.hxx> #include <sfx2/tabdlg.hxx> diff --git a/svx/source/cui/cuiimapwnd.cxx b/svx/source/cui/cuiimapwnd.cxx index 966fdecace00..b809dad3fe57 100644 --- a/svx/source/cui/cuiimapwnd.cxx +++ b/svx/source/cui/cuiimapwnd.cxx @@ -43,7 +43,7 @@ #include <svtools/imaprect.hxx> #include <svtools/imapcirc.hxx> #include <svtools/imappoly.hxx> -#include <svtools/urlbmk.hxx> +#include <svl/urlbmk.hxx> #include <xoutbmp.hxx> #include <svx/dialmgr.hxx> @@ -57,7 +57,7 @@ #include <svx/svdopath.hxx> #include <svx/xfltrit.hxx> #include <svx/svdpagv.hxx> -#include <svtools/urihelper.hxx> +#include <svl/urihelper.hxx> #include <svx/xfillit.hxx> #include <svx/xlineit.hxx> diff --git a/svx/source/cui/cuiimapwnd.hxx b/svx/source/cui/cuiimapwnd.hxx index 341223a2dc8d..0e62fab44318 100644 --- a/svx/source/cui/cuiimapwnd.hxx +++ b/svx/source/cui/cuiimapwnd.hxx @@ -6,7 +6,7 @@ #include <vcl/combobox.hxx> #include <vcl/button.hxx> #include <vcl/menu.hxx> -#include <svtools/itempool.hxx> +#include <svl/itempool.hxx> #include <svtools/imapobj.hxx> #include <svtools/transfer.hxx> #include <svtools/imap.hxx> diff --git a/svx/source/cui/cuisrchdlg.cxx b/svx/source/cui/cuisrchdlg.cxx index 9e372b1b1110..c4b9883578a1 100644 --- a/svx/source/cui/cuisrchdlg.cxx +++ b/svx/source/cui/cuisrchdlg.cxx @@ -39,16 +39,16 @@ #include <vcl/wrkwin.hxx> #include <vcl/morebtn.hxx> #include <vcl/msgbox.hxx> -#include <svtools/slstitm.hxx> -#include <svtools/itemiter.hxx> -#include <svtools/style.hxx> +#include <svl/slstitm.hxx> +#include <svl/itemiter.hxx> +#include <svl/style.hxx> #include <unotools/searchopt.hxx> #include <sfx2/dispatch.hxx> #include <sfx2/objsh.hxx> #include <sfx2/module.hxx> #include <sfx2/viewsh.hxx> #include <sfx2/basedlgs.hxx> -#include <svtools/cjkoptions.hxx> +#include <svl/cjkoptions.hxx> #include <com/sun/star/i18n/TransliterationModules.hpp> #define _CUI_SRCHDLG_CXX diff --git a/svx/source/cui/cuisrchdlg.hxx b/svx/source/cui/cuisrchdlg.hxx index db701ec95bb1..c26cf91688cf 100644 --- a/svx/source/cui/cuisrchdlg.hxx +++ b/svx/source/cui/cuisrchdlg.hxx @@ -57,9 +57,9 @@ #endif #include <sfx2/childwin.hxx> #include <sfx2/basedlgs.hxx> -#include <svtools/svarray.hxx> +#include <svl/svarray.hxx> #define _SVSTDARR_STRINGSDTOR -#include <svtools/svstdarr.hxx> +#include <svl/svstdarr.hxx> #include <svtools/svmedit.hxx> #include <sfx2/srchdefs.hxx> diff --git a/svx/source/cui/cuitbxform.cxx b/svx/source/cui/cuitbxform.cxx index 87affa0bc995..069aab8346e8 100644 --- a/svx/source/cui/cuitbxform.cxx +++ b/svx/source/cui/cuitbxform.cxx @@ -38,9 +38,9 @@ #include <string> // HACK: prevent conflict between STLPORT and Workshop headers #include <tools/ref.hxx> #include <tools/shl.hxx> -#include <svtools/intitem.hxx> -#include <svtools/eitem.hxx> -#include <svtools/stritem.hxx> +#include <svl/intitem.hxx> +#include <svl/eitem.hxx> +#include <svl/stritem.hxx> #include <sfx2/dispatch.hxx> #include <vcl/toolbox.hxx> #include <vcl/fixed.hxx> diff --git a/svx/source/cui/dbregister.cxx b/svx/source/cui/dbregister.cxx index a1b24691a280..b7fe2302c55f 100644 --- a/svx/source/cui/dbregister.cxx +++ b/svx/source/cui/dbregister.cxx @@ -40,7 +40,7 @@ #include "dbregistersettings.hxx" #include "connpooloptions.hxx" #ifndef SVTOOLS_FILENOTATION_HXX_ -#include <svtools/filenotation.hxx> +#include <svl/filenotation.hxx> #endif #include <svx/dialogs.hrc> #include <svx/svxids.hrc> @@ -48,7 +48,7 @@ #include <svtools/editbrowsebox.hxx> #include <svx/dialogs.hrc> #include <vcl/field.hxx> -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> #include <comphelper/processfactory.hxx> #include <com/sun/star/uno/Exception.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> @@ -58,7 +58,7 @@ #include <vcl/msgbox.hxx> #include <svtools/svtabbx.hxx> -#include <svtools/itemset.hxx> +#include <svl/itemset.hxx> #include "doclinkdialog.hxx" #include <tools/urlobj.hxx> #include <unotools/localfilehelper.hxx> diff --git a/svx/source/cui/dbregister.hxx b/svx/source/cui/dbregister.hxx index 2e1496a42e1c..00cf4cc911c2 100644 --- a/svx/source/cui/dbregister.hxx +++ b/svx/source/cui/dbregister.hxx @@ -34,7 +34,7 @@ #include "optpath.hxx" #include <tools/string.hxx> #include <comphelper/stl_types.hxx> -#include <svtools/poolitem.hxx> +#include <svl/poolitem.hxx> #include "ControlFocusHelper.hxx" #include <sfx2/basedlgs.hxx> diff --git a/svx/source/cui/dbregisterednamesconfig.cxx b/svx/source/cui/dbregisterednamesconfig.cxx index b78876f5a88e..cf4156f3987e 100644 --- a/svx/source/cui/dbregisterednamesconfig.cxx +++ b/svx/source/cui/dbregisterednamesconfig.cxx @@ -38,7 +38,7 @@ #include "dbregisterednamesconfig.hxx" -#include <svtools/itemset.hxx> +#include <svl/itemset.hxx> #include <tools/diagnose_ex.h> #include <svx/svxids.hrc> @@ -46,7 +46,7 @@ #include <comphelper/extract.hxx> #include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/uno/XNamingService.hpp> -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> #include <comphelper/processfactory.hxx> #include <unotools/pathoptions.hxx> #include "dbregistersettings.hxx" diff --git a/svx/source/cui/dbregistersettings.hxx b/svx/source/cui/dbregistersettings.hxx index ef994e4d0ee2..672d4bf63bcd 100644 --- a/svx/source/cui/dbregistersettings.hxx +++ b/svx/source/cui/dbregistersettings.hxx @@ -32,7 +32,7 @@ #define SVX_DBREGISTERSETTING_HXX #include <comphelper/stl_types.hxx> -#include <svtools/poolitem.hxx> +#include <svl/poolitem.hxx> //........................................................................ namespace svx diff --git a/svx/source/cui/doclinkdialog.cxx b/svx/source/cui/doclinkdialog.cxx index aec98ea74aba..f575648c9693 100644 --- a/svx/source/cui/doclinkdialog.cxx +++ b/svx/source/cui/doclinkdialog.cxx @@ -42,7 +42,7 @@ #include <svx/svxids.hrc> #include <tools/debug.hxx> #ifndef SVTOOLS_FILENOTATION_HXX_ -#include <svtools/filenotation.hxx> +#include <svl/filenotation.hxx> #endif #include <vcl/msgbox.hxx> #include <ucbhelper/content.hxx> diff --git a/svx/source/cui/grfpage.cxx b/svx/source/cui/grfpage.cxx index c80d7b0d2b87..f94ec3b2e5fb 100644 --- a/svx/source/cui/grfpage.cxx +++ b/svx/source/cui/grfpage.cxx @@ -39,7 +39,7 @@ #include <tools/shl.hxx> -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> #include <sfx2/app.hxx> #include <sfx2/module.hxx> #include <sfx2/sfxsids.hrc> diff --git a/svx/source/cui/hlinettp.cxx b/svx/source/cui/hlinettp.cxx index 275af57408e5..d03a4ea912f5 100644 --- a/svx/source/cui/hlinettp.cxx +++ b/svx/source/cui/hlinettp.cxx @@ -34,9 +34,10 @@ #ifdef SVX_DLLIMPLEMENTATION #undef SVX_DLLIMPLEMENTATION #endif -#include <svtools/adrparse.hxx> +//#include <unotools/adrparse.hxx> #include <unotools/pathoptions.hxx> #include <unotools/useroptions.hxx> +#include <svl/adrparse.hxx> #include "hlinettp.hxx" #include "hyperdlg.hrc" diff --git a/svx/source/cui/hltpbase.cxx b/svx/source/cui/hltpbase.cxx index b727602255f7..7429fd88b1e7 100644 --- a/svx/source/cui/hltpbase.cxx +++ b/svx/source/cui/hltpbase.cxx @@ -38,7 +38,7 @@ #include <sfx2/viewfrm.hxx> #include <sot/formats.hxx> #include <sfx2/sfxsids.hrc> -#include <svtools/macitem.hxx> +#include <svl/macitem.hxx> #include <ucbhelper/content.hxx> #include <unotools/localfilehelper.hxx> #include "hyperdlg.hrc" diff --git a/svx/source/cui/hltpbase.hxx b/svx/source/cui/hltpbase.hxx index 71bb37eade02..c6cca4ac32c0 100644 --- a/svx/source/cui/hltpbase.hxx +++ b/svx/source/cui/hltpbase.hxx @@ -43,8 +43,8 @@ #include <vcl/edit.hxx> #include <vcl/lstbox.hxx> #include <tools/urlobj.hxx> -#include <svtools/stritem.hxx> -#include <svtools/eitem.hxx> +#include <svl/stritem.hxx> +#include <svl/eitem.hxx> #include <svtools/transfer.hxx> #include <sfx2/dispatch.hxx> #include <vcl/msgbox.hxx> diff --git a/svx/source/cui/iconcdlg.cxx b/svx/source/cui/iconcdlg.cxx index 5435bf16da4e..1fdec1e7836d 100644 --- a/svx/source/cui/iconcdlg.cxx +++ b/svx/source/cui/iconcdlg.cxx @@ -39,7 +39,7 @@ #include <tools/shl.hxx> #define _SVSTDARR_USHORTS -#include <svtools/svstdarr.hxx> +#include <svl/svstdarr.hxx> #include <svx/dialmgr.hxx> #include "iconcdlg.hxx" diff --git a/svx/source/cui/iconcdlg.hxx b/svx/source/cui/iconcdlg.hxx index 771080a5aaac..ea74b4a66075 100644 --- a/svx/source/cui/iconcdlg.hxx +++ b/svx/source/cui/iconcdlg.hxx @@ -38,8 +38,8 @@ #endif #include <vcl/image.hxx> #include <svtools/ivctrl.hxx> -#include <svtools/itempool.hxx> -#include <svtools/itemset.hxx> +#include <svl/itempool.hxx> +#include <svl/itemset.hxx> #include <tools/list.hxx> #include <tools/string.hxx> diff --git a/svx/source/cui/insdlg.cxx b/svx/source/cui/insdlg.cxx index d53c300c79c7..2b5b7d134830 100644 --- a/svx/source/cui/insdlg.cxx +++ b/svx/source/cui/insdlg.cxx @@ -55,7 +55,7 @@ #include <stdio.h> #include <tools/urlobj.hxx> #include <tools/debug.hxx> -#include <svtools/urihelper.hxx> +#include <svl/urihelper.hxx> #include <svtools/svmedit.hxx> #include <vcl/button.hxx> #include <vcl/fixed.hxx> @@ -67,7 +67,7 @@ #include <sfx2/frmdescr.hxx> #include <sfx2/viewsh.hxx> #include <sfx2/filedlghelper.hxx> -#include <svtools/ownlist.hxx> +#include <svl/ownlist.hxx> #include <comphelper/seqstream.hxx> #include "svuidlg.hrc" @@ -87,7 +87,7 @@ using namespace ::com::sun::star::ui::dialogs; using ::rtl::OUString; #define _SVSTDARR_STRINGSDTOR -#include <svtools/svstdarr.hxx> +#include <svl/svstdarr.hxx> static String impl_getSvtResString( sal_uInt32 nId ) diff --git a/svx/source/cui/internationaloptions.cxx b/svx/source/cui/internationaloptions.cxx index 43efb498048a..d805f953d286 100644 --- a/svx/source/cui/internationaloptions.cxx +++ b/svx/source/cui/internationaloptions.cxx @@ -38,7 +38,7 @@ #ifndef _OFFAPP_INTERNATIONALOPTIONS_HRC_ #include "internationaloptions.hrc" #endif -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> #include <svx/dialogs.hrc> #include "helpid.hrc" diff --git a/svx/source/cui/linkdlg.cxx b/svx/source/cui/linkdlg.cxx index b2e00cf48c0b..192d0edc53fd 100644 --- a/svx/source/cui/linkdlg.cxx +++ b/svx/source/cui/linkdlg.cxx @@ -60,7 +60,7 @@ #include <svx/dialmgr.hxx> #define _SVSTDARR_USHORTS -#include <svtools/svstdarr.hxx> +#include <svl/svstdarr.hxx> #define MAX_FILENAME 18 #define MAX_LINKNAME 18 diff --git a/svx/source/cui/macroass.cxx b/svx/source/cui/macroass.cxx index ac4eeffd6a68..672621b467e5 100644 --- a/svx/source/cui/macroass.cxx +++ b/svx/source/cui/macroass.cxx @@ -32,7 +32,7 @@ #include "precompiled_svx.hxx" #define ITEMID_MACRO 0 -#include <svtools/macitem.hxx> +#include <svl/macitem.hxx> #undef ITEMID_MACRO #include "macroass.hxx" @@ -41,7 +41,7 @@ #include <svx/dialmgr.hxx> #define _SVSTDARR_STRINGSDTOR -#include <svtools/svstdarr.hxx> +#include <svl/svstdarr.hxx> #include <svtools/svmedit.hxx> #include "cfgutil.hxx" diff --git a/svx/source/cui/macroass.hxx b/svx/source/cui/macroass.hxx index da4fc49e4596..a41bd0d8da98 100755 --- a/svx/source/cui/macroass.hxx +++ b/svx/source/cui/macroass.hxx @@ -34,7 +34,7 @@ #include <sfx2/basedlgs.hxx> #include <sfx2/tabdlg.hxx> -#include <svtools/macitem.hxx> +#include <svl/macitem.hxx> #include <vcl/lstbox.hxx> #include <com/sun/star/frame/XFrame.hpp> diff --git a/svx/source/cui/macropg.cxx b/svx/source/cui/macropg.cxx index 0ee76246abe3..a293a3512f96 100644 --- a/svx/source/cui/macropg.cxx +++ b/svx/source/cui/macropg.cxx @@ -36,12 +36,12 @@ #include "macropg.hxx" #include <vcl/msgbox.hxx> #define _SVSTDARR_STRINGSDTOR -#include <svtools/svstdarr.hxx> +#include <svl/svstdarr.hxx> #ifndef _SV_MEDIT_HXX #include <svtools/svmedit.hxx> #endif #ifndef _EITEM_HXX -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> #endif #include <tools/diagnose_ex.h> diff --git a/svx/source/cui/macropg.hxx b/svx/source/cui/macropg.hxx index 37f714028c82..0ed414e92751 100644 --- a/svx/source/cui/macropg.hxx +++ b/svx/source/cui/macropg.hxx @@ -37,7 +37,7 @@ #include <com/sun/star/util/XModifiable.hpp> #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/uno/Reference.hxx> -#include <svtools/macitem.hxx> +#include <svl/macitem.hxx> #ifndef _LSTBOX_HXX //autogen #include <vcl/lstbox.hxx> #endif diff --git a/svx/source/cui/numfmt.cxx b/svx/source/cui/numfmt.cxx index d6978ea008b8..fcdab5730fe4 100644 --- a/svx/source/cui/numfmt.cxx +++ b/svx/source/cui/numfmt.cxx @@ -40,8 +40,8 @@ #endif // include --------------------------------------------------------------- -#include <svtools/eitem.hxx> -#include <svtools/intitem.hxx> +#include <svl/eitem.hxx> +#include <svl/intitem.hxx> #include <sfx2/objsh.hxx> #include <vcl/svapp.hxx> #include <unotools/localedatawrapper.hxx> @@ -49,7 +49,7 @@ #define _SVSTDARR_STRINGS #define _SVSTDARR_STRINGSDTOR -#include <svtools/svstdarr.hxx> +#include <svl/svstdarr.hxx> #include <svtools/colorcfg.hxx> #define _SVX_NUMFMT_CXX diff --git a/svx/source/cui/numpages.cxx b/svx/source/cui/numpages.cxx index e28422ec7933..ab1ec9770e3d 100644 --- a/svx/source/cui/numpages.cxx +++ b/svx/source/cui/numpages.cxx @@ -52,12 +52,12 @@ #include <helpid.hrc> #endif #include <svx/numitem.hxx> -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> #include <vcl/svapp.hxx> #include <gallery.hxx> -#include <svtools/urihelper.hxx> +#include <svl/urihelper.hxx> #include <svx/brshitem.hxx> -#include <svtools/intitem.hxx> +#include <svl/intitem.hxx> #include <sfx2/objsh.hxx> #include <vcl/graph.hxx> #include <vcl/msgbox.hxx> @@ -86,9 +86,9 @@ #include <svx/dialogs.hrc> //CHINA001 #include <sfx2/request.hxx> //CHINA001 -#include <svtools/aeitem.hxx> //add CHINA001 -#include <svtools/stritem.hxx>//add CHINA001 -#include <svtools/slstitm.hxx> //add CHINA001 +#include <svl/aeitem.hxx> //add CHINA001 +#include <svl/stritem.hxx>//add CHINA001 +#include <svl/slstitm.hxx> //add CHINA001 using namespace com::sun::star; using namespace com::sun::star::uno; diff --git a/svx/source/cui/numpages.hxx b/svx/source/cui/numpages.hxx index 9e3447228b45..a5d8a212d48e 100644 --- a/svx/source/cui/numpages.hxx +++ b/svx/source/cui/numpages.hxx @@ -43,7 +43,7 @@ #include <svx/numdef.hxx> #endif #include <svtools/ctrlbox.hxx> -#include <svtools/svarray.hxx> +#include <svl/svarray.hxx> // ----------------------------------------------------------------------- class SvxNumRule; diff --git a/svx/source/cui/optctl.cxx b/svx/source/cui/optctl.cxx index a2a2b2cc461c..0c774927f241 100644 --- a/svx/source/cui/optctl.cxx +++ b/svx/source/cui/optctl.cxx @@ -43,7 +43,7 @@ #ifndef _SVX_DIALOGS_HRC #include <svx/dialogs.hrc> #endif -#include <svtools/ctloptions.hxx> +#include <svl/ctloptions.hxx> // class SvxCTLOptionsPage ----------------------------------------------------- diff --git a/svx/source/cui/optdict.cxx b/svx/source/cui/optdict.cxx index 88674c141b36..a742e0caec55 100644 --- a/svx/source/cui/optdict.cxx +++ b/svx/source/cui/optdict.cxx @@ -42,7 +42,7 @@ #include <unolingu.hxx> #include <dlgutil.hxx> #include <sfx2/sfxuno.hxx> -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> #include <com/sun/star/frame/XStorable.hpp> #ifndef _UNOTOOLS_PROCESSFACTORY_HXX #include <comphelper/processfactory.hxx> diff --git a/svx/source/cui/optgdlg.cxx b/svx/source/cui/optgdlg.cxx index bbfd127c5c3b..17a0554fdb69 100644 --- a/svx/source/cui/optgdlg.cxx +++ b/svx/source/cui/optgdlg.cxx @@ -33,12 +33,12 @@ #ifdef SVX_DLLIMPLEMENTATION #undef SVX_DLLIMPLEMENTATION #endif -#include <svtools/zforlist.hxx> +#include <svl/zforlist.hxx> #include <goodies/grfmgr.hxx> -#include <svtools/flagitem.hxx> +#include <svl/flagitem.hxx> #include <sfx2/dispatch.hxx> #include <unotools/lingucfg.hxx> -#include <svtools/szitem.hxx> +#include <svl/szitem.hxx> #include <sfx2/viewsh.hxx> #include <sfx2/viewfrm.hxx> #include <sfx2/imgmgr.hxx> @@ -51,16 +51,16 @@ #include <unotools/fontoptions.hxx> #include <svtools/menuoptions.hxx> #include <unotools/startoptions.hxx> -#include <svtools/languageoptions.hxx> +#include <svl/languageoptions.hxx> #include <svtools/miscopt.hxx> #include <unotools/printwarningoptions.hxx> -#include <svtools/syslocaleoptions.hxx> +#include <unotools/syslocaleoptions.hxx> #include <svtools/helpopt.hxx> #include <svtools/accessibilityoptions.hxx> #include <unotools/configitem.hxx> #include <sfx2/objsh.hxx> #include <comphelper/types.hxx> -#include <svtools/ctloptions.hxx> +#include <svl/ctloptions.hxx> #include <svtools/langtab.hxx> #include <unotools/localfilehelper.hxx> #include <unotools/configmgr.hxx> diff --git a/svx/source/cui/optinet2.cxx b/svx/source/cui/optinet2.cxx index f91812b18a50..e761c98307de 100644 --- a/svx/source/cui/optinet2.cxx +++ b/svx/source/cui/optinet2.cxx @@ -39,10 +39,10 @@ #include <tools/shl.hxx> #include <tools/config.hxx> #include <vcl/msgbox.hxx> -#include <svtools/intitem.hxx> -#include <svtools/stritem.hxx> -#include <svtools/eitem.hxx> -#include <svtools/slstitm.hxx> +#include <svl/intitem.hxx> +#include <svl/stritem.hxx> +#include <svl/eitem.hxx> +#include <svl/slstitm.hxx> #include <sfx2/fcontnr.hxx> #include <sfx2/dispatch.hxx> #include <sfx2/docfilt.hxx> @@ -50,10 +50,10 @@ #include <sfx2/sfxsids.hrc> #include <sfx2/filedlghelper.hxx> #include <tools/inetdef.hxx> -#include <svtools/urihelper.hxx> +#include <svl/urihelper.hxx> #ifndef _CNTWIDS_HRC -#include <svtools/cntwids.hrc> +#include <svl/cntwids.hrc> #endif #include <unotools/inetoptions.hxx> #ifndef _SV_SVAPP_HXX @@ -2154,7 +2154,7 @@ public: virtual ~MailerProgramCfg_Impl(); virtual void Commit(); - + virtual void Notify( const com::sun::star::uno::Sequence< rtl::OUString >& _rPropertyNames); }; /* -------------------------------------------------------------------------*/ @@ -2234,6 +2234,10 @@ void MailerProgramCfg_Impl::Commit() PutProperties(aNames, aValues); } +void MailerProgramCfg_Impl::Notify( const com::sun::star::uno::Sequence< rtl::OUString >& ) +{ +} + /* -------------------------------------------------------------------------*/ struct SvxEMailTabPage_Impl diff --git a/svx/source/cui/optinet2.hxx b/svx/source/cui/optinet2.hxx index 0f1364b716f8..db827d6a9902 100644 --- a/svx/source/cui/optinet2.hxx +++ b/svx/source/cui/optinet2.hxx @@ -34,7 +34,7 @@ #include <vcl/lstbox.hxx> #include <vcl/group.hxx> #include <vcl/field.hxx> -#include <svtools/svarray.hxx> +#include <svl/svarray.hxx> #include <svtools/stdctrl.hxx> #include <svtools/svtabbx.hxx> #include <sfx2/tabdlg.hxx> diff --git a/svx/source/cui/optmemory.cxx b/svx/source/cui/optmemory.cxx index 3f930c4fe750..3fdeecb72df9 100644 --- a/svx/source/cui/optmemory.cxx +++ b/svx/source/cui/optmemory.cxx @@ -36,12 +36,12 @@ #endif #include <svtools/langtab.hxx> -#include <svtools/zforlist.hxx> +#include <svl/zforlist.hxx> #include <goodies/grfmgr.hxx> -#include <svtools/flagitem.hxx> +#include <svl/flagitem.hxx> #include <sfx2/dispatch.hxx> #include <unotools/lingucfg.hxx> -#include <svtools/szitem.hxx> +#include <svl/szitem.hxx> #include <sfx2/viewsh.hxx> #include <sfx2/viewfrm.hxx> #include <sfx2/filedlghelper.hxx> @@ -53,11 +53,11 @@ #include <unotools/fontoptions.hxx> #include <svtools/menuoptions.hxx> #include <unotools/startoptions.hxx> -#include <svtools/cjkoptions.hxx> +#include <svl/cjkoptions.hxx> #ifndef INCLUDED_SVTOOLS_MISCPOPT_HXX #include <svtools/miscopt.hxx> #endif -#include <svtools/syslocaleoptions.hxx> +#include <unotools/syslocaleoptions.hxx> #include <svtools/helpopt.hxx> #include <unotools/configitem.hxx> #include <sfx2/objsh.hxx> diff --git a/svx/source/cui/optpath.cxx b/svx/source/cui/optpath.cxx index 0dd7eca0990c..096a324a8d05 100644 --- a/svx/source/cui/optpath.cxx +++ b/svx/source/cui/optpath.cxx @@ -42,8 +42,8 @@ #include <vcl/msgbox.hxx> #include <sfx2/filedlghelper.hxx> #include <sfx2/app.hxx> -#include <svtools/pickerhelper.hxx> -#include <svtools/aeitem.hxx> +#include <svl/pickerhelper.hxx> +#include <svl/aeitem.hxx> #include <svtools/svtabbx.hxx> #include <svtools/filedlg.hxx> #include <tools/config.hxx> diff --git a/svx/source/cui/optsave.cxx b/svx/source/cui/optsave.cxx index 7e37c46b6733..fe5fda9dde30 100644 --- a/svx/source/cui/optsave.cxx +++ b/svx/source/cui/optsave.cxx @@ -37,8 +37,8 @@ // include --------------------------------------------------------------- #include <tools/shl.hxx> -#include <svtools/eitem.hxx> -#include <svtools/intitem.hxx> +#include <svl/eitem.hxx> +#include <svl/intitem.hxx> #define _SVX_OPTSAVE_CXX #include "optsave.hrc" diff --git a/svx/source/cui/optupdt.cxx b/svx/source/cui/optupdt.cxx index ebe23d52b66d..273c897f20eb 100644 --- a/svx/source/cui/optupdt.cxx +++ b/svx/source/cui/optupdt.cxx @@ -38,7 +38,7 @@ // include --------------------------------------------------------------- #include <vcl/svapp.hxx> #include <sfx2/filedlghelper.hxx> -#include <svtools/zforlist.hxx> +#include <svl/zforlist.hxx> #include "optupdt.hxx" #include "optupdt.hrc" diff --git a/svx/source/cui/page.cxx b/svx/source/cui/page.cxx index f842af6b7559..e8941ce636a2 100644 --- a/svx/source/cui/page.cxx +++ b/svx/source/cui/page.cxx @@ -55,8 +55,8 @@ #include <vcl/graph.hxx> #endif #include <sfx2/viewsh.hxx> -#include <svtools/itemiter.hxx> -#include <svtools/languageoptions.hxx> +#include <svl/itemiter.hxx> +#include <svl/languageoptions.hxx> #include <vcl/msgbox.hxx> #include <unotools/configitem.hxx> #include "htmlmode.hxx" @@ -89,14 +89,14 @@ #include <sfx2/module.hxx> -#include <svtools/stritem.hxx> +#include <svl/stritem.hxx> #include <svx/svxids.hrc> //CHINA001 // #i4219# #include <svtools/optionsdrawinglayer.hxx> -#include <svtools/slstitm.hxx> //CHINA001 -#include <svtools/aeitem.hxx> //CHINA001 +#include <svl/slstitm.hxx> //CHINA001 +#include <svl/aeitem.hxx> //CHINA001 #include <sfx2/request.hxx> //CHINA001 // configuration helper ======================================================= @@ -121,6 +121,9 @@ public: /** Returns true, if the current HTML export mode is set to HTML 3.2. */ inline bool IsExportModeHTML32() const { return mnExpMode == 0; } // 0 == HTML_CFG_HTML32, see offmgr/htmlcfg.hxx + virtual void Commit(); + virtual void Notify( const com::sun::star::uno::Sequence< rtl::OUString >& _rPropertyNames); + private: sal_Int32 mnExpMode; }; @@ -139,6 +142,13 @@ SvxHtmlExportModeConfigItem_Impl::SvxHtmlExportModeConfigItem_Impl() : aPropValues[ 0 ] >>= mnExpMode; } +void SvxHtmlExportModeConfigItem_Impl::Commit() +{ +} + +void SvxHtmlExportModeConfigItem_Impl::Notify( const com::sun::star::uno::Sequence< rtl::OUString >& ) +{ +} // static ---------------------------------------------------------------- diff --git a/svx/source/cui/paragrph.cxx b/svx/source/cui/paragrph.cxx index c0b72b573099..a7afb6cfdfc8 100644 --- a/svx/source/cui/paragrph.cxx +++ b/svx/source/cui/paragrph.cxx @@ -34,7 +34,7 @@ #ifdef SVX_DLLIMPLEMENTATION #undef SVX_DLLIMPLEMENTATION #endif -#include <svtools/style.hxx> +#include <svl/style.hxx> #include <sfx2/app.hxx> #include <sfx2/objsh.hxx> #include <sfx2/module.hxx> @@ -58,7 +58,7 @@ -#include <svtools/languageoptions.hxx> +#include <svl/languageoptions.hxx> #include <pgrditem.hxx> #include <svx/dialogs.hrc> #include "paragrph.hrc" @@ -81,9 +81,9 @@ #include <svx/dialmgr.hxx> #include "htmlmode.hxx" #include <svx/paravertalignitem.hxx> -#include <svtools/eitem.hxx> //add CHINA001 +#include <svl/eitem.hxx> //add CHINA001 #include <sfx2/request.hxx> //add CHINA001 -#include <svtools/intitem.hxx> //add CHINA001 +#include <svl/intitem.hxx> //add CHINA001 // static ---------------------------------------------------------------- diff --git a/svx/source/cui/postdlg.cxx b/svx/source/cui/postdlg.cxx index 8badd25b336b..3f29fddf8832 100644 --- a/svx/source/cui/postdlg.cxx +++ b/svx/source/cui/postdlg.cxx @@ -43,8 +43,8 @@ #ifndef _MSGBOX_HXX //autogen #include <vcl/msgbox.hxx> #endif -#include <svtools/itempool.hxx> -#include <svtools/itemset.hxx> +#include <svl/itempool.hxx> +#include <svl/itemset.hxx> #include <unotools/useroptions.hxx> #include <unotools/localedatawrapper.hxx> #ifndef _UNOTOOLS_PROCESSFACTORY_HXX diff --git a/svx/source/cui/scriptdlg.hrc b/svx/source/cui/scriptdlg.hrc index f4a7a75a4416..0079037c7680 100644 --- a/svx/source/cui/scriptdlg.hrc +++ b/svx/source/cui/scriptdlg.hrc @@ -30,7 +30,7 @@ #ifndef _SCRIPTDLG_HRC #define _SCRIPTDLG_HRC -#include <svtools/solar.hrc> +#include <svl/solar.hrc> #define SCRIPTDLG_OFFSET 400 diff --git a/svx/source/cui/sdrcelldlg.cxx b/svx/source/cui/sdrcelldlg.cxx index e543402330bd..ab8cf7e15197 100644 --- a/svx/source/cui/sdrcelldlg.cxx +++ b/svx/source/cui/sdrcelldlg.cxx @@ -34,7 +34,7 @@ #ifdef SVX_DLLIMPLEMENTATION #undef SVX_DLLIMPLEMENTATION #endif -#include <svtools/cjkoptions.hxx> +#include <svl/cjkoptions.hxx> #include "flagsdef.hxx" #include "svx/dialogs.hrc" #include "sdrcelldlg.hxx" diff --git a/svx/source/cui/selector.cxx b/svx/source/cui/selector.cxx index 83e4aa2b1612..a1dd7f62263a 100644 --- a/svx/source/cui/selector.cxx +++ b/svx/source/cui/selector.cxx @@ -83,7 +83,7 @@ using namespace ::com::sun::star::document; using namespace ::com::sun::star::container; #define _SVSTDARR_STRINGSDTOR -#include <svtools/svstdarr.hxx> +#include <svl/svstdarr.hxx> #include <svtools/imagemgr.hxx> #include <tools/urlobj.hxx> #include <tools/diagnose_ex.h> diff --git a/svx/source/cui/selector.hxx b/svx/source/cui/selector.hxx index 10346f251563..3e21a3812835 100644 --- a/svx/source/cui/selector.hxx +++ b/svx/source/cui/selector.hxx @@ -43,7 +43,7 @@ #define _SVSTDARR_USHORTS #define _SVSTDARR_STRINGSDTOR -#include <svtools/svstdarr.hxx> // SvUShorts +#include <svl/svstdarr.hxx> // SvUShorts #include <sfx2/minarray.hxx> #define SVX_CFGGROUP_FUNCTION 1 diff --git a/svx/source/cui/splitcelldlg.cxx b/svx/source/cui/splitcelldlg.cxx index 82f3b1c9dff5..183514fe5844 100644 --- a/svx/source/cui/splitcelldlg.cxx +++ b/svx/source/cui/splitcelldlg.cxx @@ -37,8 +37,8 @@ #include <sfx2/dispatch.hxx> -#include <svtools/intitem.hxx> -#include <svtools/eitem.hxx> +#include <svl/intitem.hxx> +#include <svl/eitem.hxx> #include "svx/dialmgr.hxx" #include "splitcelldlg.hxx" diff --git a/svx/source/cui/srchxtra.cxx b/svx/source/cui/srchxtra.cxx index 24966c6d4f5d..23acf233457d 100644 --- a/svx/source/cui/srchxtra.cxx +++ b/svx/source/cui/srchxtra.cxx @@ -40,8 +40,8 @@ #include "srchxtra.hxx" #include <tools/rcid.h> #include <vcl/msgbox.hxx> -#include <svtools/cjkoptions.hxx> -#include <svtools/whiter.hxx> +#include <svl/cjkoptions.hxx> +#include <svl/whiter.hxx> #include <sfx2/objsh.hxx> #ifndef _SVX_DIALOGS_HRC diff --git a/svx/source/cui/svuidlg.hrc b/svx/source/cui/svuidlg.hrc index b4030391e6b5..d9fd6c046fe2 100644 --- a/svx/source/cui/svuidlg.hrc +++ b/svx/source/cui/svuidlg.hrc @@ -28,7 +28,7 @@ * ************************************************************************/ -#include <svtools/solar.hrc> +#include <svl/solar.hrc> #define HID_PASTE_DLG (HID_SO2_START + 0) #define HID_LINKDLG_TABLB (HID_SO2_START + 1) diff --git a/svx/source/cui/swpossizetabpage.cxx b/svx/source/cui/swpossizetabpage.cxx index 685fc03145f2..b1b4dd8f4221 100644 --- a/svx/source/cui/swpossizetabpage.cxx +++ b/svx/source/cui/swpossizetabpage.cxx @@ -40,7 +40,7 @@ #include <svx/dialmgr.hxx> #include <dlgutil.hxx> #include <anchorid.hxx> -#include <svtools/aeitem.hxx> +#include <svl/aeitem.hxx> #include <swframevalidation.hxx> #include <tools/debug.hxx> #include <svx/dialogs.hrc> diff --git a/svx/source/cui/tabstpge.cxx b/svx/source/cui/tabstpge.cxx index 991e809827ea..5b2bfcde2456 100644 --- a/svx/source/cui/tabstpge.cxx +++ b/svx/source/cui/tabstpge.cxx @@ -52,14 +52,14 @@ #include <svx/dialmgr.hxx> #include "dlgutil.hxx" #include <sfx2/module.hxx> -#include <svtools/cjkoptions.hxx> +#include <svl/cjkoptions.hxx> #include <unotools/localedatawrapper.hxx> #ifndef _UNOTOOLS_PROCESSFACTORY_HXX #include <comphelper/processfactory.hxx> #endif #include <sfx2/request.hxx> //CHINA001 #include <svx/svxids.hrc> //add CHINA001 -#include <svtools/intitem.hxx> //add CHINA001 +#include <svl/intitem.hxx> //add CHINA001 // class TabWin_Impl ----------------------------------------------------- diff --git a/svx/source/cui/tparea.cxx b/svx/source/cui/tparea.cxx index 720de9cb00ef..bd4181a4924b 100644 --- a/svx/source/cui/tparea.cxx +++ b/svx/source/cui/tparea.cxx @@ -61,7 +61,7 @@ #include "dlgname.hxx" #include <svx/dialmgr.hxx> #include "dlgutil.hxx" -#include <svtools/intitem.hxx> //add CHINA001 +#include <svl/intitem.hxx> //add CHINA001 #include <sfx2/request.hxx>//add CHINA001 #define DLGWIN this->GetParent()->GetParent() diff --git a/svx/source/cui/transfrm.cxx b/svx/source/cui/transfrm.cxx index ba1bee46e1a1..8d0e25860db8 100644 --- a/svx/source/cui/transfrm.cxx +++ b/svx/source/cui/transfrm.cxx @@ -57,8 +57,8 @@ #include <svx/svxenum.hxx> #include "anchorid.hxx" #include <sfx2/module.hxx> -#include <svtools/rectitem.hxx> -#include <svtools/aeitem.hxx> +#include <svl/rectitem.hxx> +#include <svl/aeitem.hxx> #include <swpossizetabpage.hxx> // Toleranz fuer WorkingArea diff --git a/svx/source/cui/treeopt.cxx b/svx/source/cui/treeopt.cxx index c7a28814dd51..94578d02dc58 100644 --- a/svx/source/cui/treeopt.cxx +++ b/svx/source/cui/treeopt.cxx @@ -72,13 +72,13 @@ #endif #include <svtools/helpopt.hxx> #include <unotools/moduleoptions.hxx> -#include <svtools/languageoptions.hxx> +#include <svl/languageoptions.hxx> #include <unotools/optionsdlg.hxx> #include <sfx2/module.hxx> #include <vcl/msgbox.hxx> #include <sfx2/dispatch.hxx> #include <vcl/waitobj.hxx> -#include <svtools/slstitm.hxx> +#include <svl/slstitm.hxx> #include <sfx2/viewfrm.hxx> #include <unotools/viewoptions.hxx> #include <sfx2/printopt.hxx> @@ -86,7 +86,7 @@ #include <osl/process.h> #include <rtl/bootstrap.hxx> -#include <svtools/misccfg.hxx> +#include <unotools/misccfg.hxx> #include <sfx2/objsh.hxx> #include <sfx2/viewsh.hxx> #include <sfx2/tplpitem.hxx> @@ -312,6 +312,7 @@ public: virtual ~MailMergeCfg_Impl(); virtual void Commit(); + virtual void Notify( const com::sun::star::uno::Sequence< rtl::OUString >& _rPropertyNames); sal_Bool IsEmailSupported() const {return bIsEmailSupported;} @@ -341,6 +342,10 @@ void MailMergeCfg_Impl::Commit() { } +void MailMergeCfg_Impl::Notify( const com::sun::star::uno::Sequence< rtl::OUString >& ) +{ +} + //typedef SfxTabPage* (*FNCreateTabPage)( Window *pParent, const SfxItemSet &rAttrSet ); SfxTabPage* CreateGeneralTabPage( sal_uInt16 nId, Window* pParent, const SfxItemSet& rSet ) { @@ -1551,7 +1556,7 @@ SfxItemSet* OfaTreeOptionsDialog::CreateItemSet( sal_uInt16 nId ) SFX_APP()->GetOptions(aOptSet); pRet->Put(aOptSet); - SfxMiscCfg* pMisc = SFX_APP()->GetMiscConfig(); + utl::MiscCfg aMisc; const SfxPoolItem* pItem; SfxViewFrame* pViewFrame = SfxViewFrame::Current(); if ( pViewFrame ) @@ -1562,17 +1567,17 @@ SfxItemSet* OfaTreeOptionsDialog::CreateItemSet( sal_uInt16 nId ) if( SFX_ITEM_AVAILABLE <= pDispatch->QueryState( SID_ATTR_YEAR2000, pItem ) ) pRet->Put( SfxUInt16Item( SID_ATTR_YEAR2000, ((const SfxUInt16Item*)pItem)->GetValue() ) ); else - pRet->Put( SfxUInt16Item( SID_ATTR_YEAR2000, (USHORT)pMisc->GetYear2000() ) ); + pRet->Put( SfxUInt16Item( SID_ATTR_YEAR2000, (USHORT)aMisc.GetYear2000() ) ); } else - pRet->Put( SfxUInt16Item( SID_ATTR_YEAR2000, (USHORT)pMisc->GetYear2000() ) ); + pRet->Put( SfxUInt16Item( SID_ATTR_YEAR2000, (USHORT)aMisc.GetYear2000() ) ); // Sonstiges - Tabulator - pRet->Put(SfxBoolItem(SID_PRINTER_NOTFOUND_WARN, pMisc->IsNotFoundWarning())); + pRet->Put(SfxBoolItem(SID_PRINTER_NOTFOUND_WARN, aMisc.IsNotFoundWarning())); - sal_uInt16 nFlag = pMisc->IsPaperSizeWarning() ? SFX_PRINTER_CHG_SIZE : 0; - nFlag |= pMisc->IsPaperOrientationWarning() ? SFX_PRINTER_CHG_ORIENTATION : 0; + sal_uInt16 nFlag = aMisc.IsPaperSizeWarning() ? SFX_PRINTER_CHG_SIZE : 0; + nFlag |= aMisc.IsPaperOrientationWarning() ? SFX_PRINTER_CHG_ORIENTATION : 0; pRet->Put( SfxFlagItem( SID_PRINTER_CHANGESTODOC, nFlag )); } @@ -1686,7 +1691,7 @@ void OfaTreeOptionsDialog::ApplyItemSet( sal_uInt16 nId, const SfxItemSet& rSet { case SID_GENERAL_OPTIONS: { - SfxMiscCfg* pMisc = SFX_APP()->GetMiscConfig(); + utl::MiscCfg aMisc; const SfxPoolItem* pItem; SfxItemSet aOptSet(SFX_APP()->GetPool(), SID_ATTR_QUICKLAUNCHER, SID_ATTR_QUICKLAUNCHER ); aOptSet.Put(rSet); @@ -1707,20 +1712,20 @@ void OfaTreeOptionsDialog::ApplyItemSet( sal_uInt16 nId, const SfxItemSet& rSet SfxDispatcher* pDispatch = pViewFrame->GetDispatcher(); pDispatch->Execute( SID_ATTR_YEAR2000, SFX_CALLMODE_ASYNCHRON, pItem, 0L); } - pMisc->SetYear2000(nY2K); + aMisc.SetYear2000(nY2K); } // ------------------------------------------------------------------------- // Drucken auswerten // ------------------------------------------------------------------------- if(SFX_ITEM_SET == rSet.GetItemState(SID_PRINTER_NOTFOUND_WARN, sal_False, &pItem)) - pMisc->SetNotFoundWarning(((const SfxBoolItem*)pItem)->GetValue()); + aMisc.SetNotFoundWarning(((const SfxBoolItem*)pItem)->GetValue()); if(SFX_ITEM_SET == rSet.GetItemState(SID_PRINTER_CHANGESTODOC, sal_False, &pItem)) { const SfxFlagItem* pFlag = (const SfxFlagItem*)pItem; - pMisc->SetPaperSizeWarning(0 != (pFlag->GetValue() & SFX_PRINTER_CHG_SIZE )); - pMisc->SetPaperOrientationWarning(0 != (pFlag->GetValue() & SFX_PRINTER_CHG_ORIENTATION )); + aMisc.SetPaperSizeWarning(0 != (pFlag->GetValue() & SFX_PRINTER_CHG_SIZE )); + aMisc.SetPaperOrientationWarning(0 != (pFlag->GetValue() & SFX_PRINTER_CHG_ORIENTATION )); } // ------------------------------------------------------------------------- // evaluate help options diff --git a/svx/source/cui/zoom.cxx b/svx/source/cui/zoom.cxx index e97448999564..e34af797f064 100644 --- a/svx/source/cui/zoom.cxx +++ b/svx/source/cui/zoom.cxx @@ -38,8 +38,8 @@ // include --------------------------------------------------------------- #include <tools/shl.hxx> -#include <svtools/itemset.hxx> -#include <svtools/itempool.hxx> +#include <svl/itemset.hxx> +#include <svl/itempool.hxx> #include <sfx2/objsh.hxx> #include <vcl/msgbox.hxx> diff --git a/svx/source/customshapes/EnhancedCustomShape2d.hxx b/svx/source/customshapes/EnhancedCustomShape2d.hxx index 6be05a9e588d..6e24a3b238c6 100644 --- a/svx/source/customshapes/EnhancedCustomShape2d.hxx +++ b/svx/source/customshapes/EnhancedCustomShape2d.hxx @@ -36,7 +36,7 @@ #include <com/sun/star/uno/Sequence.h> #include <com/sun/star/beans/PropertyValues.hpp> #include <com/sun/star/awt/Point.hpp> -#include <svtools/itemset.hxx> +#include <svl/itemset.hxx> #include <com/sun/star/drawing/EnhancedCustomShapeParameterPair.hpp> #include <com/sun/star/drawing/EnhancedCustomShapeSegment.hpp> #include <com/sun/star/drawing/EnhancedCustomShapeParameter.hpp> diff --git a/svx/source/customshapes/EnhancedCustomShape3d.cxx b/svx/source/customshapes/EnhancedCustomShape3d.cxx index 2beab9adbe7a..16074f3ce3cc 100644 --- a/svx/source/customshapes/EnhancedCustomShape3d.cxx +++ b/svx/source/customshapes/EnhancedCustomShape3d.cxx @@ -37,8 +37,8 @@ #include <svditer.hxx> #include <svx/svdobj.hxx> #include <svx/svdoashp.hxx> -#include <svtools/poolitem.hxx> -#include <svtools/itemset.hxx> +#include <svl/poolitem.hxx> +#include <svl/itemset.hxx> #include <svx/xfillit0.hxx> #include <svx/xsflclit.hxx> #include <svx/xit.hxx> diff --git a/svx/source/customshapes/EnhancedCustomShapeEngine.cxx b/svx/source/customshapes/EnhancedCustomShapeEngine.cxx index 8ae4e34197c5..673e95877fcb 100644 --- a/svx/source/customshapes/EnhancedCustomShapeEngine.cxx +++ b/svx/source/customshapes/EnhancedCustomShapeEngine.cxx @@ -48,7 +48,7 @@ #include <svx/outlobj.hxx> #include <svx/outliner.hxx> #include <svx/svdoutl.hxx> -#include <svtools/itemset.hxx> +#include <svl/itemset.hxx> #include <svx/svdopath.hxx> #include <svx/svdpage.hxx> #include <svx/svdmodel.hxx> diff --git a/svx/source/customshapes/tbxcustomshapes.cxx b/svx/source/customshapes/tbxcustomshapes.cxx index 9c2678126436..391bf075675e 100644 --- a/svx/source/customshapes/tbxcustomshapes.cxx +++ b/svx/source/customshapes/tbxcustomshapes.cxx @@ -37,7 +37,7 @@ #include <svx/svxids.hrc> #endif #include <tools/shl.hxx> -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> #include <sfx2/dispatch.hxx> #include <sfx2/viewsh.hxx> #include <sfx2/viewfrm.hxx> diff --git a/svx/source/dialog/_bmpmask.cxx b/svx/source/dialog/_bmpmask.cxx index 6eac7520fe42..b71432ed15eb 100644 --- a/svx/source/dialog/_bmpmask.cxx +++ b/svx/source/dialog/_bmpmask.cxx @@ -34,7 +34,7 @@ #include <tools/shl.hxx> #include <vcl/metaact.hxx> #include <svtools/valueset.hxx> -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> #include <sfx2/dispatch.hxx> #include <svtools/colrdlg.hxx> diff --git a/svx/source/dialog/_contdlg.cxx b/svx/source/dialog/_contdlg.cxx index 1e01b9cfde24..495cb800142a 100644 --- a/svx/source/dialog/_contdlg.cxx +++ b/svx/source/dialog/_contdlg.cxx @@ -35,7 +35,7 @@ #include <tools/shl.hxx> #include <vcl/salbtype.hxx> // FRound #include <vcl/msgbox.hxx> -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> #include <sfx2/dispatch.hxx> #include <sfx2/viewfrm.hxx> #include <svtools/miscopt.hxx> diff --git a/svx/source/dialog/charmap.cxx b/svx/source/dialog/charmap.cxx index 9ef7073971b6..d1ef3768eaa7 100644 --- a/svx/source/dialog/charmap.cxx +++ b/svx/source/dialog/charmap.cxx @@ -53,7 +53,7 @@ #include <com/sun/star/accessibility/AccessibleEventId.hpp> #include <com/sun/star/accessibility/AccessibleStateType.hpp> #include <comphelper/types.hxx> -#include <svtools/itemset.hxx> +#include <svl/itemset.hxx> #include "rtl/ustrbuf.hxx" diff --git a/svx/source/dialog/databaseregistrationui.cxx b/svx/source/dialog/databaseregistrationui.cxx index 7012dab1e89c..2c4af6be9784 100644 --- a/svx/source/dialog/databaseregistrationui.cxx +++ b/svx/source/dialog/databaseregistrationui.cxx @@ -47,7 +47,7 @@ // === includes (global) ================================================= #include <sfx2/app.hxx> -#include <svtools/itemset.hxx> +#include <svl/itemset.hxx> #include <vcl/msgbox.hxx> // === /includes (global) ================================================ diff --git a/svx/source/dialog/dialmgr.cxx b/svx/source/dialog/dialmgr.cxx index f74e502cc05a..574a68a6ce91 100644 --- a/svx/source/dialog/dialmgr.cxx +++ b/svx/source/dialog/dialmgr.cxx @@ -39,7 +39,7 @@ #include <svx/dialmgr.hxx> #include <tools/rc.hxx> -#include <svtools/solar.hrc> +#include <svl/solar.hrc> #include <vcl/svapp.hxx> static ResMgr* pResMgr=0; diff --git a/svx/source/dialog/dlgctl3d.cxx b/svx/source/dialog/dlgctl3d.cxx index 8123a353bc63..edaa2cb92adb 100644 --- a/svx/source/dialog/dlgctl3d.cxx +++ b/svx/source/dialog/dlgctl3d.cxx @@ -35,7 +35,7 @@ #include <svx/dialogs.hrc> #include <svx/view3d.hxx> #include <svx/fmmodel.hxx> -#include <svtools/itempool.hxx> +#include <svl/itempool.hxx> #include <svx/fmpage.hxx> #include <svx/polysc3d.hxx> #include <svx/sphere3d.hxx> diff --git a/svx/source/dialog/dlgutil.cxx b/svx/source/dialog/dlgutil.cxx index 5dee73abe484..1d2b295a793d 100644 --- a/svx/source/dialog/dlgutil.cxx +++ b/svx/source/dialog/dlgutil.cxx @@ -39,7 +39,7 @@ #include <unolingu.hxx> #include <svtools/langtab.hxx> -#include <svtools/itemset.hxx> +#include <svl/itemset.hxx> #include <sfx2/viewfrm.hxx> #include <sfx2/objsh.hxx> diff --git a/svx/source/dialog/fntctrl.cxx b/svx/source/dialog/fntctrl.cxx index 5018bd28a640..58455f48589e 100644 --- a/svx/source/dialog/fntctrl.cxx +++ b/svx/source/dialog/fntctrl.cxx @@ -50,7 +50,7 @@ #define _SVSTDARR_USHORTS #define _SVSTDARR_ULONGS #define _SVSTDARR_XUB_STRLEN -#include <svtools/svstdarr.hxx> +#include <svl/svstdarr.hxx> #endif #include <svtools/colorcfg.hxx> diff --git a/svx/source/dialog/graphctl.cxx b/svx/source/dialog/graphctl.cxx index a3b57230da55..7ff915a51650 100644 --- a/svx/source/dialog/graphctl.cxx +++ b/svx/source/dialog/graphctl.cxx @@ -30,10 +30,10 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" -#include <svtools/itempool.hxx> +#include <svl/itempool.hxx> #include <vcl/dialog.hxx> #include <vcl/wrkwin.hxx> -#include <svtools/syslocale.hxx> +#include <unotools/syslocale.hxx> #include <rtl/math.hxx> #include <unotools/localedatawrapper.hxx> #ifndef _UNOTOOLS_PROCESSFACTORY_HXX diff --git a/svx/source/dialog/hdft.cxx b/svx/source/dialog/hdft.cxx index bb80d3dd588e..2eaf00d2b73c 100644 --- a/svx/source/dialog/hdft.cxx +++ b/svx/source/dialog/hdft.cxx @@ -33,7 +33,7 @@ // include --------------------------------------------------------------- #include <tools/shl.hxx> -#include <svtools/itemiter.hxx> +#include <svl/itemiter.hxx> #include <sfx2/app.hxx> #include <sfx2/objsh.hxx> #include <sfx2/module.hxx> diff --git a/svx/source/dialog/hyprlink.cxx b/svx/source/dialog/hyprlink.cxx index 495880278363..01c5629dc10c 100644 --- a/svx/source/dialog/hyprlink.cxx +++ b/svx/source/dialog/hyprlink.cxx @@ -35,14 +35,14 @@ #include <unotools/configitem.hxx> #include <unotools/cmdoptions.hxx> #include <svtools/inetimg.hxx> -#include <svtools/urlbmk.hxx> -#include <svtools/eitem.hxx> -#include <svtools/stritem.hxx> +#include <svl/urlbmk.hxx> +#include <svl/eitem.hxx> +#include <svl/stritem.hxx> #include <sfx2/viewfrm.hxx> #include <sfx2/docfile.hxx> #include <sfx2/imgmgr.hxx> #include <sfx2/dispatch.hxx> -#include <svtools/urihelper.hxx> +#include <svl/urihelper.hxx> #include <sfx2/objsh.hxx> #include <comphelper/processfactory.hxx> @@ -66,6 +66,8 @@ public: ~SearchDefaultConfigItem_Impl(); const OUString& GetDefaultSearchEngine(){ return sDefaultEngine;} + virtual void Notify( const com::sun::star::uno::Sequence< rtl::OUString >& aPropertyNames ); + virtual void Commit(); }; /*-- 11.11.2003 14:20:59--------------------------------------------------- @@ -86,6 +88,14 @@ SearchDefaultConfigItem_Impl::~SearchDefaultConfigItem_Impl() { } +void SearchDefaultConfigItem_Impl::Notify( const com::sun::star::uno::Sequence< rtl::OUString >& ) +{ +} + +void SearchDefaultConfigItem_Impl::Commit() +{ +} + /************************************************************************* |* |* Dialog zum Einf"ugen/"Andern eines Hyperlink diff --git a/svx/source/dialog/imapdlg.cxx b/svx/source/dialog/imapdlg.cxx index 980ec36be7cf..3990842b76b5 100644 --- a/svx/source/dialog/imapdlg.cxx +++ b/svx/source/dialog/imapdlg.cxx @@ -52,13 +52,13 @@ #include <vcl/msgbox.hxx> #include <vcl/group.hxx> #include <vcl/lstbox.hxx> -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> #include <unotools/pathoptions.hxx> #include <sfx2/dispatch.hxx> #include <sfx2/module.hxx> #include <sfx2/filedlghelper.hxx> #include "com/sun/star/ui/dialogs/TemplateDescription.hpp" -#include <svtools/urihelper.hxx> +#include <svl/urihelper.hxx> #include <svtools/miscopt.hxx> #include <svtools/ehdl.hxx> #include <svtools/sfxecode.hxx> diff --git a/svx/source/dialog/imapwnd.cxx b/svx/source/dialog/imapwnd.cxx index d835dd1a129e..37a9959acd89 100644 --- a/svx/source/dialog/imapwnd.cxx +++ b/svx/source/dialog/imapwnd.cxx @@ -38,7 +38,7 @@ #include <svtools/imaprect.hxx> #include <svtools/imapcirc.hxx> #include <svtools/imappoly.hxx> -#include <svtools/urlbmk.hxx> +#include <svl/urlbmk.hxx> #include <xoutbmp.hxx> #include <svx/dialmgr.hxx> @@ -52,7 +52,7 @@ #include <svx/svdopath.hxx> #include <svx/xfltrit.hxx> #include <svx/svdpagv.hxx> -#include <svtools/urihelper.hxx> +#include <svl/urihelper.hxx> #include <svx/xfillit.hxx> #include <svx/xlineit.hxx> #include <sfx2/evntconf.hxx> diff --git a/svx/source/dialog/imapwnd.hxx b/svx/source/dialog/imapwnd.hxx index 0b8ecd942215..012e3bf7e06c 100644 --- a/svx/source/dialog/imapwnd.hxx +++ b/svx/source/dialog/imapwnd.hxx @@ -34,7 +34,7 @@ #include <vcl/fixed.hxx> #include <vcl/button.hxx> #include <vcl/menu.hxx> -#include <svtools/itempool.hxx> +#include <svl/itempool.hxx> #include <svtools/imapobj.hxx> #include <svtools/transfer.hxx> #include <svtools/imap.hxx> diff --git a/svx/source/dialog/impgrf.cxx b/svx/source/dialog/impgrf.cxx index de5295e8d1d2..5eb1dde2cd8b 100644 --- a/svx/source/dialog/impgrf.cxx +++ b/svx/source/dialog/impgrf.cxx @@ -35,8 +35,8 @@ #include <limits.h> // USHRT_MAX #include <tools/urlobj.hxx> #include <tools/bigint.hxx> -#include <svtools/eitem.hxx> -#include <svtools/stritem.hxx> +#include <svl/eitem.hxx> +#include <svl/stritem.hxx> #include <sfx2/docfile.hxx> #include <sfx2/dispatch.hxx> #include <vcl/msgbox.hxx> diff --git a/svx/source/dialog/opengrf.cxx b/svx/source/dialog/opengrf.cxx index 6621a04d39c1..1056c6f1c162 100644 --- a/svx/source/dialog/opengrf.cxx +++ b/svx/source/dialog/opengrf.cxx @@ -46,7 +46,7 @@ #include <com/sun/star/ui/dialogs/XFilePickerNotifier.hpp> #include <com/sun/star/ui/dialogs/XFilePreview.hpp> #include <com/sun/star/ui/dialogs/XFilterManager.hpp> -#include <svtools/urihelper.hxx> +#include <svl/urihelper.hxx> #ifndef _UNOTOOLS_UCBSTREAMHELPER_HXX #include <unotools/ucbstreamhelper.hxx> #endif diff --git a/svx/source/dialog/rlrcitem.cxx b/svx/source/dialog/rlrcitem.cxx index a83c052dafea..53e1e8bea1e9 100644 --- a/svx/source/dialog/rlrcitem.cxx +++ b/svx/source/dialog/rlrcitem.cxx @@ -32,7 +32,7 @@ #include "precompiled_svx.hxx" // INCLUDE --------------------------------------------------------------- -#include <svtools/rectitem.hxx> +#include <svl/rectitem.hxx> @@ -48,7 +48,7 @@ #include "protitem.hxx" #include "rlrcitem.hxx" #include "rulritem.hxx" -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> // class SvxRulerItem ---------------------------------------------------- diff --git a/svx/source/dialog/rubydialog.cxx b/svx/source/dialog/rubydialog.cxx index c957290d55c4..8c4d1cc07cd0 100644 --- a/svx/source/dialog/rubydialog.cxx +++ b/svx/source/dialog/rubydialog.cxx @@ -38,7 +38,7 @@ #include <sfx2/app.hxx> #include <sfx2/dispatch.hxx> #include <sfx2/viewfrm.hxx> -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> #include <com/sun/star/frame/XController.hpp> #include <com/sun/star/style/XStyle.hpp> #include <com/sun/star/text/XRubySelection.hpp> diff --git a/svx/source/dialog/srchctrl.cxx b/svx/source/dialog/srchctrl.cxx index a3885763887f..a55fe24d6955 100644 --- a/svx/source/dialog/srchctrl.cxx +++ b/svx/source/dialog/srchctrl.cxx @@ -33,7 +33,7 @@ // include --------------------------------------------------------------- #include <tools/pstm.hxx> -#include <svtools/intitem.hxx> +#include <svl/intitem.hxx> #include <sfx2/objsh.hxx> #include <svx/svxids.hrc> diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx index a4cc3b44bcc7..5af535827c41 100644 --- a/svx/source/dialog/srchdlg.cxx +++ b/svx/source/dialog/srchdlg.cxx @@ -35,16 +35,16 @@ #include <vcl/wrkwin.hxx> #include <vcl/morebtn.hxx> #include <vcl/msgbox.hxx> -#include <svtools/slstitm.hxx> -#include <svtools/itemiter.hxx> -#include <svtools/style.hxx> +#include <svl/slstitm.hxx> +#include <svl/itemiter.hxx> +#include <svl/style.hxx> #include <unotools/searchopt.hxx> #include <sfx2/dispatch.hxx> #include <sfx2/objsh.hxx> #include <sfx2/module.hxx> #include <sfx2/viewsh.hxx> #include <sfx2/basedlgs.hxx> -#include <svtools/cjkoptions.hxx> +#include <svl/cjkoptions.hxx> #include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/i18n/TransliterationModules.hpp> #include <com/sun/star/frame/XDispatch.hpp> @@ -52,7 +52,7 @@ #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/frame/XModuleManager.hpp> #include <comphelper/processfactory.hxx> -#include <svtools/itempool.hxx> +#include <svl/itempool.hxx> #include <sfx2/app.hxx> #include <toolkit/unohlp.hxx> diff --git a/svx/source/dialog/svxbmpnumvalueset.cxx b/svx/source/dialog/svxbmpnumvalueset.cxx index 6abadb0ac4ab..dcfaabf0f415 100644 --- a/svx/source/dialog/svxbmpnumvalueset.cxx +++ b/svx/source/dialog/svxbmpnumvalueset.cxx @@ -37,17 +37,17 @@ #include <tools/shl.hxx> #include <i18npool/mslangid.hxx> #include <svtools/valueset.hxx> -#include <svtools/languageoptions.hxx> +#include <svl/languageoptions.hxx> #ifndef _SVX_HELPID_HRC #include <helpid.hrc> #endif #include <svx/numitem.hxx> -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> #include <vcl/svapp.hxx> #include <gallery.hxx> -#include <svtools/urihelper.hxx> +#include <svl/urihelper.hxx> #include <svx/brshitem.hxx> -#include <svtools/intitem.hxx> +#include <svl/intitem.hxx> #include <sfx2/objsh.hxx> #include <vcl/graph.hxx> #include <vcl/msgbox.hxx> diff --git a/svx/source/dialog/svxruler.cxx b/svx/source/dialog/svxruler.cxx index 712b66b86da1..6f2f7cdd2ebd 100644 --- a/svx/source/dialog/svxruler.cxx +++ b/svx/source/dialog/svxruler.cxx @@ -37,11 +37,11 @@ #include <limits.h> #include <tools/shl.hxx> #include <vcl/image.hxx> -#include <svtools/eitem.hxx> -#include <svtools/rectitem.hxx> +#include <svl/eitem.hxx> +#include <svl/rectitem.hxx> #include <sfx2/dispatch.hxx> -#include <svtools/smplhint.hxx> +#include <svl/smplhint.hxx> diff --git a/svx/source/dialog/thesdlg.cxx b/svx/source/dialog/thesdlg.cxx index 7a5497181b59..c27115ff64cd 100644 --- a/svx/source/dialog/thesdlg.cxx +++ b/svx/source/dialog/thesdlg.cxx @@ -31,7 +31,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" #include <tools/shl.hxx> -#include <svtools/lngmisc.hxx> +#include <svl/lngmisc.hxx> #include <vcl/wrkwin.hxx> #ifndef _MSGBOX_HXX //autogen #include <vcl/msgbox.hxx> diff --git a/svx/source/editeng/SvXMLAutoCorrectExport.cxx b/svx/source/editeng/SvXMLAutoCorrectExport.cxx index 011c8bede485..b5c3d5865495 100644 --- a/svx/source/editeng/SvXMLAutoCorrectExport.cxx +++ b/svx/source/editeng/SvXMLAutoCorrectExport.cxx @@ -33,7 +33,7 @@ #include <SvXMLAutoCorrectExport.hxx> #define _SVSTDARR_STRINGSISORTDTOR #define _SVSTDARR_STRINGSDTOR -#include <svtools/svstdarr.hxx> +#include <svl/svstdarr.hxx> #include <xmloff/xmltoken.hxx> using namespace ::com::sun::star::uno; diff --git a/svx/source/editeng/SvXMLAutoCorrectImport.cxx b/svx/source/editeng/SvXMLAutoCorrectImport.cxx index 04748767dcac..49718e68fb94 100644 --- a/svx/source/editeng/SvXMLAutoCorrectImport.cxx +++ b/svx/source/editeng/SvXMLAutoCorrectImport.cxx @@ -37,7 +37,7 @@ #define _SVSTDARR_STRINGSISORTDTOR #define _SVSTDARR_STRINGSDTOR -#include <svtools/svstdarr.hxx> +#include <svl/svstdarr.hxx> #include <xmloff/xmltoken.hxx> using namespace ::com::sun::star; diff --git a/svx/source/editeng/acorrcfg.cxx b/svx/source/editeng/acorrcfg.cxx index b7e5be53344a..e0e34ed085d4 100644 --- a/svx/source/editeng/acorrcfg.cxx +++ b/svx/source/editeng/acorrcfg.cxx @@ -36,7 +36,7 @@ #include <tools/urlobj.hxx> #include <unotools/pathoptions.hxx> -#include <svtools/urihelper.hxx> +#include <svl/urihelper.hxx> #include <svx/svxacorr.hxx> #include <com/sun/star/uno/Any.hxx> diff --git a/svx/source/editeng/editattr.hxx b/svx/source/editeng/editattr.hxx index 6c964590bbea..c8e2a1c268f1 100644 --- a/svx/source/editeng/editattr.hxx +++ b/svx/source/editeng/editattr.hxx @@ -54,7 +54,7 @@ class SvxFieldItem; class SvxLanguageItem; class SvxEmphasisMarkItem; class SvxCharReliefItem; -#include <svtools/poolitem.hxx> +#include <svl/poolitem.hxx> class SfxVoidItem; diff --git a/svx/source/editeng/editdbg.hxx b/svx/source/editeng/editdbg.hxx index 842c927948e3..e75a0baef217 100644 --- a/svx/source/editeng/editdbg.hxx +++ b/svx/source/editeng/editdbg.hxx @@ -31,7 +31,7 @@ #ifndef _EDITDBG_HXX #define _EDITDBG_HXX -#include <svtools/solar.hrc> +#include <svl/solar.hrc> #include <tools/string.hxx> #include <stdio.h> diff --git a/svx/source/editeng/editdoc.hxx b/svx/source/editeng/editdoc.hxx index 872f19485ae6..3364157cfc1a 100644 --- a/svx/source/editeng/editdoc.hxx +++ b/svx/source/editeng/editdoc.hxx @@ -38,9 +38,9 @@ #include <editattr.hxx> #include <edtspell.hxx> #include <svx/svxfont.hxx> -#include <svtools/itemset.hxx> -#include <svtools/style.hxx> -#include <svtools/itempool.hxx> +#include <svl/itemset.hxx> +#include <svl/style.hxx> +#include <svl/itempool.hxx> #include <tools/table.hxx> class ImpEditEngine; diff --git a/svx/source/editeng/editdoc2.cxx b/svx/source/editeng/editdoc2.cxx index 030dfb1ad615..c779e0d53734 100644 --- a/svx/source/editeng/editdoc2.cxx +++ b/svx/source/editeng/editdoc2.cxx @@ -32,7 +32,7 @@ #include "precompiled_svx.hxx" #include <eeng_pch.hxx> -#include <svtools/smplhint.hxx> +#include <svl/smplhint.hxx> #include <tools/rtti.hxx> #include <svx/lspcitem.hxx> #include <svx/adjitem.hxx> diff --git a/svx/source/editeng/editeng.cxx b/svx/source/editeng/editeng.cxx index 0f513b84bdfe..58a735529d2c 100644 --- a/svx/source/editeng/editeng.cxx +++ b/svx/source/editeng/editeng.cxx @@ -36,8 +36,8 @@ #define USE_SVXFONT #define _SVSTDARR_USHORTS -#include <svtools/svstdarr.hxx> -#include <svtools/ctloptions.hxx> +#include <svl/svstdarr.hxx> +#include <svl/ctloptions.hxx> #include <svtools/ctrltool.hxx> #include <svx/svxfont.hxx> diff --git a/svx/source/editeng/editeng.hrc b/svx/source/editeng/editeng.hrc index 2068e91c4bce..280c90f66341 100644 --- a/svx/source/editeng/editeng.hrc +++ b/svx/source/editeng/editeng.hrc @@ -31,7 +31,7 @@ #define _EDITENG_HRC #ifndef _SOLAR_HRC -#include <svtools/solar.hrc> +#include <svl/solar.hrc> #endif #define RID_EDITUNDO_DEL ( RID_EDIT_START + 0 ) diff --git a/svx/source/editeng/editobj.cxx b/svx/source/editeng/editobj.cxx index fb5e921f60f0..b9792fc2b068 100644 --- a/svx/source/editeng/editobj.cxx +++ b/svx/source/editeng/editobj.cxx @@ -50,7 +50,7 @@ #include <svx/numitem.hxx> #include <svx/brshitem.hxx> #include <vcl/graph.hxx> -#include <svtools/intitem.hxx> +#include <svl/intitem.hxx> #include <vcl/fontcvt.hxx> #include <tools/tenccvt.hxx> diff --git a/svx/source/editeng/editview.cxx b/svx/source/editeng/editview.cxx index 0e9f82cc31a1..e67d17832f6d 100644 --- a/svx/source/editeng/editview.cxx +++ b/svx/source/editeng/editview.cxx @@ -38,13 +38,13 @@ #define _SOLAR__PRIVATE 1 #include <i18npool/mslangid.hxx> -#include <svtools/languageoptions.hxx> +#include <svl/languageoptions.hxx> #include <svtools/ctrltool.hxx> #include <sfx2/srchitem.hxx> #define _SVSTDARR_USHORTS -#include <svtools/svstdarr.hxx> +#include <svl/svstdarr.hxx> #include <impedit.hxx> #include <svx/editeng.hxx> diff --git a/svx/source/editeng/edtspell.cxx b/svx/source/editeng/edtspell.cxx index df6725cff00f..63f788e192d5 100644 --- a/svx/source/editeng/edtspell.cxx +++ b/svx/source/editeng/edtspell.cxx @@ -39,8 +39,8 @@ #include <edtspell.hxx> #include <svx/flditem.hxx> #include <fontitem.hxx> -#include <svtools/intitem.hxx> -#include <svtools/eitem.hxx> +#include <svl/intitem.hxx> +#include <svl/eitem.hxx> #include <unolingu.hxx> #include <linguistic/lngprops.hxx> #include <com/sun/star/beans/XPropertySet.hpp> diff --git a/svx/source/editeng/eehtml.hxx b/svx/source/editeng/eehtml.hxx index 37d96dde87da..44146eb0d227 100644 --- a/svx/source/editeng/eehtml.hxx +++ b/svx/source/editeng/eehtml.hxx @@ -31,7 +31,7 @@ #ifndef _EEHTML_HXX #define _EEHTML_HXX -#include <svtools/svarray.hxx> +#include <svl/svarray.hxx> #include <editdoc.hxx> #include <sfx2/sfxhtml.hxx> diff --git a/svx/source/editeng/eeobj.cxx b/svx/source/editeng/eeobj.cxx index 8dd58f8a5d41..aadc1bd111f3 100644 --- a/svx/source/editeng/eeobj.cxx +++ b/svx/source/editeng/eeobj.cxx @@ -38,7 +38,7 @@ #include <sot/exchange.hxx> #include <sot/formats.hxx> #include <svx/editeng.hxx> -#include <svtools/itempool.hxx> +#include <svl/itempool.hxx> #include <vos/mutex.hxx> #include <vcl/svapp.hxx> using namespace ::com::sun::star; diff --git a/svx/source/editeng/eerdll.cxx b/svx/source/editeng/eerdll.cxx index 0d1872f96549..fb715925546c 100644 --- a/svx/source/editeng/eerdll.cxx +++ b/svx/source/editeng/eerdll.cxx @@ -36,7 +36,7 @@ #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <comphelper/processfactory.hxx> -#include <svtools/solar.hrc> +#include <svl/solar.hrc> #include <eerdll.hxx> #include <eerdll2.hxx> #include <svx/lspcitem.hxx> @@ -46,7 +46,7 @@ #include <svx/flditem.hxx> #include <svx/emphitem.hxx> #include <svx/scriptspaceitem.hxx> -#include <svtools/itempool.hxx> +#include <svl/itempool.hxx> #include <vcl/virdev.hxx> #include <vcl/svapp.hxx> diff --git a/svx/source/editeng/eertfpar.cxx b/svx/source/editeng/eertfpar.cxx index a659b0e513f0..dd5afec53e7b 100644 --- a/svx/source/editeng/eertfpar.cxx +++ b/svx/source/editeng/eertfpar.cxx @@ -35,7 +35,7 @@ #include <eertfpar.hxx> #include <impedit.hxx> -#include <svtools/intitem.hxx> +#include <svl/intitem.hxx> #include <svx/escpitem.hxx> #include <svx/fhgtitem.hxx> #include "fontitem.hxx" diff --git a/svx/source/editeng/impedit.cxx b/svx/source/editeng/impedit.cxx index 16f0c1f5277d..44e8086e1748 100644 --- a/svx/source/editeng/impedit.cxx +++ b/svx/source/editeng/impedit.cxx @@ -57,7 +57,7 @@ #include <vos/mutex.hxx> #include <svx/flditem.hxx> -#include <svtools/intitem.hxx> +#include <svl/intitem.hxx> #include <svtools/transfer.hxx> #include <sot/exchange.hxx> diff --git a/svx/source/editeng/impedit.hxx b/svx/source/editeng/impedit.hxx index 25b7cec4f449..6c4cd7cfb17f 100644 --- a/svx/source/editeng/impedit.hxx +++ b/svx/source/editeng/impedit.hxx @@ -42,7 +42,7 @@ #include <vcl/cursor.hxx> #include <vcl/dndhelp.hxx> -#include <svtools/ondemand.hxx> +#include <svl/ondemand.hxx> #include <com/sun/star/linguistic2/XSpellAlternatives.hpp> #include <com/sun/star/linguistic2/SpellFailure.hpp> #include <com/sun/star/linguistic2/XSpellChecker.hpp> diff --git a/svx/source/editeng/impedit2.cxx b/svx/source/editeng/impedit2.cxx index f8cd7e67a4c9..9e8236f3b536 100644 --- a/svx/source/editeng/impedit2.cxx +++ b/svx/source/editeng/impedit2.cxx @@ -44,9 +44,9 @@ #include <edtspell.hxx> #include <eeobj.hxx> #include <txtrange.hxx> -#include <svtools/urlbmk.hxx> +#include <svl/urlbmk.hxx> #include <svtools/colorcfg.hxx> -#include <svtools/ctloptions.hxx> +#include <svl/ctloptions.hxx> #include <acorrcfg.hxx> #include <svx/fhgtitem.hxx> diff --git a/svx/source/editeng/impedit3.cxx b/svx/source/editeng/impedit3.cxx index d272991953c5..72cf588bc6a1 100644 --- a/svx/source/editeng/impedit3.cxx +++ b/svx/source/editeng/impedit3.cxx @@ -36,7 +36,7 @@ #include <vcl/gdimtf.hxx> #define _SVSTDARR_USHORTS -#include <svtools/svstdarr.hxx> +#include <svl/svstdarr.hxx> #ifndef _WRKWIN_HXX //autogen #include <vcl/wrkwin.hxx> @@ -68,7 +68,7 @@ #include <svx/numitem.hxx> #include <svtools/colorcfg.hxx> -#include <svtools/ctloptions.hxx> +#include <svl/ctloptions.hxx> #include <forbiddencharacterstable.hxx> diff --git a/svx/source/editeng/impedit5.cxx b/svx/source/editeng/impedit5.cxx index 3c98c0d23818..9d551dd94682 100644 --- a/svx/source/editeng/impedit5.cxx +++ b/svx/source/editeng/impedit5.cxx @@ -37,7 +37,7 @@ #include <svx/editeng.hxx> #include <editdbg.hxx> -#include <svtools/smplhint.hxx> +#include <svl/smplhint.hxx> #include <svx/lrspitem.hxx> diff --git a/svx/source/editeng/svxacorr.cxx b/svx/source/editeng/svxacorr.cxx index a6f9faf6eff4..958c9b3b5435 100644 --- a/svx/source/editeng/svxacorr.cxx +++ b/svx/source/editeng/svxacorr.cxx @@ -50,13 +50,13 @@ // fuer die Sort-String-Arrays aus dem SVMEM.HXX #define _SVSTDARR_STRINGSISORTDTOR #define _SVSTDARR_STRINGSDTOR -#include <svtools/svstdarr.hxx> +#include <svl/svstdarr.hxx> #ifndef SVTOOLS_FSTATHELPER_HXX -#include <svtools/fstathelper.hxx> +#include <svl/fstathelper.hxx> #endif #include <svtools/helpopt.hxx> -#include <svtools/urihelper.hxx> +#include <svl/urihelper.hxx> #include <unotools/charclass.hxx> #ifndef _COM_SUN_STAR_I18N_UNICODETYPE_HDL_ #include <com/sun/star/i18n/UnicodeType.hdl> diff --git a/svx/source/engine3d/float3d.cxx b/svx/source/engine3d/float3d.cxx index a5147c55e81e..71a5ba2065f8 100644 --- a/svx/source/engine3d/float3d.cxx +++ b/svx/source/engine3d/float3d.cxx @@ -33,7 +33,7 @@ #include <sfx2/dispatch.hxx> #include <sfx2/module.hxx> #include <sfx2/viewfrm.hxx> -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> #include <svtools/colrdlg.hxx> #include <vcl/msgbox.hxx> #include <sfx2/viewsh.hxx> @@ -50,7 +50,7 @@ #include <svx/fmpage.hxx> #include <svx/polysc3d.hxx> #include <svx/eeitem.hxx> -#include <svtools/style.hxx> +#include <svl/style.hxx> #include <dlgutil.hxx> @@ -65,7 +65,7 @@ #include <gallery.hxx> #define GALLERY_THEME "3D" -#include <svtools/whiter.hxx> +#include <svl/whiter.hxx> #include <svx/float3d.hxx> #include "float3d.hrc" diff --git a/svx/source/engine3d/obj3d.cxx b/svx/source/engine3d/obj3d.cxx index 2d3408ffeb86..905bd7706a1f 100644 --- a/svx/source/engine3d/obj3d.cxx +++ b/svx/source/engine3d/obj3d.cxx @@ -52,7 +52,7 @@ #include <vcl/svapp.hxx> #include <vcl/settings.hxx> #include <svx/xlnclit.hxx> -#include <svtools/metitem.hxx> +#include <svl/metitem.hxx> #include <svx/xtable.hxx> #include <svx/xfillit.hxx> #include <svx/xlnwtit.hxx> @@ -68,7 +68,7 @@ #include <vcl/gradient.hxx> #include <vcl/metaact.hxx> #include <svx/svx3ditems.hxx> -#include <svtools/whiter.hxx> +#include <svl/whiter.hxx> #include <svtools/colorcfg.hxx> #include <svx/eeitem.hxx> #include <svx/xgrscit.hxx> diff --git a/svx/source/engine3d/polysc3d.cxx b/svx/source/engine3d/polysc3d.cxx index 9cca99b55188..48783368f7db 100644 --- a/svx/source/engine3d/polysc3d.cxx +++ b/svx/source/engine3d/polysc3d.cxx @@ -39,11 +39,11 @@ #include <vcl/svapp.hxx> #include <svx/svdpage.hxx> #include <svx/svdpool.hxx> -#include <svtools/style.hxx> +#include <svl/style.hxx> #include "globl3d.hxx" #include <svx/polysc3d.hxx> #include <svx/xlnclit.hxx> -#include <svtools/metitem.hxx> +#include <svl/metitem.hxx> #include <svx/xtable.hxx> #include <svx/xlnwtit.hxx> diff --git a/svx/source/engine3d/scene3d.cxx b/svx/source/engine3d/scene3d.cxx index 22ef5777f730..0e2b87be4ca7 100644 --- a/svx/source/engine3d/scene3d.cxx +++ b/svx/source/engine3d/scene3d.cxx @@ -40,7 +40,7 @@ #endif #include "globl3d.hxx" #include <svx/svdpage.hxx> -#include <svtools/style.hxx> +#include <svl/style.hxx> #include <svx/scene3d.hxx> #include <svx/e3dundo.hxx> #include <svx/svdtrans.hxx> @@ -50,7 +50,7 @@ #include <svx/xlntrit.hxx> #include <svx/xfltrit.hxx> #include <svx/svx3ditems.hxx> -#include <svtools/whiter.hxx> +#include <svl/whiter.hxx> #include <svx/xflftrit.hxx> #include <svx/sdr/properties/e3dsceneproperties.hxx> #include <svx/sdr/contact/viewcontactofe3dscene.hxx> diff --git a/svx/source/fmcomp/fmgridcl.cxx b/svx/source/fmcomp/fmgridcl.cxx index c210919bd09d..a03a67283fcb 100644 --- a/svx/source/fmcomp/fmgridcl.cxx +++ b/svx/source/fmcomp/fmgridcl.cxx @@ -70,7 +70,7 @@ #ifndef _SVSTDARR_STRINGSDTOR #define _SVSTDARR_STRINGSDTOR #define _SVSTDARR_ULONGS -#include <svtools/svstdarr.hxx> +#include <svl/svstdarr.hxx> #endif #include <comphelper/extract.hxx> @@ -80,9 +80,9 @@ #include <connectivity/dbtools.hxx> #include <sfx2/dispatch.hxx> #include <sfx2/viewfrm.hxx> -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> #include <svtools/fmtfield.hxx> -#include <svtools/numuno.hxx> +#include <svl/numuno.hxx> #include <tools/multisel.hxx> #include <tools/shl.hxx> #include <tools/diagnose_ex.h> diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx index ff7cfd422eb8..a4318682de5e 100644 --- a/svx/source/fmcomp/gridcell.cxx +++ b/svx/source/fmcomp/gridcell.cxx @@ -66,7 +66,7 @@ #include <rtl/math.hxx> #include <svtools/calendar.hxx> #include <svtools/fmtfield.hxx> -#include <svtools/numuno.hxx> +#include <svl/numuno.hxx> #include <svtools/svmedit.hxx> #include <svx/dialmgr.hxx> #include <toolkit/helper/vclunohelper.hxx> diff --git a/svx/source/form/ParseContext.cxx b/svx/source/form/ParseContext.cxx index 3e30601ef0fd..ee3a8369b2ee 100644 --- a/svx/source/form/ParseContext.cxx +++ b/svx/source/form/ParseContext.cxx @@ -37,7 +37,7 @@ #include <svx/dialmgr.hxx> -#include <svtools/syslocale.hxx> +#include <unotools/syslocale.hxx> #include <vcl/svapp.hxx> #include <tools/debug.hxx> #include <vos/mutex.hxx> diff --git a/svx/source/form/databaselocationinput.cxx b/svx/source/form/databaselocationinput.cxx index b7d5f3a7281e..fb9d625ce6e2 100644 --- a/svx/source/form/databaselocationinput.cxx +++ b/svx/source/form/databaselocationinput.cxx @@ -45,7 +45,7 @@ #include <rtl/ustrbuf.hxx> #include <sfx2/filedlghelper.hxx> #include <svtools/urlcontrol.hxx> -#include <svtools/filenotation.hxx> +#include <svl/filenotation.hxx> #include <tools/diagnose_ex.h> #include <unotools/confignode.hxx> #include <unotools/ucbhelper.hxx> diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx index af32dc4fb9a9..f652be197bbd 100644 --- a/svx/source/form/datanavi.cxx +++ b/svx/source/form/datanavi.cxx @@ -46,7 +46,7 @@ #include <svtools/miscopt.hxx> #include <unotools/pathoptions.hxx> #include <unotools/viewoptions.hxx> -#include <svtools/svtools.hrc> +#include <svl/svtools.hrc> #include <sfx2/app.hxx> #include <sfx2/filedlghelper.hxx> #include <sfx2/objitem.hxx> diff --git a/svx/source/form/fmexch.cxx b/svx/source/form/fmexch.cxx index b50cee74a252..8edcfbedb0ba 100644 --- a/svx/source/form/fmexch.cxx +++ b/svx/source/form/fmexch.cxx @@ -33,7 +33,7 @@ #include "fmexch.hxx" #include <sot/storage.hxx> -#include <svtools/itempool.hxx> +#include <svl/itempool.hxx> #ifndef _SVX_DBEXCH_HRC #include <dbexch.hrc> @@ -43,7 +43,7 @@ #include <tools/diagnose_ex.h> #define _SVSTDARR_ULONGS -#include <svtools/svstdarr.hxx> +#include <svl/svstdarr.hxx> //........................................................................ namespace svxform diff --git a/svx/source/form/fmshell.cxx b/svx/source/form/fmshell.cxx index 78586ed2bd87..02af55880f76 100644 --- a/svx/source/form/fmshell.cxx +++ b/svx/source/form/fmshell.cxx @@ -56,10 +56,10 @@ #include <sfx2/viewfrm.hxx> #include <vcl/wrkwin.hxx> #include <vcl/msgbox.hxx> -#include <svtools/whiter.hxx> +#include <svl/whiter.hxx> #include <sfx2/app.hxx> -#include <svtools/intitem.hxx> -#include <svtools/visitem.hxx> +#include <svl/intitem.hxx> +#include <svl/visitem.hxx> #include <unotools/moduleoptions.hxx> #include <sfx2/objface.hxx> #include <sfx2/request.hxx> @@ -79,7 +79,7 @@ #endif #include "fmexch.hxx" #include <svx/fmglob.hxx> -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> #include <tools/shl.hxx> #include <svx/svdpage.hxx> #include <svx/fmmodel.hxx> @@ -91,7 +91,7 @@ #include <vcl/sound.hxx> #include "fmexpl.hxx" #include "formcontrolling.hxx" -#include <svtools/numuno.hxx> +#include <svl/numuno.hxx> #include <connectivity/dbtools.hxx> #include <comphelper/types.hxx> #include <comphelper/processfactory.hxx> diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx index 8c5ca61f6691..8a1e3c212d4c 100644 --- a/svx/source/form/fmshimp.cxx +++ b/svx/source/form/fmshimp.cxx @@ -3919,6 +3919,10 @@ void FmXFormShell::Notify( const com::sun::star::uno::Sequence< rtl::OUString >& } } +void FmXFormShell::Commit() +{ +} + //------------------------------------------------------------------------ void FmXFormShell::SetWizardUsing(sal_Bool _bUseThem) { diff --git a/svx/source/form/fmsrccfg.cxx b/svx/source/form/fmsrccfg.cxx index 95759df4c0ef..c1552e095848 100644 --- a/svx/source/form/fmsrccfg.cxx +++ b/svx/source/form/fmsrccfg.cxx @@ -31,7 +31,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" #include "fmsrccfg.hxx" -#include <svtools/filerec.hxx> +#include <svl/filerec.hxx> #include <com/sun/star/i18n/TransliterationModules.hpp> #include <comphelper/processfactory.hxx> diff --git a/svx/source/form/fmsrcimp.cxx b/svx/source/form/fmsrcimp.cxx index 3d1235624802..e82fe484f2b8 100644 --- a/svx/source/form/fmsrcimp.cxx +++ b/svx/source/form/fmsrcimp.cxx @@ -73,7 +73,7 @@ #include "fmsearch.hrc" #endif #include <comphelper/numbers.hxx> -#include <svtools/syslocale.hxx> +#include <unotools/syslocale.hxx> #define EQUAL_BOOKMARKS(a, b) a == b diff --git a/svx/source/form/fmtextcontroldialogs.cxx b/svx/source/form/fmtextcontroldialogs.cxx index 14529b8ac9b7..b332e4a7ab40 100644 --- a/svx/source/form/fmtextcontroldialogs.cxx +++ b/svx/source/form/fmtextcontroldialogs.cxx @@ -48,10 +48,10 @@ #endif #include "flagsdef.hxx" -#include <svtools/intitem.hxx> +#include <svl/intitem.hxx> #include <com/sun/star/uno/Sequence.hxx> -#include <svtools/cjkoptions.hxx> +#include <svl/cjkoptions.hxx> //........................................................................ namespace svx diff --git a/svx/source/form/fmtextcontrolshell.cxx b/svx/source/form/fmtextcontrolshell.cxx index 10c0978288a6..2e155ef46b53 100644 --- a/svx/source/form/fmtextcontrolshell.cxx +++ b/svx/source/form/fmtextcontrolshell.cxx @@ -66,12 +66,12 @@ #include <sfx2/request.hxx> #include <sfx2/sfxuno.hxx> #include <sfx2/viewfrm.hxx> -#include <svtools/eitem.hxx> -#include <svtools/intitem.hxx> -#include <svtools/itempool.hxx> -#include <svtools/languageoptions.hxx> +#include <svl/eitem.hxx> +#include <svl/intitem.hxx> +#include <svl/itempool.hxx> +#include <svl/languageoptions.hxx> #include <svtools/stringtransfer.hxx> -#include <svtools/whiter.hxx> +#include <svl/whiter.hxx> #include <toolkit/helper/vclunohelper.hxx> #include <tools/diagnose_ex.h> #include <vcl/msgbox.hxx> diff --git a/svx/source/form/fmtools.cxx b/svx/source/form/fmtools.cxx index df8b51b8b82f..0d963ef905db 100644 --- a/svx/source/form/fmtools.cxx +++ b/svx/source/form/fmtools.cxx @@ -91,8 +91,8 @@ #include "fmprop.hrc" #endif #include <sfx2/bindings.hxx> -#include <svtools/eitem.hxx> -#include <svtools/stritem.hxx> +#include <svl/eitem.hxx> +#include <svl/stritem.hxx> #include <cppuhelper/servicefactory.hxx> #include <comphelper/types.hxx> #include <comphelper/property.hxx> diff --git a/svx/source/form/fmundo.cxx b/svx/source/form/fmundo.cxx index 2436113312cc..88f15756a233 100644 --- a/svx/source/form/fmundo.cxx +++ b/svx/source/form/fmundo.cxx @@ -56,7 +56,7 @@ #include <svx/dialmgr.hxx> #include "fmpgeimp.hxx" #include "svx/dbtoolsclient.hxx" -#include <svtools/macitem.hxx> +#include <svl/macitem.hxx> #include <tools/shl.hxx> #include <tools/diagnose_ex.h> #include <sfx2/objsh.hxx> diff --git a/svx/source/form/formcontrolfactory.cxx b/svx/source/form/formcontrolfactory.cxx index de1a7d76b526..36463c4ada89 100644 --- a/svx/source/form/formcontrolfactory.cxx +++ b/svx/source/form/formcontrolfactory.cxx @@ -57,7 +57,7 @@ #include <comphelper/componentcontext.hxx> #include <comphelper/numbers.hxx> -#include <svtools/syslocale.hxx> +#include <unotools/syslocale.hxx> #include <tools/gen.hxx> #include <tools/diagnose_ex.h> diff --git a/svx/source/form/tbxform.cxx b/svx/source/form/tbxform.cxx index 08c83b571a8f..cc5cd24ebcf0 100644 --- a/svx/source/form/tbxform.cxx +++ b/svx/source/form/tbxform.cxx @@ -33,9 +33,9 @@ #include <string> // HACK: prevent conflict between STLPORT and Workshop headers #include <tools/ref.hxx> #include <tools/shl.hxx> -#include <svtools/intitem.hxx> -#include <svtools/eitem.hxx> -#include <svtools/stritem.hxx> +#include <svl/intitem.hxx> +#include <svl/eitem.hxx> +#include <svl/stritem.hxx> #include <sfx2/dispatch.hxx> #include <vcl/toolbox.hxx> #include <vcl/fixed.hxx> diff --git a/svx/source/form/typemap.cxx b/svx/source/form/typemap.cxx index 5ef0c3f5c447..4a94b165b1b6 100644 --- a/svx/source/form/typemap.cxx +++ b/svx/source/form/typemap.cxx @@ -32,8 +32,8 @@ #include "precompiled_svx.hxx" #include <sfx2/objitem.hxx> #include <sfx2/msg.hxx> -#include <svtools/stritem.hxx> -#include <svtools/intitem.hxx> +#include <svl/stritem.hxx> +#include <svl/intitem.hxx> #include <svx/wghtitem.hxx> #include <svx/udlnitem.hxx> #include <svx/crsditem.hxx> diff --git a/svx/source/gallery2/galbrws1.hxx b/svx/source/gallery2/galbrws1.hxx index 344843c69740..23c8e6840626 100644 --- a/svx/source/gallery2/galbrws1.hxx +++ b/svx/source/gallery2/galbrws1.hxx @@ -31,7 +31,7 @@ #include <vcl/lstbox.hxx> #include <vcl/button.hxx> #include <vcl/menu.hxx> -#include <svtools/lstner.hxx> +#include <svl/lstner.hxx> #include <vector> #include "galbrws.hxx" diff --git a/svx/source/gallery2/galbrws2.cxx b/svx/source/gallery2/galbrws2.cxx index edc7f253a024..93315a8dddef 100644 --- a/svx/source/gallery2/galbrws2.cxx +++ b/svx/source/gallery2/galbrws2.cxx @@ -35,10 +35,10 @@ #include <sot/formats.hxx> #include <vcl/msgbox.hxx> #include <svtools/valueset.hxx> -#include <svtools/urlbmk.hxx> -#include <svtools/stritem.hxx> -#include <svtools/intitem.hxx> -#include <svtools/eitem.hxx> +#include <svl/urlbmk.hxx> +#include <svl/stritem.hxx> +#include <svl/intitem.hxx> +#include <svl/eitem.hxx> #include <svtools/transfer.hxx> #include <sfx2/bindings.hxx> #include <sfx2/dispatch.hxx> diff --git a/svx/source/gallery2/galmisc.cxx b/svx/source/gallery2/galmisc.cxx index d531404e083f..b91fb1cfb882 100644 --- a/svx/source/gallery2/galmisc.cxx +++ b/svx/source/gallery2/galmisc.cxx @@ -37,10 +37,10 @@ #include <ucbhelper/content.hxx> #include <tools/resmgr.hxx> #include <tools/urlobj.hxx> -#include <svtools/solar.hrc> -#include <svtools/urihelper.hxx> +#include <svl/solar.hrc> +#include <svl/urihelper.hxx> #include <svtools/filter.hxx> -#include <svtools/itempool.hxx> +#include <svl/itempool.hxx> #include <sfx2/docfile.hxx> #include <avmedia/mediawindow.hxx> #include <vcl/svapp.hxx> diff --git a/svx/source/gallery2/galobj.cxx b/svx/source/gallery2/galobj.cxx index f2f800e8a2c9..d0b1e68460a6 100644 --- a/svx/source/gallery2/galobj.cxx +++ b/svx/source/gallery2/galobj.cxx @@ -43,7 +43,7 @@ #include <tools/rcid.h> #include <tools/vcompat.hxx> #include <vcl/virdev.hxx> -#include <svtools/itempool.hxx> +#include <svl/itempool.hxx> #include <svx/fmmodel.hxx> #include <svx/fmview.hxx> #include <svx/fmpage.hxx> diff --git a/svx/source/gallery2/galtheme.cxx b/svx/source/gallery2/galtheme.cxx index 6bfb2232829f..e92be98a06b6 100644 --- a/svx/source/gallery2/galtheme.cxx +++ b/svx/source/gallery2/galtheme.cxx @@ -45,7 +45,7 @@ #include <sot/filelist.hxx> #include <vcl/virdev.hxx> #include <vcl/cvtgrf.hxx> -#include <svtools/itempool.hxx> +#include <svl/itempool.hxx> #include <sfx2/docfile.hxx> #include <avmedia/mediawindow.hxx> #include <svx/svdograf.hxx> diff --git a/svx/source/inc/GraphCtlAccessibleContext.hxx b/svx/source/inc/GraphCtlAccessibleContext.hxx index 0b862e1be691..dc96c2b9ecfc 100644 --- a/svx/source/inc/GraphCtlAccessibleContext.hxx +++ b/svx/source/inc/GraphCtlAccessibleContext.hxx @@ -52,7 +52,7 @@ #include <com/sun/star/lang/IndexOutOfBoundsException.hpp> #include <vos/mutex.hxx> #include <comphelper/broadcasthelper.hxx> -#include <svtools/lstner.hxx> +#include <svl/lstner.hxx> #include <set> #include <map> diff --git a/svx/source/inc/SpellDialog.hxx b/svx/source/inc/SpellDialog.hxx index e7545eaeb6e7..86c41d17452e 100644 --- a/svx/source/inc/SpellDialog.hxx +++ b/svx/source/inc/SpellDialog.hxx @@ -49,7 +49,7 @@ #include <svx/langbox.hxx> #include <memory> #include <svtools/svmedit.hxx> -#include <svtools/lstner.hxx> +#include <svl/lstner.hxx> #include <svtools/xtextedt.hxx> #include <svx/SpellPortions.hxx> diff --git a/svx/source/inc/filtnav.hxx b/svx/source/inc/filtnav.hxx index 2bb298836d02..9809010c901c 100644 --- a/svx/source/inc/filtnav.hxx +++ b/svx/source/inc/filtnav.hxx @@ -32,11 +32,11 @@ #include <com/sun/star/awt/XTextComponent.hpp> #include <com/sun/star/form/XForm.hpp> -#include <svtools/lstner.hxx> -#include <svtools/brdcst.hxx> +#include <svl/lstner.hxx> +#include <svl/brdcst.hxx> #include <vcl/window.hxx> #include <sfx2/childwin.hxx> -#include <svtools/poolitem.hxx> +#include <svl/poolitem.hxx> #include <sfx2/bindings.hxx> #include <sfx2/dockwin.hxx> #include <sfx2/ctrlitem.hxx> diff --git a/svx/source/inc/fmexpl.hxx b/svx/source/inc/fmexpl.hxx index df60ba931739..bc1da6d2a59c 100644 --- a/svx/source/inc/fmexpl.hxx +++ b/svx/source/inc/fmexpl.hxx @@ -30,11 +30,11 @@ #ifndef _SVX_FMEXPL_HXX #define _SVX_FMEXPL_HXX -#include <svtools/lstner.hxx> -#include <svtools/brdcst.hxx> +#include <svl/lstner.hxx> +#include <svl/brdcst.hxx> #include <vcl/window.hxx> #include <sfx2/childwin.hxx> -#include <svtools/poolitem.hxx> +#include <svl/poolitem.hxx> #include <sfx2/bindings.hxx> #include <sfx2/dockwin.hxx> #include <sfx2/ctrlitem.hxx> diff --git a/svx/source/inc/fmitems.hxx b/svx/source/inc/fmitems.hxx index 30bdefaf1c58..e637c57f0c15 100644 --- a/svx/source/inc/fmitems.hxx +++ b/svx/source/inc/fmitems.hxx @@ -31,7 +31,7 @@ #define _SVX_FMITEMS_HXX -#include <svtools/poolitem.hxx> +#include <svl/poolitem.hxx> #include <comphelper/uno3.hxx> // FORWARD_DECLARE_INTERFACE(awt,XControlContainer) FORWARD_DECLARE_INTERFACE(uno,Any) diff --git a/svx/source/inc/fmresids.hrc b/svx/source/inc/fmresids.hrc index 95a478fc5aee..3adaf1c587bb 100644 --- a/svx/source/inc/fmresids.hrc +++ b/svx/source/inc/fmresids.hrc @@ -31,7 +31,7 @@ #define _SVX_FMRESIDS_HRC // include ----------------------------------------------------------- -#include <svtools/solar.hrc> +#include <svl/solar.hrc> // unnamed ressources ------------------------------------------------------- // sub ressources ..................... diff --git a/svx/source/inc/fmshimp.hxx b/svx/source/inc/fmshimp.hxx index 85644ea5daba..98d6c5c6ed27 100644 --- a/svx/source/inc/fmshimp.hxx +++ b/svx/source/inc/fmshimp.hxx @@ -57,21 +57,21 @@ #ifndef _SVX_SVXIDS_HRC #include <svx/svxids.hrc> #endif -#include <svtools/svarray.hxx> -#include <svtools/lstner.hxx> +#include <svl/svarray.hxx> +#include <svl/lstner.hxx> #define _SVSTDARR_BOOLS #define _SVSTDARR_BYTES #define _SVSTDARR_LONGS #define _SVSTDARR_ULONGS #define _SVSTDARR_USHORTS -#include <svtools/svstdarr.hxx> +#include <svl/svstdarr.hxx> #include <sfx2/mnuitem.hxx> #include "fmtools.hxx" #include "fmsrccfg.hxx" #include <osl/mutex.hxx> #include <vos/thread.hxx> -#include <svtools/cancel.hxx> +#include <svl/cancel.hxx> #include <tools/debug.hxx> #include <cppuhelper/component.hxx> #include <comphelper/stl_types.hxx> @@ -534,6 +534,7 @@ private: // ConfigItem related stuff virtual void Notify( const com::sun::star::uno::Sequence< rtl::OUString >& _rPropertyNames); + virtual void Commit(); void implAdjustConfigCache(); ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer > diff --git a/svx/source/inc/fmtools.hxx b/svx/source/inc/fmtools.hxx index 935e84c6448e..8ecff316c2ee 100644 --- a/svx/source/inc/fmtools.hxx +++ b/svx/source/inc/fmtools.hxx @@ -71,7 +71,7 @@ #ifndef _SVSTDARR_ULONGS #define _SVSTDARR_ULONGS -#include <svtools/svstdarr.hxx> +#include <svl/svstdarr.hxx> #endif #include <sfx2/ctrlitem.hxx> #include <tools/link.hxx> diff --git a/svx/source/inc/fmundo.hxx b/svx/source/inc/fmundo.hxx index 596eaac0014e..be53cc727df2 100644 --- a/svx/source/inc/fmundo.hxx +++ b/svx/source/inc/fmundo.hxx @@ -51,7 +51,7 @@ #include <cppuhelper/implbase3.hxx> -#include <svtools/lstner.hxx> +#include <svl/lstner.hxx> #include <comphelper/uno3.hxx> class FmFormModel; diff --git a/svx/source/inc/svdoimp.hxx b/svx/source/inc/svdoimp.hxx index 2b16060bbb4e..839d34018853 100644 --- a/svx/source/inc/svdoimp.hxx +++ b/svx/source/inc/svdoimp.hxx @@ -33,7 +33,7 @@ #include <vcl/mapmod.hxx> -//#include <svtools/lstner.hxx> +//#include <svl/lstner.hxx> //#include <vcl/timer.hxx> //#include <svx/svdsob.hxx> //#include <svx/svdtypes.hxx> // fuer SdrLayerID diff --git a/svx/source/inc/unoedprx.hxx b/svx/source/inc/unoedprx.hxx index 4758b17dd621..a260063d7525 100644 --- a/svx/source/inc/unoedprx.hxx +++ b/svx/source/inc/unoedprx.hxx @@ -32,7 +32,7 @@ #define _SVX_UNOEDPRX_HXX #include <memory> -#include <svtools/brdcst.hxx> +#include <svl/brdcst.hxx> #include <svx/unoedsrc.hxx> #include <svx/editdata.hxx> diff --git a/svx/source/intro/iso.src b/svx/source/intro/iso.src index cff148376d2a..510379d54ab5 100644 --- a/svx/source/intro/iso.src +++ b/svx/source/intro/iso.src @@ -33,7 +33,7 @@ #endif #ifndef _SVTOOLS_HRC -#include <svtools/svtools.hrc> +#include <svl/svtools.hrc> #endif #include "intro.hrc" diff --git a/svx/source/intro/ooo.src b/svx/source/intro/ooo.src index 9a59a643168f..eea02180d922 100644 --- a/svx/source/intro/ooo.src +++ b/svx/source/intro/ooo.src @@ -29,7 +29,7 @@ ************************************************************************/ #ifndef _SVTOOLS_HRC -#include <svtools/svtools.hrc> +#include <svl/svtools.hrc> #endif #ifndef _SVTOOLS_IMAGEMGR_HRC diff --git a/svx/source/items/SmartTagItem.cxx b/svx/source/items/SmartTagItem.cxx index 726aea57287f..73ea6edca1c6 100644 --- a/svx/source/items/SmartTagItem.cxx +++ b/svx/source/items/SmartTagItem.cxx @@ -40,7 +40,7 @@ #endif -//#include <svtools/memberid.hrc> +//#include <svl/memberid.hrc> //#include "svxids.hrc" //#include "svxitems.hrc" diff --git a/svx/source/items/clipfmtitem.cxx b/svx/source/items/clipfmtitem.cxx index 5e07c233f115..59c907b476b2 100644 --- a/svx/source/items/clipfmtitem.cxx +++ b/svx/source/items/clipfmtitem.cxx @@ -34,7 +34,7 @@ #define _SVSTDARR_ULONGS #define _SVSTDARR_STRINGSDTOR -#include <svtools/svstdarr.hxx> +#include <svl/svstdarr.hxx> #include <clipfmtitem.hxx> #include <com/sun/star/frame/status/ClipboardFormats.hpp> diff --git a/svx/source/items/flditem.cxx b/svx/source/items/flditem.cxx index 56f1a1986d82..05cdddcf307a 100644 --- a/svx/source/items/flditem.cxx +++ b/svx/source/items/flditem.cxx @@ -31,7 +31,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" #include <vcl/metaact.hxx> -#include <svtools/zforlist.hxx> +#include <svl/zforlist.hxx> #include <tools/urlobj.hxx> #define _SVX_FLDITEM_CXX diff --git a/svx/source/items/frmitems.cxx b/svx/source/items/frmitems.cxx index 39d21f253663..49649c2b4c5e 100644 --- a/svx/source/items/frmitems.cxx +++ b/svx/source/items/frmitems.cxx @@ -52,9 +52,9 @@ #define _SVX_FRMITEMS_CXX -#include <svtools/memberid.hrc> +#include <svl/memberid.hrc> #include <svtools/wallitem.hxx> -#include <svtools/cntwall.hxx> +#include <svl/cntwall.hxx> #include <rtl/ustring.hxx> #include <rtl/ustrbuf.hxx> diff --git a/svx/source/items/numfmtsh.cxx b/svx/source/items/numfmtsh.cxx index ca6333753769..cb26266abb01 100644 --- a/svx/source/items/numfmtsh.cxx +++ b/svx/source/items/numfmtsh.cxx @@ -40,8 +40,8 @@ #include <i18npool/mslangid.hxx> #define _ZFORLIST_DECLARE_TABLE -#include <svtools/zforlist.hxx> -#include <svtools/zformat.hxx> +#include <svl/zforlist.hxx> +#include <svl/zformat.hxx> #include <svtools/langtab.hxx> #include <vcl/svapp.hxx> diff --git a/svx/source/items/pageitem.cxx b/svx/source/items/pageitem.cxx index 4d96adb0c3b1..54eaf9b5898e 100644 --- a/svx/source/items/pageitem.cxx +++ b/svx/source/items/pageitem.cxx @@ -40,7 +40,7 @@ #include <svx/unomid.hxx> #include <com/sun/star/style/PageStyleLayout.hpp> #include <com/sun/star/style/BreakType.hpp> -#include <svtools/itemset.hxx> +#include <svl/itemset.hxx> using namespace ::rtl; using namespace ::com::sun::star; diff --git a/svx/source/items/paraitem.cxx b/svx/source/items/paraitem.cxx index 6dc1b3e9f26b..bcdc7f451352 100644 --- a/svx/source/items/paraitem.cxx +++ b/svx/source/items/paraitem.cxx @@ -39,7 +39,7 @@ #ifndef _UNOTOOLS_PROCESSFACTORY_HXX #include <comphelper/processfactory.hxx> #endif -#include <svtools/syslocale.hxx> +#include <unotools/syslocale.hxx> #include <comphelper/types.hxx> @@ -51,9 +51,9 @@ using namespace ::com::sun::star; #define GLOBALOVERFLOW3 #define _SVX_PARAITEM_CXX -#include <svtools/itempool.hxx> +#include <svl/itempool.hxx> -#include <svtools/memberid.hrc> +#include <svl/memberid.hrc> #include <svx/svxitems.hrc> #include <svx/lspcitem.hxx> diff --git a/svx/source/items/textitem.cxx b/svx/source/items/textitem.cxx index 2d1e5b6ebf9f..d891dc29b10c 100644 --- a/svx/source/items/textitem.cxx +++ b/svx/source/items/textitem.cxx @@ -47,7 +47,7 @@ #define GLOBALOVERFLOW3 -#include <svtools/memberid.hrc> +#include <svl/memberid.hrc> #include <svx/svxids.hrc> #include <svx/svxitems.hrc> #include <vcl/vclenum.hxx> @@ -56,10 +56,10 @@ #include <rtl/ustring.hxx> #include <i18npool/mslangid.hxx> -#include <svtools/itemset.hxx> +#include <svl/itemset.hxx> #include <svtools/langtab.hxx> -#include <svtools/itempool.hxx> +#include <svl/itempool.hxx> #include <svtools/ctrltool.hxx> #include <vcl/settings.hxx> #include <vcl/svapp.hxx> diff --git a/svx/source/mnuctrls/SmartTagCtl.cxx b/svx/source/mnuctrls/SmartTagCtl.cxx index 8921bff841c1..0b922d5cfd12 100644 --- a/svx/source/mnuctrls/SmartTagCtl.cxx +++ b/svx/source/mnuctrls/SmartTagCtl.cxx @@ -37,7 +37,7 @@ #include <com/sun/star/container/XStringKeyMap.hpp> #endif #include <svtools/stdmenu.hxx> -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> #include <sfx2/dispatch.hxx> #ifndef _SVX_SVXIDS_HRC #include <svx/svxids.hrc> diff --git a/svx/source/mnuctrls/clipboardctl.cxx b/svx/source/mnuctrls/clipboardctl.cxx index 3cd538e4c079..aa8f73189533 100644 --- a/svx/source/mnuctrls/clipboardctl.cxx +++ b/svx/source/mnuctrls/clipboardctl.cxx @@ -35,9 +35,9 @@ #include <sfx2/bindings.hxx> #include <sfx2/dispatch.hxx> #include <tools/gen.hxx> -#include <svtools/intitem.hxx> +#include <svl/intitem.hxx> #include <sot/exchange.hxx> -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> #include <vcl/toolbox.hxx> #include <clipboardctl.hxx> #include <clipfmtitem.hxx> diff --git a/svx/source/mnuctrls/fntszctl.cxx b/svx/source/mnuctrls/fntszctl.cxx index 65bf41c48825..4a4f2a54a1f0 100644 --- a/svx/source/mnuctrls/fntszctl.cxx +++ b/svx/source/mnuctrls/fntszctl.cxx @@ -32,7 +32,7 @@ #include "precompiled_svx.hxx" #include <string> // HACK: prevent conflict between STLPORT and Workshop headern -#include <svtools/itempool.hxx> +#include <svl/itempool.hxx> #include <svtools/stdmenu.hxx> #include <svtools/ctrltool.hxx> #include <sfx2/app.hxx> diff --git a/svx/source/msfilter/msdffimp.cxx b/svx/source/msfilter/msdffimp.cxx index 0e751e3181e7..5792f84b53df 100644 --- a/svx/source/msfilter/msdffimp.cxx +++ b/svx/source/msfilter/msdffimp.cxx @@ -56,7 +56,7 @@ #include <svx/editdata.hxx> #endif -#include <svtools/urihelper.hxx> +#include <svl/urihelper.hxx> // textitem.hxx editdata.hxx @@ -170,7 +170,7 @@ #include <svx/editeng.hxx> #include "gallery.hxx" #include <com/sun/star/drawing/ShadeMode.hpp> -#include <svtools/itempool.hxx> +#include <svl/itempool.hxx> #include <vcl/svapp.hxx> #include <svx/svx3ditems.hxx> #include <svx/svdoashp.hxx> diff --git a/svx/source/options/asiancfg.cxx b/svx/source/options/asiancfg.cxx index 5046c6b1d32c..a6b3c7d4f3f0 100644 --- a/svx/source/options/asiancfg.cxx +++ b/svx/source/options/asiancfg.cxx @@ -31,7 +31,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" #include <asiancfg.hxx> -#include <svtools/svarray.hxx> +#include <svl/svarray.hxx> #include <com/sun/star/uno/Any.hxx> #include <com/sun/star/uno/Sequence.hxx> #include <com/sun/star/lang/Locale.hpp> diff --git a/svx/source/options/htmlcfg.cxx b/svx/source/options/htmlcfg.cxx index 9069ab50fcb3..1df8ac788eab 100644 --- a/svx/source/options/htmlcfg.cxx +++ b/svx/source/options/htmlcfg.cxx @@ -265,6 +265,11 @@ void SvxHtmlOptions::Commit() } PutProperties(aNames, aValues); } + +void SvxHtmlOptions::Notify( const com::sun::star::uno::Sequence< rtl::OUString >& ) +{ +} + // ----------------------------------------------------------------------- USHORT SvxHtmlOptions::GetFontSize(USHORT nPos) const { diff --git a/svx/source/options/optlingu.cxx b/svx/source/options/optlingu.cxx index c58a0c01fb80..8f81a43f2be1 100644 --- a/svx/source/options/optlingu.cxx +++ b/svx/source/options/optlingu.cxx @@ -36,7 +36,7 @@ #define _SVSTDARR_STRINGSDTOR #define _SVSTDARR_USHORTS //#ifndef _SVSTDARR_HXX -//#include <svtools/svstdarr.hxx> +//#include <svl/svstdarr.hxx> //#endif #include <vcl/msgbox.hxx> #include <vcl/field.hxx> @@ -44,7 +44,7 @@ #include <tools/shl.hxx> #include <tools/dynary.hxx> #include <i18npool/mslangid.hxx> -//#include <svtools/svarray.hxx> +//#include <svl/svarray.hxx> #include <unotools/lingucfg.hxx> #include <unolingu.hxx> #include <dlgutil.hxx> @@ -72,8 +72,8 @@ #include <com/sun/star/system/SystemShellExecuteFlags.hpp> #include <unotools/extendedsecurityoptions.hxx> #include <svtools/svlbox.hxx> -#include <svtools/eitem.hxx> -#include <svtools/intitem.hxx> +#include <svl/eitem.hxx> +#include <svl/intitem.hxx> #include <sfx2/viewfrm.hxx> #include <vcl/svapp.hxx> #define _SVX_OPTLINGU_CXX diff --git a/svx/source/options/srchcfg.cxx b/svx/source/options/srchcfg.cxx index 0bd97a67d7af..110bfc56ce61 100644 --- a/svx/source/options/srchcfg.cxx +++ b/svx/source/options/srchcfg.cxx @@ -34,7 +34,7 @@ #ifndef _SVX_SRCHNCFG_HXX #include <srchcfg.hxx> #endif -#include <svtools/svarray.hxx> +#include <svl/svarray.hxx> #include <com/sun/star/uno/Any.hxx> #include <com/sun/star/uno/Sequence.hxx> #include <com/sun/star/beans/PropertyValue.hpp> diff --git a/svx/source/outliner/outl_pch.hxx b/svx/source/outliner/outl_pch.hxx index 698eac0c2dae..18d23c188d25 100644 --- a/svx/source/outliner/outl_pch.hxx +++ b/svx/source/outliner/outl_pch.hxx @@ -27,7 +27,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#include <svtools/intitem.hxx> +#include <svl/intitem.hxx> #include <svx/editeng.hxx> #include <svx/editview.hxx> diff --git a/svx/source/outliner/outleeng.cxx b/svx/source/outliner/outleeng.cxx index a9d797de3c09..6f5f5f68e5ab 100644 --- a/svx/source/outliner/outleeng.cxx +++ b/svx/source/outliner/outleeng.cxx @@ -37,7 +37,7 @@ #include <outleeng.hxx> #include <paralist.hxx> #include <outliner.hrc> -#include <svtools/itemset.hxx> +#include <svl/itemset.hxx> #include <svx/eeitem.hxx> #include "editstat.hxx" #include "outlundo.hxx" diff --git a/svx/source/outliner/outlin2.cxx b/svx/source/outliner/outlin2.cxx index eb435ca6ae7f..f2da8129d87f 100644 --- a/svx/source/outliner/outlin2.cxx +++ b/svx/source/outliner/outlin2.cxx @@ -33,7 +33,7 @@ #include <outl_pch.hxx> #include <tools/list.hxx> -#include <svtools/style.hxx> +#include <svl/style.hxx> #include <vcl/mapmod.hxx> #include <forbiddencharacterstable.hxx> diff --git a/svx/source/outliner/outliner.cxx b/svx/source/outliner/outliner.cxx index 3da9e8dbecac..6e02731e6177 100644 --- a/svx/source/outliner/outliner.cxx +++ b/svx/source/outliner/outliner.cxx @@ -34,7 +34,7 @@ #include <outl_pch.hxx> #include <math.h> -#include <svtools/style.hxx> +#include <svl/style.hxx> #include <vcl/wrkwin.hxx> #define _OUTLINER_CXX #include <svx/outliner.hxx> @@ -46,8 +46,8 @@ #include <editstat.hxx> #include <svx/scripttypeitem.hxx> #include <svx/editobj.hxx> -#include <svtools/itemset.hxx> -#include <svtools/whiter.hxx> +#include <svl/itemset.hxx> +#include <svl/whiter.hxx> #include <vcl/metric.hxx> #include <svx/numitem.hxx> #include <svx/adjitem.hxx> @@ -57,7 +57,7 @@ #include <goodies/grfmgr.hxx> #include <svx/svxfont.hxx> #include <svx/brshitem.hxx> -#include <svtools/itempool.hxx> +#include <svl/itempool.hxx> // #101498# calculate if it's RTL or not #include <unicode/ubidi.h> diff --git a/svx/source/outliner/outliner.hrc b/svx/source/outliner/outliner.hrc index 85a6d044a8be..36c5f1728fcd 100644 --- a/svx/source/outliner/outliner.hrc +++ b/svx/source/outliner/outliner.hrc @@ -31,7 +31,7 @@ #define _OUTLINER_HRC #ifndef _SOLAR_HRC -#include <svtools/solar.hrc> +#include <svl/solar.hrc> #endif #ifndef RID_OUTL_START diff --git a/svx/source/outliner/outlvw.cxx b/svx/source/outliner/outlvw.cxx index 098a4055ce0f..8faaaf6e5c7f 100644 --- a/svx/source/outliner/outlvw.cxx +++ b/svx/source/outliner/outlvw.cxx @@ -31,7 +31,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" #include <outl_pch.hxx> -#include <svtools/style.hxx> +#include <svl/style.hxx> #define _OUTLINER_CXX #include <svx/outliner.hxx> @@ -44,7 +44,7 @@ #include <svx/eeitem.hxx> #include <svx/numitem.hxx> #include <vcl/window.hxx> -#include <svtools/itemset.hxx> +#include <svl/itemset.hxx> #include <editstat.hxx> diff --git a/svx/source/sdr/attribute/sdrformtextattribute.cxx b/svx/source/sdr/attribute/sdrformtextattribute.cxx index 0282b519499c..09ec874c9ebd 100644 --- a/svx/source/sdr/attribute/sdrformtextattribute.cxx +++ b/svx/source/sdr/attribute/sdrformtextattribute.cxx @@ -32,7 +32,7 @@ #include "precompiled_svx.hxx" #include <svx/sdr/attribute/sdrformtextattribute.hxx> -#include <svtools/itemset.hxx> +#include <svl/itemset.hxx> #include <svx/xftdiit.hxx> #include <svx/xftstit.hxx> diff --git a/svx/source/sdr/contact/viewcontactofgraphic.cxx b/svx/source/sdr/contact/viewcontactofgraphic.cxx index 6a92cb27ff8c..6e5f2f42c2b3 100644 --- a/svx/source/sdr/contact/viewcontactofgraphic.cxx +++ b/svx/source/sdr/contact/viewcontactofgraphic.cxx @@ -35,7 +35,7 @@ #include <svx/svdograf.hxx> #include <svx/sdr/attribute/sdrallattribute.hxx> #include <svx/sdr/primitive2d/sdrattributecreator.hxx> -#include <svtools/itemset.hxx> +#include <svl/itemset.hxx> #ifndef ITEMID_GRF_CROP #define ITEMID_GRF_CROP 0 diff --git a/svx/source/sdr/contact/viewcontactofsdrcaptionobj.cxx b/svx/source/sdr/contact/viewcontactofsdrcaptionobj.cxx index 309e554b0329..c5c682222fde 100644 --- a/svx/source/sdr/contact/viewcontactofsdrcaptionobj.cxx +++ b/svx/source/sdr/contact/viewcontactofsdrcaptionobj.cxx @@ -41,7 +41,7 @@ ////////////////////////////////////////////////////////////////////////////// // includes for special text box shadow (SC) -#include <svtools/itemset.hxx> +#include <svl/itemset.hxx> #include <svx/xhatch.hxx> #include <svx/xflhtit.hxx> #include <svx/xflclit.hxx> diff --git a/svx/source/sdr/contact/viewcontactofsdrcircobj.cxx b/svx/source/sdr/contact/viewcontactofsdrcircobj.cxx index 1366ed26ca1a..c57c153e9e40 100644 --- a/svx/source/sdr/contact/viewcontactofsdrcircobj.cxx +++ b/svx/source/sdr/contact/viewcontactofsdrcircobj.cxx @@ -37,7 +37,7 @@ #include <svx/sdr/primitive2d/sdrattributecreator.hxx> #include <svx/sdr/attribute/sdrallattribute.hxx> #include <svx/sdr/primitive2d/sdrellipseprimitive2d.hxx> -#include <svtools/itemset.hxx> +#include <svl/itemset.hxx> #include <svx/sxciaitm.hxx> ////////////////////////////////////////////////////////////////////////////// diff --git a/svx/source/sdr/contact/viewcontactofsdrmeasureobj.cxx b/svx/source/sdr/contact/viewcontactofsdrmeasureobj.cxx index 1c34cf6ae77b..18a82377d582 100644 --- a/svx/source/sdr/contact/viewcontactofsdrmeasureobj.cxx +++ b/svx/source/sdr/contact/viewcontactofsdrmeasureobj.cxx @@ -36,7 +36,7 @@ #include <svx/svdomeas.hxx> #include <svx/sdr/primitive2d/sdrattributecreator.hxx> #include <svx/sdr/attribute/sdrallattribute.hxx> -#include <svtools/itemset.hxx> +#include <svl/itemset.hxx> #include <svx/sxmbritm.hxx> #include <svx/sxmlhitm.hxx> #include <svx/sxmtritm.hxx> diff --git a/svx/source/sdr/contact/viewcontactofsdrrectobj.cxx b/svx/source/sdr/contact/viewcontactofsdrrectobj.cxx index 8ba8ae8ab4c9..bf483b5329f2 100644 --- a/svx/source/sdr/contact/viewcontactofsdrrectobj.cxx +++ b/svx/source/sdr/contact/viewcontactofsdrrectobj.cxx @@ -37,7 +37,7 @@ #include <svx/sdr/primitive2d/sdrattributecreator.hxx> #include <svx/sdr/attribute/sdrallattribute.hxx> #include <svx/sdr/primitive2d/sdrrectangleprimitive2d.hxx> -#include <svtools/itemset.hxx> +#include <svl/itemset.hxx> #include <svx/sdr/primitive2d/sdrprimitivetools.hxx> ////////////////////////////////////////////////////////////////////////////// diff --git a/svx/source/sdr/primitive2d/sdrattributecreator.cxx b/svx/source/sdr/primitive2d/sdrattributecreator.cxx index 4e57166b4723..d9592124f916 100644 --- a/svx/source/sdr/primitive2d/sdrattributecreator.cxx +++ b/svx/source/sdr/primitive2d/sdrattributecreator.cxx @@ -31,7 +31,7 @@ #include "precompiled_svx.hxx" #include <svx/sdr/primitive2d/sdrattributecreator.hxx> -#include <svtools/itemset.hxx> +#include <svl/itemset.hxx> #include <svx/xdef.hxx> #include <basegfx/polygon/b2dpolygon.hxx> #include <svx/xlineit0.hxx> @@ -67,7 +67,7 @@ #include <svx/sdr/attribute/sdrtextattribute.hxx> #include <svx/sdr/attribute/sdrallattribute.hxx> #include <svx/xbtmpit.hxx> -#include <svtools/itempool.hxx> +#include <svl/itempool.hxx> #include <vcl/svapp.hxx> #include <basegfx/range/b2drange.hxx> #include <svx/svx3ditems.hxx> diff --git a/svx/source/sdr/primitive3d/sdrattributecreator3d.cxx b/svx/source/sdr/primitive3d/sdrattributecreator3d.cxx index 1f08584a9079..6f997a2658ef 100644 --- a/svx/source/sdr/primitive3d/sdrattributecreator3d.cxx +++ b/svx/source/sdr/primitive3d/sdrattributecreator3d.cxx @@ -31,7 +31,7 @@ #include <svx/sdr/primitive3d/sdrattributecreator3d.hxx> #include <svx/svx3ditems.hxx> -#include <svtools/itemset.hxx> +#include <svl/itemset.hxx> #include <com/sun/star/drawing/NormalsKind.hpp> #include <com/sun/star/drawing/TextureProjectionMode.hpp> #include <drawinglayer/attribute/sdrattribute3d.hxx> diff --git a/svx/source/sdr/properties/attributeproperties.cxx b/svx/source/sdr/properties/attributeproperties.cxx index 297eb77e1319..4fcdb12ffe5c 100644 --- a/svx/source/sdr/properties/attributeproperties.cxx +++ b/svx/source/sdr/properties/attributeproperties.cxx @@ -33,10 +33,10 @@ #include <svx/sdr/properties/attributeproperties.hxx> #include <svx/sdr/properties/itemsettools.hxx> #include <tools/debug.hxx> -#include <svtools/itemset.hxx> -#include <svtools/style.hxx> -#include <svtools/whiter.hxx> -#include <svtools/poolitem.hxx> +#include <svl/itemset.hxx> +#include <svl/style.hxx> +#include <svl/whiter.hxx> +#include <svl/poolitem.hxx> #include <svx/svdobj.hxx> #include <svx/svddef.hxx> #include <svx/xit.hxx> @@ -54,7 +54,7 @@ #include <svx/svdpage.hxx> // #114265# -#include <svtools/smplhint.hxx> +#include <svl/smplhint.hxx> ////////////////////////////////////////////////////////////////////////////// diff --git a/svx/source/sdr/properties/captionproperties.cxx b/svx/source/sdr/properties/captionproperties.cxx index 94dbb3c20315..7f33ee39854e 100644 --- a/svx/source/sdr/properties/captionproperties.cxx +++ b/svx/source/sdr/properties/captionproperties.cxx @@ -31,8 +31,8 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" #include <svx/sdr/properties/captionproperties.hxx> -#include <svtools/itemset.hxx> -#include <svtools/style.hxx> +#include <svl/itemset.hxx> +#include <svl/style.hxx> #include <svx/svddef.hxx> #include <svx/eeitem.hxx> #include <svx/svdocapt.hxx> diff --git a/svx/source/sdr/properties/circleproperties.cxx b/svx/source/sdr/properties/circleproperties.cxx index 63b12505da59..1043aaf2b9d0 100644 --- a/svx/source/sdr/properties/circleproperties.cxx +++ b/svx/source/sdr/properties/circleproperties.cxx @@ -31,8 +31,8 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" #include <svx/sdr/properties/circleproperties.hxx> -#include <svtools/itemset.hxx> -#include <svtools/style.hxx> +#include <svl/itemset.hxx> +#include <svl/style.hxx> #include <svx/svddef.hxx> #include <svx/eeitem.hxx> #include <svx/svdocirc.hxx> diff --git a/svx/source/sdr/properties/connectorproperties.cxx b/svx/source/sdr/properties/connectorproperties.cxx index e36fef84c4a2..cc144525e264 100644 --- a/svx/source/sdr/properties/connectorproperties.cxx +++ b/svx/source/sdr/properties/connectorproperties.cxx @@ -31,8 +31,8 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" #include <svx/sdr/properties/connectorproperties.hxx> -#include <svtools/itemset.hxx> -#include <svtools/style.hxx> +#include <svl/itemset.hxx> +#include <svl/style.hxx> #include <svx/svddef.hxx> #include <svx/eeitem.hxx> #include <svx/svdoedge.hxx> diff --git a/svx/source/sdr/properties/customshapeproperties.cxx b/svx/source/sdr/properties/customshapeproperties.cxx index c95659e8a26a..88dd25fab96b 100644 --- a/svx/source/sdr/properties/customshapeproperties.cxx +++ b/svx/source/sdr/properties/customshapeproperties.cxx @@ -31,14 +31,14 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" #include <svx/sdr/properties/customshapeproperties.hxx> -#include <svtools/itemset.hxx> -#include <svtools/style.hxx> +#include <svl/itemset.hxx> +#include <svl/style.hxx> #include <svx/svdoashp.hxx> #include <svx/eeitem.hxx> #include <svx/sdtagitm.hxx> -#include <svtools/whiter.hxx> -#include <svtools/itemset.hxx> -#include <svtools/smplhint.hxx> +#include <svl/whiter.hxx> +#include <svl/itemset.hxx> +#include <svl/smplhint.hxx> ////////////////////////////////////////////////////////////////////////////// diff --git a/svx/source/sdr/properties/defaultproperties.cxx b/svx/source/sdr/properties/defaultproperties.cxx index 6e826fa594b3..1f4d1bd65c88 100644 --- a/svx/source/sdr/properties/defaultproperties.cxx +++ b/svx/source/sdr/properties/defaultproperties.cxx @@ -32,8 +32,8 @@ #include "precompiled_svx.hxx" #include <svx/sdr/properties/defaultproperties.hxx> #include <svx/sdr/properties/itemsettools.hxx> -#include <svtools/itemset.hxx> -#include <svtools/whiter.hxx> +#include <svl/itemset.hxx> +#include <svl/whiter.hxx> #include <vector> #include <svx/svdobj.hxx> diff --git a/svx/source/sdr/properties/e3dcompoundproperties.cxx b/svx/source/sdr/properties/e3dcompoundproperties.cxx index 55f485c9f41a..6434bc4c67be 100644 --- a/svx/source/sdr/properties/e3dcompoundproperties.cxx +++ b/svx/source/sdr/properties/e3dcompoundproperties.cxx @@ -31,7 +31,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" #include <svx/sdr/properties/e3dcompoundproperties.hxx> -#include <svtools/itemset.hxx> +#include <svl/itemset.hxx> #include <svx/obj3d.hxx> #include <svx/scene3d.hxx> diff --git a/svx/source/sdr/properties/e3dextrudeproperties.cxx b/svx/source/sdr/properties/e3dextrudeproperties.cxx index 3d25f5d79ee4..37b934d2289f 100644 --- a/svx/source/sdr/properties/e3dextrudeproperties.cxx +++ b/svx/source/sdr/properties/e3dextrudeproperties.cxx @@ -31,7 +31,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" #include <svx/sdr/properties/e3dextrudeproperties.hxx> -#include <svtools/itemset.hxx> +#include <svl/itemset.hxx> #include <svx/extrud3d.hxx> ////////////////////////////////////////////////////////////////////////////// diff --git a/svx/source/sdr/properties/e3dlatheproperties.cxx b/svx/source/sdr/properties/e3dlatheproperties.cxx index 5b6b19581710..ba051dcc542f 100644 --- a/svx/source/sdr/properties/e3dlatheproperties.cxx +++ b/svx/source/sdr/properties/e3dlatheproperties.cxx @@ -31,7 +31,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" #include <svx/sdr/properties/e3dlatheproperties.hxx> -#include <svtools/itemset.hxx> +#include <svl/itemset.hxx> #include <svx/lathe3d.hxx> ////////////////////////////////////////////////////////////////////////////// diff --git a/svx/source/sdr/properties/e3dproperties.cxx b/svx/source/sdr/properties/e3dproperties.cxx index 8fa772d7158a..78ecb989b49b 100644 --- a/svx/source/sdr/properties/e3dproperties.cxx +++ b/svx/source/sdr/properties/e3dproperties.cxx @@ -31,7 +31,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" #include <svx/sdr/properties/e3dproperties.hxx> -#include <svtools/itemset.hxx> +#include <svl/itemset.hxx> #include <svx/svddef.hxx> #include <svx/obj3d.hxx> diff --git a/svx/source/sdr/properties/e3dsceneproperties.cxx b/svx/source/sdr/properties/e3dsceneproperties.cxx index c55b3839f804..7ae476929bc4 100644 --- a/svx/source/sdr/properties/e3dsceneproperties.cxx +++ b/svx/source/sdr/properties/e3dsceneproperties.cxx @@ -31,8 +31,8 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" #include <svx/sdr/properties/e3dsceneproperties.hxx> -#include <svtools/itemset.hxx> -#include <svtools/whiter.hxx> +#include <svl/itemset.hxx> +#include <svl/whiter.hxx> #include <svx/svddef.hxx> #include <svx/scene3d.hxx> #include <svditer.hxx> diff --git a/svx/source/sdr/properties/e3dsphereproperties.cxx b/svx/source/sdr/properties/e3dsphereproperties.cxx index 35f59f5126e3..c8444358dec7 100644 --- a/svx/source/sdr/properties/e3dsphereproperties.cxx +++ b/svx/source/sdr/properties/e3dsphereproperties.cxx @@ -31,7 +31,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" #include <svx/sdr/properties/e3dsphereproperties.hxx> -#include <svtools/itemset.hxx> +#include <svl/itemset.hxx> #include <svx/sphere3d.hxx> ////////////////////////////////////////////////////////////////////////////// diff --git a/svx/source/sdr/properties/emptyproperties.cxx b/svx/source/sdr/properties/emptyproperties.cxx index ec02c36e2694..a6433942a235 100644 --- a/svx/source/sdr/properties/emptyproperties.cxx +++ b/svx/source/sdr/properties/emptyproperties.cxx @@ -32,7 +32,7 @@ #include "precompiled_svx.hxx" #include <svx/sdr/properties/emptyproperties.hxx> #include <tools/debug.hxx> -#include <svtools/itemset.hxx> +#include <svl/itemset.hxx> #include <svx/svddef.hxx> #include <svx/svdobj.hxx> #include <svx/svdpool.hxx> diff --git a/svx/source/sdr/properties/graphicproperties.cxx b/svx/source/sdr/properties/graphicproperties.cxx index 8f478540d993..c7eaf8a91afd 100644 --- a/svx/source/sdr/properties/graphicproperties.cxx +++ b/svx/source/sdr/properties/graphicproperties.cxx @@ -31,8 +31,8 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" #include <svx/sdr/properties/graphicproperties.hxx> -#include <svtools/itemset.hxx> -#include <svtools/style.hxx> +#include <svl/itemset.hxx> +#include <svl/style.hxx> #include <svx/svddef.hxx> #include <svx/eeitem.hxx> #include <svx/svdograf.hxx> diff --git a/svx/source/sdr/properties/groupproperties.cxx b/svx/source/sdr/properties/groupproperties.cxx index cb0bc1d37889..6370978c4527 100644 --- a/svx/source/sdr/properties/groupproperties.cxx +++ b/svx/source/sdr/properties/groupproperties.cxx @@ -31,8 +31,8 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" #include <svx/sdr/properties/groupproperties.hxx> -#include <svtools/itemset.hxx> -#include <svtools/whiter.hxx> +#include <svl/itemset.hxx> +#include <svl/whiter.hxx> #include <svx/svddef.hxx> #include <svx/eeitem.hxx> #include <svx/svdogrp.hxx> diff --git a/svx/source/sdr/properties/itemsettools.cxx b/svx/source/sdr/properties/itemsettools.cxx index 1052f469cc07..ad99a6eb6755 100644 --- a/svx/source/sdr/properties/itemsettools.cxx +++ b/svx/source/sdr/properties/itemsettools.cxx @@ -32,8 +32,8 @@ #include "precompiled_svx.hxx" #include <svx/sdr/properties/itemsettools.hxx> #include <tools/debug.hxx> -#include <svtools/itemset.hxx> -#include <svtools/whiter.hxx> +#include <svl/itemset.hxx> +#include <svl/whiter.hxx> #include <vector> #include <svx/svdogrp.hxx> diff --git a/svx/source/sdr/properties/measureproperties.cxx b/svx/source/sdr/properties/measureproperties.cxx index ed5ba1241396..e5d02ff97459 100644 --- a/svx/source/sdr/properties/measureproperties.cxx +++ b/svx/source/sdr/properties/measureproperties.cxx @@ -31,8 +31,8 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" #include <svx/sdr/properties/measureproperties.hxx> -#include <svtools/itemset.hxx> -#include <svtools/style.hxx> +#include <svl/itemset.hxx> +#include <svl/style.hxx> #include <svx/svddef.hxx> #include <svx/eeitem.hxx> #include <svx/svdomeas.hxx> diff --git a/svx/source/sdr/properties/pageproperties.cxx b/svx/source/sdr/properties/pageproperties.cxx index 5d7e6aa94c06..90cfa5e7bd31 100644 --- a/svx/source/sdr/properties/pageproperties.cxx +++ b/svx/source/sdr/properties/pageproperties.cxx @@ -31,7 +31,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" #include <svx/sdr/properties/pageproperties.hxx> -#include <svtools/itemset.hxx> +#include <svl/itemset.hxx> #include <svx/svdobj.hxx> #include <svx/svdpool.hxx> diff --git a/svx/source/sdr/properties/properties.cxx b/svx/source/sdr/properties/properties.cxx index b3cc32d71536..be25b62bb935 100644 --- a/svx/source/sdr/properties/properties.cxx +++ b/svx/source/sdr/properties/properties.cxx @@ -32,7 +32,7 @@ #include "precompiled_svx.hxx" #include <svx/sdr/properties/properties.hxx> #include <svx/sdr/properties/itemsettools.hxx> -#include <svtools/itemset.hxx> +#include <svl/itemset.hxx> #include <svx/svdogrp.hxx> #include <svditer.hxx> diff --git a/svx/source/sdr/properties/textproperties.cxx b/svx/source/sdr/properties/textproperties.cxx index f720e1b9d1b2..8f9626b37a02 100644 --- a/svx/source/sdr/properties/textproperties.cxx +++ b/svx/source/sdr/properties/textproperties.cxx @@ -31,10 +31,10 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" #include <svx/sdr/properties/textproperties.hxx> -#include <svtools/itemset.hxx> -#include <svtools/style.hxx> -#include <svtools/itemiter.hxx> -#include <svtools/smplhint.hxx> +#include <svl/itemset.hxx> +#include <svl/style.hxx> +#include <svl/itemiter.hxx> +#include <svl/smplhint.hxx> #include <svx/svddef.hxx> #include <svx/svdotext.hxx> #include <svx/svdoutl.hxx> diff --git a/svx/source/src/app.hrc b/svx/source/src/app.hrc index 682766a2c32c..f0952241979e 100644 --- a/svx/source/src/app.hrc +++ b/svx/source/src/app.hrc @@ -39,7 +39,7 @@ // include --------------------------------------------------------------- -#include <svtools/solar.hrc> +#include <svl/solar.hrc> #include <sfx2/sfxsids.hrc> // Ranges ---------------------------------------------------------------- diff --git a/svx/source/stbctrls/insctrl.cxx b/svx/source/stbctrls/insctrl.cxx index 160acae81f29..d2ecdbc13eec 100644 --- a/svx/source/stbctrls/insctrl.cxx +++ b/svx/source/stbctrls/insctrl.cxx @@ -36,7 +36,7 @@ #ifndef _STATUS_HXX //autogen #include <vcl/status.hxx> #endif -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> #include <sfx2/app.hxx> #include <sfx2/dispatch.hxx> diff --git a/svx/source/stbctrls/modctrl.cxx b/svx/source/stbctrls/modctrl.cxx index 46223e8b977f..8b4f0907431d 100644 --- a/svx/source/stbctrls/modctrl.cxx +++ b/svx/source/stbctrls/modctrl.cxx @@ -36,7 +36,7 @@ #ifndef _STATUS_HXX //autogen #include <vcl/status.hxx> #endif -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> #include <sfx2/app.hxx> #define _SVX_MODCTRL_CXX diff --git a/svx/source/stbctrls/pszctrl.cxx b/svx/source/stbctrls/pszctrl.cxx index 1895aad4cae1..92953295b88f 100644 --- a/svx/source/stbctrls/pszctrl.cxx +++ b/svx/source/stbctrls/pszctrl.cxx @@ -42,9 +42,9 @@ #include <vcl/menu.hxx> #endif #include <vcl/image.hxx> -#include <svtools/stritem.hxx> -#include <svtools/ptitem.hxx> -#include <svtools/itempool.hxx> +#include <svl/stritem.hxx> +#include <svl/ptitem.hxx> +#include <svl/itempool.hxx> #include <sfx2/app.hxx> #include <sfx2/module.hxx> #include <sfx2/dispatch.hxx> diff --git a/svx/source/stbctrls/selctrl.cxx b/svx/source/stbctrls/selctrl.cxx index 58fd6784852c..9fd8448a8091 100644 --- a/svx/source/stbctrls/selctrl.cxx +++ b/svx/source/stbctrls/selctrl.cxx @@ -36,7 +36,7 @@ #ifndef _STATUS_HXX //autogen #include <vcl/status.hxx> #endif -#include <svtools/intitem.hxx> +#include <svl/intitem.hxx> #include <sfx2/dispatch.hxx> #include <tools/urlobj.hxx> diff --git a/svx/source/stbctrls/xmlsecctrl.cxx b/svx/source/stbctrls/xmlsecctrl.cxx index 890cde02e428..63ef175a83dd 100644 --- a/svx/source/stbctrls/xmlsecctrl.cxx +++ b/svx/source/stbctrls/xmlsecctrl.cxx @@ -41,7 +41,7 @@ #endif #include <vcl/image.hxx> //#ifndef _SFXITEMPOOL_HXX -//#include <svtools/itempool.hxx> +//#include <svl/itempool.hxx> //#endif #include <sfx2/signaturestate.hxx> #include <sfx2/app.hxx> @@ -50,9 +50,9 @@ #include <sfx2/objsh.hxx> #include <sfx2/sfxsids.hrc> -#include <svtools/intitem.hxx> +#include <svl/intitem.hxx> -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> #include <svx/dialogs.hrc> #include <svx/dialmgr.hxx> diff --git a/svx/source/svdraw/svdattr.cxx b/svx/source/svdraw/svdattr.cxx index 97a2802573d8..356546e409a0 100644 --- a/svx/source/svdraw/svdattr.cxx +++ b/svx/source/svdraw/svdattr.cxx @@ -52,7 +52,7 @@ #include <svx/svdattrx.hxx> #include <svx/svdpool.hxx> -#include <svtools/solar.hrc> +#include <svl/solar.hrc> #include "xmlcnitm.hxx" #include <svx/svxids.hrc> diff --git a/svx/source/svdraw/svdedtv1.cxx b/svx/source/svdraw/svdedtv1.cxx index 2c6f0891b396..48f6df15c5fd 100644 --- a/svx/source/svdraw/svdedtv1.cxx +++ b/svx/source/svdraw/svdedtv1.cxx @@ -38,7 +38,7 @@ #define _MATH_H #endif #include <tools/bigint.hxx> -#include <svtools/itemiter.hxx> +#include <svl/itemiter.hxx> #include <vcl/msgbox.hxx> #include <svx/rectenum.hxx> #include <svx/svxids.hrc> // fuer SID_ATTR_TRANSFORM_... @@ -56,8 +56,8 @@ #include "svdstr.hrc" // Namen aus der Resource #include "svdglob.hxx" // StringCache #include <svx/eeitem.hxx> -#include <svtools/aeitem.hxx> -#include <svtools/whiter.hxx> +#include <svl/aeitem.hxx> +#include <svl/whiter.hxx> #include <svx/sdr/contact/objectcontact.hxx> #include <svx/sdr/contact/viewcontact.hxx> #include <svx/e3dsceneupdater.hxx> diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx index 901bc0e7e5b6..fb9670a5d4b4 100644 --- a/svx/source/svdraw/svdedxv.cxx +++ b/svx/source/svdraw/svdedxv.cxx @@ -33,14 +33,14 @@ #include <svtools/accessibilityoptions.hxx> #include <svx/svdedxv.hxx> -#include <svtools/solar.hrc> +#include <svl/solar.hrc> //#include <tools/string.h> -#include <svtools/itemiter.hxx> +#include <svl/itemiter.hxx> #include <vcl/msgbox.hxx> #include <vcl/hatch.hxx> -#include <svtools/whiter.hxx> -#include <svtools/style.hxx> +#include <svl/whiter.hxx> +#include <svl/style.hxx> #include <editstat.hxx> #include <tools/config.hxx> #include <vcl/cursor.hxx> diff --git a/svx/source/svdraw/svdetc.cxx b/svx/source/svdraw/svdetc.cxx index 5134b97f6ab4..980cb30563c1 100644 --- a/svx/source/svdraw/svdetc.cxx +++ b/svx/source/svdraw/svdetc.cxx @@ -44,10 +44,10 @@ #include <svx/svdoutl.hxx> #include <vcl/bmpacc.hxx> #include <svx/eeitem.hxx> -#include <svtools/itemset.hxx> +#include <svl/itemset.hxx> #include <tools/config.hxx> #include <unotools/cacheoptions.hxx> -#include <svtools/whiter.hxx> +#include <svl/whiter.hxx> #include <tools/bigint.hxx> #include "fontitem.hxx" #include <svx/colritem.hxx> @@ -59,13 +59,13 @@ #include <svx/xbtmpit.hxx> #include <svx/xflgrit.hxx> #include <svx/svdoole2.hxx> -#include <svtools/itempool.hxx> +#include <svl/itempool.hxx> #include <unotools/localedatawrapper.hxx> #include <com/sun/star/lang/Locale.hpp> #include <comphelper/processfactory.hxx> #include <i18npool/lang.h> #include <unotools/charclass.hxx> -#include <svtools/syslocale.hxx> +#include <unotools/syslocale.hxx> #include <svx/xflbckit.hxx> #include <svx/extrusionbar.hxx> #include <svx/fontworkbar.hxx> diff --git a/svx/source/svdraw/svdfmtf.cxx b/svx/source/svdraw/svdfmtf.cxx index 30c3ff62531a..6682e421c180 100644 --- a/svx/source/svdraw/svdfmtf.cxx +++ b/svx/source/svdraw/svdfmtf.cxx @@ -70,7 +70,7 @@ #include <svx/svdograf.hxx> #include <svx/svdopath.hxx> #include <svx/svdetc.hxx> -#include <svtools/itemset.hxx> +#include <svl/itemset.hxx> #include <basegfx/polygon/b2dpolygon.hxx> #include <vcl/salbtype.hxx> // FRound diff --git a/svx/source/svdraw/svdibrow.cxx b/svx/source/svdraw/svdibrow.cxx index 9c37d2e556ca..3c0cd7a19be5 100644 --- a/svx/source/svdraw/svdibrow.cxx +++ b/svx/source/svdraw/svdibrow.cxx @@ -63,12 +63,12 @@ #include <svx/fhgtitem.hxx> #include <svx/charscaleitem.hxx> -#include <svtools/whiter.hxx> -#include <svtools/flagitem.hxx> -#include <svtools/ptitem.hxx> -#include <svtools/rectitem.hxx> +#include <svl/whiter.hxx> +#include <svl/flagitem.hxx> +#include <svl/ptitem.hxx> +#include <svl/rectitem.hxx> -#include <svtools/rngitem.hxx> +#include <svl/rngitem.hxx> #include <sdrpaintwindow.hxx> //////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/svx/source/svdraw/svdmark.cxx b/svx/source/svdraw/svdmark.cxx index d2e70af1eeb7..14e628c9b518 100644 --- a/svx/source/svdraw/svdmark.cxx +++ b/svx/source/svdraw/svdmark.cxx @@ -48,7 +48,7 @@ //////////////////////////////////////////////////////////////////////////////////////////////////// #include <svx/obj3d.hxx> #include <svx/scene3d.hxx> -#include <svtools/brdcst.hxx> +#include <svl/brdcst.hxx> #include <svx/svdoedge.hxx> //////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx index 0eab890b49f0..be84f0688580 100644 --- a/svx/source/svdraw/svdmodel.cxx +++ b/svx/source/svdraw/svdmodel.cxx @@ -42,7 +42,7 @@ #include <unotools/ucbstreamhelper.hxx> #include <tools/string.hxx> -#include <svtools/whiter.hxx> +#include <svl/whiter.hxx> #include <svx/xit.hxx> #include <svx/xbtmpit.hxx> #include <svx/xlndsit.hxx> @@ -77,24 +77,24 @@ #include "fontitem.hxx" #include <svx/colritem.hxx> #include <svx/fhgtitem.hxx> -#include <svtools/style.hxx> +#include <svl/style.hxx> #include <tools/bigint.hxx> #include <svx/numitem.hxx> #include <bulitem.hxx> #include <svx/outlobj.hxx> #include "forbiddencharacterstable.hxx" -#include <svtools/zforlist.hxx> +#include <svl/zforlist.hxx> #include <comphelper/processfactory.hxx> // #90477# #include <tools/tenccvt.hxx> -#include <svtools/syslocale.hxx> +#include <unotools/syslocale.hxx> // #95114# #include <vcl/svapp.hxx> #include <svx/sdr/properties/properties.hxx> #include <svx/eeitem.hxx> -#include <svtools/itemset.hxx> +#include <svl/itemset.hxx> using namespace ::com::sun::star; using namespace ::com::sun::star::uno; diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx index dab855fa6f41..bb5f2b377e99 100644 --- a/svx/source/svdraw/svdoashp.cxx +++ b/svx/source/svdraw/svdoashp.cxx @@ -46,7 +46,7 @@ #include <com/sun/star/awt/Rectangle.hpp> #include "unopolyhelper.hxx" #include <comphelper/processfactory.hxx> -#include <svtools/urihelper.hxx> +#include <svl/urihelper.hxx> #include <com/sun/star/uno/Sequence.h> #include <svx/svdogrp.hxx> #include <vcl/salbtype.hxx> // FRound @@ -80,7 +80,7 @@ #include <svx/writingmodeitem.hxx> #include <svx/xlnclit.hxx> #include <svx/svxids.hrc> -#include <svtools/whiter.hxx> +#include <svl/whiter.hxx> #include <svx/sdr/properties/customshapeproperties.hxx> #include <svx/sdr/contact/viewcontactofsdrobjcustomshape.hxx> #include <svx/xlnclit.hxx> diff --git a/svx/source/svdraw/svdoattr.cxx b/svx/source/svdraw/svdoattr.cxx index d4d4717535b8..275548f93b51 100644 --- a/svx/source/svdraw/svdoattr.cxx +++ b/svx/source/svdraw/svdoattr.cxx @@ -46,8 +46,8 @@ #include <svx/svdorect.hxx> #include <svx/svdocirc.hxx> #include <svx/svdomeas.hxx> -#include <svtools/smplhint.hxx> -#include <svtools/itemiter.hxx> +#include <svl/smplhint.hxx> +#include <svl/itemiter.hxx> #include <svx/xenum.hxx> #include <svx/xlineit0.hxx> #include <svx/xlnstwit.hxx> @@ -67,9 +67,9 @@ //#include <svx/charscaleitem.hxx> #include <svx/xlnstcit.hxx> #include <svx/xlnwtit.hxx> -#include <svtools/style.hxx> -#include <svtools/style.hxx> -#include <svtools/whiter.hxx> +#include <svl/style.hxx> +#include <svl/style.hxx> +#include <svl/whiter.hxx> #include <svx/xlnclit.hxx> #include <svx/xflclit.hxx> #include <svx/xlntrit.hxx> diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx index 7ba4aec3e565..7bf1ea90f221 100644 --- a/svx/source/svdraw/svdobj.cxx +++ b/svx/source/svdraw/svdobj.cxx @@ -97,7 +97,7 @@ #include <svx/svdpool.hxx> #include <svx/editeng.hxx> #include <vcl/salbtype.hxx> // FRound -#include <svtools/whiter.hxx> +#include <svl/whiter.hxx> // #97849# #include <svx/fmmodel.hxx> diff --git a/svx/source/svdraw/svdocapt.cxx b/svx/source/svdraw/svdocapt.cxx index 102b5b1eb824..be3529ea4818 100644 --- a/svx/source/svdraw/svdocapt.cxx +++ b/svx/source/svdraw/svdocapt.cxx @@ -32,7 +32,7 @@ #include "precompiled_svx.hxx" #include <tools/bigint.hxx> #include <svx/xlnwtit.hxx> -#include <svtools/style.hxx> +#include <svl/style.hxx> #include <svx/svdocapt.hxx> #include <svx/xpool.hxx> #include <svx/xpoly.hxx> diff --git a/svx/source/svdraw/svdocirc.cxx b/svx/source/svdraw/svdocirc.cxx index b3175566d561..0be63fefa61f 100644 --- a/svx/source/svdraw/svdocirc.cxx +++ b/svx/source/svdraw/svdocirc.cxx @@ -30,7 +30,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" -#include <svtools/style.hxx> +#include <svl/style.hxx> #include <tools/bigint.hxx> #include <svx/xlnwtit.hxx> #include <svx/xlnedwit.hxx> diff --git a/svx/source/svdraw/svdoedge.cxx b/svx/source/svdraw/svdoedge.cxx index e55eeaae42b7..7e608887c6fc 100644 --- a/svx/source/svdraw/svdoedge.cxx +++ b/svx/source/svdraw/svdoedge.cxx @@ -48,8 +48,8 @@ #include <svx/svdetc.hxx> #include "svdglob.hxx" // StringCache #include "svdstr.hrc" // Objektname -#include <svtools/style.hxx> -#include <svtools/smplhint.hxx> +#include <svl/style.hxx> +#include <svl/smplhint.hxx> #include <svx/eeitem.hxx> #include "svdoimp.hxx" #include <svx/sdr/properties/connectorproperties.hxx> diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx index 3f5da01e101b..bf68fe84adf0 100644 --- a/svx/source/svdraw/svdograf.cxx +++ b/svx/source/svdraw/svdograf.cxx @@ -41,9 +41,9 @@ #include <sot/storage.hxx> #include <unotools/ucbstreamhelper.hxx> #include <unotools/localfilehelper.hxx> -#include <svtools/style.hxx> +#include <svl/style.hxx> #include <svtools/filter.hxx> -#include <svtools/urihelper.hxx> +#include <svl/urihelper.hxx> #include <goodies/grfmgr.hxx> #include <vcl/svapp.hxx> diff --git a/svx/source/svdraw/svdogrp.cxx b/svx/source/svdraw/svdogrp.cxx index 5782ca91b74b..ea29c860e8ab 100644 --- a/svx/source/svdraw/svdogrp.cxx +++ b/svx/source/svdraw/svdogrp.cxx @@ -41,7 +41,7 @@ #include <sfx2/lnkbase.hxx> #include <tools/urlobj.hxx> -#include <svtools/urihelper.hxx> +#include <svl/urihelper.hxx> #include <svx/xpool.hxx> #include <svx/xpoly.hxx> @@ -58,7 +58,7 @@ #include "svdstr.hrc" // Objektname #include <svx/svxids.hrc> -#include <svtools/whiter.hxx> +#include <svl/whiter.hxx> #include <svx/svdpool.hxx> #include <svx/sdr/properties/groupproperties.hxx> diff --git a/svx/source/svdraw/svdomeas.cxx b/svx/source/svdraw/svdomeas.cxx index 330b7f5c37f6..411058a766c6 100644 --- a/svx/source/svdraw/svdomeas.cxx +++ b/svx/source/svdraw/svdomeas.cxx @@ -45,8 +45,8 @@ #include <svx/svdview.hxx> #include "svdglob.hxx" // StringCache #include "svdstr.hrc" // Objektname -#include <svtools/style.hxx> -#include <svtools/smplhint.hxx> +#include <svl/style.hxx> +#include <svl/smplhint.hxx> #include <svx/eeitem.hxx> #include <svx/xlnstit.hxx> #include <svx/xlnstwit.hxx> @@ -63,7 +63,7 @@ #include <svx/svdogrp.hxx> #include <svx/svdopath.hxx> #include <svx/svdpage.hxx> -#include <svtools/syslocale.hxx> +#include <unotools/syslocale.hxx> #include "svdoimp.hxx" #include <svx/sdr/properties/measureproperties.hxx> #include <svx/sdr/contact/viewcontactofsdrmeasureobj.hxx> diff --git a/svx/source/svdraw/svdoole2.cxx b/svx/source/svdraw/svdoole2.cxx index a2b6991773e1..ebb25344fc63 100644 --- a/svx/source/svdraw/svdoole2.cxx +++ b/svx/source/svdraw/svdoole2.cxx @@ -73,8 +73,8 @@ #include <svtools/transfer.hxx> #include <cppuhelper/implbase5.hxx> -#include <svtools/solar.hrc> -#include <svtools/urihelper.hxx> +#include <svl/solar.hrc> +#include <svl/urihelper.hxx> #include <vos/mutex.hxx> #include <vcl/svapp.hxx> diff --git a/svx/source/svdraw/svdopage.cxx b/svx/source/svdraw/svdopage.cxx index be174aeb5d69..edbba120732e 100644 --- a/svx/source/svdraw/svdopage.cxx +++ b/svx/source/svdraw/svdopage.cxx @@ -41,7 +41,7 @@ #include <svx/svdpagv.hxx> #include <svx/svdoutl.hxx> #include <svtools/colorcfg.hxx> -#include <svtools/itemset.hxx> +#include <svl/itemset.hxx> #include <svx/sdr/properties/pageproperties.hxx> // #111111# diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx index 6b2f02299d4a..7ae49a7a795a 100644 --- a/svx/source/svdraw/svdotext.cxx +++ b/svx/source/svdraw/svdotext.cxx @@ -51,7 +51,7 @@ #include <svx/editobj.hxx> #include <svx/outliner.hxx> #include <svx/fhgtitem.hxx> -#include <svtools/itempool.hxx> +#include <svl/itempool.hxx> #include <svx/adjitem.hxx> #include <svx/flditem.hxx> #include <svx/xftouit.hxx> @@ -59,9 +59,9 @@ #include <svx/xflgrit.hxx> #include <svx/svdpool.hxx> #include <svx/xflclit.hxx> -#include <svtools/style.hxx> +#include <svl/style.hxx> #include <svx/editeng.hxx> -#include <svtools/itemiter.hxx> +#include <svl/itemiter.hxx> #include <svx/sdr/properties/textproperties.hxx> // #110496# diff --git a/svx/source/svdraw/svdotextdecomposition.cxx b/svx/source/svdraw/svdotextdecomposition.cxx index 93d3651e3f01..2f4b7cf8eb8e 100644 --- a/svx/source/svdraw/svdotextdecomposition.cxx +++ b/svx/source/svdraw/svdotextdecomposition.cxx @@ -42,7 +42,7 @@ #include <editstat.hxx> #include <vcl/salbtype.hxx> #include <svx/sdtfchim.hxx> -#include <svtools/itemset.hxx> +#include <svl/itemset.hxx> #include <basegfx/polygon/b2dpolygontools.hxx> #include <basegfx/polygon/b2dpolygon.hxx> #include <drawinglayer/animation/animationtiming.hxx> diff --git a/svx/source/svdraw/svdotextpathdecomposition.cxx b/svx/source/svdraw/svdotextpathdecomposition.cxx index f6a30d40b3d5..365d6bafa70e 100644 --- a/svx/source/svdraw/svdotextpathdecomposition.cxx +++ b/svx/source/svdraw/svdotextpathdecomposition.cxx @@ -38,7 +38,7 @@ #include <svx/sdr/primitive2d/sdrtextprimitive2d.hxx> #include <basegfx/range/b2drange.hxx> #include <vcl/salbtype.hxx> -#include <svtools/itemset.hxx> +#include <svl/itemset.hxx> #include <basegfx/polygon/b2dpolygontools.hxx> #include <basegfx/polygon/b2dpolygon.hxx> #include <algorithm> diff --git a/svx/source/svdraw/svdotxat.cxx b/svx/source/svdraw/svdotxat.cxx index 87d0ad3ef9cf..99d5b051a362 100644 --- a/svx/source/svdraw/svdotxat.cxx +++ b/svx/source/svdraw/svdotxat.cxx @@ -31,7 +31,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" -#include <svtools/style.hxx> +#include <svl/style.hxx> #include <svx/svdotext.hxx> #include "svditext.hxx" #include <svx/svdmodel.hxx> // fuer GetMaxObjSize und GetStyleSheetPool @@ -47,8 +47,8 @@ #include <svx/editview.hxx> -#include <svtools/smplhint.hxx> -#include <svtools/whiter.hxx> +#include <svl/smplhint.hxx> +#include <svl/whiter.hxx> #include <svx/outlobj.hxx> #include <svx/outliner.hxx> #include <svx/eeitem.hxx> @@ -56,10 +56,10 @@ #include <svx/fhgtitem.hxx> #include <svx/charscaleitem.hxx> -#include <svtools/style.hxx> -#include <svtools/itemiter.hxx> +#include <svl/style.hxx> +#include <svl/itemiter.hxx> #include <svx/lrspitem.hxx> -#include <svtools/itempool.hxx> +#include <svl/itempool.hxx> #include <svx/numitem.hxx> #include <svx/editeng.hxx> #include <svx/postitem.hxx> diff --git a/svx/source/svdraw/svdotxed.cxx b/svx/source/svdraw/svdotxed.cxx index f384cc9b4326..945bc2e48f91 100644 --- a/svx/source/svdraw/svdotxed.cxx +++ b/svx/source/svdraw/svdotxed.cxx @@ -37,7 +37,7 @@ #include <svx/svdoutl.hxx> #include <svx/outliner.hxx> #include <editstat.hxx> -#include <svtools/itemset.hxx> +#include <svl/itemset.hxx> #include <svx/eeitem.hxx> #include <svx/sdtfchim.hxx> diff --git a/svx/source/svdraw/svdotxln.cxx b/svx/source/svdraw/svdotxln.cxx index ff997b3f7556..d61655beb306 100644 --- a/svx/source/svdraw/svdotxln.cxx +++ b/svx/source/svdraw/svdotxln.cxx @@ -51,7 +51,7 @@ #include <linkmgr.hxx> #include <tools/urlobj.hxx> -#include <svtools/urihelper.hxx> +#include <svl/urihelper.hxx> // #90477# #include <tools/tenccvt.hxx> diff --git a/svx/source/svdraw/svdotxtr.cxx b/svx/source/svdraw/svdotxtr.cxx index aaed882cae3d..beb39b6285c3 100644 --- a/svx/source/svdraw/svdotxtr.cxx +++ b/svx/source/svdraw/svdotxtr.cxx @@ -43,7 +43,7 @@ #include <svx/sdr/properties/itemsettools.hxx> #include <svx/sdr/properties/properties.hxx> #include <basegfx/polygon/b2dpolypolygontools.hxx> -#include <svtools/itemset.hxx> +#include <svl/itemset.hxx> #include <svditer.hxx> #include <drawinglayer/processor2d/textaspolygonextractor2d.hxx> #include <svx/sdr/contact/viewcontact.hxx> diff --git a/svx/source/svdraw/svdoutl.cxx b/svx/source/svdraw/svdoutl.cxx index fe9b89fa4295..6f76cf4cde7a 100644 --- a/svx/source/svdraw/svdoutl.cxx +++ b/svx/source/svdraw/svdoutl.cxx @@ -36,7 +36,7 @@ #include <editstat.hxx> #include <svx/svdmodel.hxx> #include <svx/eeitem.hxx> -#include <svtools/itempool.hxx> +#include <svl/itempool.hxx> DBG_NAME(SdrOutliner) /************************************************************************* diff --git a/svx/source/svdraw/svdpntv.cxx b/svx/source/svdraw/svdpntv.cxx index c89c458aa9c7..428beec134e4 100644 --- a/svx/source/svdraw/svdpntv.cxx +++ b/svx/source/svdraw/svdpntv.cxx @@ -42,7 +42,7 @@ #endif #include <svx/svdpage.hxx> #include <svx/svdpagv.hxx> -#include <svtools/smplhint.hxx> +#include <svl/smplhint.hxx> #include <svx/svdpntv.hxx> #include <svx/editdata.hxx> @@ -66,10 +66,10 @@ #include <svx/svdobj.hxx> #include <svx/svdview.hxx> #include <svx/sxlayitm.hxx> -#include <svtools/itemiter.hxx> +#include <svl/itemiter.hxx> #include <svx/eeitem.hxx> -#include <svtools/whiter.hxx> -#include <svtools/style.hxx> +#include <svl/whiter.hxx> +#include <svl/style.hxx> #include <svx/sdrpagewindow.hxx> #include <svx/svdouno.hxx> #include <vcl/svapp.hxx> @@ -289,14 +289,14 @@ SdrPaintView::SdrPaintView(SdrModel* pModel1, OutputDevice* pOut) // Flag zur Visualisierung von Gruppen bVisualizeEnteredGroup = TRUE; - StartListening( maColorConfig ); + maColorConfig.AddListener(this); onChangeColorConfig(); } SdrPaintView::~SdrPaintView() { DBG_DTOR(SdrPaintView,NULL); - EndListening( maColorConfig ); + maColorConfig.RemoveListener(this); ClearPageView(); #ifdef DBG_UTIL @@ -345,12 +345,12 @@ void __EXPORT SdrPaintView::Notify(SfxBroadcaster& /*rBC*/, const SfxHint& rHint } } } +} - if( rHint.ISA( SfxSimpleHint ) && ( (SfxSimpleHint&) rHint ).GetId() == SFX_HINT_COLORS_CHANGED ) - { - onChangeColorConfig(); - InvalidateAllWin(); - } +void SdrPaintView::ConfigurationChanged( ::utl::ConfigurationBroadcaster* p, sal_uInt32 ) +{ + onChangeColorConfig(); + InvalidateAllWin(); } //////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/svx/source/svdraw/svdtext.cxx b/svx/source/svdraw/svdtext.cxx index 038eb96b35e6..3bd09667a067 100644 --- a/svx/source/svdraw/svdtext.cxx +++ b/svx/source/svdraw/svdtext.cxx @@ -40,7 +40,7 @@ #include "svx/svdmodel.hxx" #include "svx/fhgtitem.hxx" #include <svx/eeitem.hxx> -#include <svtools/itemset.hxx> +#include <svl/itemset.hxx> SdrText::SdrText( SdrTextObj& rObject, OutlinerParaObject* pOutlinerParaObject /* = 0 */ ) : mpOutlinerParaObject( pOutlinerParaObject ) diff --git a/svx/source/svdraw/svdtrans.cxx b/svx/source/svdraw/svdtrans.cxx index 380cf0523212..5bf21f8f30c2 100644 --- a/svx/source/svdraw/svdtrans.cxx +++ b/svx/source/svdraw/svdtrans.cxx @@ -38,7 +38,7 @@ #include <vcl/virdev.hxx> #include <tools/bigint.hxx> #include <tools/debug.hxx> -#include <svtools/syslocale.hxx> +#include <unotools/syslocale.hxx> //////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/svx/source/svdraw/svdundo.cxx b/svx/source/svdraw/svdundo.cxx index 08cee1eb17d3..ed76f2884c9e 100644 --- a/svx/source/svdraw/svdundo.cxx +++ b/svx/source/svdraw/svdundo.cxx @@ -47,7 +47,7 @@ #include <svx/sdr/properties/itemsettools.hxx> #include <svx/sdr/properties/properties.hxx> #include <svx/svdocapt.hxx> -#include <svtools/whiter.hxx> +#include <svl/whiter.hxx> #include <svx/e3dsceneupdater.hxx> #include "svdviter.hxx" diff --git a/svx/source/svdraw/svdview.cxx b/svx/source/svdraw/svdview.cxx index c7702b0d372a..edda4b700e29 100644 --- a/svx/source/svdraw/svdview.cxx +++ b/svx/source/svdraw/svdview.cxx @@ -185,14 +185,14 @@ SdrView::SdrView(SdrModel* pModel1, OutputDevice* pOut) { bTextEditOnObjectsWithoutTextIfTextTool=FALSE; - StartListening( maAccessibilityOptions ); + maAccessibilityOptions.AddListener(this); onAccessibilityOptionsChanged(); } SdrView::~SdrView() { - EndListening( maAccessibilityOptions ); + maAccessibilityOptions.RemoveListener(this); } BOOL SdrView::KeyInput(const KeyEvent& rKEvt, Window* pWin) @@ -1560,14 +1560,10 @@ BOOL SdrView::IsDeleteMarkedPossible() const return IsDeleteMarkedObjPossible(); } -void SdrView::Notify(SfxBroadcaster& rBC, const SfxHint& rHint) +void SdrView::ConfigurationChanged( ::utl::ConfigurationBroadcaster*p, sal_uInt32 nHint) { - if( rHint.ISA( SfxSimpleHint ) && ( (SfxSimpleHint&) rHint ).GetId() == SFX_HINT_ACCESSIBILITY_CHANGED ) - { - onAccessibilityOptionsChanged(); - } - - SdrCreateView::Notify(rBC, rHint); + onAccessibilityOptionsChanged(); + SdrCreateView::ConfigurationChanged(p, nHint); } SvtAccessibilityOptions& SdrView::getAccessibilityOptions() diff --git a/svx/source/svdraw/svdviter.cxx b/svx/source/svdraw/svdviter.cxx index e64396ac4819..4a9facd69281 100644 --- a/svx/source/svdraw/svdviter.cxx +++ b/svx/source/svdraw/svdviter.cxx @@ -38,7 +38,7 @@ #include <svx/svdview.hxx> #include <svx/svdpagv.hxx> #include <svx/svdsob.hxx> -#include <svtools/brdcst.hxx> +#include <svl/brdcst.hxx> #include <sdrpaintwindow.hxx> //////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/svx/source/svdraw/svdxcgv.cxx b/svx/source/svdraw/svdxcgv.cxx index b9a197ed89fb..22de2cfe3888 100644 --- a/svx/source/svdraw/svdxcgv.cxx +++ b/svx/source/svdraw/svdxcgv.cxx @@ -52,8 +52,8 @@ #include "svdglob.hxx" // StringCache #include "xoutbmp.hxx" #include <vcl/metaact.hxx> -#include <svtools/poolitem.hxx> -#include <svtools/itempool.hxx> +#include <svl/poolitem.hxx> +#include <svl/itempool.hxx> #include <tools/bigint.hxx> #include <sot/formats.hxx> @@ -62,7 +62,7 @@ #include <vcl/virdev.hxx> // b4967543 -#include <svtools/style.hxx> +#include <svl/style.hxx> // #i72535# #include "fmobj.hxx" diff --git a/svx/source/svrtf/rtfitem.cxx b/svx/source/svrtf/rtfitem.cxx index 889298b89f35..8e19f67fb0f7 100644 --- a/svx/source/svrtf/rtfitem.cxx +++ b/svx/source/svrtf/rtfitem.cxx @@ -92,8 +92,8 @@ #include <svtools/rtftoken.h> -#include <svtools/itempool.hxx> -#include <svtools/itemiter.hxx> +#include <svl/itempool.hxx> +#include <svl/itemiter.hxx> #include "svxrtf.hxx" diff --git a/svx/source/svrtf/svxrtf.cxx b/svx/source/svrtf/svxrtf.cxx index 24e3c6f89666..a9d153562650 100644 --- a/svx/source/svrtf/svxrtf.cxx +++ b/svx/source/svrtf/svxrtf.cxx @@ -37,10 +37,10 @@ #include <ctype.h> #include <tools/datetime.hxx> #include <rtl/tencinfo.h> -#include <svtools/itemiter.hxx> -#include <svtools/whiter.hxx> +#include <svl/itemiter.hxx> +#include <svl/whiter.hxx> #include <svtools/rtftoken.h> -#include <svtools/itempool.hxx> +#include <svl/itempool.hxx> #include <comphelper/string.hxx> diff --git a/svx/source/svxlink/linkmgr.cxx b/svx/source/svxlink/linkmgr.cxx index 4f66ba983c06..26cc0bace065 100644 --- a/svx/source/svxlink/linkmgr.cxx +++ b/svx/source/svxlink/linkmgr.cxx @@ -37,10 +37,10 @@ #include <vcl/graph.hxx> #include <sfx2/lnkbase.hxx> #include <tools/urlobj.hxx> -#include <svtools/stritem.hxx> -#include <svtools/eitem.hxx> -#include <svtools/intitem.hxx> -#include <svtools/rectitem.hxx> +#include <svl/stritem.hxx> +#include <svl/eitem.hxx> +#include <svl/intitem.hxx> +#include <svl/rectitem.hxx> #include <sfx2/app.hxx> #include <sfx2/request.hxx> #include <sfx2/objsh.hxx> @@ -50,8 +50,8 @@ #include <sfx2/dispatch.hxx> #include <unotools/charclass.hxx> #include <unotools/localfilehelper.hxx> -#include <svtools/itemset.hxx> -#include <svtools/urihelper.hxx> +#include <svl/itemset.hxx> +#include <svl/urihelper.hxx> #include <com/sun/star/datatransfer/DataFlavor.hpp> #include "linkmgr.hxx" diff --git a/svx/source/table/cell.cxx b/svx/source/table/cell.cxx index 42034f2bd0cb..f7fcfc763e6f 100644 --- a/svx/source/table/cell.cxx +++ b/svx/source/table/cell.cxx @@ -37,8 +37,8 @@ #include <com/sun/star/table/TableBorder.hpp> #include <cppuhelper/typeprovider.hxx> -#include <svtools/style.hxx> -#include <svtools/itemset.hxx> +#include <svl/style.hxx> +#include <svl/itemset.hxx> #include <vos/mutex.hxx> #include <vcl/svapp.hxx> diff --git a/svx/source/table/celleditsource.cxx b/svx/source/table/celleditsource.cxx index bd9401e562f6..5a518e34502f 100644 --- a/svx/source/table/celleditsource.cxx +++ b/svx/source/table/celleditsource.cxx @@ -38,9 +38,9 @@ #include <vos/mutex.hxx> #include <vcl/svapp.hxx> #include <comphelper/processfactory.hxx> -#include <svtools/lstner.hxx> -#include <svtools/hint.hxx> -#include <svtools/style.hxx> +#include <svl/lstner.hxx> +#include <svl/hint.hxx> +#include <svl/style.hxx> #include "celleditsource.hxx" #include "cell.hxx" diff --git a/svx/source/table/svdotable.cxx b/svx/source/table/svdotable.cxx index 44caaee6c148..97e06fd4bb61 100644 --- a/svx/source/table/svdotable.cxx +++ b/svx/source/table/svdotable.cxx @@ -45,7 +45,7 @@ #include <basegfx/polygon/b2dpolygontools.hxx> #include <basegfx/polygon/b2dpolypolygon.hxx> #include <basegfx/polygon/b2dpolygon.hxx> -#include <svtools/style.hxx> +#include <svl/style.hxx> #include "editstat.hxx" #include "svx/outlobj.hxx" #include "svx/svdview.hxx" diff --git a/svx/source/table/tablecontroller.cxx b/svx/source/table/tablecontroller.cxx index d7f64c852fc6..20acc4b4c822 100644 --- a/svx/source/table/tablecontroller.cxx +++ b/svx/source/table/tablecontroller.cxx @@ -43,7 +43,7 @@ #include <sal/config.h> #include <vcl/svapp.hxx> -#include <svtools/whiter.hxx> +#include <svl/whiter.hxx> #include <sfx2/request.hxx> diff --git a/svx/source/tbxctrls/colorwindow.hxx b/svx/source/tbxctrls/colorwindow.hxx index 9109c6bb32d5..6475ec5fc1a5 100644 --- a/svx/source/tbxctrls/colorwindow.hxx +++ b/svx/source/tbxctrls/colorwindow.hxx @@ -5,7 +5,7 @@ #define __SVX_COLORWINDOW_HXX_ #include <sfx2/tbxctrl.hxx> -#include <svtools/lstner.hxx> +#include <svl/lstner.hxx> #include <rtl/ustring.hxx> #include <com/sun/star/frame/XFrame.hpp> diff --git a/svx/source/tbxctrls/extrusioncontrols.cxx b/svx/source/tbxctrls/extrusioncontrols.cxx index 06fe8c26f0be..cee193d32eb8 100644 --- a/svx/source/tbxctrls/extrusioncontrols.cxx +++ b/svx/source/tbxctrls/extrusioncontrols.cxx @@ -41,9 +41,9 @@ #include <sfx2/app.hxx> #include <sfx2/dispatch.hxx> #include <sfx2/objsh.hxx> -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> #include <vcl/settings.hxx> -#include <svtools/intitem.hxx> +#include <svl/intitem.hxx> #include <svx/colritem.hxx> #include "chrtitem.hxx" #include <tools/urlobj.hxx> diff --git a/svx/source/tbxctrls/fontworkgallery.cxx b/svx/source/tbxctrls/fontworkgallery.cxx index dfa22cc64e23..8d2c8f2c10bc 100644 --- a/svx/source/tbxctrls/fontworkgallery.cxx +++ b/svx/source/tbxctrls/fontworkgallery.cxx @@ -32,7 +32,7 @@ #include "precompiled_svx.hxx" #include <com/sun/star/text/WritingMode.hpp> #include <sfx2/app.hxx> -#include <svtools/itempool.hxx> +#include <svl/itempool.hxx> #include <svx/fmmodel.hxx> #include <sfx2/dispatch.hxx> #include <dlgutil.hxx> diff --git a/svx/source/tbxctrls/formatpaintbrushctrl.cxx b/svx/source/tbxctrls/formatpaintbrushctrl.cxx index d4540bb363e7..23dfd9f32719 100644 --- a/svx/source/tbxctrls/formatpaintbrushctrl.cxx +++ b/svx/source/tbxctrls/formatpaintbrushctrl.cxx @@ -34,7 +34,7 @@ #include "formatpaintbrushctrl.hxx" // header for class SfxBoolItem -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> // header for define SFX_APP #include <sfx2/app.hxx> diff --git a/svx/source/tbxctrls/grafctrl.cxx b/svx/source/tbxctrls/grafctrl.cxx index a556110c69c5..50da14402fae 100644 --- a/svx/source/tbxctrls/grafctrl.cxx +++ b/svx/source/tbxctrls/grafctrl.cxx @@ -41,9 +41,9 @@ #endif #include <vcl/fixed.hxx> #include <vcl/msgbox.hxx> -#include <svtools/intitem.hxx> -#include <svtools/eitem.hxx> -#include <svtools/whiter.hxx> +#include <svl/intitem.hxx> +#include <svl/eitem.hxx> +#include <svl/whiter.hxx> #include <sfx2/app.hxx> #include <sfx2/dispatch.hxx> #include <sfx2/objsh.hxx> diff --git a/svx/source/tbxctrls/layctrl.cxx b/svx/source/tbxctrls/layctrl.cxx index 74c4d2a55e86..0054b0f23ef5 100644 --- a/svx/source/tbxctrls/layctrl.cxx +++ b/svx/source/tbxctrls/layctrl.cxx @@ -38,7 +38,7 @@ #ifndef _SV_BUTTON_HXX //autogen #include <vcl/button.hxx> #endif -#include <svtools/intitem.hxx> +#include <svl/intitem.hxx> #include <sfx2/dispatch.hxx> #include <sfx2/app.hxx> diff --git a/svx/source/tbxctrls/lboxctrl.cxx b/svx/source/tbxctrls/lboxctrl.cxx index 0cc0fa700f28..977054166752 100644 --- a/svx/source/tbxctrls/lboxctrl.cxx +++ b/svx/source/tbxctrls/lboxctrl.cxx @@ -43,11 +43,11 @@ #include <sfx2/dispatch.hxx> #include <sfx2/viewsh.hxx> #include <tools/gen.hxx> -#include <svtools/intitem.hxx> -#include <svtools/eitem.hxx> +#include <svl/intitem.hxx> +#include <svl/eitem.hxx> #include <svtools/stdctrl.hxx> -#include <svtools/slstitm.hxx> -#include <svtools/stritem.hxx> +#include <svl/slstitm.hxx> +#include <svl/stritem.hxx> #include <svx/dialmgr.hxx> #include <lboxctrl.hxx> #ifndef _VCL_MNEMONIC_HXX_ diff --git a/svx/source/tbxctrls/subtoolboxcontrol.cxx b/svx/source/tbxctrls/subtoolboxcontrol.cxx index 2fa2f9d2feac..9a05becc205f 100644 --- a/svx/source/tbxctrls/subtoolboxcontrol.cxx +++ b/svx/source/tbxctrls/subtoolboxcontrol.cxx @@ -30,7 +30,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" -#include <svtools/intitem.hxx> +#include <svl/intitem.hxx> #include <vcl/toolbox.hxx> #include <sfx2/app.hxx> diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx index cff14ad46237..c1b87f46b22b 100644 --- a/svx/source/tbxctrls/tbcontrl.cxx +++ b/svx/source/tbxctrls/tbcontrl.cxx @@ -36,15 +36,15 @@ #include <string> // HACK: prevent conflict between STLPORT and Workshop headers #include <tools/shl.hxx> -#include <svtools/poolitem.hxx> -#include <svtools/eitem.hxx> +#include <svl/poolitem.hxx> +#include <svl/eitem.hxx> #include <vcl/toolbox.hxx> #include <vcl/bmpacc.hxx> #include <svtools/valueset.hxx> #include <svtools/ctrlbox.hxx> -#include <svtools/style.hxx> +#include <svl/style.hxx> #include <svtools/ctrltool.hxx> -#include <svtools/stritem.hxx> +#include <svl/stritem.hxx> #include <unotools/pathoptions.hxx> #include <sfx2/tplpitem.hxx> #include <sfx2/dispatch.hxx> @@ -52,7 +52,7 @@ #include <sfx2/objsh.hxx> #include <sfx2/docfac.hxx> #include <sfx2/templdlg.hxx> -#include <svtools/isethint.hxx> +#include <svl/isethint.hxx> #include <sfx2/querystatus.hxx> #include <sfx2/sfxstatuslistener.hxx> #include <tools/urlobj.hxx> @@ -64,7 +64,7 @@ #endif #include <vcl/svapp.hxx> -#include <svtools/smplhint.hxx> +#include <svl/smplhint.hxx> #define _SVX_TBCONTRL_CXX #include <svtools/colorcfg.hxx> diff --git a/svx/source/tbxctrls/tbxalign.cxx b/svx/source/tbxctrls/tbxalign.cxx index 7b00096efc49..6ef9cf94f0c1 100644 --- a/svx/source/tbxctrls/tbxalign.cxx +++ b/svx/source/tbxctrls/tbxalign.cxx @@ -30,7 +30,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" -#include <svtools/aeitem.hxx> +#include <svl/aeitem.hxx> #include <svx/dialmgr.hxx> #include <svx/dialogs.hrc> diff --git a/svx/source/tbxctrls/tbxdrctl.cxx b/svx/source/tbxctrls/tbxdrctl.cxx index fb5e96271f87..28864c49a0d6 100644 --- a/svx/source/tbxctrls/tbxdrctl.cxx +++ b/svx/source/tbxctrls/tbxdrctl.cxx @@ -35,7 +35,7 @@ #include <tools/ref.hxx> #include <tools/shl.hxx> -#include <svtools/aeitem.hxx> +#include <svl/aeitem.hxx> #include <sfx2/dispatch.hxx> #include <sfx2/viewsh.hxx> #include <sfx2/imagemgr.hxx> diff --git a/svx/source/tbxctrls/verttexttbxctrl.cxx b/svx/source/tbxctrls/verttexttbxctrl.cxx index 6fbbcce20305..daeef8f74cec 100644 --- a/svx/source/tbxctrls/verttexttbxctrl.cxx +++ b/svx/source/tbxctrls/verttexttbxctrl.cxx @@ -34,9 +34,9 @@ #include <svx/dialmgr.hxx> #include <svx/dialogs.hrc> #include <verttexttbxctrl.hxx> -#include <svtools/languageoptions.hxx> +#include <svl/languageoptions.hxx> #include <sfx2/app.hxx> -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> #include <vcl/toolbox.hxx> #include <rtl/ustring.hxx> diff --git a/svx/source/toolbars/fontworkbar.cxx b/svx/source/toolbars/fontworkbar.cxx index d18fcaeb3cba..c40c5c5df8d5 100644 --- a/svx/source/toolbars/fontworkbar.cxx +++ b/svx/source/toolbars/fontworkbar.cxx @@ -355,7 +355,7 @@ static void impl_execute( SdrView*, SfxRequest& rReq, SdrCustomShapeGeometryItem #include "gallery.hxx" #include <svx/fmmodel.hxx> #include <svx/fmpage.hxx> -#include <svtools/itempool.hxx> +#include <svl/itempool.hxx> void GetGeometryForCustomShape( SdrCustomShapeGeometryItem& rGeometryItem, const rtl::OUString rCustomShape ) { diff --git a/svx/source/unodraw/UnoGraphicExporter.cxx b/svx/source/unodraw/UnoGraphicExporter.cxx index 5d1af9af2190..c5f8497fba15 100644 --- a/svx/source/unodraw/UnoGraphicExporter.cxx +++ b/svx/source/unodraw/UnoGraphicExporter.cxx @@ -59,7 +59,7 @@ #include <vcl/svapp.hxx> #include <vcl/virdev.hxx> #include <svtools/FilterConfigItem.hxx> -#include <svtools/outstrm.hxx> +#include <svl/outstrm.hxx> #include <svx/sdr/contact/objectcontactofobjlistpainter.hxx> #include <svx/sdr/contact/viewobjectcontact.hxx> #include <svx/sdr/contact/viewcontact.hxx> diff --git a/svx/source/unodraw/UnoNameItemTable.cxx b/svx/source/unodraw/UnoNameItemTable.cxx index 14e23ace3a98..61c006822231 100644 --- a/svx/source/unodraw/UnoNameItemTable.cxx +++ b/svx/source/unodraw/UnoNameItemTable.cxx @@ -32,9 +32,9 @@ #include "precompiled_svx.hxx" #include <set> -#include <svtools/itempool.hxx> -#include <svtools/itemset.hxx> -#include <svtools/style.hxx> +#include <svl/itempool.hxx> +#include <svl/itemset.hxx> +#include <svl/style.hxx> #include <comphelper/stl_types.hxx> #include <svx/svdmodel.hxx> diff --git a/svx/source/unodraw/UnoNameItemTable.hxx b/svx/source/unodraw/UnoNameItemTable.hxx index 515171e5a1c7..1bb5a60e1946 100644 --- a/svx/source/unodraw/UnoNameItemTable.hxx +++ b/svx/source/unodraw/UnoNameItemTable.hxx @@ -37,7 +37,7 @@ #include <cppuhelper/implbase2.hxx> #include <vector> -#include <svtools/lstner.hxx> +#include <svl/lstner.hxx> #include <svx/xit.hxx> #include <svx/xdef.hxx> diff --git a/svx/source/unodraw/UnoNamespaceMap.cxx b/svx/source/unodraw/UnoNamespaceMap.cxx index 0f414eb2b7ce..12d35898439e 100644 --- a/svx/source/unodraw/UnoNamespaceMap.cxx +++ b/svx/source/unodraw/UnoNamespaceMap.cxx @@ -43,7 +43,7 @@ #include <osl/diagnose.h> #include <osl/mutex.hxx> #include <comphelper/stl_types.hxx> -#include <svtools/itempool.hxx> +#include <svl/itempool.hxx> #include "unoapi.hxx" #include "xmlcnitm.hxx" diff --git a/svx/source/unodraw/unobtabl.cxx b/svx/source/unodraw/unobtabl.cxx index 99e54a165ac3..f2b05f80ca7c 100644 --- a/svx/source/unodraw/unobtabl.cxx +++ b/svx/source/unodraw/unobtabl.cxx @@ -30,9 +30,9 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" -#include <svtools/itempool.hxx> +#include <svl/itempool.hxx> #include <vcl/cvtgrf.hxx> -#include <svtools/itemset.hxx> +#include <svl/itemset.hxx> #include <svx/xit.hxx> #ifndef SVX_LIGHT #ifndef _SFXDOCFILE_HXX diff --git a/svx/source/unodraw/unodtabl.cxx b/svx/source/unodraw/unodtabl.cxx index 1eaa0d974dbd..2a56c3868ae1 100644 --- a/svx/source/unodraw/unodtabl.cxx +++ b/svx/source/unodraw/unodtabl.cxx @@ -31,8 +31,8 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" #include <com/sun/star/drawing/LineDash.hpp> -#include <svtools/itempool.hxx> -#include <svtools/itemset.hxx> +#include <svl/itempool.hxx> +#include <svl/itemset.hxx> #include <vector> #include "UnoNameItemTable.hxx" diff --git a/svx/source/unodraw/unofdesc.cxx b/svx/source/unodraw/unofdesc.cxx index 6b9ed30cda29..389729795a36 100644 --- a/svx/source/unodraw/unofdesc.cxx +++ b/svx/source/unodraw/unofdesc.cxx @@ -45,7 +45,7 @@ #include <svx/crsditem.hxx> #include <svx/wrlmitem.hxx> #include <svx/unomid.hxx> -#include <svtools/itempool.hxx> +#include <svl/itempool.hxx> #include "unofdesc.hxx" diff --git a/svx/source/unodraw/unogtabl.cxx b/svx/source/unodraw/unogtabl.cxx index f13997b92e8e..460ac59dbc20 100644 --- a/svx/source/unodraw/unogtabl.cxx +++ b/svx/source/unodraw/unogtabl.cxx @@ -31,8 +31,8 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" #include <com/sun/star/awt/Gradient.hpp> -#include <svtools/itempool.hxx> -#include <svtools/itemset.hxx> +#include <svl/itempool.hxx> +#include <svl/itemset.hxx> #include "UnoNameItemTable.hxx" #include <svx/xgrad.hxx> diff --git a/svx/source/unodraw/unohtabl.cxx b/svx/source/unodraw/unohtabl.cxx index 2360f2650aba..f715db91c585 100644 --- a/svx/source/unodraw/unohtabl.cxx +++ b/svx/source/unodraw/unohtabl.cxx @@ -31,8 +31,8 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" #include <com/sun/star/drawing/Hatch.hpp> -#include <svtools/itempool.hxx> -#include <svtools/itemset.hxx> +#include <svl/itempool.hxx> +#include <svl/itemset.hxx> #include "UnoNameItemTable.hxx" #include <svx/xhatch.hxx> diff --git a/svx/source/unodraw/unoipset.cxx b/svx/source/unodraw/unoipset.cxx index 36c7139bd3ad..1574b97308f5 100644 --- a/svx/source/unodraw/unoipset.cxx +++ b/svx/source/unodraw/unoipset.cxx @@ -31,12 +31,12 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" #include <com/sun/star/beans/XPropertySet.hpp> -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> #include <tools/list.hxx> #include <hash_map> #include <vector> -#include <svtools/itemprop.hxx> +#include <svl/itemprop.hxx> #include <svx/unoipset.hxx> #include <svx/svdpool.hxx> diff --git a/svx/source/unodraw/unomod.cxx b/svx/source/unodraw/unomod.cxx index 7f7aedf860e9..1ca285f6e952 100644 --- a/svx/source/unodraw/unomod.cxx +++ b/svx/source/unodraw/unomod.cxx @@ -38,7 +38,7 @@ #include <vos/mutex.hxx> #include <vcl/svapp.hxx> #include <tools/list.hxx> -#include <svtools/itemprop.hxx> +#include <svl/itemprop.hxx> #include <svtools/unoevent.hxx> #include <comphelper/sequence.hxx> diff --git a/svx/source/unodraw/unomtabl.cxx b/svx/source/unodraw/unomtabl.cxx index e2ba9fd9a219..9e73954bf870 100644 --- a/svx/source/unodraw/unomtabl.cxx +++ b/svx/source/unodraw/unomtabl.cxx @@ -36,12 +36,12 @@ #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/container/XNameContainer.hpp> #include <com/sun/star/drawing/PointSequence.hpp> -#include <svtools/style.hxx> +#include <svl/style.hxx> #include <cppuhelper/implbase2.hxx> -#include <svtools/itempool.hxx> -#include <svtools/itemset.hxx> -#include <svtools/lstner.hxx> +#include <svl/itempool.hxx> +#include <svl/itemset.hxx> +#include <svl/lstner.hxx> #include <svx/xlnedit.hxx> #include <svx/xlnstit.hxx> #include <svx/svdmodel.hxx> diff --git a/svx/source/unodraw/unonrule.cxx b/svx/source/unodraw/unonrule.cxx index 7947cde7e790..af4a327edb7d 100644 --- a/svx/source/unodraw/unonrule.cxx +++ b/svx/source/unodraw/unonrule.cxx @@ -43,7 +43,7 @@ #include <cppuhelper/implbase1.hxx> #include <cppuhelper/implbase5.hxx> -#include <svtools/itempool.hxx> +#include <svl/itempool.hxx> #include <goodies/grfmgr.hxx> #include <vcl/svapp.hxx> diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx index 3f7f58a1e9ad..d09ba5d439dc 100644 --- a/svx/source/unodraw/unoshape.cxx +++ b/svx/source/unodraw/unoshape.cxx @@ -38,7 +38,7 @@ #include <com/sun/star/drawing/CircleKind.hpp> #include <com/sun/star/embed/NoVisualAreaSizeException.hpp> #include <vcl/svapp.hxx> -#include <svtools/itemprop.hxx> +#include <svl/itemprop.hxx> #include <svtools/fltcall.hxx> #include <vos/mutex.hxx> #include <svx/unotext.hxx> diff --git a/svx/source/unodraw/unoshtxt.cxx b/svx/source/unodraw/unoshtxt.cxx index 81439effcfc1..4fe72f586476 100644 --- a/svx/source/unodraw/unoshtxt.cxx +++ b/svx/source/unodraw/unoshtxt.cxx @@ -35,11 +35,11 @@ #include <svx/unoshtxt.hxx> #include <unoedhlp.hxx> -#include <svtools/lstner.hxx> +#include <svl/lstner.hxx> #include <rtl/ref.hxx> #include <osl/mutex.hxx> -#include <svtools/hint.hxx> -#include <svtools/style.hxx> +#include <svl/hint.hxx> +#include <svl/style.hxx> #include <svx/svdmodel.hxx> #include <svx/svdoutl.hxx> #include <svx/svdobj.hxx> diff --git a/svx/source/unodraw/unottabl.cxx b/svx/source/unodraw/unottabl.cxx index a238d9c4a4f3..1358e3005b02 100644 --- a/svx/source/unodraw/unottabl.cxx +++ b/svx/source/unodraw/unottabl.cxx @@ -31,8 +31,8 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" #include <com/sun/star/awt/Gradient.hpp> -#include <svtools/itempool.hxx> -#include <svtools/itemset.hxx> +#include <svl/itempool.hxx> +#include <svl/itemset.hxx> #include <svx/xgrad.hxx> #include <svx/xflftrit.hxx> diff --git a/svx/source/unoedit/unoedsrc.cxx b/svx/source/unoedit/unoedsrc.cxx index 5714d38c75ec..67d11a49c90e 100644 --- a/svx/source/unoedit/unoedsrc.cxx +++ b/svx/source/unoedit/unoedsrc.cxx @@ -30,7 +30,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" -#include <svtools/brdcst.hxx> +#include <svl/brdcst.hxx> #include <svx/unoedsrc.hxx> diff --git a/svx/source/unoedit/unofored.cxx b/svx/source/unoedit/unofored.cxx index c06c37ae2070..14c8fb20a768 100644 --- a/svx/source/unoedit/unofored.cxx +++ b/svx/source/unoedit/unofored.cxx @@ -35,7 +35,7 @@ #include <svx/eeitem.hxx> #include <com/sun/star/i18n/WordType.hpp> -#include <svtools/itemset.hxx> +#include <svl/itemset.hxx> #include <svx/editeng.hxx> #include <svx/editview.hxx> #include <unoedhlp.hxx> diff --git a/svx/source/unoedit/unoforou.cxx b/svx/source/unoedit/unoforou.cxx index c54f76d5f4dc..a98b6830b698 100644 --- a/svx/source/unoedit/unoforou.cxx +++ b/svx/source/unoedit/unoforou.cxx @@ -32,16 +32,16 @@ #include "precompiled_svx.hxx" #include <algorithm> -#include <svtools/style.hxx> +#include <svl/style.hxx> #include <com/sun/star/i18n/WordType.hpp> -#include <svtools/itemset.hxx> +#include <svl/itemset.hxx> #include <svx/editeng.hxx> #include <svx/editdata.hxx> #include <svx/outliner.hxx> #include <unoedhlp.hxx> #include <svx/svdobj.hxx> -#include <svtools/poolitem.hxx> +#include <svl/poolitem.hxx> #include <vcl/wrkwin.hxx> #include <svx/eeitem.hxx> diff --git a/svx/source/unoedit/unotext.cxx b/svx/source/unoedit/unotext.cxx index a46533657f1c..a4d8c36462e6 100644 --- a/svx/source/unoedit/unotext.cxx +++ b/svx/source/unoedit/unotext.cxx @@ -38,16 +38,16 @@ #include <com/sun/star/text/XTextField.hdl> #endif #include <vos/mutex.hxx> -#include <svtools/itemset.hxx> +#include <svl/itemset.hxx> #include <svx/eeitem.hxx> -#include <svtools/itempool.hxx> +#include <svl/itempool.hxx> #include <fontitem.hxx> #include <svx/tstpitem.hxx> #include <svx/svdobj.hxx> -#include <svtools/intitem.hxx> +#include <svl/intitem.hxx> -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> #include <rtl/uuid.h> #include <rtl/memory.h> diff --git a/svx/source/unoedit/unotext2.cxx b/svx/source/unoedit/unotext2.cxx index 3a5ae174c579..bc9fb01fbe62 100644 --- a/svx/source/unoedit/unotext2.cxx +++ b/svx/source/unoedit/unotext2.cxx @@ -34,7 +34,7 @@ #include <vos/mutex.hxx> #define _SVSTDARR_USHORTS -#include <svtools/svstdarr.hxx> +#include <svl/svstdarr.hxx> #include <rtl/uuid.h> #include <rtl/memory.h> diff --git a/svx/source/unogallery/unogalitem.cxx b/svx/source/unogallery/unogalitem.cxx index 9eaf4f1aa440..fe880bacb02f 100644 --- a/svx/source/unogallery/unogalitem.cxx +++ b/svx/source/unogallery/unogalitem.cxx @@ -44,8 +44,8 @@ #ifndef _SV_GRAPH_HXX_ #include <vcl/graph.hxx> #endif -#include <svtools/itemprop.hxx> -#include <svtools/itempool.hxx> +#include <svl/itemprop.hxx> +#include <svl/itempool.hxx> #ifndef _COM_SUN_STAR_BEANS_PROPERTYSTATE_HDL_ diff --git a/svx/source/unogallery/unogaltheme.hxx b/svx/source/unogallery/unogaltheme.hxx index 4900c6396a9d..5af538defc08 100644 --- a/svx/source/unogallery/unogaltheme.hxx +++ b/svx/source/unogallery/unogaltheme.hxx @@ -34,7 +34,7 @@ #include <list> #include <cppuhelper/implbase1.hxx> -#include <svtools/lstner.hxx> +#include <svl/lstner.hxx> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/gallery/XGalleryTheme.hpp> diff --git a/svx/source/xml/xmltxtexp.cxx b/svx/source/xml/xmltxtexp.cxx index 4f034b098db7..c3ec9f926b01 100644 --- a/svx/source/xml/xmltxtexp.cxx +++ b/svx/source/xml/xmltxtexp.cxx @@ -38,8 +38,8 @@ #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/io/XActiveDataSource.hpp> #include <tools/debug.hxx> -#include <svtools/itemprop.hxx> -#include <svtools/brdcst.hxx> +#include <svl/itemprop.hxx> +#include <svl/brdcst.hxx> #include <com/sun/star/uno/Sequence.hxx> #include <sfx2/docfile.hxx> #ifndef _SVSTOR_HXX diff --git a/svx/source/xml/xmltxtimp.cxx b/svx/source/xml/xmltxtimp.cxx index 9bbe425dce66..b0087c6b4e26 100644 --- a/svx/source/xml/xmltxtimp.cxx +++ b/svx/source/xml/xmltxtimp.cxx @@ -44,7 +44,7 @@ #ifndef _SVSTOR_HXX #include <sot/storage.hxx> #endif -#include <svtools/itemprop.hxx> +#include <svl/itemprop.hxx> #include <sfx2/docfile.hxx> #include <xmloff/xmlimp.hxx> #include "xmloff/xmlmetae.hxx" diff --git a/svx/source/xoutdev/_xoutbmp.cxx b/svx/source/xoutdev/_xoutbmp.cxx index a9258118ed43..0277135c4136 100644 --- a/svx/source/xoutdev/_xoutbmp.cxx +++ b/svx/source/xoutdev/_xoutbmp.cxx @@ -38,7 +38,7 @@ #include <tools/poly.hxx> #include <vcl/virdev.hxx> #include <vcl/wrkwin.hxx> -#include <svtools/solar.hrc> +#include <svl/solar.hrc> #include <sfx2/docfile.hxx> #include <sfx2/app.hxx> #include "impgrf.hxx" diff --git a/svx/source/xoutdev/xattr.cxx b/svx/source/xoutdev/xattr.cxx index 6fae754662ee..6b05262d2321 100644 --- a/svx/source/xoutdev/xattr.cxx +++ b/svx/source/xoutdev/xattr.cxx @@ -43,16 +43,16 @@ #include <com/sun/star/awt/Gradient.hpp> #include <com/sun/star/uno/Sequence.hxx> #include <com/sun/star/beans/PropertyValue.hpp> -#include <svtools/itempool.hxx> +#include <svl/itempool.hxx> #include <tools/stream.hxx> #include "unoapi.hxx" -#include <svtools/style.hxx> +#include <svl/style.hxx> #include "unopolyhelper.hxx" #include <tools/bigint.hxx> -#include <svtools/itemset.hxx> +#include <svl/itemset.hxx> #include <svx/dialogs.hrc> #include "svdstr.hrc" #include "xattr.hxx" diff --git a/svx/source/xoutdev/xattrbmp.cxx b/svx/source/xoutdev/xattrbmp.cxx index 5cdd3b9a74b6..d7db2994a68e 100644 --- a/svx/source/xoutdev/xattrbmp.cxx +++ b/svx/source/xoutdev/xattrbmp.cxx @@ -37,7 +37,7 @@ #include <vcl/virdev.hxx> #include <vcl/bitmapex.hxx> #include <toolkit/unohlp.hxx> -#include <svtools/style.hxx> +#include <svl/style.hxx> #include <svx/dialogs.hrc> #include "xattr.hxx" diff --git a/svx/source/xoutdev/xexch.cxx b/svx/source/xoutdev/xexch.cxx index d8ccea2a9ecc..1ee473e7b8b7 100644 --- a/svx/source/xoutdev/xexch.cxx +++ b/svx/source/xoutdev/xexch.cxx @@ -38,13 +38,13 @@ #include <svx/xflasit.hxx> #include <svx/xfillit0.hxx> #ifndef _SFXIPOOL_HXX -#include <svtools/itempool.hxx> +#include <svl/itempool.hxx> #endif -#include <svtools/whiter.hxx> +#include <svl/whiter.hxx> #ifndef _SFXIPOOL_HXX -#include <svtools/itempool.hxx> +#include <svl/itempool.hxx> #endif -#include <svtools/itemset.hxx> +#include <svl/itemset.hxx> #include <svx/xdef.hxx> #include "xexch.hxx" diff --git a/svx/source/xoutdev/xpool.cxx b/svx/source/xoutdev/xpool.cxx index 052e52152415..12dc4c2f823a 100644 --- a/svx/source/xoutdev/xpool.cxx +++ b/svx/source/xoutdev/xpool.cxx @@ -36,7 +36,7 @@ #include <svx/xpool.hxx> #include <svx/svdattr.hxx> #include <svx/svxids.hrc> -#include <svtools/itemset.hxx> +#include <svl/itemset.hxx> /************************************************************************* |* diff --git a/svx/source/xoutdev/xtabbtmp.cxx b/svx/source/xoutdev/xtabbtmp.cxx index 629fc0dd928d..2f91fc1d828b 100644 --- a/svx/source/xoutdev/xtabbtmp.cxx +++ b/svx/source/xoutdev/xtabbtmp.cxx @@ -44,7 +44,7 @@ #include <tools/urlobj.hxx> #include <vcl/virdev.hxx> -#include <svtools/itemset.hxx> +#include <svl/itemset.hxx> #include <sfx2/docfile.hxx> #include <svx/dialogs.hrc> #include <svx/dialmgr.hxx> diff --git a/svx/source/xoutdev/xtabdash.cxx b/svx/source/xoutdev/xtabdash.cxx index ca81ab19fe5e..a050e566e6f4 100644 --- a/svx/source/xoutdev/xtabdash.cxx +++ b/svx/source/xoutdev/xtabdash.cxx @@ -48,7 +48,7 @@ #include <tools/urlobj.hxx> #include <vcl/virdev.hxx> #include <vcl/window.hxx> -#include <svtools/itemset.hxx> +#include <svl/itemset.hxx> #include <sfx2/docfile.hxx> #include <svx/dialogs.hrc> #include <svx/dialmgr.hxx> diff --git a/svx/source/xoutdev/xtabgrdt.cxx b/svx/source/xoutdev/xtabgrdt.cxx index 4b2153ae2802..6f79eccf9f92 100644 --- a/svx/source/xoutdev/xtabgrdt.cxx +++ b/svx/source/xoutdev/xtabgrdt.cxx @@ -46,7 +46,7 @@ #include <tools/urlobj.hxx> #include <vcl/virdev.hxx> -#include <svtools/itemset.hxx> +#include <svl/itemset.hxx> #include <sfx2/docfile.hxx> #include <svx/dialogs.hrc> #include <svx/dialmgr.hxx> diff --git a/svx/source/xoutdev/xtabhtch.cxx b/svx/source/xoutdev/xtabhtch.cxx index a389a97526e9..91b00c52be3a 100644 --- a/svx/source/xoutdev/xtabhtch.cxx +++ b/svx/source/xoutdev/xtabhtch.cxx @@ -47,7 +47,7 @@ #include <tools/urlobj.hxx> #include <vcl/virdev.hxx> -#include <svtools/itemset.hxx> +#include <svl/itemset.hxx> #include <sfx2/docfile.hxx> #include <svx/dialogs.hrc> #include <svx/dialmgr.hxx> diff --git a/svx/source/xoutdev/xtablend.cxx b/svx/source/xoutdev/xtablend.cxx index 3d298811f2b6..ab105d8e21cf 100644 --- a/svx/source/xoutdev/xtablend.cxx +++ b/svx/source/xoutdev/xtablend.cxx @@ -49,7 +49,7 @@ #ifndef _SV_APP_HXX #include <vcl/svapp.hxx> #endif -#include <svtools/itemset.hxx> +#include <svl/itemset.hxx> #include <sfx2/docfile.hxx> #include <svx/dialogs.hrc> |