diff options
Diffstat (limited to 'svx/inc')
202 files changed, 275 insertions, 271 deletions
diff --git a/svx/inc/bolnitem.hxx b/svx/inc/bolnitem.hxx index bfb55d676866..22040d790c71 100644 --- a/svx/inc/bolnitem.hxx +++ b/svx/inc/bolnitem.hxx @@ -34,7 +34,7 @@ -#include <svtools/poolitem.hxx> +#include <svl/poolitem.hxx> #include "svx/svxdllapi.h" diff --git a/svx/inc/bulitem.hxx b/svx/inc/bulitem.hxx index b0adc0d4dd9f..cae4fbcc24ef 100644 --- a/svx/inc/bulitem.hxx +++ b/svx/inc/bulitem.hxx @@ -66,7 +66,7 @@ #define VALID_STYLE 0x0040 #define VALID_PREVTEXT 0x0080 #define VALID_FOLLOWTEXT 0x0100 -#include <svtools/poolitem.hxx> +#include <svl/poolitem.hxx> #include <vcl/font.hxx> #include <goodies/grfmgr.hxx> diff --git a/svx/inc/charhiddenitem.hxx b/svx/inc/charhiddenitem.hxx index ea36786a503b..c11abea5145d 100644 --- a/svx/inc/charhiddenitem.hxx +++ b/svx/inc/charhiddenitem.hxx @@ -32,8 +32,8 @@ // include --------------------------------------------------------------- -#include <svtools/poolitem.hxx> -#include <svtools/eitem.hxx> +#include <svl/poolitem.hxx> +#include <svl/eitem.hxx> #include "svx/svxdllapi.h" // class SvxCharHiddenItem ------------------------------------------------- diff --git a/svx/inc/chrtitem.hxx b/svx/inc/chrtitem.hxx index a15824e0790c..ffaa10c71360 100644 --- a/svx/inc/chrtitem.hxx +++ b/svx/inc/chrtitem.hxx @@ -32,7 +32,7 @@ // include --------------------------------------------------------------- -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> #include "svx/svxdllapi.h" //------------------------------------------------------------------------ diff --git a/svx/inc/clipboardctl.hxx b/svx/inc/clipboardctl.hxx index f17ecfbc6983..3e76dc7a5fe1 100644 --- a/svx/inc/clipboardctl.hxx +++ b/svx/inc/clipboardctl.hxx @@ -33,7 +33,7 @@ #include <sfx2/tbxctrl.hxx> #include <sfx2/ctrlitem.hxx> -#include <svtools/poolitem.hxx> +#include <svl/poolitem.hxx> #include "svx/svxdllapi.h" diff --git a/svx/inc/clipfmtitem.hxx b/svx/inc/clipfmtitem.hxx index cdb62e84fb66..b304c0796bfc 100644 --- a/svx/inc/clipfmtitem.hxx +++ b/svx/inc/clipfmtitem.hxx @@ -33,7 +33,7 @@ // include --------------------------------------------------------------- #include <tools/gen.hxx> -#include <svtools/poolitem.hxx> +#include <svl/poolitem.hxx> #include "svx/svxdllapi.h" // class SvxClipboardFmtItem ---------------------------------------------- diff --git a/svx/inc/dlgutil.hxx b/svx/inc/dlgutil.hxx index 866db4a6c3fd..9cf995814674 100644 --- a/svx/inc/dlgutil.hxx +++ b/svx/inc/dlgutil.hxx @@ -34,8 +34,8 @@ #ifndef _FIELD_HXX #include <vcl/field.hxx> #endif -#include <svtools/poolitem.hxx> -#include <svtools/intitem.hxx> +#include <svl/poolitem.hxx> +#include <svl/intitem.hxx> #include "svx/svxdllapi.h" // macro ----------------------------------------------------------------- diff --git a/svx/inc/drawitem.hxx b/svx/inc/drawitem.hxx index 5e5e10725bf6..f9bb93b47136 100644 --- a/svx/inc/drawitem.hxx +++ b/svx/inc/drawitem.hxx @@ -32,7 +32,7 @@ // include --------------------------------------------------------------- -#include <svtools/poolitem.hxx> +#include <svl/poolitem.hxx> #include <com/sun/star/uno/Sequence.hxx> #include <com/sun/star/drawing/LineDash.hpp> #include "svx/svxdllapi.h" diff --git a/svx/inc/editund2.hxx b/svx/inc/editund2.hxx index bb693183136d..65c83dd4f0e8 100644 --- a/svx/inc/editund2.hxx +++ b/svx/inc/editund2.hxx @@ -32,7 +32,7 @@ #define _EDITUND2_HXX #include "svx/svxdllapi.h" -#include <svtools/undo.hxx> +#include <svl/undo.hxx> class ImpEditEngine; diff --git a/svx/inc/extrusioncontrols.hxx b/svx/inc/extrusioncontrols.hxx index 35e63fb55a1c..b707cae39f98 100644 --- a/svx/inc/extrusioncontrols.hxx +++ b/svx/inc/extrusioncontrols.hxx @@ -31,7 +31,7 @@ #define _SVX_EXTRUSION_CONTROLS_HXX #include <svtools/valueset.hxx> -#include <svtools/lstner.hxx> +#include <svl/lstner.hxx> #include <sfx2/tbxctrl.hxx> #include <svtools/svtreebx.hxx> #ifndef _SV_BUTTON_HXX diff --git a/svx/inc/flstitem.hxx b/svx/inc/flstitem.hxx index 72b1001a3c39..f41970cc79da 100644 --- a/svx/inc/flstitem.hxx +++ b/svx/inc/flstitem.hxx @@ -32,7 +32,7 @@ // include --------------------------------------------------------------- -#include <svtools/poolitem.hxx> +#include <svl/poolitem.hxx> #include <rtl/ustring.hxx> #include <com/sun/star/uno/Sequence.h> #include "svx/svxdllapi.h" diff --git a/svx/inc/fmhelp.hrc b/svx/inc/fmhelp.hrc index c7f172cbe5db..9f807f44d5f5 100644 --- a/svx/inc/fmhelp.hrc +++ b/svx/inc/fmhelp.hrc @@ -31,7 +31,7 @@ #define _SVX_FMHELP_HRC // include ----------------------------------------------------------- -#include <svtools/solar.hrc> +#include <svl/solar.hrc> // in solar.hrc //#define HID_FORMS_START (HID_LIB_START+4000) diff --git a/svx/inc/fontitem.hxx b/svx/inc/fontitem.hxx index da0ee972954b..c6d0087382a5 100644 --- a/svx/inc/fontitem.hxx +++ b/svx/inc/fontitem.hxx @@ -32,7 +32,7 @@ // include --------------------------------------------------------------- -#include <svtools/poolitem.hxx> +#include <svl/poolitem.hxx> #include <tools/string.hxx> #ifndef _FONT_HXX //autogen #include <vcl/font.hxx> diff --git a/svx/inc/fwdtitem.hxx b/svx/inc/fwdtitem.hxx index 14cf9559210f..8a02474f525c 100644 --- a/svx/inc/fwdtitem.hxx +++ b/svx/inc/fwdtitem.hxx @@ -33,7 +33,7 @@ // include --------------------------------------------------------------- -#include <svtools/poolitem.hxx> +#include <svl/poolitem.hxx> // class SvxFontWidthItem ----------------------------------------------- diff --git a/svx/inc/galbrws2.hxx b/svx/inc/galbrws2.hxx index 5eac53593608..119146fe62e7 100644 --- a/svx/inc/galbrws2.hxx +++ b/svx/inc/galbrws2.hxx @@ -37,7 +37,7 @@ #include <vcl/timer.hxx> #include <vcl/toolbox.hxx> #include <svtools/transfer.hxx> -#include <svtools/lstner.hxx> +#include <svl/lstner.hxx> #include <svtools/miscopt.hxx> #include "galbrws.hxx" diff --git a/svx/inc/galctrl.hxx b/svx/inc/galctrl.hxx index d2cdbcd68847..ac51c0eadb18 100644 --- a/svx/inc/galctrl.hxx +++ b/svx/inc/galctrl.hxx @@ -41,7 +41,7 @@ #include <vcl/edit.hxx> #include <vcl/combobox.hxx> #include <vcl/sound.hxx> -#include <svtools/slstitm.hxx> +#include <svl/slstitm.hxx> #include <svtools/transfer.hxx> #include <svtools/valueset.hxx> #include <svtools/brwbox.hxx> diff --git a/svx/inc/galdlg.hxx b/svx/inc/galdlg.hxx index fb07dcadba6b..0351bee44b57 100644 --- a/svx/inc/galdlg.hxx +++ b/svx/inc/galdlg.hxx @@ -43,7 +43,7 @@ #include <vcl/edit.hxx> #include <vcl/combobox.hxx> #include <vcl/sound.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/inc/gallery1.hxx b/svx/inc/gallery1.hxx index e3665a47c707..ace74e1fe8a4 100644 --- a/svx/inc/gallery1.hxx +++ b/svx/inc/gallery1.hxx @@ -34,7 +34,7 @@ #include <tools/string.hxx> #include <tools/list.hxx> #include <tools/urlobj.hxx> -#include <svtools/brdcst.hxx> +#include <svl/brdcst.hxx> #include "svx/svxdllapi.h" #include "gallery.hrc" diff --git a/svx/inc/galmisc.hxx b/svx/inc/galmisc.hxx index ff7634d876d8..cfda79f0a6ca 100644 --- a/svx/inc/galmisc.hxx +++ b/svx/inc/galmisc.hxx @@ -34,7 +34,7 @@ #include <sot/storage.hxx> #include <tools/urlobj.hxx> #include <svtools/imap.hxx> -#include <svtools/hint.hxx> +#include <svl/hint.hxx> #include <svtools/transfer.hxx> #include <svx/svdobj.hxx> #include "galobj.hxx" diff --git a/svx/inc/galtheme.hxx b/svx/inc/galtheme.hxx index 15a1c6fbb1e2..8d86c44d8ba9 100644 --- a/svx/inc/galtheme.hxx +++ b/svx/inc/galtheme.hxx @@ -38,8 +38,8 @@ #include <tools/debug.hxx> #include <tools/urlobj.hxx> #include <vcl/salctype.hxx> -#include <svtools/brdcst.hxx> -#include <svtools/lstner.hxx> +#include <svl/brdcst.hxx> +#include <svl/lstner.hxx> #include <svtools/transfer.hxx> #include <sot/storage.hxx> #include "galobj.hxx" diff --git a/svx/inc/grafctrl.hxx b/svx/inc/grafctrl.hxx index b0a27462fb04..ea5a7236f6fe 100644 --- a/svx/inc/grafctrl.hxx +++ b/svx/inc/grafctrl.hxx @@ -31,8 +31,8 @@ #ifndef _SVX_GRAFCTRL_HXX #define _SVX_GRAFCTRL_HXX -#include <svtools/lstner.hxx> -#include <svtools/intitem.hxx> +#include <svl/lstner.hxx> +#include <svl/intitem.hxx> #include <sfx2/tbxctrl.hxx> #include "svx/svxdllapi.h" diff --git a/svx/inc/helpid.hrc b/svx/inc/helpid.hrc index 3cac79c92f80..678c2810b232 100644 --- a/svx/inc/helpid.hrc +++ b/svx/inc/helpid.hrc @@ -31,7 +31,7 @@ #define _SVX_HELPID_HRC // include --------------------------------------------------------------- -#include <svtools/solar.hrc> +#include <svl/solar.hrc> // Help-Ids -------------------------------------------------------------- diff --git a/svx/inc/hlnkitem.hxx b/svx/inc/hlnkitem.hxx index 6c8422e60d0e..a820be6562f1 100644 --- a/svx/inc/hlnkitem.hxx +++ b/svx/inc/hlnkitem.hxx @@ -31,9 +31,9 @@ #define _SVX_HLNKITEM_HXX #include <tools/string.hxx> -#include <svtools/poolitem.hxx> +#include <svl/poolitem.hxx> #include <sfx2/sfxsids.hrc> -#include <svtools/macitem.hxx> +#include <svl/macitem.hxx> #include "svx/svxdllapi.h" #define HYPERDLG_EVENT_MOUSEOVER_OBJECT 0x0001 diff --git a/svx/inc/htmlcfg.hxx b/svx/inc/htmlcfg.hxx index 2e3175898377..5fa8bdb6071a 100644 --- a/svx/inc/htmlcfg.hxx +++ b/svx/inc/htmlcfg.hxx @@ -61,7 +61,8 @@ public: SvxHtmlOptions(); ~SvxHtmlOptions(); - virtual void Commit(); + virtual void Commit(); + virtual void Notify( const com::sun::star::uno::Sequence< rtl::OUString >& _rPropertyNames); USHORT GetFontSize(USHORT nPos) const; void SetFontSize(USHORT nPos, USHORT nSize); diff --git a/svx/inc/linectrl.hxx b/svx/inc/linectrl.hxx index d8d5df55c97c..82c042e08d1f 100644 --- a/svx/inc/linectrl.hxx +++ b/svx/inc/linectrl.hxx @@ -32,7 +32,7 @@ #include <svtools/valueset.hxx> -#include <svtools/lstner.hxx> +#include <svl/lstner.hxx> #include <sfx2/tbxctrl.hxx> #include "svx/svxdllapi.h" diff --git a/svx/inc/nlbkitem.hxx b/svx/inc/nlbkitem.hxx index 3e586731345a..db3298c3d5b1 100644 --- a/svx/inc/nlbkitem.hxx +++ b/svx/inc/nlbkitem.hxx @@ -33,7 +33,7 @@ // include --------------------------------------------------------------- -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> #include "svx/svxdllapi.h" // class SvxNoLinebreakItem ---------------------------------------------- diff --git a/svx/inc/ofaitem.hxx b/svx/inc/ofaitem.hxx index 9a57dbb2989c..7701cb82206b 100644 --- a/svx/inc/ofaitem.hxx +++ b/svx/inc/ofaitem.hxx @@ -32,7 +32,7 @@ // include ---------------------------------------------------------------- -#include <svtools/poolitem.hxx> +#include <svl/poolitem.hxx> #include "svx/svxdllapi.h" // class OfaPtrItem ------------------------------------------------------ diff --git a/svx/inc/opaqitem.hxx b/svx/inc/opaqitem.hxx index c5306c0e0a61..07a5cbb4fd36 100644 --- a/svx/inc/opaqitem.hxx +++ b/svx/inc/opaqitem.hxx @@ -32,7 +32,7 @@ // include --------------------------------------------------------------- -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> #include "svx/svxdllapi.h" class SvXMLUnitConverter; diff --git a/svx/inc/optgrid.hxx b/svx/inc/optgrid.hxx index 31e5ac10f59b..e91530f33cd5 100644 --- a/svx/inc/optgrid.hxx +++ b/svx/inc/optgrid.hxx @@ -33,7 +33,7 @@ // include --------------------------------------------------------------- #include <sfx2/tabdlg.hxx> -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> #include <vcl/group.hxx> #include <vcl/fixed.hxx> #include <vcl/field.hxx> diff --git a/svx/inc/optitems.hxx b/svx/inc/optitems.hxx index e48367556925..6e951c0100f4 100644 --- a/svx/inc/optitems.hxx +++ b/svx/inc/optitems.hxx @@ -32,7 +32,7 @@ // include --------------------------------------------------------------- -#include <svtools/poolitem.hxx> +#include <svl/poolitem.hxx> #include <com/sun/star/uno/Reference.hxx> #include "svx/svxdllapi.h" diff --git a/svx/inc/pch/precompiled_svx.hxx b/svx/inc/pch/precompiled_svx.hxx index d118cfbb409d..aea1b42c8f85 100644 --- a/svx/inc/pch/precompiled_svx.hxx +++ b/svx/inc/pch/precompiled_svx.hxx @@ -753,29 +753,29 @@ #include <vector> #include "svtools/FilterConfigItem.hxx" #include "svtools/accessibilityoptions.hxx" -#include "svtools/adrparse.hxx" +#include "unotools/adrparse.hxx" #include "svtools/apearcfg.hxx" -#include "svtools/brdcst.hxx" +#include "svl/brdcst.hxx" #include "unotools/cacheoptions.hxx" -#include "svtools/cancel.hxx" -#include "svtools/cjkoptions.hxx" +#include "svl/cancel.hxx" +#include "svl/cjkoptions.hxx" #include "unotools/cmdoptions.hxx" -#include "svtools/cntwall.hxx" +#include "svl/cntwall.hxx" #include "svtools/colorcfg.hxx" -#include "svtools/ctloptions.hxx" +#include "svl/ctloptions.hxx" #include "unotools/defaultoptions.hxx" #include "unotools/dynamicmenuoptions.hxx" #include "svtools/ehdl.hxx" -#include "svtools/eitem.hxx" +#include "svl/eitem.hxx" #include "unotools/eventcfg.hxx" #include "unotools/extendedsecurityoptions.hxx" -#include "svtools/filenotation.hxx" -#include "svtools/flagitem.hxx" +#include "svl/filenotation.hxx" +#include "svl/flagitem.hxx" #include "unotools/fltrcfg.hxx" #include "unotools/fontoptions.hxx" #include "svtools/fontsubstconfig.hxx" #include "svtools/helpopt.hxx" -#include "svtools/hint.hxx" +#include "svl/hint.hxx" #include "svtools/htmlkywd.hxx" #include "svtools/htmltokn.h" #include "svtools/imagemgr.hxx" @@ -785,69 +785,69 @@ #include "svtools/imaprect.hxx" #include "svtools/inetimg.hxx" #include "unotools/inetoptions.hxx" -#include "svtools/intitem.hxx" -#include "svtools/isethint.hxx" -#include "svtools/itemiter.hxx" -#include "svtools/itempool.hxx" -#include "svtools/itemprop.hxx" -#include "svtools/itemset.hxx" +#include "svl/intitem.hxx" +#include "svl/isethint.hxx" +#include "svl/itemiter.hxx" +#include "svl/itempool.hxx" +#include "svl/itemprop.hxx" +#include "svl/itemset.hxx" #include "unotools/javaoptions.hxx" -#include "svtools/languageoptions.hxx" +#include "svl/languageoptions.hxx" #include "unotools/lingucfg.hxx" #include "unotools/linguprops.hxx" -#include "svtools/lngmisc.hxx" +#include "svl/lngmisc.hxx" #include "svtools/localresaccess.hxx" -#include "svtools/lstner.hxx" -#include "svtools/macitem.hxx" +#include "svl/lstner.hxx" +#include "svl/macitem.hxx" #include "svtools/menuoptions.hxx" -#include "svtools/metitem.hxx" -#include "svtools/misccfg.hxx" +#include "svl/metitem.hxx" +#include "unotools/misccfg.hxx" #include "svtools/miscopt.hxx" #include "unotools/moduleoptions.hxx" -#include "svtools/numuno.hxx" +#include "svl/numuno.hxx" #include "unotools/optionsdlg.hxx" #include "svtools/parhtml.hxx" #include "svtools/parrtf.hxx" #include "unotools/pathoptions.hxx" -#include "svtools/pickerhelper.hxx" -#include "svtools/poolitem.hxx" +#include "svl/pickerhelper.hxx" +#include "svl/poolitem.hxx" #include "unotools/printwarningoptions.hxx" -#include "svtools/ptitem.hxx" -#include "svtools/rectitem.hxx" -#include "svtools/rngitem.hxx" +#include "svl/ptitem.hxx" +#include "svl/rectitem.hxx" +#include "svl/rngitem.hxx" #include "svtools/rtfkeywd.hxx" #include "svtools/rtfout.hxx" #include "svtools/rtftoken.h" #include "unotools/saveopt.hxx" #include "unotools/searchopt.hxx" #include "unotools/securityoptions.hxx" -#include "svtools/sfontitm.hxx" -#include "svtools/slstitm.hxx" -#include "svtools/smplhint.hxx" +#include "svl/sfontitm.hxx" +#include "svl/slstitm.hxx" +#include "svl/smplhint.hxx" #include "svtools/soerr.hxx" #include "unotools/sourceviewconfig.hxx" #include "unotools/startoptions.hxx" #include "svtools/stdmenu.hxx" #include "svtools/stringtransfer.hxx" -#include "svtools/stritem.hxx" -#include "svtools/style.hxx" -#include "svtools/svarray.hxx" -#include "svtools/svstdarr.hxx" -#include "svtools/syslocaleoptions.hxx" -#include "svtools/szitem.hxx" +#include "svl/stritem.hxx" +#include "svl/style.hxx" +#include "svl/svarray.hxx" +#include "svl/svstdarr.hxx" +#include "unotools/syslocaleoptions.hxx" +#include "svl/szitem.hxx" #include "svtools/textdata.hxx" #include "svtools/transfer.hxx" #include "svtools/txtcmp.hxx" -#include "svtools/undo.hxx" +#include "svl/undo.hxx" #include "unotools/undoopt.hxx" #include "svtools/unoevent.hxx" #include "svtools/unoimap.hxx" -#include "svtools/urihelper.hxx" -#include "svtools/urlbmk.hxx" +#include "svl/urihelper.hxx" +#include "svl/urlbmk.hxx" #include "unotools/useroptions.hxx" #include "unotools/viewoptions.hxx" -#include "svtools/visitem.hxx" -#include "svtools/whiter.hxx" +#include "svl/visitem.hxx" +#include "svl/whiter.hxx" #include "sys/stat.h" #include "sys/types.h" #include "toolkit/awt/vclxdevice.hxx" diff --git a/svx/inc/pgrditem.hxx b/svx/inc/pgrditem.hxx index 719995362f13..e1c886829d17 100644 --- a/svx/inc/pgrditem.hxx +++ b/svx/inc/pgrditem.hxx @@ -32,7 +32,7 @@ // include --------------------------------------------------------------- -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> #include "svx/svxdllapi.h" // class SvxParaGridItem ------------------------------------------------- diff --git a/svx/inc/postattr.hxx b/svx/inc/postattr.hxx index 87908ebebd78..425f3f84bf76 100644 --- a/svx/inc/postattr.hxx +++ b/svx/inc/postattr.hxx @@ -32,7 +32,7 @@ // include --------------------------------------------------------------- -#include <svtools/stritem.hxx> +#include <svl/stritem.hxx> #include "svx/svxdllapi.h" // class SvxPostItAuthorItem --------------------------------------------- diff --git a/svx/inc/prntitem.hxx b/svx/inc/prntitem.hxx index da56c7d0a3f4..f9b91e12a2a7 100644 --- a/svx/inc/prntitem.hxx +++ b/svx/inc/prntitem.hxx @@ -32,7 +32,7 @@ // include --------------------------------------------------------------- -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> #include "svx/svxdllapi.h" diff --git a/svx/inc/protitem.hxx b/svx/inc/protitem.hxx index c3707b9b3558..bb6646f9445a 100644 --- a/svx/inc/protitem.hxx +++ b/svx/inc/protitem.hxx @@ -33,7 +33,7 @@ // include --------------------------------------------------------------- -#include <svtools/poolitem.hxx> +#include <svl/poolitem.hxx> #include "svx/svxdllapi.h" class SvXMLUnitConverter; diff --git a/svx/inc/rotmodit.hxx b/svx/inc/rotmodit.hxx index a91074f2f79f..f88b8a2b35ef 100644 --- a/svx/inc/rotmodit.hxx +++ b/svx/inc/rotmodit.hxx @@ -31,7 +31,7 @@ #ifndef _SVX_ROTMODIT_HXX #define _SVX_ROTMODIT_HXX -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> #include "svx/svxdllapi.h" //---------------------------------------------------------------------------- diff --git a/svx/inc/rulritem.hxx b/svx/inc/rulritem.hxx index 8a1b49f4bc55..7d035acef427 100644 --- a/svx/inc/rulritem.hxx +++ b/svx/inc/rulritem.hxx @@ -34,7 +34,7 @@ #include <tools/gen.hxx> -#include <svtools/poolitem.hxx> +#include <svl/poolitem.hxx> #include "svx/svxdllapi.h" // class SvxLongLRSpaceItem ---------------------------------------------- diff --git a/svx/inc/srchdlg.hxx b/svx/inc/srchdlg.hxx index f002113cb565..cd4006e86690 100644 --- a/svx/inc/srchdlg.hxx +++ b/svx/inc/srchdlg.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> #include "svx/svxdllapi.h" diff --git a/svx/inc/svx/SmartTagItem.hxx b/svx/inc/svx/SmartTagItem.hxx index ebb5172c14bc..a3f040d8d594 100644 --- a/svx/inc/svx/SmartTagItem.hxx +++ b/svx/inc/svx/SmartTagItem.hxx @@ -32,7 +32,7 @@ // include --------------------------------------------------------------- -#include <svtools/poolitem.hxx> +#include <svl/poolitem.hxx> #include <com/sun/star/uno/Reference.hxx> #include <com/sun/star/uno/Sequence.hxx> #include <com/sun/star/smarttags/XSmartTagAction.hpp> diff --git a/svx/inc/svx/adjitem.hxx b/svx/inc/svx/adjitem.hxx index ce8699bd3f3d..b29a356ded63 100644 --- a/svx/inc/svx/adjitem.hxx +++ b/svx/inc/svx/adjitem.hxx @@ -32,7 +32,7 @@ // include --------------------------------------------------------------- -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> #include <svx/svxenum.hxx> #ifndef _SVX_SVXIDS_HRC diff --git a/svx/inc/svx/akrnitem.hxx b/svx/inc/svx/akrnitem.hxx index eaafd8f546a9..cd581ced8cfa 100644 --- a/svx/inc/svx/akrnitem.hxx +++ b/svx/inc/svx/akrnitem.hxx @@ -32,7 +32,7 @@ // include --------------------------------------------------------------- -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> #ifndef _SVX_SVXIDS_HRC #include <svx/svxids.hrc> #endif diff --git a/svx/inc/svx/algitem.hxx b/svx/inc/svx/algitem.hxx index 379d20afc685..71900afca1ab 100644 --- a/svx/inc/svx/algitem.hxx +++ b/svx/inc/svx/algitem.hxx @@ -33,8 +33,8 @@ // include --------------------------------------------------------------- #include <svx/svxids.hrc> -#include <svtools/poolitem.hxx> -#include <svtools/eitem.hxx> +#include <svl/poolitem.hxx> +#include <svl/eitem.hxx> #include <svx/svxenum.hxx> #include "svx/svxdllapi.h" diff --git a/svx/inc/svx/blnkitem.hxx b/svx/inc/svx/blnkitem.hxx index 7aee8797a43b..1c4c3eb3985d 100644 --- a/svx/inc/svx/blnkitem.hxx +++ b/svx/inc/svx/blnkitem.hxx @@ -32,8 +32,8 @@ // include --------------------------------------------------------------- -#include <svtools/poolitem.hxx> -#include <svtools/eitem.hxx> +#include <svl/poolitem.hxx> +#include <svl/eitem.hxx> #ifndef _SVX_SVXIDS_HRC #include <svx/svxids.hrc> #endif diff --git a/svx/inc/svx/borderline.hxx b/svx/inc/svx/borderline.hxx index 937fe3d2a973..77fae1f676d0 100644 --- a/svx/inc/svx/borderline.hxx +++ b/svx/inc/svx/borderline.hxx @@ -32,7 +32,7 @@ #define SVX_BORDERLINE_HXX #include <tools/color.hxx> -#include <svtools/poolitem.hxx> +#include <svl/poolitem.hxx> #include "svx/svxdllapi.h" // Line defaults in twips (former Writer defaults): diff --git a/svx/inc/svx/boxitem.hxx b/svx/inc/svx/boxitem.hxx index 06dd343c7c11..4b45eb0377c8 100644 --- a/svx/inc/svx/boxitem.hxx +++ b/svx/inc/svx/boxitem.hxx @@ -30,7 +30,7 @@ #ifndef _SVX_BOXITEM_HXX #define _SVX_BOXITEM_HXX -#include <svtools/poolitem.hxx> +#include <svl/poolitem.hxx> #include <svx/borderline.hxx> #ifndef _SVX_SVXIDS_HRC #include <svx/svxids.hrc> diff --git a/svx/inc/svx/brkitem.hxx b/svx/inc/svx/brkitem.hxx index 50bc798af490..f2241fc08d60 100644 --- a/svx/inc/svx/brkitem.hxx +++ b/svx/inc/svx/brkitem.hxx @@ -32,7 +32,7 @@ // include --------------------------------------------------------------- -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> #include <svx/svxenum.hxx> #ifndef _SVX_SVXIDS_HRC #include <svx/svxids.hrc> diff --git a/svx/inc/svx/brshitem.hxx b/svx/inc/svx/brshitem.hxx index f418a54fbe55..7952ae3ec2ff 100644 --- a/svx/inc/svx/brshitem.hxx +++ b/svx/inc/svx/brshitem.hxx @@ -32,7 +32,7 @@ // include --------------------------------------------------------------- -#include <svtools/poolitem.hxx> +#include <svl/poolitem.hxx> #ifndef _SVX_SVXIDS_HRC #include <svx/svxids.hrc> #endif diff --git a/svx/inc/svx/charreliefitem.hxx b/svx/inc/svx/charreliefitem.hxx index 719b28dee875..95685902ad9c 100644 --- a/svx/inc/svx/charreliefitem.hxx +++ b/svx/inc/svx/charreliefitem.hxx @@ -32,7 +32,7 @@ // include --------------------------------------------------------------- -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> #include <vcl/fntstyle.hxx> #ifndef _SVX_SVXIDS_HRC #include <svx/svxids.hrc> diff --git a/svx/inc/svx/charrotateitem.hxx b/svx/inc/svx/charrotateitem.hxx index 20a6618169cd..62bae4b7caa5 100644 --- a/svx/inc/svx/charrotateitem.hxx +++ b/svx/inc/svx/charrotateitem.hxx @@ -32,7 +32,7 @@ // include --------------------------------------------------------------- -#include <svtools/intitem.hxx> +#include <svl/intitem.hxx> #ifndef _SVX_SVXIDS_HRC #include <svx/svxids.hrc> #endif diff --git a/svx/inc/svx/charscaleitem.hxx b/svx/inc/svx/charscaleitem.hxx index 40ce8002dc04..ed957424731c 100644 --- a/svx/inc/svx/charscaleitem.hxx +++ b/svx/inc/svx/charscaleitem.hxx @@ -33,7 +33,7 @@ // include --------------------------------------------------------------- #ifndef _SFXENUMITEM_HXX -#include <svtools/intitem.hxx> +#include <svl/intitem.hxx> #endif #ifndef _SVX_SVXIDS_HRC #include <svx/svxids.hrc> diff --git a/svx/inc/svx/cmapitem.hxx b/svx/inc/svx/cmapitem.hxx index b2ce3d24aa30..cec4d6e538c6 100644 --- a/svx/inc/svx/cmapitem.hxx +++ b/svx/inc/svx/cmapitem.hxx @@ -32,7 +32,7 @@ // include --------------------------------------------------------------- -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> #include <svx/svxenum.hxx> #ifndef _SVX_SVXIDS_HRC #include <svx/svxids.hrc> diff --git a/svx/inc/svx/cntritem.hxx b/svx/inc/svx/cntritem.hxx index 577e2843e91a..da5d48bf06ea 100644 --- a/svx/inc/svx/cntritem.hxx +++ b/svx/inc/svx/cntritem.hxx @@ -32,7 +32,7 @@ // include --------------------------------------------------------------- -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> #ifndef _SVX_SVXIDS_HRC #include <svx/svxids.hrc> #endif diff --git a/svx/inc/svx/colrctrl.hxx b/svx/inc/svx/colrctrl.hxx index 56a7e0a410fa..9a908afa4588 100644 --- a/svx/inc/svx/colrctrl.hxx +++ b/svx/inc/svx/colrctrl.hxx @@ -34,7 +34,7 @@ #include <sfx2/childwin.hxx> #include <svtools/valueset.hxx> #include <svtools/transfer.hxx> -#include <svtools/lstner.hxx> +#include <svl/lstner.hxx> #include "svx/svxdllapi.h" class XColorTable; diff --git a/svx/inc/svx/colritem.hxx b/svx/inc/svx/colritem.hxx index 97b60b20a5a0..aea4918850d3 100644 --- a/svx/inc/svx/colritem.hxx +++ b/svx/inc/svx/colritem.hxx @@ -32,7 +32,7 @@ // include --------------------------------------------------------------- -#include <svtools/poolitem.hxx> +#include <svl/poolitem.hxx> #ifndef _SVX_SVXIDS_HRC #include <svx/svxids.hrc> #endif diff --git a/svx/inc/svx/crsditem.hxx b/svx/inc/svx/crsditem.hxx index c954d0fc15b4..945ae086f36e 100644 --- a/svx/inc/svx/crsditem.hxx +++ b/svx/inc/svx/crsditem.hxx @@ -33,7 +33,7 @@ // include --------------------------------------------------------------- #include <vcl/vclenum.hxx> -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> #ifndef _SVX_SVXIDS_HRC #include <svx/svxids.hrc> #endif diff --git a/svx/inc/svx/dlgctl3d.hxx b/svx/inc/svx/dlgctl3d.hxx index ca2c3ac1e4f7..4ee362978429 100644 --- a/svx/inc/svx/dlgctl3d.hxx +++ b/svx/inc/svx/dlgctl3d.hxx @@ -34,7 +34,7 @@ #include <vcl/ctrl.hxx> #include <vcl/scrbar.hxx> #include <vcl/button.hxx> -#include <svtools/itemset.hxx> +#include <svl/itemset.hxx> #include "svx/svxdllapi.h" #include <basegfx/vector/b3dvector.hxx> diff --git a/svx/inc/svx/e3ditem.hxx b/svx/inc/svx/e3ditem.hxx index 4441df6f6ad7..cc90da3aff9e 100644 --- a/svx/inc/svx/e3ditem.hxx +++ b/svx/inc/svx/e3ditem.hxx @@ -31,7 +31,7 @@ #ifndef _SVXE3DITEM_HXX #define _SVXE3DITEM_HXX -#include <svtools/poolitem.hxx> +#include <svl/poolitem.hxx> #include <basegfx/vector/b3dvector.hxx> #include "svx/svxdllapi.h" diff --git a/svx/inc/svx/editdata.hxx b/svx/inc/svx/editdata.hxx index b059ae25831c..8e3c9f853961 100644 --- a/svx/inc/svx/editdata.hxx +++ b/svx/inc/svx/editdata.hxx @@ -35,7 +35,7 @@ #include <tools/string.hxx> #include "svx/svxdllapi.h" -#include <svtools/svarray.hxx> +#include <svl/svarray.hxx> class SfxItemSet; class SfxPoolItem; diff --git a/svx/inc/svx/editobj.hxx b/svx/inc/svx/editobj.hxx index f291adefcf71..31a62225ced1 100644 --- a/svx/inc/svx/editobj.hxx +++ b/svx/inc/svx/editobj.hxx @@ -34,7 +34,7 @@ #include <tools/stream.hxx> #include <tools/debug.hxx> #include <rsc/rscsfx.hxx> -#include <svtools/itemset.hxx> +#include <svl/itemset.hxx> #include <svx/eeitem.hxx> #include "svx/svxdllapi.h" diff --git a/svx/inc/svx/emphitem.hxx b/svx/inc/svx/emphitem.hxx index fd80081f2d30..c6956a819dc3 100644 --- a/svx/inc/svx/emphitem.hxx +++ b/svx/inc/svx/emphitem.hxx @@ -33,7 +33,7 @@ // include --------------------------------------------------------------- #include <vcl/vclenum.hxx> -#include <svtools/intitem.hxx> +#include <svl/intitem.hxx> #ifndef _SVX_SVXIDS_HRC #include <svx/svxids.hrc> #endif diff --git a/svx/inc/svx/escpitem.hxx b/svx/inc/svx/escpitem.hxx index 3c47837c99e8..f96c3479dd0f 100644 --- a/svx/inc/svx/escpitem.hxx +++ b/svx/inc/svx/escpitem.hxx @@ -32,7 +32,7 @@ // include --------------------------------------------------------------- -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> #include <svx/svxenum.hxx> #ifndef _SVX_SVXIDS_HRC #include <svx/svxids.hrc> diff --git a/svx/inc/svx/fhgtitem.hxx b/svx/inc/svx/fhgtitem.hxx index 86d09bccfd8a..e77457a94e61 100644 --- a/svx/inc/svx/fhgtitem.hxx +++ b/svx/inc/svx/fhgtitem.hxx @@ -32,7 +32,7 @@ // include --------------------------------------------------------------- -#include <svtools/poolitem.hxx> +#include <svl/poolitem.hxx> #ifndef _SVX_SVXIDS_HRC #include <svx/svxids.hrc> #endif diff --git a/svx/inc/svx/fillctrl.hxx b/svx/inc/svx/fillctrl.hxx index 25e8d0c79759..7fb21f9d7b63 100644 --- a/svx/inc/svx/fillctrl.hxx +++ b/svx/inc/svx/fillctrl.hxx @@ -31,7 +31,7 @@ #ifndef _FILLCTRL_HXX #define _FILLCTRL_HXX -#include <svtools/lstner.hxx> +#include <svl/lstner.hxx> #include <sfx2/tbxctrl.hxx> #include "svx/svxdllapi.h" diff --git a/svx/inc/svx/flditem.hxx b/svx/inc/svx/flditem.hxx index 1ed9ffbf3c57..1d14870d33d3 100644 --- a/svx/inc/svx/flditem.hxx +++ b/svx/inc/svx/flditem.hxx @@ -33,7 +33,7 @@ #include <i18npool/lang.h> #include <tools/time.hxx> #include <tools/date.hxx> -#include <svtools/poolitem.hxx> +#include <svl/poolitem.hxx> #include <tools/pstm.hxx> #include "svx/svxdllapi.h" diff --git a/svx/inc/svx/fmsearch.hxx b/svx/inc/svx/fmsearch.hxx index 30b3ec389907..85e5e94f33ee 100644 --- a/svx/inc/svx/fmsearch.hxx +++ b/svx/inc/svx/fmsearch.hxx @@ -34,7 +34,7 @@ #include <com/sun/star/sdbc/XResultSet.hpp> #define _SVSTDARR_STRINGSDTOR -#include <svtools/svstdarr.hxx> +#include <svl/svstdarr.hxx> #ifndef _DIALOG_HXX //autogen #include <vcl/dialog.hxx> diff --git a/svx/inc/svx/fntctl.hxx b/svx/inc/svx/fntctl.hxx index 2488ad229fcd..924ae78c4182 100644 --- a/svx/inc/svx/fntctl.hxx +++ b/svx/inc/svx/fntctl.hxx @@ -33,7 +33,7 @@ // include --------------------------------------------------------------- #include <sfx2/mnuitem.hxx> -#include <svtools/lstner.hxx> +#include <svl/lstner.hxx> #include "svx/svxdllapi.h" diff --git a/svx/inc/svx/forbiddenruleitem.hxx b/svx/inc/svx/forbiddenruleitem.hxx index 8aea672c726d..24010eacc5ed 100644 --- a/svx/inc/svx/forbiddenruleitem.hxx +++ b/svx/inc/svx/forbiddenruleitem.hxx @@ -32,7 +32,7 @@ // include --------------------------------------------------------------- -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> #ifndef _SVX_SVXIDS_HRC #include <svx/svxids.hrc> #endif diff --git a/svx/inc/svx/frmdiritem.hxx b/svx/inc/svx/frmdiritem.hxx index 56678de69b19..e82638c94d95 100644 --- a/svx/inc/svx/frmdiritem.hxx +++ b/svx/inc/svx/frmdiritem.hxx @@ -32,7 +32,7 @@ // include --------------------------------------------------------------- -#include <svtools/intitem.hxx> +#include <svl/intitem.hxx> #include <svx/frmdir.hxx> #ifndef _SVX_SVXIDS_HRC #include <svx/svxids.hrc> diff --git a/svx/inc/svx/grfcrop.hxx b/svx/inc/svx/grfcrop.hxx index 9dd363c6f320..7281bc559b4d 100644 --- a/svx/inc/svx/grfcrop.hxx +++ b/svx/inc/svx/grfcrop.hxx @@ -30,7 +30,7 @@ #ifndef _SVX_GRFCROP_HXX #define _SVX_GRFCROP_HXX -#include <svtools/poolitem.hxx> +#include <svl/poolitem.hxx> #include "svx/svxdllapi.h" diff --git a/svx/inc/svx/hngpnctitem.hxx b/svx/inc/svx/hngpnctitem.hxx index 224933d2a9a5..dad568857bab 100644 --- a/svx/inc/svx/hngpnctitem.hxx +++ b/svx/inc/svx/hngpnctitem.hxx @@ -32,7 +32,7 @@ // include --------------------------------------------------------------- -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> #ifndef _SVX_SVXIDS_HRC #include <svx/svxids.hrc> #endif diff --git a/svx/inc/svx/hyznitem.hxx b/svx/inc/svx/hyznitem.hxx index 6e9464090698..0c6f46e09e8c 100644 --- a/svx/inc/svx/hyznitem.hxx +++ b/svx/inc/svx/hyznitem.hxx @@ -32,7 +32,7 @@ // include --------------------------------------------------------------- -#include <svtools/poolitem.hxx> +#include <svl/poolitem.hxx> #ifndef _SVX_SVXIDS_HRC #include <svx/svxids.hrc> #endif diff --git a/svx/inc/svx/itemtype.hxx b/svx/inc/svx/itemtype.hxx index a65b9bf79b48..a01bea487147 100644 --- a/svx/inc/svx/itemtype.hxx +++ b/svx/inc/svx/itemtype.hxx @@ -41,7 +41,7 @@ #include <tools/resid.hxx> #include <tools/bigint.hxx> #include <svx/dialmgr.hxx> -#include <svtools/poolitem.hxx> +#include <svl/poolitem.hxx> #include <tools/shl.hxx> #include "svx/svxdllapi.h" diff --git a/svx/inc/svx/keepitem.hxx b/svx/inc/svx/keepitem.hxx index ff1b14f9ff5c..f12f6a79e413 100644 --- a/svx/inc/svx/keepitem.hxx +++ b/svx/inc/svx/keepitem.hxx @@ -32,7 +32,7 @@ // include --------------------------------------------------------------- -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> #ifndef _SVX_SVXIDS_HRC #include <svx/svxids.hrc> #endif diff --git a/svx/inc/svx/kernitem.hxx b/svx/inc/svx/kernitem.hxx index 578d414bb77f..9e6f5b81da2b 100644 --- a/svx/inc/svx/kernitem.hxx +++ b/svx/inc/svx/kernitem.hxx @@ -32,7 +32,7 @@ // include --------------------------------------------------------------- -#include <svtools/intitem.hxx> +#include <svl/intitem.hxx> #ifndef _SVX_SVXIDS_HRC #include <svx/svxids.hrc> #endif diff --git a/svx/inc/svx/langitem.hxx b/svx/inc/svx/langitem.hxx index 73fd969e3176..5345fede13f7 100644 --- a/svx/inc/svx/langitem.hxx +++ b/svx/inc/svx/langitem.hxx @@ -32,7 +32,7 @@ // include --------------------------------------------------------------- -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> #include <i18npool/lang.h> #ifndef _SVX_SVXIDS_HRC #include <svx/svxids.hrc> diff --git a/svx/inc/svx/lrspitem.hxx b/svx/inc/svx/lrspitem.hxx index 47c97484d97d..1f54209cc82a 100644 --- a/svx/inc/svx/lrspitem.hxx +++ b/svx/inc/svx/lrspitem.hxx @@ -32,7 +32,7 @@ // include --------------------------------------------------------------- -#include <svtools/poolitem.hxx> +#include <svl/poolitem.hxx> #ifndef _SVX_SVXIDS_HRC #include <svx/svxids.hrc> #endif diff --git a/svx/inc/svx/lspcitem.hxx b/svx/inc/svx/lspcitem.hxx index 3baa51d7cd7c..e73a3aed11f7 100644 --- a/svx/inc/svx/lspcitem.hxx +++ b/svx/inc/svx/lspcitem.hxx @@ -32,7 +32,7 @@ // include --------------------------------------------------------------- -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> #include <svx/svxenum.hxx> #ifndef _SVX_SVXIDS_HRC diff --git a/svx/inc/svx/msdffimp.hxx b/svx/inc/svx/msdffimp.hxx index 248a31dcf71f..41ebfa2e7e1e 100644 --- a/svx/inc/svx/msdffimp.hxx +++ b/svx/inc/svx/msdffimp.hxx @@ -34,7 +34,7 @@ #include <com/sun/star/uno/Reference.h> #include <com/sun/star/embed/XEmbeddedObject.hpp> #include <tools/solar.h> // UINTXX -#include <svtools/svarray.hxx> +#include <svl/svarray.hxx> #include <tools/color.hxx> #include <tools/gen.hxx> diff --git a/svx/inc/svx/nhypitem.hxx b/svx/inc/svx/nhypitem.hxx index 78f81169cc9e..6cca0508a53d 100644 --- a/svx/inc/svx/nhypitem.hxx +++ b/svx/inc/svx/nhypitem.hxx @@ -32,7 +32,7 @@ // include --------------------------------------------------------------- -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> #ifndef _SVX_SVXIDS_HRC #include <svx/svxids.hrc> #endif diff --git a/svx/inc/svx/numfmtsh.hxx b/svx/inc/svx/numfmtsh.hxx index 5e6fe3737f94..7aee6f6bbb65 100644 --- a/svx/inc/svx/numfmtsh.hxx +++ b/svx/inc/svx/numfmtsh.hxx @@ -46,7 +46,7 @@ #endif #include "svx/svxdllapi.h" -#include <svtools/svstdarr.hxx> +#include <svl/svstdarr.hxx> // forward --------------------------------------------------------------- diff --git a/svx/inc/svx/numinf.hxx b/svx/inc/svx/numinf.hxx index 6035f71bc196..b1525a8f56a6 100644 --- a/svx/inc/svx/numinf.hxx +++ b/svx/inc/svx/numinf.hxx @@ -32,7 +32,7 @@ // include --------------------------------------------------------------- -#include <svtools/itempool.hxx> +#include <svl/itempool.hxx> #include <svx/numfmtsh.hxx> #include "svx/svxdllapi.h" diff --git a/svx/inc/svx/numitem.hxx b/svx/inc/svx/numitem.hxx index 17eb3d62630c..ea9fca06b290 100644 --- a/svx/inc/svx/numitem.hxx +++ b/svx/inc/svx/numitem.hxx @@ -34,7 +34,7 @@ #include <tools/link.hxx> #include <tools/string.hxx> -#include <svtools/poolitem.hxx> +#include <svl/poolitem.hxx> #include <svx/svxenum.hxx> #include <tools/gen.hxx> #ifndef _SVX_NUMDEF_HXX //autogen diff --git a/svx/inc/svx/obj3d.hxx b/svx/inc/svx/obj3d.hxx index 46c79b45e4d1..30a22938f888 100644 --- a/svx/inc/svx/obj3d.hxx +++ b/svx/inc/svx/obj3d.hxx @@ -40,7 +40,7 @@ #include <vcl/bitmap.hxx> #include <svx/svx3ditems.hxx> #include <svx/xflclit.hxx> -#include <svtools/itemset.hxx> +#include <svl/itemset.hxx> #include <basegfx/polygon/b3dpolypolygon.hxx> #include <basegfx/point/b2dpoint.hxx> #include <basegfx/polygon/b2dpolygon.hxx> diff --git a/svx/inc/svx/orphitem.hxx b/svx/inc/svx/orphitem.hxx index b1962b31eadd..676e245c3770 100644 --- a/svx/inc/svx/orphitem.hxx +++ b/svx/inc/svx/orphitem.hxx @@ -32,7 +32,7 @@ // include --------------------------------------------------------------- -#include <svtools/intitem.hxx> +#include <svl/intitem.hxx> #ifndef _SVX_SVXIDS_HRC #include <svx/svxids.hrc> #endif diff --git a/svx/inc/svx/outliner.hxx b/svx/inc/svx/outliner.hxx index 37e3d8ac71ee..e87ed9bd6114 100644 --- a/svx/inc/svx/outliner.hxx +++ b/svx/inc/svx/outliner.hxx @@ -34,7 +34,7 @@ #include <tools/string.hxx> #include <tools/debug.hxx> -#include <svtools/brdcst.hxx> +#include <svl/brdcst.hxx> #include <svx/editdata.hxx> #include <i18npool/lang.h> diff --git a/svx/inc/svx/pageitem.hxx b/svx/inc/svx/pageitem.hxx index 740e3a9e6edc..a9f611474a1b 100644 --- a/svx/inc/svx/pageitem.hxx +++ b/svx/inc/svx/pageitem.hxx @@ -32,7 +32,7 @@ // include --------------------------------------------------------------- -#include <svtools/poolitem.hxx> +#include <svl/poolitem.hxx> #include <tools/string.hxx> #include "svx/svxdllapi.h" diff --git a/svx/inc/svx/paravertalignitem.hxx b/svx/inc/svx/paravertalignitem.hxx index 7fc1379307ad..a7026422cc97 100644 --- a/svx/inc/svx/paravertalignitem.hxx +++ b/svx/inc/svx/paravertalignitem.hxx @@ -32,7 +32,7 @@ // include --------------------------------------------------------------- -#include <svtools/intitem.hxx> +#include <svl/intitem.hxx> #ifndef _SVX_SVXIDS_HRC #include <svx/svxids.hrc> #endif diff --git a/svx/inc/svx/pbinitem.hxx b/svx/inc/svx/pbinitem.hxx index 92241320ad14..f6a490cd8316 100644 --- a/svx/inc/svx/pbinitem.hxx +++ b/svx/inc/svx/pbinitem.hxx @@ -32,7 +32,7 @@ // include --------------------------------------------------------------- -#include <svtools/intitem.hxx> +#include <svl/intitem.hxx> #ifndef _SVX_SVXIDS_HRC #include <svx/svxids.hrc> #endif diff --git a/svx/inc/svx/pmdlitem.hxx b/svx/inc/svx/pmdlitem.hxx index 211083065797..edbf627c516b 100644 --- a/svx/inc/svx/pmdlitem.hxx +++ b/svx/inc/svx/pmdlitem.hxx @@ -32,7 +32,7 @@ // include --------------------------------------------------------------- -#include <svtools/stritem.hxx> +#include <svl/stritem.hxx> #ifndef _SVX_SVXIDS_HRC #include <svx/svxids.hrc> #endif diff --git a/svx/inc/svx/postitem.hxx b/svx/inc/svx/postitem.hxx index 18870f34ecbb..b662f64116b5 100644 --- a/svx/inc/svx/postitem.hxx +++ b/svx/inc/svx/postitem.hxx @@ -33,7 +33,7 @@ // include --------------------------------------------------------------- #include <vcl/vclenum.hxx> -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> #ifndef _SVX_SVXIDS_HRC #include <svx/svxids.hrc> #endif diff --git a/svx/inc/svx/prszitem.hxx b/svx/inc/svx/prszitem.hxx index 1b603acb0762..f075358f7a24 100644 --- a/svx/inc/svx/prszitem.hxx +++ b/svx/inc/svx/prszitem.hxx @@ -32,7 +32,7 @@ // include --------------------------------------------------------------- -#include <svtools/intitem.hxx> +#include <svl/intitem.hxx> #ifndef _SVX_SVXIDS_HRC #include <svx/svxids.hrc> #endif diff --git a/svx/inc/svx/ruler.hxx b/svx/inc/svx/ruler.hxx index 53c713161156..200f7f997471 100644 --- a/svx/inc/svx/ruler.hxx +++ b/svx/inc/svx/ruler.hxx @@ -32,7 +32,7 @@ #include <vcl/menu.hxx> #include <svtools/ruler.hxx> -#include <svtools/lstner.hxx> +#include <svl/lstner.hxx> #include "svx/svxdllapi.h" class SvxProtectItem; diff --git a/svx/inc/svx/scriptspaceitem.hxx b/svx/inc/svx/scriptspaceitem.hxx index d05fc45f8fe9..660d3c9c2019 100644 --- a/svx/inc/svx/scriptspaceitem.hxx +++ b/svx/inc/svx/scriptspaceitem.hxx @@ -32,7 +32,7 @@ // include --------------------------------------------------------------- -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> #ifndef _SVX_SVXIDS_HRC #include <svx/svxids.hrc> #endif diff --git a/svx/inc/svx/scripttypeitem.hxx b/svx/inc/svx/scripttypeitem.hxx index c35ae38b314b..75af8bcd8397 100644 --- a/svx/inc/svx/scripttypeitem.hxx +++ b/svx/inc/svx/scripttypeitem.hxx @@ -32,11 +32,11 @@ // include --------------------------------------------------------------- -#include <svtools/intitem.hxx> +#include <svl/intitem.hxx> #ifndef _SVX_SVXIDS_HRC #include <svx/svxids.hrc> #endif -#include <svtools/languageoptions.hxx> +#include <svl/languageoptions.hxx> #include "svx/svxdllapi.h" // class SvxScriptTypeItem ---------------------------------------------- diff --git a/svx/inc/svx/sdangitm.hxx b/svx/inc/svx/sdangitm.hxx index 3ae426d921fa..27205b49ec8b 100644 --- a/svx/inc/svx/sdangitm.hxx +++ b/svx/inc/svx/sdangitm.hxx @@ -30,7 +30,7 @@ #ifndef _SDANGITM_HXX #define _SDANGITM_HXX -#include <svtools/intitem.hxx> +#include <svl/intitem.hxx> #include "svx/svxdllapi.h" diff --git a/svx/inc/svx/sdasaitm.hxx b/svx/inc/svx/sdasaitm.hxx index 2301e0021b42..9678dec88968 100644 --- a/svx/inc/svx/sdasaitm.hxx +++ b/svx/inc/svx/sdasaitm.hxx @@ -31,7 +31,7 @@ #ifndef _SDASAITM_HXX #define _SDASAITM_HXX -#include <svtools/poolitem.hxx> +#include <svl/poolitem.hxx> #include <tools/list.hxx> class SdrCustomShapeAdjustmentValue diff --git a/svx/inc/svx/sdasitm.hxx b/svx/inc/svx/sdasitm.hxx index 882b3b74fedd..2499a857b965 100644 --- a/svx/inc/svx/sdasitm.hxx +++ b/svx/inc/svx/sdasitm.hxx @@ -33,7 +33,7 @@ #include <svx/svddef.hxx> #include <svx/sdooitm.hxx> -#include <svtools/stritem.hxx> +#include <svl/stritem.hxx> #include <com/sun/star/uno/Sequence.hxx> #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/uno/Any.hxx> diff --git a/svx/inc/svx/sdggaitm.hxx b/svx/inc/svx/sdggaitm.hxx index a1c6ba0431d6..c20ec38e78d1 100644 --- a/svx/inc/svx/sdggaitm.hxx +++ b/svx/inc/svx/sdggaitm.hxx @@ -31,7 +31,7 @@ #ifndef _SDGGAITM_HXX #define _SDGGAITM_HXX -#include <svtools/intitem.hxx> +#include <svl/intitem.hxx> #include <svx/svddef.hxx> #include "svx/svxdllapi.h" diff --git a/svx/inc/svx/sdgmoitm.hxx b/svx/inc/svx/sdgmoitm.hxx index 0f46c913c82e..0f27c6ef8ba4 100644 --- a/svx/inc/svx/sdgmoitm.hxx +++ b/svx/inc/svx/sdgmoitm.hxx @@ -32,7 +32,7 @@ #define _SDGMOITM_HXX #include <goodies/grfmgr.hxx> -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> #include <svx/svddef.hxx> #include "svx/svxdllapi.h" diff --git a/svx/inc/svx/sdmetitm.hxx b/svx/inc/svx/sdmetitm.hxx index 65f8a33443ed..b4f39d5fa76f 100644 --- a/svx/inc/svx/sdmetitm.hxx +++ b/svx/inc/svx/sdmetitm.hxx @@ -30,7 +30,7 @@ #ifndef _SDMETITM_HXX #define _SDMETITM_HXX -#include <svtools/intitem.hxx> +#include <svl/intitem.hxx> #include "svx/svxdllapi.h" diff --git a/svx/inc/svx/sdooitm.hxx b/svx/inc/svx/sdooitm.hxx index 5a49830909bc..d8af5ef51428 100644 --- a/svx/inc/svx/sdooitm.hxx +++ b/svx/inc/svx/sdooitm.hxx @@ -30,7 +30,7 @@ #ifndef _SDOOITM_HXX #define _SDOOITM_HXX -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> #include "svx/svxdllapi.h" diff --git a/svx/inc/svx/sdprcitm.hxx b/svx/inc/svx/sdprcitm.hxx index 404b70504b99..b9e17365629f 100644 --- a/svx/inc/svx/sdprcitm.hxx +++ b/svx/inc/svx/sdprcitm.hxx @@ -30,7 +30,7 @@ #ifndef _SDPRCITM_HXX #define _SDPRCITM_HXX -#include <svtools/intitem.hxx> +#include <svl/intitem.hxx> #include "svx/svxdllapi.h" diff --git a/svx/inc/svx/sdr/properties/attributeproperties.hxx b/svx/inc/svx/sdr/properties/attributeproperties.hxx index e91b05998837..5bdcda6e8116 100644 --- a/svx/inc/svx/sdr/properties/attributeproperties.hxx +++ b/svx/inc/svx/sdr/properties/attributeproperties.hxx @@ -31,7 +31,7 @@ #ifndef _SDR_PROPERTIES_ATTRIBUTEPROPERTIES_HXX #define _SDR_PROPERTIES_ATTRIBUTEPROPERTIES_HXX -#include <svtools/lstner.hxx> +#include <svl/lstner.hxx> #include <svx/sdr/properties/defaultproperties.hxx> #include "svx/svxdllapi.h" diff --git a/svx/inc/svx/sdrpagewindow.hxx b/svx/inc/svx/sdrpagewindow.hxx index 1845d152a65f..87806b4a72e4 100644 --- a/svx/inc/svx/sdrpagewindow.hxx +++ b/svx/inc/svx/sdrpagewindow.hxx @@ -38,7 +38,7 @@ #include <com/sun/star/util/XModeChangeListener.hpp> #include <cppuhelper/implbase4.hxx> #include <svx/svdtypes.hxx> // fuer SdrLayerID -#include <svtools/svarray.hxx> +#include <svl/svarray.hxx> #include <tools/contnr.hxx> #include <svx/sdrpagewindow.hxx> #include "svx/svxdllapi.h" diff --git a/svx/inc/svx/sdtaaitm.hxx b/svx/inc/svx/sdtaaitm.hxx index ae9547d5f1ae..27b8cde80a10 100644 --- a/svx/inc/svx/sdtaaitm.hxx +++ b/svx/inc/svx/sdtaaitm.hxx @@ -30,7 +30,7 @@ #ifndef _SDTAAITM_HXX #define _SDTAAITM_HXX -#include <svtools/intitem.hxx> +#include <svl/intitem.hxx> #include <svx/svddef.hxx> #include "svx/svxdllapi.h" diff --git a/svx/inc/svx/sdtacitm.hxx b/svx/inc/svx/sdtacitm.hxx index 03ad7551df35..b34aaa5c2c0a 100644 --- a/svx/inc/svx/sdtacitm.hxx +++ b/svx/inc/svx/sdtacitm.hxx @@ -30,7 +30,7 @@ #ifndef sdtacitm_hxx #define sdtacitm_hxx -#include <svtools/intitem.hxx> +#include <svl/intitem.hxx> #include <svx/svddef.hxx> // Anzahl der Durchlaeufe. 0=Endlos. diff --git a/svx/inc/svx/sdtaditm.hxx b/svx/inc/svx/sdtaditm.hxx index 9f56d1684852..bff071dab476 100644 --- a/svx/inc/svx/sdtaditm.hxx +++ b/svx/inc/svx/sdtaditm.hxx @@ -30,7 +30,7 @@ #ifndef _SDTADITM_HXX #define _SDTADITM_HXX -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> #include <svx/svddef.hxx> #include "svx/svxdllapi.h" diff --git a/svx/inc/svx/sdtaitm.hxx b/svx/inc/svx/sdtaitm.hxx index c51b0a6d8b62..ca816c5581ed 100644 --- a/svx/inc/svx/sdtaitm.hxx +++ b/svx/inc/svx/sdtaitm.hxx @@ -30,7 +30,7 @@ #ifndef _SDTAITM_HXX #define _SDTAITM_HXX -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> #include <svx/svddef.hxx> #include "svx/svxdllapi.h" diff --git a/svx/inc/svx/sdtakitm.hxx b/svx/inc/svx/sdtakitm.hxx index e73f704455f6..ef91d76f0374 100644 --- a/svx/inc/svx/sdtakitm.hxx +++ b/svx/inc/svx/sdtakitm.hxx @@ -30,7 +30,7 @@ #ifndef SDTAKITM_HXX #define SDTAKITM_HXX -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> #include <svx/svddef.hxx> #include "svx/svxdllapi.h" diff --git a/svx/inc/svx/sdtayitm.hxx b/svx/inc/svx/sdtayitm.hxx index f1bb5a224140..84d82d561522 100644 --- a/svx/inc/svx/sdtayitm.hxx +++ b/svx/inc/svx/sdtayitm.hxx @@ -30,7 +30,7 @@ #ifndef _SDTAYITM_HXX #define _SDTAYITM_HXX -#include <svtools/intitem.hxx> +#include <svl/intitem.hxx> #include <svx/svddef.hxx> #include "svx/svxdllapi.h" diff --git a/svx/inc/svx/sdtfsitm.hxx b/svx/inc/svx/sdtfsitm.hxx index 146b2c60bab1..467107d49812 100644 --- a/svx/inc/svx/sdtfsitm.hxx +++ b/svx/inc/svx/sdtfsitm.hxx @@ -30,7 +30,7 @@ #ifndef _SDTFSITM_HXX #define _SDTFSITM_HXX -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> #include <svx/svddef.hxx> #include "svx/svxdllapi.h" diff --git a/svx/inc/svx/sdynitm.hxx b/svx/inc/svx/sdynitm.hxx index 9e0b27a87404..88826007ef90 100644 --- a/svx/inc/svx/sdynitm.hxx +++ b/svx/inc/svx/sdynitm.hxx @@ -30,7 +30,7 @@ #ifndef _SDYNITM_HXX #define _SDYNITM_HXX -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> #include "svx/svxdllapi.h" diff --git a/svx/inc/svx/shaditem.hxx b/svx/inc/svx/shaditem.hxx index c28be7ddc58a..90c33aef2410 100644 --- a/svx/inc/svx/shaditem.hxx +++ b/svx/inc/svx/shaditem.hxx @@ -33,7 +33,7 @@ // include --------------------------------------------------------------- #include <tools/color.hxx> -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> #include <svx/svxenum.hxx> #ifndef _SVX_SVXIDS_HRC #include <svx/svxids.hrc> diff --git a/svx/inc/svx/shdditem.hxx b/svx/inc/svx/shdditem.hxx index 5421aa54002d..f37f58ba048c 100644 --- a/svx/inc/svx/shdditem.hxx +++ b/svx/inc/svx/shdditem.hxx @@ -32,7 +32,7 @@ // include --------------------------------------------------------------- -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> #ifndef _SVX_SVXIDS_HRC #include <svx/svxids.hrc> #endif diff --git a/svx/inc/svx/sizeitem.hxx b/svx/inc/svx/sizeitem.hxx index 5d796def9370..d99ed038a600 100644 --- a/svx/inc/svx/sizeitem.hxx +++ b/svx/inc/svx/sizeitem.hxx @@ -33,7 +33,7 @@ // include --------------------------------------------------------------- #include <tools/gen.hxx> -#include <svtools/poolitem.hxx> +#include <svl/poolitem.hxx> #ifndef _SVX_SVXIDS_HRC #include <svx/svxids.hrc> #endif diff --git a/svx/inc/svx/spltitem.hxx b/svx/inc/svx/spltitem.hxx index e635ce57cdc3..7cf18a02ca93 100644 --- a/svx/inc/svx/spltitem.hxx +++ b/svx/inc/svx/spltitem.hxx @@ -32,7 +32,7 @@ // include --------------------------------------------------------------- -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> #ifndef _SVX_SVXIDS_HRC #include <svx/svxids.hrc> #endif diff --git a/svx/inc/svx/svdattr.hxx b/svx/inc/svx/svdattr.hxx index eaaba216d929..6149916f0d6c 100644 --- a/svx/inc/svx/svdattr.hxx +++ b/svx/inc/svx/svdattr.hxx @@ -32,7 +32,7 @@ #define _SVDATTR_HXX #ifndef _SOLAR_HRC -#include <svtools/solar.hrc> +#include <svl/solar.hrc> #endif #include <tools/solar.h> #include <svx/sdangitm.hxx> diff --git a/svx/inc/svx/svdfppt.hxx b/svx/inc/svx/svdfppt.hxx index 63f196876e93..845e1696b5ae 100644 --- a/svx/inc/svx/svdfppt.hxx +++ b/svx/inc/svx/svdfppt.hxx @@ -34,7 +34,7 @@ #ifndef SVX_LIGHT #include <tools/solar.h> -#include <svtools/svarray.hxx> +#include <svl/svarray.hxx> #include <tools/string.hxx> #include <tools/gen.hxx> #ifndef _SV_COLOR_HXX diff --git a/svx/inc/svx/svdhdl.hxx b/svx/inc/svx/svdhdl.hxx index 4960323feeb7..8d7d4552ea6c 100644 --- a/svx/inc/svx/svdhdl.hxx +++ b/svx/inc/svx/svdhdl.hxx @@ -39,7 +39,7 @@ #include <tools/contnr.hxx> #ifndef _SOLAR_HRC -#include <svtools/solar.hrc> +#include <svl/solar.hrc> #endif #include <svx/xpoly.hxx> diff --git a/svx/inc/svx/svdmodel.hxx b/svx/inc/svx/svdmodel.hxx index 2873b77ac2ea..a9abeac76fc2 100644 --- a/svx/inc/svx/svdmodel.hxx +++ b/svx/inc/svx/svdmodel.hxx @@ -40,12 +40,12 @@ #ifndef _MAPMOD_HXX //autogen #include <vcl/mapmod.hxx> #endif -#include <svtools/brdcst.hxx> +#include <svl/brdcst.hxx> #include <tools/string.hxx> #include <tools/datetime.hxx> -#include <svtools/hint.hxx> +#include <svl/hint.hxx> -#include <svtools/style.hxx> +#include <svl/style.hxx> #include <svx/pageitem.hxx> #include <vcl/field.hxx> diff --git a/svx/inc/svx/svdobj.hxx b/svx/inc/svx/svdobj.hxx index 349bf49ccf06..cc21e645e4d2 100644 --- a/svx/inc/svx/svdobj.hxx +++ b/svx/inc/svx/svdobj.hxx @@ -35,7 +35,7 @@ #include <cppuhelper/weakref.hxx> #include <vcl/mapmod.hxx> #include <tools/weakbase.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/inc/svx/svdpagv.hxx b/svx/inc/svx/svdpagv.hxx index cf5ae7e165d0..2d6323cc5a5d 100644 --- a/svx/inc/svx/svdpagv.hxx +++ b/svx/inc/svx/svdpagv.hxx @@ -32,7 +32,7 @@ #define _SVDPAGV_HXX #include <com/sun/star/awt/XControlContainer.hpp> -#include <svtools/lstner.hxx> +#include <svl/lstner.hxx> #include <svx/svdhlpln.hxx> #include <cppuhelper/implbase4.hxx> #include <svx/svdsob.hxx> diff --git a/svx/inc/svx/svdpntv.hxx b/svx/inc/svx/svdpntv.hxx index 48523dc97c3b..940133da5568 100644 --- a/svx/inc/svx/svdpntv.hxx +++ b/svx/inc/svx/svdpntv.hxx @@ -31,19 +31,20 @@ #ifndef _SVDPNTV_HXX #define _SVDPNTV_HXX -#include <svtools/brdcst.hxx> -#include <svtools/lstner.hxx> -#include <svtools/smplhint.hxx> -#include <svtools/undo.hxx> +#include <svl/brdcst.hxx> +#include <svl/lstner.hxx> +#include <svl/smplhint.hxx> +#include <svl/undo.hxx> #include <svx/svddrag.hxx> #include <svx/svdlayer.hxx> // fuer SetOfByte #include <vcl/window.hxx> #include <svtools/colorcfg.hxx> #include <com/sun/star/awt/XControlContainer.hpp> -#include <svtools/itemset.hxx> +#include <svl/itemset.hxx> #include <vcl/timer.hxx> #include "svx/svxdllapi.h" #include <svtools/optionsdrawinglayer.hxx> +#include <unotools/options.hxx> //************************************************************ // Pre-Defines @@ -127,7 +128,7 @@ typedef ::std::vector< SdrPaintWindow* > SdrPaintWindowVector; //////////////////////////////////////////////////////////////////////////////////////////////////// -class SVX_DLLPUBLIC SdrPaintView : public SfxListener, public SfxRepeatTarget, public SfxBroadcaster +class SVX_DLLPUBLIC SdrPaintView : public SfxListener, public SfxRepeatTarget, public SfxBroadcaster, public ::utl::ConfigurationListener { friend class SdrPageView; friend class FrameAnimator; @@ -241,6 +242,7 @@ protected: protected: void AppendPaintWindow(SdrPaintWindow& rNew); SdrPaintWindow* RemovePaintWindow(SdrPaintWindow& rOld); + void ConfigurationChanged( ::utl::ConfigurationBroadcaster*, sal_uInt32 ); public: sal_uInt32 PaintWindowCount() const { return maPaintWindows.size(); } diff --git a/svx/inc/svx/svdundo.hxx b/svx/inc/svx/svdundo.hxx index 717b1a070c6f..803b454a6f0c 100644 --- a/svx/inc/svx/svdundo.hxx +++ b/svx/inc/svx/svdundo.hxx @@ -32,9 +32,9 @@ #define _SVDUNDO_HXX #ifndef _SOLAR_HRC -#include <svtools/solar.hrc> +#include <svl/solar.hrc> #endif -#include <svtools/undo.hxx> +#include <svl/undo.hxx> #include <tools/contnr.hxx> #include <tools/gen.hxx> #include <svx/svdtypes.hxx> // fuer enum RepeatFuncts diff --git a/svx/inc/svx/svdview.hxx b/svx/inc/svx/svdview.hxx index a6ae55eddafa..1fe40e40df41 100644 --- a/svx/inc/svx/svdview.hxx +++ b/svx/inc/svx/svdview.hxx @@ -38,6 +38,7 @@ #include <svtools/accessibilityoptions.hxx> #include "svx/svxdllapi.h" #include <svx/svdcrtv.hxx> +#include <unotools/options.hxx> //////////////////////////////////////////////////////////////////////////////////////////////////// // @@ -197,8 +198,6 @@ class SVX_DLLPUBLIC SdrView: public SdrCreateView, public tools::WeakBase< SdrVi protected: SvtAccessibilityOptions maAccessibilityOptions; - virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint); - public: TYPEINFO(); SdrView(SdrModel* pModel1, OutputDevice* pOut = 0L); @@ -235,6 +234,8 @@ public: virtual BOOL MouseMove(const MouseEvent& rMEvt, Window* pWin); virtual BOOL Command(const CommandEvent& rCEvt, Window* pWin); + virtual void ConfigurationChanged( utl::ConfigurationBroadcaster*, sal_uInt32 ); + BOOL SetAttributes(const SfxItemSet& rSet, BOOL bReplaceAll=FALSE) { return SdrCreateView::SetAttributes(rSet,bReplaceAll); } BOOL SetStyleSheet(SfxStyleSheet* pStyleSheet, BOOL bDontRemoveHardAttr=FALSE) { return SdrCreateView::SetStyleSheet(pStyleSheet,bDontRemoveHardAttr); } diff --git a/svx/inc/svx/svx3ditems.hxx b/svx/inc/svx/svx3ditems.hxx index e956edb69803..998b20a7a751 100644 --- a/svx/inc/svx/svx3ditems.hxx +++ b/svx/inc/svx/svx3ditems.hxx @@ -30,8 +30,8 @@ #ifndef _SVX3DITEMS_HXX #define _SVX3DITEMS_HXX -#include <svtools/intitem.hxx> -#include <svtools/eitem.hxx> +#include <svl/intitem.hxx> +#include <svl/eitem.hxx> #include <svx/colritem.hxx> diff --git a/svx/inc/svx/svxacorr.hxx b/svx/inc/svx/svxacorr.hxx index ea4585b20af6..5d61f303972d 100644 --- a/svx/inc/svx/svxacorr.hxx +++ b/svx/inc/svx/svxacorr.hxx @@ -33,7 +33,7 @@ #include <com/sun/star/embed/XStorage.hpp> #include <tools/rtti.hxx> -#include <svtools/svarray.hxx> +#include <svl/svarray.hxx> #include <i18npool/lang.h> #include <tools/time.hxx> #include <tools/date.hxx> diff --git a/svx/inc/svx/svxbox.hxx b/svx/inc/svx/svxbox.hxx index d98d0f19ff3e..f5b1bd21c148 100644 --- a/svx/inc/svx/svxbox.hxx +++ b/svx/inc/svx/svxbox.hxx @@ -32,7 +32,7 @@ // include --------------------------------------------------------------- -#include <svtools/svarray.hxx> +#include <svl/svarray.hxx> #include <tools/string.hxx> #ifndef _LSTBOX_HXX //autogen diff --git a/svx/inc/svx/svxids.hrc b/svx/inc/svx/svxids.hrc index a4b0d8736618..e6a694921711 100644 --- a/svx/inc/svx/svxids.hrc +++ b/svx/inc/svx/svxids.hrc @@ -31,8 +31,8 @@ #define _SVX_SVXIDS_HRC // include ------------------------------------------------------------------ -#include <svtools/memberid.hrc> -#include <svtools/solar.hrc> +#include <svl/memberid.hrc> +#include <svl/solar.hrc> #include <sfx2/sfx.hrc> #include <sfx2/sfxsids.hrc> diff --git a/svx/inc/svx/svxitems.hrc b/svx/inc/svx/svxitems.hrc index 019211697711..5d554cf67ebf 100644 --- a/svx/inc/svx/svxitems.hrc +++ b/svx/inc/svx/svxitems.hrc @@ -33,7 +33,7 @@ // include ------------------------------------------------------------------ #ifndef _SOLAR_HRC -#include <svtools/solar.hrc> +#include <svl/solar.hrc> #endif // BOOL --------------------------------------------------------------------- diff --git a/svx/inc/svx/sxcecitm.hxx b/svx/inc/svx/sxcecitm.hxx index 58c6bb167e0f..229f80394ce7 100644 --- a/svx/inc/svx/sxcecitm.hxx +++ b/svx/inc/svx/sxcecitm.hxx @@ -30,7 +30,7 @@ #ifndef _SXCECITM_HXX #define _SXCECITM_HXX -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> #include <svx/svddef.hxx> #include <svx/sdynitm.hxx> #include <svx/sdmetitm.hxx> diff --git a/svx/inc/svx/sxcikitm.hxx b/svx/inc/svx/sxcikitm.hxx index 239df3664a63..c94263e55d17 100644 --- a/svx/inc/svx/sxcikitm.hxx +++ b/svx/inc/svx/sxcikitm.hxx @@ -31,7 +31,7 @@ #define _SXCIKITM_HXX #include <svx/svddef.hxx> -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> enum SdrCircKind {SDRCIRC_FULL, SDRCIRC_SECT, diff --git a/svx/inc/svx/sxctitm.hxx b/svx/inc/svx/sxctitm.hxx index f0eebfbc740b..35d496179e2a 100644 --- a/svx/inc/svx/sxctitm.hxx +++ b/svx/inc/svx/sxctitm.hxx @@ -30,7 +30,7 @@ #ifndef _SXCTITM_HXX #define _SXCTITM_HXX -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> #include <svx/svddef.hxx> #include "svx/svxdllapi.h" diff --git a/svx/inc/svx/sxekitm.hxx b/svx/inc/svx/sxekitm.hxx index 2693daa4a309..a763a90e4b1f 100644 --- a/svx/inc/svx/sxekitm.hxx +++ b/svx/inc/svx/sxekitm.hxx @@ -30,7 +30,7 @@ #ifndef _SXEKITM_HXX #define _SXEKITM_HXX -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> #include <svx/svddef.hxx> #include "svx/svxdllapi.h" diff --git a/svx/inc/svx/sxfiitm.hxx b/svx/inc/svx/sxfiitm.hxx index 3228dee660e7..72a258d2fa70 100644 --- a/svx/inc/svx/sxfiitm.hxx +++ b/svx/inc/svx/sxfiitm.hxx @@ -30,7 +30,7 @@ #ifndef _SFXIITM_HXX #define _SFXIITM_HXX -#include <svtools/poolitem.hxx> +#include <svl/poolitem.hxx> #include <tools/fract.hxx> /*************************************************************************/ diff --git a/svx/inc/svx/sxlayitm.hxx b/svx/inc/svx/sxlayitm.hxx index d09ef3261505..972bed84e8de 100644 --- a/svx/inc/svx/sxlayitm.hxx +++ b/svx/inc/svx/sxlayitm.hxx @@ -31,8 +31,8 @@ #define _SYLAYITM_HXX #include <svx/svddef.hxx> -#include <svtools/stritem.hxx> -#include <svtools/intitem.hxx> +#include <svl/stritem.hxx> +#include <svl/intitem.hxx> #include <svx/svdtypes.hxx> //------------------------------ diff --git a/svx/inc/svx/sxmfsitm.hxx b/svx/inc/svx/sxmfsitm.hxx index a2068a51e032..4d9f245e54b1 100644 --- a/svx/inc/svx/sxmfsitm.hxx +++ b/svx/inc/svx/sxmfsitm.hxx @@ -31,7 +31,7 @@ #define _SXMFSITM_HXX #include <svx/svddef.hxx> -#include <svtools/stritem.hxx> +#include <svl/stritem.hxx> // Formatstring (aehnl. Calc), z.B. "#.###,00km" // ueberschreibt SdrMeasureUnitItem und SdrMeasureShowUnitItem (n.i.) diff --git a/svx/inc/svx/sxmkitm.hxx b/svx/inc/svx/sxmkitm.hxx index a5979bceef00..ae537a976e25 100644 --- a/svx/inc/svx/sxmkitm.hxx +++ b/svx/inc/svx/sxmkitm.hxx @@ -31,7 +31,7 @@ #define _SXMKITM_HXX #include <svx/svddef.hxx> -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> enum SdrMeasureKind {SDRMEASURE_STD,SDRMEASURE_RADIUS}; // n.i. diff --git a/svx/inc/svx/sxmtpitm.hxx b/svx/inc/svx/sxmtpitm.hxx index f8a65552b1c2..a708c9429678 100644 --- a/svx/inc/svx/sxmtpitm.hxx +++ b/svx/inc/svx/sxmtpitm.hxx @@ -31,7 +31,7 @@ #define _SXMTPITM_HXX #include <svx/svddef.hxx> -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> #include "svx/svxdllapi.h" enum SdrMeasureTextHPos {SDRMEASURE_TEXTHAUTO,SDRMEASURE_TEXTLEFTOUTSIDE,SDRMEASURE_TEXTINSIDE,SDRMEASURE_TEXTRIGHTOUTSIDE}; diff --git a/svx/inc/svx/sxmuitm.hxx b/svx/inc/svx/sxmuitm.hxx index e48fcefc8315..9f721f67fef2 100644 --- a/svx/inc/svx/sxmuitm.hxx +++ b/svx/inc/svx/sxmuitm.hxx @@ -32,7 +32,7 @@ #include <vcl/field.hxx> #include <svx/svddef.hxx> -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> #include "svx/svxdllapi.h" // Vorgabe einer Masseinheit. Der Zahlenwert wird in diese Einheit umgerechnet diff --git a/svx/inc/svx/sxonitm.hxx b/svx/inc/svx/sxonitm.hxx index 8172df9cd200..ce5c5e72cfd1 100644 --- a/svx/inc/svx/sxonitm.hxx +++ b/svx/inc/svx/sxonitm.hxx @@ -31,7 +31,7 @@ #define _SXONITM_HXX #include <svx/svddef.hxx> -#include <svtools/stritem.hxx> +#include <svl/stritem.hxx> //------------------------------ // class SdrObjectNameItem diff --git a/svx/inc/svx/tbcontrl.hxx b/svx/inc/svx/tbcontrl.hxx index 4b52785756c9..e531ebfad54b 100644 --- a/svx/inc/svx/tbcontrl.hxx +++ b/svx/inc/svx/tbcontrl.hxx @@ -158,7 +158,7 @@ // ITEMID_...-Defines im *.cxx #include <rsc/rscsfx.hxx> -#include <svtools/lstner.hxx> +#include <svl/lstner.hxx> #include <sfx2/tbxctrl.hxx> #include <svx/strarray.hxx> #include "svx/svxdllapi.h" diff --git a/svx/inc/svx/tstpitem.hxx b/svx/inc/svx/tstpitem.hxx index 58c9a6400aed..b910b1b1e704 100644 --- a/svx/inc/svx/tstpitem.hxx +++ b/svx/inc/svx/tstpitem.hxx @@ -32,7 +32,7 @@ // include --------------------------------------------------------------- -#include <svtools/poolitem.hxx> +#include <svl/poolitem.hxx> #include <svx/svxenum.hxx> #ifndef _SVX_SVXIDS_HRC #include <svx/svxids.hrc> diff --git a/svx/inc/svx/twolinesitem.hxx b/svx/inc/svx/twolinesitem.hxx index cf7ec3c48f2e..5c0094db0f42 100644 --- a/svx/inc/svx/twolinesitem.hxx +++ b/svx/inc/svx/twolinesitem.hxx @@ -31,7 +31,7 @@ #define _SVX_TWOLINESITEM_HXX #include <sal/types.h> -#include <svtools/poolitem.hxx> +#include <svl/poolitem.hxx> #ifndef _SVX_SVXIDS_HRC #include <svx/svxids.hrc> #endif diff --git a/svx/inc/svx/udlnitem.hxx b/svx/inc/svx/udlnitem.hxx index ca27f07b9602..33d5d59e3ff6 100644 --- a/svx/inc/svx/udlnitem.hxx +++ b/svx/inc/svx/udlnitem.hxx @@ -32,7 +32,7 @@ // include --------------------------------------------------------------- -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> #ifndef _SVX_SVXIDS_HRC #include <svx/svxids.hrc> #endif diff --git a/svx/inc/svx/ulspitem.hxx b/svx/inc/svx/ulspitem.hxx index 133246bcd1d9..9c57a445a0a7 100644 --- a/svx/inc/svx/ulspitem.hxx +++ b/svx/inc/svx/ulspitem.hxx @@ -32,7 +32,7 @@ // include --------------------------------------------------------------- -#include <svtools/poolitem.hxx> +#include <svl/poolitem.hxx> #ifndef _SVX_SVXIDS_HRC #include <svx/svxids.hrc> #endif diff --git a/svx/inc/svx/unoedsrc.hxx b/svx/inc/svx/unoedsrc.hxx index a4777b6469b4..6c3025072e3c 100644 --- a/svx/inc/svx/unoedsrc.hxx +++ b/svx/inc/svx/unoedsrc.hxx @@ -42,8 +42,8 @@ #ifndef _SV_COLOR_HXX //autogen #include <tools/color.hxx> #endif -#include <svtools/poolitem.hxx> -#include <svtools/itempool.hxx> +#include <svl/poolitem.hxx> +#include <svl/itempool.hxx> #include "svx/svxdllapi.h" #include <list> diff --git a/svx/inc/svx/unoipset.hxx b/svx/inc/svx/unoipset.hxx index b16079e515cd..ffc9f834f7b4 100644 --- a/svx/inc/svx/unoipset.hxx +++ b/svx/inc/svx/unoipset.hxx @@ -34,7 +34,7 @@ #include <com/sun/star/beans/XPropertySetInfo.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include "svx/svxdllapi.h" -#include <svtools/itemprop.hxx> +#include <svl/itemprop.hxx> class SvxIDPropertyCombineList; class SdrItemPool; diff --git a/svx/inc/svx/unopage.hxx b/svx/inc/svx/unopage.hxx index 39caa0849ec6..83671f2934f8 100644 --- a/svx/inc/svx/unopage.hxx +++ b/svx/inc/svx/unopage.hxx @@ -44,7 +44,7 @@ #endif #include <cppuhelper/weak.hxx> #include <cppuhelper/weakagg.hxx> -#include <svtools/lstner.hxx> +#include <svl/lstner.hxx> #include <svx/mutxhelp.hxx> #include "svx/svxdllapi.h" diff --git a/svx/inc/svx/unoprov.hxx b/svx/inc/svx/unoprov.hxx index ebe1e375f58c..3c7f87f58fbd 100644 --- a/svx/inc/svx/unoprov.hxx +++ b/svx/inc/svx/unoprov.hxx @@ -33,7 +33,7 @@ #include <com/sun/star/lang/XServiceInfo.hpp> #include <svx/svdpool.hxx> -#include <svtools/itemprop.hxx> +#include <svl/itemprop.hxx> #include <tools/list.hxx> #include "svx/svxdllapi.h" diff --git a/svx/inc/svx/unoshape.hxx b/svx/inc/svx/unoshape.hxx index f400376a6937..ec81d8beaa1c 100644 --- a/svx/inc/svx/unoshape.hxx +++ b/svx/inc/svx/unoshape.hxx @@ -49,7 +49,7 @@ #include <com/sun/star/beans/XMultiPropertyStates.hpp> #include <tools/gen.hxx> #include <tools/weakbase.hxx> -#include <svtools/lstner.hxx> +#include <svl/lstner.hxx> #include <svx/unoipset.hxx> #include <cppuhelper/weak.hxx> #include <cppuhelper/weakagg.hxx> diff --git a/svx/inc/svx/unoshprp.hxx b/svx/inc/svx/unoshprp.hxx index 4e1f91ca23da..e23b24a21957 100644 --- a/svx/inc/svx/unoshprp.hxx +++ b/svx/inc/svx/unoshprp.hxx @@ -82,7 +82,7 @@ #include <svx/unoprnms.hxx> #include <svx/unomid.hxx> #include <svx/unotext.hxx> -#include <svtools/itemprop.hxx> +#include <svl/itemprop.hxx> #include <svx/svxids.hrc> diff --git a/svx/inc/svx/unotext.hxx b/svx/inc/svx/unotext.hxx index 63ce0a28b739..46e26dbbc0a8 100644 --- a/svx/inc/svx/unotext.hxx +++ b/svx/inc/svx/unotext.hxx @@ -50,11 +50,11 @@ #include <com/sun/star/text/XTextCopy.hpp> #include <cppuhelper/weak.hxx> #include <cppuhelper/weakagg.hxx> -#include <svtools/itemprop.hxx> +#include <svl/itemprop.hxx> #include <svx/editdata.hxx> #include <svx/unoedsrc.hxx> -#include <svtools/itemset.hxx> -#include <svtools/itempool.hxx> +#include <svl/itemset.hxx> +#include <svl/itempool.hxx> #include <svx/svxenum.hxx> #include <svx/outliner.hxx> #include <svx/unoforou.hxx> diff --git a/svx/inc/svx/viewlayoutitem.hxx b/svx/inc/svx/viewlayoutitem.hxx index 6e294290098d..a58e83c1a38b 100644 --- a/svx/inc/svx/viewlayoutitem.hxx +++ b/svx/inc/svx/viewlayoutitem.hxx @@ -30,7 +30,7 @@ #ifndef _SVX_VIEWLAYOUTITEM_HXX #define _SVX_VIEWLAYOUTITEM_HXX -#include <svtools/intitem.hxx> +#include <svl/intitem.hxx> #ifndef _SVX_SVXIDS_HRC #include <svx/svxids.hrc> #endif diff --git a/svx/inc/svx/wghtitem.hxx b/svx/inc/svx/wghtitem.hxx index eac6cb0da621..2a63885e3e42 100644 --- a/svx/inc/svx/wghtitem.hxx +++ b/svx/inc/svx/wghtitem.hxx @@ -33,7 +33,7 @@ // include --------------------------------------------------------------- #include <vcl/vclenum.hxx> -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> #ifndef _SVX_SVXIDS_HRC #include <svx/svxids.hrc> #endif diff --git a/svx/inc/svx/widwitem.hxx b/svx/inc/svx/widwitem.hxx index 78f7a3a563e2..682e3bea5c39 100644 --- a/svx/inc/svx/widwitem.hxx +++ b/svx/inc/svx/widwitem.hxx @@ -32,7 +32,7 @@ // include --------------------------------------------------------------- -#include <svtools/intitem.hxx> +#include <svl/intitem.hxx> #ifndef _SVX_SVXIDS_HRC #include <svx/svxids.hrc> diff --git a/svx/inc/svx/writingmodeitem.hxx b/svx/inc/svx/writingmodeitem.hxx index 02092073a6bf..0e481479a611 100644 --- a/svx/inc/svx/writingmodeitem.hxx +++ b/svx/inc/svx/writingmodeitem.hxx @@ -33,7 +33,7 @@ // include --------------------------------------------------------------- #include <com/sun/star/text/WritingMode.hpp> -#include <svtools/intitem.hxx> +#include <svl/intitem.hxx> #include <svx/svddef.hxx> #include "svx/svxdllapi.h" diff --git a/svx/inc/svx/wrlmitem.hxx b/svx/inc/svx/wrlmitem.hxx index b2138548e50c..aa5116125d28 100644 --- a/svx/inc/svx/wrlmitem.hxx +++ b/svx/inc/svx/wrlmitem.hxx @@ -32,7 +32,7 @@ // include --------------------------------------------------------------- -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> #ifndef _SVX_SVXIDS_HRC #include <svx/svxids.hrc> #endif diff --git a/svx/inc/svx/xfillit.hxx b/svx/inc/svx/xfillit.hxx index cf88f88ed80d..6ac90e8a8a93 100644 --- a/svx/inc/svx/xfillit.hxx +++ b/svx/inc/svx/xfillit.hxx @@ -38,7 +38,7 @@ #include <svx/xgrad.hxx> #include <svx/xhatch.hxx> #include <svx/xenum.hxx> -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> #include <svx/xflclit.hxx> #include <svx/xsflclit.hxx> diff --git a/svx/inc/svx/xfillit0.hxx b/svx/inc/svx/xfillit0.hxx index 9bb4543beb51..4fbc0686a5ba 100644 --- a/svx/inc/svx/xfillit0.hxx +++ b/svx/inc/svx/xfillit0.hxx @@ -31,7 +31,7 @@ #ifndef SVX_XFILLIT0_HXX #define SVX_XFILLIT0_HXX -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> #include <svx/xdef.hxx> #include <svx/xenum.hxx> diff --git a/svx/inc/svx/xflasit.hxx b/svx/inc/svx/xflasit.hxx index 50bea4e013ba..f5ca7bc9efff 100644 --- a/svx/inc/svx/xflasit.hxx +++ b/svx/inc/svx/xflasit.hxx @@ -31,7 +31,7 @@ #ifndef _SVX_XFLASIT_HXX #define _SVX_XFLASIT_HXX -#include <svtools/poolitem.hxx> +#include <svl/poolitem.hxx> #include "svx/svxdllapi.h" /************************************************************************* diff --git a/svx/inc/svx/xflbckit.hxx b/svx/inc/svx/xflbckit.hxx index 2744982b8639..aecae3acdeb4 100644 --- a/svx/inc/svx/xflbckit.hxx +++ b/svx/inc/svx/xflbckit.hxx @@ -31,7 +31,7 @@ #ifndef _SVX_XFLBCKIT_HXX #define _SVX_XFLBCKIT_HXX -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> #include "svx/svxdllapi.h" /************************************************************************* diff --git a/svx/inc/svx/xflbmpit.hxx b/svx/inc/svx/xflbmpit.hxx index 42117613cba4..231bab10f122 100644 --- a/svx/inc/svx/xflbmpit.hxx +++ b/svx/inc/svx/xflbmpit.hxx @@ -31,7 +31,7 @@ #ifndef _SVX_XFLBMPIT_HXX #define _SVX_XFLBMPIT_HXX -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> #include "svx/svxdllapi.h" /************************************************************************* diff --git a/svx/inc/svx/xflbmsli.hxx b/svx/inc/svx/xflbmsli.hxx index 332bbf9792b7..a0f88b111331 100644 --- a/svx/inc/svx/xflbmsli.hxx +++ b/svx/inc/svx/xflbmsli.hxx @@ -31,7 +31,7 @@ #ifndef _SVX_XFLBMSLI_HXX #define _SVX_XFLBMSLI_HXX -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> #include "svx/svxdllapi.h" /************************************************************************* diff --git a/svx/inc/svx/xflbmsxy.hxx b/svx/inc/svx/xflbmsxy.hxx index 78263dd2c5e3..254428badb6c 100644 --- a/svx/inc/svx/xflbmsxy.hxx +++ b/svx/inc/svx/xflbmsxy.hxx @@ -31,7 +31,7 @@ #ifndef _SVX_XFLBMSXY_HXX #define _SVX_XFLBMSXY_HXX -#include <svtools/metitem.hxx> +#include <svl/metitem.hxx> #include "svx/svxdllapi.h" /************************************************************************* diff --git a/svx/inc/svx/xflbmtit.hxx b/svx/inc/svx/xflbmtit.hxx index c38fd9c45514..db969aa650c5 100644 --- a/svx/inc/svx/xflbmtit.hxx +++ b/svx/inc/svx/xflbmtit.hxx @@ -31,7 +31,7 @@ #ifndef _SVX_XFLBMTIT_HXX #define _SVX_XFLBMTIT_HXX -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> #include "svx/svxdllapi.h" /************************************************************************* diff --git a/svx/inc/svx/xflboxy.hxx b/svx/inc/svx/xflboxy.hxx index 9f0c37f9b6b3..2dfd12f6d6dc 100644 --- a/svx/inc/svx/xflboxy.hxx +++ b/svx/inc/svx/xflboxy.hxx @@ -31,7 +31,7 @@ #ifndef _SVX_XFLBOXY_HXX #define _SVX_XFLBOXY_HXX -#include <svtools/intitem.hxx> +#include <svl/intitem.hxx> #include "svx/svxdllapi.h" /************************************************************************* diff --git a/svx/inc/svx/xflbstit.hxx b/svx/inc/svx/xflbstit.hxx index af2dee2fa116..a91c44d02831 100644 --- a/svx/inc/svx/xflbstit.hxx +++ b/svx/inc/svx/xflbstit.hxx @@ -31,7 +31,7 @@ #ifndef _SVX_XFLBSTIT_HXX #define _SVX_XFLBSTIT_HXX -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> #include "svx/svxdllapi.h" /************************************************************************* diff --git a/svx/inc/svx/xflbtoxy.hxx b/svx/inc/svx/xflbtoxy.hxx index 828435432bb1..2f6744e4c022 100644 --- a/svx/inc/svx/xflbtoxy.hxx +++ b/svx/inc/svx/xflbtoxy.hxx @@ -31,7 +31,7 @@ #ifndef _SVX_XFLBTOXY_HXX #define _SVX_XFLBTOXY_HXX -#include <svtools/intitem.hxx> +#include <svl/intitem.hxx> #include "svx/svxdllapi.h" /************************************************************************* diff --git a/svx/inc/svx/xfltrit.hxx b/svx/inc/svx/xfltrit.hxx index dd4738e340b3..5b78342d1ebf 100644 --- a/svx/inc/svx/xfltrit.hxx +++ b/svx/inc/svx/xfltrit.hxx @@ -31,7 +31,7 @@ #ifndef _SVX_XFLTRIT_HXX #define _SVX_XFLTRIT_HXX -#include <svtools/intitem.hxx> +#include <svl/intitem.hxx> #include "svx/svxdllapi.h" /************************************************************************* diff --git a/svx/inc/svx/xftadit.hxx b/svx/inc/svx/xftadit.hxx index 839d636d41c2..a29dfb8540a8 100644 --- a/svx/inc/svx/xftadit.hxx +++ b/svx/inc/svx/xftadit.hxx @@ -31,7 +31,7 @@ #ifndef _SVX_XFTADIT_HXX #define _SVX_XFTADIT_HXX -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> #include "svx/svxdllapi.h" /************************************************************************* diff --git a/svx/inc/svx/xftdiit.hxx b/svx/inc/svx/xftdiit.hxx index 33ca48003471..fc47ac7b6c7d 100644 --- a/svx/inc/svx/xftdiit.hxx +++ b/svx/inc/svx/xftdiit.hxx @@ -31,7 +31,7 @@ #ifndef _SVX_XFTDIIT_HXX #define _SVX_XFTDIIT_HXX -#include <svtools/metitem.hxx> +#include <svl/metitem.hxx> #include "svx/svxdllapi.h" /************************************************************************* diff --git a/svx/inc/svx/xftmrit.hxx b/svx/inc/svx/xftmrit.hxx index ea428b141a40..f0d7fc1ac362 100644 --- a/svx/inc/svx/xftmrit.hxx +++ b/svx/inc/svx/xftmrit.hxx @@ -31,7 +31,7 @@ #ifndef _SVX_XFTMRIT_HXX #define _SVX_XFTMRIT_HXX -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> #include "svx/svxdllapi.h" /************************************************************************* diff --git a/svx/inc/svx/xftshit.hxx b/svx/inc/svx/xftshit.hxx index 02866ed2975d..973a12095dd9 100644 --- a/svx/inc/svx/xftshit.hxx +++ b/svx/inc/svx/xftshit.hxx @@ -31,7 +31,7 @@ #ifndef _SVX_XFTSHIT_HXX #define _SVX_XFTSHIT_HXX -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> #include "svx/svxdllapi.h" /************************************************************************* diff --git a/svx/inc/svx/xftshtit.hxx b/svx/inc/svx/xftshtit.hxx index cc4b87f71673..7d7744640533 100644 --- a/svx/inc/svx/xftshtit.hxx +++ b/svx/inc/svx/xftshtit.hxx @@ -31,7 +31,7 @@ #ifndef _SVX_XFTSHTIT_HXX #define _SVX_XFTSHTIT_HXX -#include <svtools/intitem.hxx> +#include <svl/intitem.hxx> /************************************************************************* |* diff --git a/svx/inc/svx/xftshxy.hxx b/svx/inc/svx/xftshxy.hxx index dd19518b0510..7f83e8e826b2 100644 --- a/svx/inc/svx/xftshxy.hxx +++ b/svx/inc/svx/xftshxy.hxx @@ -31,7 +31,7 @@ #ifndef _SVX_XFTSHXY_HXX #define _SVX_XFTSHXY_HXX -#include <svtools/metitem.hxx> +#include <svl/metitem.hxx> #include "svx/svxdllapi.h" /************************************************************************* diff --git a/svx/inc/svx/xftstit.hxx b/svx/inc/svx/xftstit.hxx index 062d4c1fd8e9..dd9b14e1f75d 100644 --- a/svx/inc/svx/xftstit.hxx +++ b/svx/inc/svx/xftstit.hxx @@ -31,7 +31,7 @@ #ifndef _SVX_XFTSTIT_HXX #define _SVX_XFTSTIT_HXX -#include <svtools/metitem.hxx> +#include <svl/metitem.hxx> #include "svx/svxdllapi.h" /************************************************************************* diff --git a/svx/inc/svx/xgrscit.hxx b/svx/inc/svx/xgrscit.hxx index 3d2ee96b0618..3cf97e3c7ce0 100644 --- a/svx/inc/svx/xgrscit.hxx +++ b/svx/inc/svx/xgrscit.hxx @@ -31,7 +31,7 @@ #ifndef _SVX_XGRSCIT_HXX #define _SVX_XGRSCIT_HXX -#include <svtools/intitem.hxx> +#include <svl/intitem.hxx> #include "svx/svxdllapi.h" /************************************************************************* diff --git a/svx/inc/svx/xit.hxx b/svx/inc/svx/xit.hxx index 993f16eb1f43..b864cf0d20c0 100644 --- a/svx/inc/svx/xit.hxx +++ b/svx/inc/svx/xit.hxx @@ -31,7 +31,7 @@ #ifndef _SVX_XIT_HXX #define _SVX_XIT_HXX -#include <svtools/stritem.hxx> +#include <svl/stritem.hxx> #include <svx/xdef.hxx> #include "svx/svxdllapi.h" diff --git a/svx/inc/svx/xlineit.hxx b/svx/inc/svx/xlineit.hxx index 3181da265a64..46e8d34e32bc 100644 --- a/svx/inc/svx/xlineit.hxx +++ b/svx/inc/svx/xlineit.hxx @@ -35,8 +35,8 @@ #include <svx/xcolit.hxx> #include <svx/xpoly.hxx> #include <svx/xenum.hxx> -#include <svtools/metitem.hxx> -#include <svtools/eitem.hxx> +#include <svl/metitem.hxx> +#include <svl/eitem.hxx> class XDash; class XDashTable; diff --git a/svx/inc/svx/xlineit0.hxx b/svx/inc/svx/xlineit0.hxx index 57104bf05d06..41754785f0bf 100644 --- a/svx/inc/svx/xlineit0.hxx +++ b/svx/inc/svx/xlineit0.hxx @@ -32,7 +32,7 @@ #define _SVX_XLINEIT0_HXX #include <svx/xenum.hxx> -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> //--------------------- // class LineStyleItem //--------------------- diff --git a/svx/inc/svx/xlnasit.hxx b/svx/inc/svx/xlnasit.hxx index 6743e4a30747..413de684537b 100644 --- a/svx/inc/svx/xlnasit.hxx +++ b/svx/inc/svx/xlnasit.hxx @@ -32,7 +32,7 @@ #define _SVX_XLNASIT_HXX -#include <svtools/poolitem.hxx> +#include <svl/poolitem.hxx> #include "svx/svxdllapi.h" /************************************************************************* diff --git a/svx/inc/svx/xlnedcit.hxx b/svx/inc/svx/xlnedcit.hxx index f1a6fe3e2846..0adabb2862e5 100644 --- a/svx/inc/svx/xlnedcit.hxx +++ b/svx/inc/svx/xlnedcit.hxx @@ -31,7 +31,7 @@ #ifndef _SVX_XLNEDCIT_HXX #define _SVX_XLNEDCIT_HXX -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> #include "svx/svxdllapi.h" //---------------------------- diff --git a/svx/inc/svx/xlnedwit.hxx b/svx/inc/svx/xlnedwit.hxx index 621bdd7b3c5b..13735ae5f7d6 100644 --- a/svx/inc/svx/xlnedwit.hxx +++ b/svx/inc/svx/xlnedwit.hxx @@ -31,7 +31,7 @@ #ifndef _SVX_XLNEDWIT_HXX #define _SVX_XLNEDWIT_HXX -#include <svtools/metitem.hxx> +#include <svl/metitem.hxx> #include "svx/svxdllapi.h" #define LINE_END_WIDTH_DEFAULT (200) diff --git a/svx/inc/svx/xlnstcit.hxx b/svx/inc/svx/xlnstcit.hxx index 9a76b644ffd4..c7d65bf1f106 100644 --- a/svx/inc/svx/xlnstcit.hxx +++ b/svx/inc/svx/xlnstcit.hxx @@ -31,7 +31,7 @@ #ifndef _SVX_XLNSTCIT_HXX #define _SVX_XLNSTCIT_HXX -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> #include "svx/svxdllapi.h" //------------------------------ diff --git a/svx/inc/svx/xlnstwit.hxx b/svx/inc/svx/xlnstwit.hxx index e7522e0761b3..a5899b7743cc 100644 --- a/svx/inc/svx/xlnstwit.hxx +++ b/svx/inc/svx/xlnstwit.hxx @@ -31,7 +31,7 @@ #ifndef _SVX_XLNSTWIT_HXX #define _SVX_XLNSTWIT_HXX -#include <svtools/metitem.hxx> +#include <svl/metitem.hxx> #include "svx/svxdllapi.h" #define LINE_START_WIDTH_DEFAULT (200) diff --git a/svx/inc/svx/xlntrit.hxx b/svx/inc/svx/xlntrit.hxx index 377f70730294..2590ea304e3b 100644 --- a/svx/inc/svx/xlntrit.hxx +++ b/svx/inc/svx/xlntrit.hxx @@ -31,7 +31,7 @@ #ifndef _SVX_XLNTRIT_HXX #define _SVX_XLNTRIT_HXX -#include <svtools/intitem.hxx> +#include <svl/intitem.hxx> #include "svx/svxdllapi.h" /************************************************************************* diff --git a/svx/inc/svx/xlnwtit.hxx b/svx/inc/svx/xlnwtit.hxx index 59be68eec389..11f832716a08 100644 --- a/svx/inc/svx/xlnwtit.hxx +++ b/svx/inc/svx/xlnwtit.hxx @@ -31,7 +31,7 @@ #ifndef _SVX_XLNWTIT_HXX #define _SVX_XLNWTIT_HXX -#include <svtools/metitem.hxx> +#include <svl/metitem.hxx> #include "svx/svxdllapi.h" //--------------------- diff --git a/svx/inc/svx/xpool.hxx b/svx/inc/svx/xpool.hxx index c8e944801941..10fb329b6216 100644 --- a/svx/inc/svx/xpool.hxx +++ b/svx/inc/svx/xpool.hxx @@ -31,7 +31,7 @@ #ifndef _XPOOL_HXX #define _XPOOL_HXX -#include <svtools/itempool.hxx> +#include <svl/itempool.hxx> #include <svx/xdef.hxx> #include "svx/svxdllapi.h" diff --git a/svx/inc/svx/xsetit.hxx b/svx/inc/svx/xsetit.hxx index ae65dba27427..02dc65747540 100644 --- a/svx/inc/svx/xsetit.hxx +++ b/svx/inc/svx/xsetit.hxx @@ -34,8 +34,8 @@ #ifndef _XATTR_HXX #include <svx/xit.hxx> #endif -#include <svtools/metitem.hxx> -#include <svtools/eitem.hxx> +#include <svl/metitem.hxx> +#include <svl/eitem.hxx> #include <svx/rectenum.hxx> #include <svx/xlnasit.hxx> diff --git a/svx/inc/svx/xtextit.hxx b/svx/inc/svx/xtextit.hxx index dd7aaa7c9472..3cc0fbccc152 100644 --- a/svx/inc/svx/xtextit.hxx +++ b/svx/inc/svx/xtextit.hxx @@ -32,8 +32,8 @@ #define _SVX_XTEXTITEM_HXX #include <svx/xenum.hxx> -#include <svtools/metitem.hxx> -#include <svtools/eitem.hxx> +#include <svl/metitem.hxx> +#include <svl/eitem.hxx> #include <svx/xit.hxx> #include <svx/xcolit.hxx> diff --git a/svx/inc/svx/xtextit0.hxx b/svx/inc/svx/xtextit0.hxx index 30989da4cd9d..3edf5114e8f9 100644 --- a/svx/inc/svx/xtextit0.hxx +++ b/svx/inc/svx/xtextit0.hxx @@ -32,7 +32,7 @@ #define _SVX_TEXTIT0_HXX #include <svx/xenum.hxx> -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> #include "svx/svxdllapi.h" /************************************************************************* diff --git a/svx/inc/svx/zoomitem.hxx b/svx/inc/svx/zoomitem.hxx index f802cb7ed61c..75aafc540ee3 100644 --- a/svx/inc/svx/zoomitem.hxx +++ b/svx/inc/svx/zoomitem.hxx @@ -30,7 +30,7 @@ #ifndef _SVX_ZOOMITEM_HXX #define _SVX_ZOOMITEM_HXX -#include <svtools/intitem.hxx> +#include <svl/intitem.hxx> #ifndef _SVX_SVXIDS_HRC #include <svx/svxids.hrc> #endif diff --git a/svx/inc/svx/zoomslideritem.hxx b/svx/inc/svx/zoomslideritem.hxx index b18f43ceaebc..c58cd255ae8d 100644 --- a/svx/inc/svx/zoomslideritem.hxx +++ b/svx/inc/svx/zoomslideritem.hxx @@ -30,7 +30,7 @@ #ifndef _SVX_ZOOMSLIDERITEM_HXX #define _SVX_ZOOMSLIDERITEM_HXX -#include <svtools/intitem.hxx> +#include <svl/intitem.hxx> #ifndef _SVX_SVXIDS_HRC #include <svx/svxids.hrc> #endif diff --git a/svx/inc/svxgrahicitem.hxx b/svx/inc/svxgrahicitem.hxx index af88babba468..9e2dca690d94 100644 --- a/svx/inc/svxgrahicitem.hxx +++ b/svx/inc/svxgrahicitem.hxx @@ -31,7 +31,7 @@ #define _SVX_GRAPHICITEM_HXX -#include <svtools/poolitem.hxx> +#include <svl/poolitem.hxx> #include "svx/svxdllapi.h" #include <vcl/graph.hxx> diff --git a/svx/inc/svxrtf.hxx b/svx/inc/svxrtf.hxx index f66e37033759..7dfa141b259a 100644 --- a/svx/inc/svxrtf.hxx +++ b/svx/inc/svxrtf.hxx @@ -35,11 +35,11 @@ #include <tools/table.hxx> #endif #include <tools/string.hxx> -#include <svtools/itemset.hxx> +#include <svl/itemset.hxx> #include <svtools/parrtf.hxx> #define _SVSTDARR_USHORTS -#include <svtools/svstdarr.hxx> +#include <svl/svstdarr.hxx> #include "svx/svxdllapi.h" diff --git a/svx/inc/txtrange.hxx b/svx/inc/txtrange.hxx index ae83cb4bf2f5..1b7a05c1f9e5 100644 --- a/svx/inc/txtrange.hxx +++ b/svx/inc/txtrange.hxx @@ -34,7 +34,7 @@ #ifndef _TXTRANGE_HXX #define _SVSTDARR_BOOLS #define _SVSTDARR_LONGS -#include <svtools/svstdarr.hxx> +#include <svl/svstdarr.hxx> #endif #include "svx/svxdllapi.h" diff --git a/svx/inc/unoapi.hxx b/svx/inc/unoapi.hxx index afd6cbec14a9..0ea3585d173a 100644 --- a/svx/inc/unoapi.hxx +++ b/svx/inc/unoapi.hxx @@ -36,7 +36,7 @@ #include <com/sun/star/drawing/XDrawPage.hpp> #include <sal/types.h> #include <goodies/grfmgr.hxx> -#include <svtools/poolitem.hxx> +#include <svl/poolitem.hxx> #include "svx/svxdllapi.h" class SvxShape; diff --git a/svx/inc/unoedhlp.hxx b/svx/inc/unoedhlp.hxx index b732ba867af1..317b9c9c7ab2 100644 --- a/svx/inc/unoedhlp.hxx +++ b/svx/inc/unoedhlp.hxx @@ -34,7 +34,7 @@ #include <memory> #include <tools/solar.h> #include <svtools/textdata.hxx> -#include <svtools/hint.hxx> +#include <svl/hint.hxx> #include <tools/gen.hxx> #include "svx/svxdllapi.h" diff --git a/svx/inc/unofdesc.hxx b/svx/inc/unofdesc.hxx index 1e94a146ad4a..d434b090ad75 100644 --- a/svx/inc/unofdesc.hxx +++ b/svx/inc/unofdesc.hxx @@ -33,7 +33,7 @@ #include <com/sun/star/awt/FontDescriptor.hpp> #include <com/sun/star/beans/PropertyState.hpp> -#include <svtools/itemset.hxx> +#include <svl/itemset.hxx> #include <vcl/font.hxx> #include "svx/svxdllapi.h" diff --git a/svx/inc/xlinjoit.hxx b/svx/inc/xlinjoit.hxx index dc1016d0a05b..97b4bb2ac276 100644 --- a/svx/inc/xlinjoit.hxx +++ b/svx/inc/xlinjoit.hxx @@ -31,7 +31,7 @@ #ifndef _SVX_XLINJOIT_HXX #define _SVX_XLINJOIT_HXX -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> #include <svx/xenum.hxx> #include "svx/svxdllapi.h" diff --git a/svx/inc/xmlcnitm.hxx b/svx/inc/xmlcnitm.hxx index 3e38b80d8719..22b6e02955a0 100644 --- a/svx/inc/xmlcnitm.hxx +++ b/svx/inc/xmlcnitm.hxx @@ -31,7 +31,7 @@ #ifndef _SVX_XMLCNITM_HXX #define _SVX_XMLCNITM_HXX -#include <svtools/poolitem.hxx> +#include <svl/poolitem.hxx> #include "svx/svxdllapi.h" class SvXMLNamespaceMap; |