diff options
| author | Mathias Bauer <mba@openoffice.org> | 2009-10-16 00:05:16 +0200 |
|---|---|---|
| committer | Mathias Bauer <mba@openoffice.org> | 2009-10-16 00:05:16 +0200 |
| commit | 5bb7ed58d718d37fa56e592ffdaf01cc9a0410af (patch) | |
| tree | 15dede36d984980b4217224a390064d62cc615ac | |
| parent | de4a42cf94391345c950caf3b8bbf84982dea42f (diff) | |
#i103496#: split svtools; improve ConfitItems
812 files changed, 1605 insertions, 1543 deletions
diff --git a/avmedia/inc/avmedia/mediaitem.hxx b/avmedia/inc/avmedia/mediaitem.hxx index d2ac1e9ea8..3a2c43686a 100644 --- a/avmedia/inc/avmedia/mediaitem.hxx +++ b/avmedia/inc/avmedia/mediaitem.hxx @@ -33,7 +33,7 @@ #include <tools/rtti.hxx> #ifndef _POOLITEM_HXX -#include <svtools/poolitem.hxx> +#include <svl/poolitem.hxx> #endif #include <com/sun/star/media/ZoomLevel.hpp> diff --git a/avmedia/inc/avmedia/mediatoolbox.hxx b/avmedia/inc/avmedia/mediatoolbox.hxx index 3dc7d2d235..6da465ee4b 100644 --- a/avmedia/inc/avmedia/mediatoolbox.hxx +++ b/avmedia/inc/avmedia/mediatoolbox.hxx @@ -31,7 +31,7 @@ #ifndef _AVMEDIA_MEDIATOOLBOX_HXX #define _AVMEDIA_MEDIATOOLBOX_HXX -#include <svtools/lstner.hxx> +#include <svl/lstner.hxx> #include <sfx2/tbxctrl.hxx> namespace avmedia diff --git a/avmedia/inc/helpids.hrc b/avmedia/inc/helpids.hrc index d5148aeacd..4ce7f12962 100644 --- a/avmedia/inc/helpids.hrc +++ b/avmedia/inc/helpids.hrc @@ -31,7 +31,7 @@ #ifndef _AVMEDIA_HELPIDS_HRC #define _AVMEDIA_HELPIDS_HRC -#include <svtools/solar.hrc> +#include <svl/solar.hrc> #define HID_AVMEDIA_TOOLBOXITEM_PLAY (HID_AVMEDIA_START+0) #define HID_AVMEDIA_TOOLBOXITEM_PAUSE (HID_AVMEDIA_START+1) diff --git a/avmedia/source/framework/mediacontrol.cxx b/avmedia/source/framework/mediacontrol.cxx index 4675da3ac3..218740f0d1 100644 --- a/avmedia/source/framework/mediacontrol.cxx +++ b/avmedia/source/framework/mediacontrol.cxx @@ -37,7 +37,7 @@ #include <tools/time.hxx> #include <vcl/svapp.hxx> #include <vcl/lstbox.hxx> -#include <svtools/syslocale.hxx> +#include <unotools/syslocale.hxx> #include <sfx2/viewfrm.hxx> #include <math.h> #include <algorithm> diff --git a/avmedia/source/framework/mediamisc.cxx b/avmedia/source/framework/mediamisc.cxx index 28a3598e45..f52cabf231 100644 --- a/avmedia/source/framework/mediamisc.cxx +++ b/avmedia/source/framework/mediamisc.cxx @@ -29,7 +29,7 @@ ************************************************************************/ #include <tools/resmgr.hxx> -#include <svtools/solar.hrc> +#include <svl/solar.hrc> #include <vcl/svapp.hxx> namespace avmedia { diff --git a/avmedia/source/framework/mediaplayer.cxx b/avmedia/source/framework/mediaplayer.cxx index 1042c8e670..bb77f8602d 100644 --- a/avmedia/source/framework/mediaplayer.cxx +++ b/avmedia/source/framework/mediaplayer.cxx @@ -35,7 +35,7 @@ #include "mediacontrol.hrc" #include "helpids.hrc" -#include <svtools/stritem.hxx> +#include <svl/stritem.hxx> #include <sfx2/app.hxx> #include <sfx2/sfxsids.hrc> #include <sfx2/bindings.hxx> diff --git a/basic/inc/basic/basmgr.hxx b/basic/inc/basic/basmgr.hxx index 3285c09527..8c9d084922 100644 --- a/basic/inc/basic/basmgr.hxx +++ b/basic/inc/basic/basmgr.hxx @@ -32,7 +32,7 @@ #define _BASMGR_HXX #include <tools/string.hxx> -#include <svtools/brdcst.hxx> +#include <svl/brdcst.hxx> #include <basic/sbstar.hxx> #include <com/sun/star/script/XStorageBasedLibraryContainer.hpp> #include <com/sun/star/script/XStarBasicAccess.hpp> diff --git a/basic/inc/basic/sbdef.hxx b/basic/inc/basic/sbdef.hxx index c13cd69378..f7367c9364 100644 --- a/basic/inc/basic/sbdef.hxx +++ b/basic/inc/basic/sbdef.hxx @@ -32,7 +32,7 @@ #define _SB_SBDEF_HXX #include <basic/sbxdef.hxx> -#include <svtools/svarray.hxx> +#include <svl/svarray.hxx> #define _BASIC_TEXTPORTIONS diff --git a/basic/inc/basic/sbx.hxx b/basic/inc/basic/sbx.hxx index 0a686e5d96..70ee8a2b7f 100644 --- a/basic/inc/basic/sbx.hxx +++ b/basic/inc/basic/sbx.hxx @@ -32,9 +32,9 @@ #define _SBXCLASS_HXX #include "tools/ref.hxx" -#include "svtools/svarray.hxx" -#include "svtools/smplhint.hxx" -#include "svtools/lstner.hxx" +#include "svl/svarray.hxx" +#include "svl/smplhint.hxx" +#include "svl/lstner.hxx" #include <basic/sbxdef.hxx> #include <basic/sbxform.hxx> diff --git a/basic/inc/basic/sbxbase.hxx b/basic/inc/basic/sbxbase.hxx index 577e509b28..e3f72c7c79 100644 --- a/basic/inc/basic/sbxbase.hxx +++ b/basic/inc/basic/sbxbase.hxx @@ -33,7 +33,7 @@ #include <i18npool/lang.h> #include "tools/list.hxx" -#include "svtools/svarray.hxx" +#include "svl/svarray.hxx" #include <basic/sbxdef.hxx> class SbxFactory; diff --git a/basic/inc/basic/sbxobj.hxx b/basic/inc/basic/sbxobj.hxx index a517b4375e..2792d6e5d4 100644 --- a/basic/inc/basic/sbxobj.hxx +++ b/basic/inc/basic/sbxobj.hxx @@ -31,7 +31,7 @@ #ifndef _SBX_SBXOBJECT_HXX #define _SBX_SBXOBJECT_HXX -#include <svtools/lstner.hxx> +#include <svl/lstner.hxx> #include <basic/sbxvar.hxx> /////////////////////////////////////////////////////////////////////////// diff --git a/basic/inc/basic/testtool.hxx b/basic/inc/basic/testtool.hxx index a425844ce5..f8d65bce9e 100644 --- a/basic/inc/basic/testtool.hxx +++ b/basic/inc/basic/testtool.hxx @@ -30,7 +30,7 @@ #ifndef _BASIC_TESTTOOL_HXX_ #define _BASIC_TESTTOOL_HXX_ -#include <svtools/smplhint.hxx> +#include <svl/smplhint.hxx> #include <tools/string.hxx> #define TESTTOOL_DEFAULT_PORT 12479 diff --git a/basic/inc/pch/precompiled_basic.hxx b/basic/inc/pch/precompiled_basic.hxx index 0a0ee33fd9..f1c120b261 100644 --- a/basic/inc/pch/precompiled_basic.hxx +++ b/basic/inc/pch/precompiled_basic.hxx @@ -173,35 +173,35 @@ #include "sot/storage.hxx" #include "sot/storinfo.hxx" -#include "svtools/brdcst.hxx" +#include "svl/brdcst.hxx" #include "svtools/ctrlbox.hxx" #include "svtools/ctrltool.hxx" #include "svtools/ehdl.hxx" #include "svtools/filedlg.hxx" -#include "svtools/hint.hxx" -#include "svtools/lstner.hxx" +#include "svl/hint.hxx" +#include "svl/lstner.hxx" #include "unotools/pathoptions.hxx" #include "svtools/sfxecode.hxx" -#include "svtools/smplhint.hxx" -#include "svtools/solar.hrc" +#include "svl/smplhint.hxx" +#include "svl/solar.hrc" #include "svtools/stringtransfer.hxx" -#include "svtools/svarray.hxx" -#include "svtools/svdde.hxx" +#include "svl/svarray.hxx" +#include "svl/svdde.hxx" #include "svtools/svmedit.hxx" -#include "svtools/svstdarr.hxx" +#include "svl/svstdarr.hxx" #include "svtools/svtdata.hxx" -#include "svtools/svtools.hrc" +#include "svl/svtools.hrc" #include "svtools/svtreebx.hxx" -#include "svtools/syslocale.hxx" +#include "unotools/syslocale.hxx" #include "svtools/taskbar.hxx" #include "svtools/textdata.hxx" #include "svtools/texteng.hxx" #include "svtools/textview.hxx" #include "svtools/transfer.hxx" #include "svtools/txtattr.hxx" -#include "svtools/undo.hxx" -#include "svtools/zforlist.hxx" -#include "svtools/zformat.hxx" +#include "svl/undo.hxx" +#include "svl/zforlist.hxx" +#include "svl/zformat.hxx" #include "tools/color.hxx" diff --git a/basic/inc/sb.hrc b/basic/inc/sb.hrc index be03905eb0..6caf7ade5c 100644 --- a/basic/inc/sb.hrc +++ b/basic/inc/sb.hrc @@ -31,7 +31,7 @@ #ifndef _SB_HRC #define _SB_HRC -#include <svtools/solar.hrc> +#include <svl/solar.hrc> #ifndef IDS_SBERR_START #define IDS_SBERR_START RID_BASIC_START diff --git a/basic/source/app/app.cxx b/basic/source/app/app.cxx index 00a7877fcf..9c7f457ad4 100644 --- a/basic/source/app/app.cxx +++ b/basic/source/app/app.cxx @@ -80,7 +80,7 @@ #include <com/sun/star/ucb/XContentProviderManager.hpp> #include <ucbhelper/content.hxx> -#include <svtools/syslocale.hxx> +#include <unotools/syslocale.hxx> using namespace comphelper; using namespace cppu; diff --git a/basic/source/app/app.hxx b/basic/source/app/app.hxx index f348689773..b30b7261c2 100644 --- a/basic/source/app/app.hxx +++ b/basic/source/app/app.hxx @@ -42,8 +42,8 @@ #include <vcl/wrkwin.hxx> #endif #include <vcl/timer.hxx> -#include <svtools/brdcst.hxx> -#include <svtools/lstner.hxx> +#include <svl/brdcst.hxx> +#include <svl/lstner.hxx> class BasicFrame; #include <basic/mybasic.hxx> diff --git a/basic/source/app/appedit.cxx b/basic/source/app/appedit.cxx index 122aa9c7a1..b2e3942d36 100644 --- a/basic/source/app/appedit.cxx +++ b/basic/source/app/appedit.cxx @@ -34,7 +34,7 @@ #include <svtools/ctrltool.hxx> #include <svtools/textview.hxx> #include <svtools/texteng.hxx> -#include <svtools/undo.hxx> +#include <svl/undo.hxx> #ifndef _BASIC_TTRESHLP_HXX #include <basic/ttstrhlp.hxx> diff --git a/basic/source/app/dialogs.cxx b/basic/source/app/dialogs.cxx index fa770f985f..2fc7baffe1 100644 --- a/basic/source/app/dialogs.cxx +++ b/basic/source/app/dialogs.cxx @@ -60,13 +60,13 @@ #include <svtools/stringtransfer.hxx> #include <vcl/splitwin.hxx> #ifndef _ZFORLIST_HXX //autogen -#include <svtools/zformat.hxx> +#include <svl/zformat.hxx> #endif #include <svtools/ctrltool.hxx> // Ohne Includeschutz #include <svtools/svtdata.hxx> -#include <svtools/solar.hrc> +#include <svl/solar.hrc> #include <basic/dispdefs.hxx> diff --git a/basic/source/app/msgedit.cxx b/basic/source/app/msgedit.cxx index 1ef046170d..beabe69afe 100644 --- a/basic/source/app/msgedit.cxx +++ b/basic/source/app/msgedit.cxx @@ -48,7 +48,7 @@ Version 3 Changed Charset from CHARSET_IBMPC to RTL_TEXTENCODING_UTF8 #endif #include <tools/fsys.hxx> #include <svtools/stringtransfer.hxx> -#include <svtools/syslocale.hxx> +#include <unotools/syslocale.hxx> #ifndef _BASIC_TTRESHLP_HXX #include <basic/ttstrhlp.hxx> #endif diff --git a/basic/source/app/textedit.hxx b/basic/source/app/textedit.hxx index 19efd764c2..d31d013e36 100644 --- a/basic/source/app/textedit.hxx +++ b/basic/source/app/textedit.hxx @@ -40,7 +40,7 @@ class BreakpointWindow; #include <vcl/timer.hxx> #include <tools/table.hxx> #include <tools/debug.hxx> -#include <svtools/lstner.hxx> +#include <svl/lstner.hxx> #include <svtools/svmedit.hxx> #include "dataedit.hxx" diff --git a/basic/source/basmgr/basicmanagerrepository.cxx b/basic/source/basmgr/basicmanagerrepository.cxx index 2340c73269..3a0be2efa4 100644 --- a/basic/source/basmgr/basicmanagerrepository.cxx +++ b/basic/source/basmgr/basicmanagerrepository.cxx @@ -45,7 +45,7 @@ #include <svtools/ehdl.hxx> #include <svtools/sfxecode.hxx> #include <unotools/pathoptions.hxx> -#include <svtools/smplhint.hxx> +#include <svl/smplhint.hxx> #include <vcl/svapp.hxx> #include <tools/debug.hxx> #include <tools/diagnose_ex.h> diff --git a/basic/source/basmgr/basmgr.cxx b/basic/source/basmgr/basmgr.cxx index e357d5828f..e4628c48bb 100644 --- a/basic/source/basmgr/basmgr.cxx +++ b/basic/source/basmgr/basmgr.cxx @@ -33,7 +33,7 @@ #include <tools/stream.hxx> #include <sot/storage.hxx> #include <tools/urlobj.hxx> -#include <svtools/smplhint.hxx> +#include <svl/smplhint.hxx> #include <vcl/svapp.hxx> #include <vcl/window.hxx> #include <vcl/wrkwin.hxx> diff --git a/basic/source/classes/propacc.cxx b/basic/source/classes/propacc.cxx index aed5b2b3c5..f54cdc800d 100644 --- a/basic/source/classes/propacc.cxx +++ b/basic/source/classes/propacc.cxx @@ -35,7 +35,7 @@ #include <tools/urlobj.hxx> #include <tools/errcode.hxx> -#include <svtools/svarray.hxx> +#include <svl/svarray.hxx> #include <basic/sbstar.hxx> #include <sbunoobj.hxx> diff --git a/basic/source/classes/sbunoobj.cxx b/basic/source/classes/sbunoobj.cxx index 8ee3df992e..240927e75a 100644 --- a/basic/source/classes/sbunoobj.cxx +++ b/basic/source/classes/sbunoobj.cxx @@ -36,7 +36,7 @@ #ifndef _TOOLERR_HXX //autogen #include <tools/errcode.hxx> #endif -#include <svtools/hint.hxx> +#include <svl/hint.hxx> #include <cppuhelper/implbase1.hxx> #include <cppuhelper/exc_hlp.hxx> diff --git a/basic/source/classes/sbxmod.cxx b/basic/source/classes/sbxmod.cxx index 21b31020f9..f3d4d763dc 100644 --- a/basic/source/classes/sbxmod.cxx +++ b/basic/source/classes/sbxmod.cxx @@ -36,7 +36,7 @@ #include <vos/macros.hxx> #include <vcl/svapp.hxx> #include <tools/stream.hxx> -#include <svtools/brdcst.hxx> +#include <svl/brdcst.hxx> #include <tools/shl.hxx> #include <basic/sbx.hxx> #include "sb.hxx" diff --git a/basic/source/inc/propacc.hxx b/basic/source/inc/propacc.hxx index 663060638b..c6517459aa 100644 --- a/basic/source/inc/propacc.hxx +++ b/basic/source/inc/propacc.hxx @@ -30,7 +30,7 @@ #ifndef _SFX_PROPBAG_HXX #define _SFX_PROPBAG_HXX -#include <svtools/svarray.hxx> +#include <svl/svarray.hxx> #ifndef _COM_SUN_STAR_BEANS_PROPERTYVALUE_HXX_ #include <com/sun/star/beans/PropertyValue.hpp> #endif diff --git a/basic/source/inc/symtbl.hxx b/basic/source/inc/symtbl.hxx index 8b19aa6da6..e2510b0272 100644 --- a/basic/source/inc/symtbl.hxx +++ b/basic/source/inc/symtbl.hxx @@ -31,7 +31,7 @@ #ifndef _SYMTBL_HXX #define _SYMTBL_HXX -#include <svtools/svarray.hxx> +#include <svl/svarray.hxx> #include <tools/string.hxx> #include <basic/sbxdef.hxx> #include <basic/sbdef.hxx> diff --git a/basic/source/runtime/basrdll.cxx b/basic/source/runtime/basrdll.cxx index 51a1aa00b0..6933957799 100644 --- a/basic/source/runtime/basrdll.cxx +++ b/basic/source/runtime/basrdll.cxx @@ -33,7 +33,7 @@ #include <tools/shl.hxx> #include <vcl/svapp.hxx> #ifndef _SOLAR_HRC -#include <svtools/solar.hrc> +#include <svl/solar.hrc> #endif #include <tools/debug.hxx> #include <vcl/msgbox.hxx> diff --git a/basic/source/runtime/ddectrl.cxx b/basic/source/runtime/ddectrl.cxx index 3a88477b5b..10a74a6748 100644 --- a/basic/source/runtime/ddectrl.cxx +++ b/basic/source/runtime/ddectrl.cxx @@ -31,7 +31,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_basic.hxx" #include <tools/errcode.hxx> -#include <svtools/svdde.hxx> +#include <svl/svdde.hxx> #include "ddectrl.hxx" #ifndef _SBERRORS_HXX #include <basic/sberrors.hxx> diff --git a/basic/source/runtime/dllmgr.hxx b/basic/source/runtime/dllmgr.hxx index 9cd003e858..f8689ddd10 100644 --- a/basic/source/runtime/dllmgr.hxx +++ b/basic/source/runtime/dllmgr.hxx @@ -32,9 +32,9 @@ #define _DLLMGR_HXX #define _SVSTDARR_BYTESTRINGSSORT -#include <svtools/svarray.hxx> +#include <svl/svarray.hxx> #ifndef _SVSTDARR_HXX //autogen -#include <svtools/svstdarr.hxx> +#include <svl/svstdarr.hxx> #endif // !!! nur zum debuggen fuer infoboxes !!! diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx index 5c1bae13ab..6621e6c3f0 100644 --- a/basic/source/runtime/methods.cxx +++ b/basic/source/runtime/methods.cxx @@ -43,7 +43,7 @@ #include <vcl/wintypes.hxx> #include <vcl/msgbox.hxx> #include <basic/sbx.hxx> -#include <svtools/zforlist.hxx> +#include <svl/zforlist.hxx> #include <rtl/math.hxx> #include <tools/urlobj.hxx> #include <osl/time.h> diff --git a/basic/source/runtime/methods1.cxx b/basic/source/runtime/methods1.cxx index 08a94feefc..3f2b72af39 100644 --- a/basic/source/runtime/methods1.cxx +++ b/basic/source/runtime/methods1.cxx @@ -44,7 +44,7 @@ #ifndef _SBX_HXX #include <basic/sbx.hxx> #endif -#include <svtools/zforlist.hxx> +#include <svl/zforlist.hxx> #include <tools/fsys.hxx> #include <tools/urlobj.hxx> #include <osl/file.hxx> diff --git a/basic/source/runtime/runtime.cxx b/basic/source/runtime/runtime.cxx index 361255af24..a7cf7277c0 100644 --- a/basic/source/runtime/runtime.cxx +++ b/basic/source/runtime/runtime.cxx @@ -33,8 +33,8 @@ #include <tools/fsys.hxx> #include <vcl/svapp.hxx> #include <tools/wldcrd.hxx> -#include <svtools/zforlist.hxx> -#include <svtools/syslocale.hxx> +#include <svl/zforlist.hxx> +#include <unotools/syslocale.hxx> #include "runtime.hxx" #include "sbintern.hxx" #include "opcodes.hxx" diff --git a/basic/source/sbx/format.src b/basic/source/sbx/format.src index dde88272eb..afdd3f8522 100644 --- a/basic/source/sbx/format.src +++ b/basic/source/sbx/format.src @@ -28,7 +28,7 @@ * ************************************************************************/ -#include "svtools/svtools.hrc" +#include "svl/svtools.hrc" String STR_BASICKEY_FORMAT_ON { diff --git a/basic/source/sbx/sbxdate.cxx b/basic/source/sbx/sbxdate.cxx index efa5daef97..cdfeb2dd3c 100644 --- a/basic/source/sbx/sbxdate.cxx +++ b/basic/source/sbx/sbxdate.cxx @@ -31,7 +31,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_basic.hxx" #include <vcl/svapp.hxx> -#include <svtools/zforlist.hxx> +#include <svl/zforlist.hxx> #include <tools/errcode.hxx> #include <tools/color.hxx> #include <i18npool/lang.h> diff --git a/basic/source/sbx/sbxobj.cxx b/basic/source/sbx/sbxobj.cxx index 7f8584d889..e977456814 100644 --- a/basic/source/sbx/sbxobj.cxx +++ b/basic/source/sbx/sbxobj.cxx @@ -35,7 +35,7 @@ #include <basic/sbx.hxx> #include <basic/sbxbase.hxx> #include "sbxres.hxx" -#include <svtools/brdcst.hxx> +#include <svl/brdcst.hxx> TYPEINIT1(SbxMethod,SbxVariable) TYPEINIT1(SbxProperty,SbxVariable) diff --git a/basic/source/sbx/sbxscan.cxx b/basic/source/sbx/sbxscan.cxx index 07a3012b60..041e14b983 100644 --- a/basic/source/sbx/sbxscan.cxx +++ b/basic/source/sbx/sbxscan.cxx @@ -34,7 +34,7 @@ #include <basic/sbx.hxx> #include "sbxconv.hxx" -#include "svtools/syslocale.hxx" +#include "unotools/syslocale.hxx" #if defined ( UNX ) #include <stdlib.h> @@ -50,12 +50,12 @@ #include "sbxres.hxx" #include <basic/sbxbase.hxx> #include <basic/sbxform.hxx> -#include <svtools/svtools.hrc> +#include <svl/svtools.hrc> #include "basrid.hxx" #include "runtime.hxx" -#include <svtools/zforlist.hxx> +#include <svl/zforlist.hxx> #include <comphelper/processfactory.hxx> diff --git a/basic/source/sbx/sbxvar.cxx b/basic/source/sbx/sbxvar.cxx index 1ecd20cc2b..b391023c20 100644 --- a/basic/source/sbx/sbxvar.cxx +++ b/basic/source/sbx/sbxvar.cxx @@ -33,7 +33,7 @@ #include <tools/stream.hxx> -#include "svtools/brdcst.hxx" +#include "svl/brdcst.hxx" #include <basic/sbx.hxx> #include <basic/sbxbase.hxx> diff --git a/connectivity/prj/build.lst b/connectivity/prj/build.lst index 20cb27644e..238381692b 100644 --- a/connectivity/prj/build.lst +++ b/connectivity/prj/build.lst @@ -1,4 +1,4 @@ -cn connectivity : l10n comphelper MOZ:moz SO:moz_prebuilt svtools UNIXODBC:unixODBC unoil javaunohelper HSQLDB:hsqldb QADEVOOO:qadevOOo officecfg NSS:nss NULL +cn connectivity : l10n comphelper MOZ:moz SO:moz_prebuilt svl UNIXODBC:unixODBC unoil javaunohelper HSQLDB:hsqldb QADEVOOO:qadevOOo officecfg NSS:nss NULL cn connectivity usr1 - all cn_mkout NULL cn connectivity\inc nmake - all cn_inc NULL cn connectivity\com\sun\star\sdbcx\comp\hsqldb nmake - all cn_jhsqldbdb cn_hsqldb cn_inc NULL diff --git a/connectivity/source/commontools/formattedcolumnvalue.cxx b/connectivity/source/commontools/formattedcolumnvalue.cxx index 5160fc6bd9..58811abc5e 100644 --- a/connectivity/source/commontools/formattedcolumnvalue.cxx +++ b/connectivity/source/commontools/formattedcolumnvalue.cxx @@ -44,7 +44,7 @@ #include <com/sun/star/sdbc/DataType.hpp> /** === end UNO includes === **/ -//#include <svtools/syslocale.hxx> +//#include <unotools/syslocale.hxx> #include <tools/diagnose_ex.h> diff --git a/connectivity/source/drivers/calc/CTable.cxx b/connectivity/source/drivers/calc/CTable.cxx index f108815a10..84d7054c71 100644 --- a/connectivity/source/drivers/calc/CTable.cxx +++ b/connectivity/source/drivers/calc/CTable.cxx @@ -50,7 +50,7 @@ #include <com/sun/star/util/NumberFormat.hpp> #include <com/sun/star/util/XNumberFormatsSupplier.hpp> #include <com/sun/star/text/XText.hpp> -#include <svtools/converter.hxx> +#include <svl/converter.hxx> #include "calc/CConnection.hxx" #include "calc/CColumns.hxx" #include "connectivity/sdbcx/VColumn.hxx" @@ -58,7 +58,7 @@ #include <osl/thread.h> #include <tools/config.hxx> #include <comphelper/sequence.hxx> -#include <svtools/zforlist.hxx> +#include <svl/zforlist.hxx> #include <rtl/math.hxx> #include <comphelper/extract.hxx> #include <connectivity/dbexception.hxx> diff --git a/connectivity/source/drivers/dbase/DTable.cxx b/connectivity/source/drivers/dbase/DTable.cxx index 216dc2d9fc..171f10ccdb 100644 --- a/connectivity/source/drivers/dbase/DTable.cxx +++ b/connectivity/source/drivers/dbase/DTable.cxx @@ -35,7 +35,7 @@ #include <com/sun/star/sdbc/DataType.hpp> #include <com/sun/star/ucb/XContentAccess.hpp> #include <com/sun/star/sdbc/XRow.hpp> -#include <svtools/converter.hxx> +#include <svl/converter.hxx> #include "dbase/DConnection.hxx" #include "dbase/DColumns.hxx" #include <osl/thread.h> @@ -44,8 +44,8 @@ #include "dbase/DIndexes.hxx" //#include "file/FDriver.hxx" #include <comphelper/sequence.hxx> -#include <svtools/zforlist.hxx> -#include <svtools/syslocale.hxx> +#include <svl/zforlist.hxx> +#include <unotools/syslocale.hxx> #include <rtl/math.hxx> #include <stdio.h> //sprintf #include <ucbhelper/content.hxx> diff --git a/connectivity/source/drivers/evoab/LFolderList.cxx b/connectivity/source/drivers/evoab/LFolderList.cxx index 577d950ca6..91dc6eb310 100644 --- a/connectivity/source/drivers/evoab/LFolderList.cxx +++ b/connectivity/source/drivers/evoab/LFolderList.cxx @@ -36,13 +36,13 @@ #include "LFolderList.hxx" #include <com/sun/star/sdbc/ColumnValue.hpp> #include <com/sun/star/sdbc/DataType.hpp> -#include <svtools/converter.hxx> +#include <svl/converter.hxx> #include "LConnection.hxx" #include "LColumns.hxx" #include <osl/thread.h> #include <tools/config.hxx> #include <comphelper/sequence.hxx> -#include <svtools/zforlist.hxx> +#include <svl/zforlist.hxx> #include <rtl/math.hxx> #include <stdio.h> //sprintf #include <comphelper/extract.hxx> @@ -59,7 +59,7 @@ #ifndef CONNECTIVITY_EVOAB_DEBUG_HELPER_HXX #include "LDebug.hxx" #endif -#include <svtools/syslocale.hxx> +#include <unotools/syslocale.hxx> using namespace ::comphelper; using namespace connectivity; diff --git a/connectivity/source/drivers/evoab/LTable.cxx b/connectivity/source/drivers/evoab/LTable.cxx index 47e8368694..959980492e 100644 --- a/connectivity/source/drivers/evoab/LTable.cxx +++ b/connectivity/source/drivers/evoab/LTable.cxx @@ -39,13 +39,13 @@ #ifndef _COM_SUN_STAR_SQLC_XROW_HPP_ //#include <com/sun/star/sdbc/XRow.hpp> #endif -#include <svtools/converter.hxx> +#include <svl/converter.hxx> #include "LConnection.hxx" #include "LColumns.hxx" #include <osl/thread.h> #include <tools/config.hxx> #include <comphelper/sequence.hxx> -#include <svtools/zforlist.hxx> +#include <svl/zforlist.hxx> #include <rtl/math.hxx> #include <stdio.h> //sprintf #include <comphelper/extract.hxx> @@ -56,7 +56,7 @@ #include <i18npool/mslangid.hxx> #include "connectivity/dbconversion.hxx" #include <comphelper/types.hxx> -#include <svtools/syslocale.hxx> +#include <unotools/syslocale.hxx> #ifndef CONNECTIVITY_EVOAB_DEBUG_HELPER_HXX #include "LDebug.hxx" #endif diff --git a/connectivity/source/drivers/evoab2/NResultSet.cxx b/connectivity/source/drivers/evoab2/NResultSet.cxx index c7e6a1617d..b227b0c232 100644 --- a/connectivity/source/drivers/evoab2/NResultSet.cxx +++ b/connectivity/source/drivers/evoab2/NResultSet.cxx @@ -54,7 +54,7 @@ #include <cppuhelper/typeprovider.hxx> #include <rtl/string.hxx> #include <tools/diagnose_ex.h> -#include <svtools/syslocale.hxx> +#include <unotools/syslocale.hxx> #include <unotools/intlwrapper.hxx> #include <cstring> diff --git a/connectivity/source/drivers/file/fcode.cxx b/connectivity/source/drivers/file/fcode.cxx index 1793cf58e3..f970646455 100644 --- a/connectivity/source/drivers/file/fcode.cxx +++ b/connectivity/source/drivers/file/fcode.cxx @@ -34,8 +34,8 @@ #include <osl/diagnose.h> #include "connectivity/sqlparse.hxx" #include <i18npool/mslangid.hxx> -#include <vcl/svapp.hxx> #include <tools/debug.hxx> +#include <tools/string.hxx> #include "TConnection.hxx" #include <com/sun/star/sdb/SQLFilterOperator.hpp> #include <comphelper/types.hxx> diff --git a/connectivity/source/drivers/flat/ETable.cxx b/connectivity/source/drivers/flat/ETable.cxx index 7fbc472586..eac86a5a41 100644 --- a/connectivity/source/drivers/flat/ETable.cxx +++ b/connectivity/source/drivers/flat/ETable.cxx @@ -36,13 +36,13 @@ #include <com/sun/star/sdbc/ColumnValue.hpp> #include <com/sun/star/sdbc/DataType.hpp> #include <com/sun/star/ucb/XContentAccess.hpp> -#include <svtools/converter.hxx> +#include <svl/converter.hxx> #include "flat/EConnection.hxx" #include "flat/EColumns.hxx" #include <osl/thread.h> #include <tools/config.hxx> #include <comphelper/sequence.hxx> -#include <svtools/zforlist.hxx> +#include <svl/zforlist.hxx> #include <rtl/math.hxx> #include <stdio.h> //sprintf #include <comphelper/extract.hxx> @@ -54,7 +54,7 @@ #include "connectivity/dbconversion.hxx" #include <comphelper/types.hxx> #include "file/quotedstring.hxx" -#include <svtools/syslocale.hxx> +#include <unotools/syslocale.hxx> #include <rtl/logfile.hxx> using namespace ::comphelper; diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index 0e09b8b87d..660db6a0c5 100644 --- a/desktop/source/app/app.cxx +++ b/desktop/source/app/app.cxx @@ -120,12 +120,13 @@ #include <osl/signal.h> #include <rtl/uuid.h> #include <unotools/pathoptions.hxx> -#include <svtools/languageoptions.hxx> +#include <svl/languageoptions.hxx> #include <unotools/internaloptions.hxx> #include <svtools/miscopt.hxx> #include <svtools/menuoptions.hxx> -#include <svtools/syslocaleoptions.hxx> -#include <svtools/folderrestriction.hxx> +#include <unotools/syslocaleoptions.hxx> +#include <unotools/syslocale.hxx> +#include <svl/folderrestriction.hxx> #include <unotools/tempfile.hxx> #include <rtl/logfile.hxx> #include <rtl/ustrbuf.hxx> @@ -147,7 +148,7 @@ #include <svtools/fontsubstconfig.hxx> #include <svtools/accessibilityoptions.hxx> #include <svtools/apearcfg.hxx> -#include <svtools/misccfg.hxx> +#include <unotools/misccfg.hxx> #include <svtools/filter.hxx> #include <unotools/regoptions.hxx> @@ -1329,7 +1330,7 @@ void Desktop::Main() //LanguageSelection langselect; OUString aUILocaleString = LanguageSelection::getLanguageString(); Locale aUILocale = LanguageSelection::IsoStringToLocale(aUILocaleString); - LanguageType eLanguage = SvtSysLocaleOptions().GetLocaleLanguageType(); + LanguageType eLanguage = SvtSysLocale().GetLanguage(); // #i39040#, do not call anything between GetSettings and SetSettings that might have // a side effect on the settings (like, eg, SvtSysLocaleOptions().GetLocaleLanguageType(), @@ -1820,10 +1821,6 @@ void Desktop::SystemSettingsChanging( AllSettings& rSettings, Window* ) hStyleSettings.SetDragFullOptions( nDragFullOptions ); rSettings.SetStyleSettings ( hStyleSettings ); - - MiscSettings aMiscSettings( rSettings.GetMiscSettings() ); - aMiscSettings.SetTwoDigitYearStart( (USHORT) SfxMiscCfg().GetYear2000() ); - rSettings.SetMiscSettings( aMiscSettings ); } // ======================================================================== diff --git a/desktop/source/app/cmdlineargs.cxx b/desktop/source/app/cmdlineargs.cxx index 84bb6cd7b2..e2a8558372 100644 --- a/desktop/source/app/cmdlineargs.cxx +++ b/desktop/source/app/cmdlineargs.cxx @@ -41,7 +41,7 @@ #include <com/sun/star/uno/Reference.hxx> #include "tools/getprocessworkingdir.hxx" -#include <svtools/documentlockfile.hxx> +#include <svl/documentlockfile.hxx> using namespace rtl; using namespace com::sun::star::lang; diff --git a/desktop/source/app/desktop.hrc b/desktop/source/app/desktop.hrc index 76d6710ba0..0a67c2017f 100644 --- a/desktop/source/app/desktop.hrc +++ b/desktop/source/app/desktop.hrc @@ -32,7 +32,7 @@ #define _DESKTOP_HRC_ #ifndef _SOLAR_HRC -#include <svtools/solar.hrc> +#include <svl/solar.hrc> #endif #define RID_DESKTOP_DIALOG_START 2000 diff --git a/desktop/source/app/langselect.hxx b/desktop/source/app/langselect.hxx index 748b50fc65..7d233c2d58 100644 --- a/desktop/source/app/langselect.hxx +++ b/desktop/source/app/langselect.hxx @@ -36,7 +36,7 @@ #include <com/sun/star/lang/Locale.hpp> #include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/beans/XPropertySet.hpp> -#include <svtools/languageoptions.hxx> +#include <svl/languageoptions.hxx> namespace desktop { diff --git a/desktop/source/app/userinstall.cxx b/desktop/source/app/userinstall.cxx index 920da56133..ccdeadbd7c 100644 --- a/desktop/source/app/userinstall.cxx +++ b/desktop/source/app/userinstall.cxx @@ -50,9 +50,9 @@ #include <tools/resmgr.hxx> #endif #include <unotools/bootstrap.hxx> -#include <svtools/languageoptions.hxx> +#include <svl/languageoptions.hxx> #ifndef _SVTOOLS_SYSLOCALEOPTIONSOPTIONS_HXX -#include <svtools/syslocaleoptions.hxx> +#include <unotools/syslocaleoptions.hxx> #endif #include <comphelper/processfactory.hxx> #include <com/sun/star/container/XNameAccess.hpp> diff --git a/desktop/source/deployment/gui/dp_gui_autoscrolledit.cxx b/desktop/source/deployment/gui/dp_gui_autoscrolledit.cxx index af99601334..dc9ea6fea8 100644 --- a/desktop/source/deployment/gui/dp_gui_autoscrolledit.cxx +++ b/desktop/source/deployment/gui/dp_gui_autoscrolledit.cxx @@ -33,7 +33,7 @@ #include "svtools/svmedit2.hxx" -#include "svtools/lstner.hxx" +#include "svl/lstner.hxx" #include "svtools/xtextedt.hxx" #include "vcl/scrbar.hxx" diff --git a/desktop/source/deployment/gui/dp_gui_autoscrolledit.hxx b/desktop/source/deployment/gui/dp_gui_autoscrolledit.hxx index c73a4df82c..6ed3d3c723 100644 --- a/desktop/source/deployment/gui/dp_gui_autoscrolledit.hxx +++ b/desktop/source/deployment/gui/dp_gui_autoscrolledit.hxx @@ -31,7 +31,7 @@ #define INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_GUI_DP_GUI_AUTOSCROLLEDIT_HXX #include "svtools/svmedit2.hxx" -#include "svtools/lstner.hxx" +#include "svl/lstner.hxx" namespace dp_gui { diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.cxx b/desktop/source/deployment/gui/dp_gui_dialog2.cxx index 4430b5b444..e8acd11e45 100644 --- a/desktop/source/deployment/gui/dp_gui_dialog2.cxx +++ b/desktop/source/deployment/gui/dp_gui_dialog2.cxx @@ -34,7 +34,7 @@ #include "dp_gui.hrc" #include "svtools/controldims.hrc" -#include "svtools/svtools.hrc" +#include "svl/svtools.hrc" #include "dp_gui.h" #include "dp_gui_dialog2.hxx" diff --git a/desktop/source/deployment/gui/license_dialog.cxx b/desktop/source/deployment/gui/license_dialog.cxx index d0e2c44be2..f8b3f2be40 100644 --- a/desktop/source/deployment/gui/license_dialog.cxx +++ b/desktop/source/deployment/gui/license_dialog.cxx @@ -43,7 +43,7 @@ #include "com/sun/star/lang/XServiceInfo.hpp" #include "com/sun/star/task/XJobExecutor.hpp" #include "svtools/svmedit.hxx" -#include "svtools/lstner.hxx" +#include "svl/lstner.hxx" #include "svtools/xtextedt.hxx" #include <vcl/scrbar.hxx> #include "vcl/threadex.hxx" diff --git a/desktop/source/deployment/manager/dp_manager.cxx b/desktop/source/deployment/manager/dp_manager.cxx index aff8ada634..f940366e06 100644 --- a/desktop/source/deployment/manager/dp_manager.cxx +++ b/desktop/source/deployment/manager/dp_manager.cxx @@ -49,7 +49,7 @@ #include "comphelper/servicedecl.hxx" #include "comphelper/sequence.hxx" #include "xmlscript/xml_helper.hxx" -#include "svtools/inettype.hxx" +#include "svl/inettype.hxx" #include "com/sun/star/lang/DisposedException.hpp" #include "com/sun/star/lang/WrappedTargetRuntimeException.hpp" #include "com/sun/star/beans/UnknownPropertyException.hpp" diff --git a/desktop/source/deployment/registry/component/dp_component.cxx b/desktop/source/deployment/registry/component/dp_component.cxx index 3f2def05d7..1da716513a 100644 --- a/desktop/source/deployment/registry/component/dp_component.cxx +++ b/desktop/source/deployment/registry/component/dp_component.cxx @@ -45,7 +45,7 @@ #include "comphelper/servicedecl.hxx" #include "comphelper/sequence.hxx" #include "xmlscript/xml_helper.hxx" -#include "svtools/inettype.hxx" +#include "svl/inettype.hxx" #include "com/sun/star/lang/WrappedTargetRuntimeException.hpp" #include "com/sun/star/container/XNameContainer.hpp" #include "com/sun/star/container/XHierarchicalNameAccess.hpp" diff --git a/desktop/source/deployment/registry/configuration/dp_configuration.cxx b/desktop/source/deployment/registry/configuration/dp_configuration.cxx index bf63a338ee..e13d580e2b 100644 --- a/desktop/source/deployment/registry/configuration/dp_configuration.cxx +++ b/desktop/source/deployment/registry/configuration/dp_configuration.cxx @@ -45,7 +45,7 @@ #include "comphelper/anytostring.hxx" #include "comphelper/servicedecl.hxx" #include "xmlscript/xml_helper.hxx" -#include "svtools/inettype.hxx" +#include "svl/inettype.hxx" #include "com/sun/star/ucb/NameClash.hpp" #include "com/sun/star/io/XActiveDataSink.hpp" #include "com/sun/star/lang/WrappedTargetRuntimeException.hpp" diff --git a/desktop/source/deployment/registry/executable/dp_executable.cxx b/desktop/source/deployment/registry/executable/dp_executable.cxx index 902d9f6645..5ecfab8b34 100644 --- a/desktop/source/deployment/registry/executable/dp_executable.cxx +++ b/desktop/source/deployment/registry/executable/dp_executable.cxx @@ -38,7 +38,7 @@ #include "osl/file.hxx" #include "ucbhelper/content.hxx" #include "comphelper/servicedecl.hxx" -#include "svtools/inettype.hxx" +#include "svl/inettype.hxx" #include "cppuhelper/implbase1.hxx" using namespace ::com::sun::star; diff --git a/desktop/source/deployment/registry/help/dp_help.cxx b/desktop/source/deployment/registry/help/dp_help.cxx index 8ef0a7141a..61636da1e2 100644 --- a/desktop/source/deployment/registry/help/dp_help.cxx +++ b/desktop/source/deployment/registry/help/dp_help.cxx @@ -38,7 +38,7 @@ #include "osl/file.hxx" #include "ucbhelper/content.hxx" #include "comphelper/servicedecl.hxx" -#include "svtools/inettype.hxx" +#include "svl/inettype.hxx" #include <transex3/compilehelp.hxx> #include <com/sun/star/ucb/XSimpleFileAccess.hpp> diff --git a/desktop/source/deployment/registry/package/dp_package.cxx b/desktop/source/deployment/registry/package/dp_package.cxx index 98f80df964..b4042d1969 100644 --- a/desktop/source/deployment/registry/package/dp_package.cxx +++ b/desktop/source/deployment/registry/package/dp_package.cxx @@ -44,7 +44,7 @@ #include "cppuhelper/exc_hlp.hxx" #include "cppuhelper/implbase1.hxx" #include "ucbhelper/content.hxx" -#include "svtools/inettype.hxx" +#include "svl/inettype.hxx" #include "comphelper/anytostring.hxx" #include "comphelper/makesequence.hxx" #include "comphelper/sequence.hxx" diff --git a/desktop/source/deployment/registry/script/dp_script.cxx b/desktop/source/deployment/registry/script/dp_script.cxx index 1a8a0e4d1b..f5c2ee3e3e 100644 --- a/desktop/source/deployment/registry/script/dp_script.cxx +++ b/desktop/source/deployment/registry/script/dp_script.cxx @@ -40,7 +40,7 @@ #include "cppuhelper/exc_hlp.hxx" #include "cppuhelper/implbase1.hxx" #include "comphelper/servicedecl.hxx" -#include "svtools/inettype.hxx" +#include "svl/inettype.hxx" #include "com/sun/star/util/XUpdatable.hpp" #include "com/sun/star/script/XLibraryContainer.hpp" #include <com/sun/star/ucb/XSimpleFileAccess.hpp> diff --git a/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx b/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx index c460409890..953cdb8901 100644 --- a/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx +++ b/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx @@ -38,7 +38,7 @@ #include "ucbhelper/content.hxx" #include "cppuhelper/exc_hlp.hxx" #include "comphelper/servicedecl.hxx" -#include "svtools/inettype.hxx" +#include "svl/inettype.hxx" #include <com/sun/star/container/XNameContainer.hpp> #include <com/sun/star/script/provider/XScriptProviderFactory.hpp> #include <memory> diff --git a/desktop/source/inc/helpid.hrc b/desktop/source/inc/helpid.hrc index 6532e1687e..7bbc194670 100644 --- a/desktop/source/inc/helpid.hrc +++ b/desktop/source/inc/helpid.hrc @@ -31,7 +31,7 @@ #if ! defined INCLUDED_DESKTOP_HELPID_HRC #define INCLUDED_DESKTOP_HELPID_HRC -#include "svtools/solar.hrc" +#include "svl/solar.hrc" #define HID_GLOBAL_FALLBACK 0xFFFFFFFF diff --git a/desktop/source/migration/pages.hxx b/desktop/source/migration/pages.hxx index c5ab388687..f243fff61f 100644 --- a/desktop/source/migration/pages.hxx +++ b/desktop/source/migration/pages.hxx @@ -38,7 +38,7 @@ #include <vcl/scrbar.hxx> #include <svtools/wizardmachine.hxx> #include <svtools/svmedit.hxx> -#include <svtools/lstner.hxx> +#include <svl/lstner.hxx> #include <svtools/xtextedt.hxx> namespace desktop diff --git a/drawinglayer/source/processor2d/canvasprocessor.cxx b/drawinglayer/source/processor2d/canvasprocessor.cxx index 77cb2b3350..2a1e699197 100644 --- a/drawinglayer/source/processor2d/canvasprocessor.cxx +++ b/drawinglayer/source/processor2d/canvasprocessor.cxx @@ -46,7 +46,7 @@ #include <drawinglayer/primitive2d/modifiedcolorprimitive2d.hxx> #include <drawinglayer/primitive2d/transformprimitive2d.hxx> #include <canvas/canvastools.hxx> -#include <svtools/ctloptions.hxx> +#include <svl/ctloptions.hxx> #include <vcl/svapp.hxx> #include <drawinglayer/primitive2d/maskprimitive2d.hxx> #include <basegfx/polygon/b2dpolygonclipper.hxx> diff --git a/drawinglayer/source/processor2d/vclprocessor2d.cxx b/drawinglayer/source/processor2d/vclprocessor2d.cxx index 4f803e9366..747bb1c66d 100644 --- a/drawinglayer/source/processor2d/vclprocessor2d.cxx +++ b/drawinglayer/source/processor2d/vclprocessor2d.cxx @@ -58,7 +58,7 @@ #include <drawinglayer/primitive2d/markerarrayprimitive2d.hxx> #include <drawinglayer/primitive2d/pointarrayprimitive2d.hxx> #include <drawinglayer/primitive2d/wrongspellprimitive2d.hxx> -#include <svtools/ctloptions.hxx> +#include <svl/ctloptions.hxx> #include <vcl/svapp.hxx> #include <drawinglayer/primitive2d/pagepreviewprimitive2d.hxx> #include <tools/diagnose_ex.h> diff --git a/formula/inc/helpids.hrc b/formula/inc/helpids.hrc index 438d4da088..be01c94513 100644 --- a/formula/inc/helpids.hrc +++ b/formula/inc/helpids.hrc @@ -31,7 +31,7 @@ #define FORMULA_HELPID_HRC #ifndef _SOLAR_HRC -#include <svtools/solar.hrc> // HID_FORMULA_START +#include <svl/solar.hrc> // HID_FORMULA_START #endif #define HID_FORMULADLG_FORMULA (HID_FORMULA_START + 0) diff --git a/formula/source/core/api/FormulaCompiler.cxx b/formula/source/core/api/FormulaCompiler.cxx index 5f8fd73be1..c236ddfb79 100644 --- a/formula/source/core/api/FormulaCompiler.cxx +++ b/formula/source/core/api/FormulaCompiler.cxx @@ -35,7 +35,7 @@ #include "core_resource.hxx" #include "core_resource.hrc" -#include <svtools/zforlist.hxx> +#include <svl/zforlist.hxx> #include <tools/rc.hxx> #include <tools/rcid.h> #include <com/sun/star/sheet/FormulaOpCodeMapEntry.hpp> diff --git a/formula/source/core/inc/core_resource.hrc b/formula/source/core/inc/core_resource.hrc index a8cc75b67c..ecb21ef55b 100644 --- a/formula/source/core/inc/core_resource.hrc +++ b/formula/source/core/inc/core_resource.hrc @@ -31,7 +31,7 @@ #ifndef _FORMULA_CORE_RESOURCE_HRC_ #define _FORMULA_CORE_RESOURCE_HRC_ -#include <svtools/solar.hrc> +#include <svl/solar.hrc> //------------------------------------------------------------------------------ #define RID_CORE_STRINGS_START RID_FORMULA_START diff --git a/formula/source/core/resource/core_resource.cxx b/formula/source/core/resource/core_resource.cxx index 088c5958f2..d61c479462 100644 --- a/formula/source/core/resource/core_resource.cxx +++ b/formula/source/core/resource/core_resource.cxx @@ -37,7 +37,7 @@ // ---- needed as long as we have no contexts for components --- #include <vcl/svapp.hxx> -#include <svtools/solar.hrc> +#include <svl/solar.hrc> //......................................................................... namespace formula diff --git a/formula/source/ui/dlg/FormulaHelper.cxx b/formula/source/ui/dlg/FormulaHelper.cxx index f5ba200853..678e011c6f 100644 --- a/formula/source/ui/dlg/FormulaHelper.cxx +++ b/formula/source/ui/dlg/FormulaHelper.cxx @@ -31,7 +31,7 @@ #include "formula/formulahelper.hxx" #include <unotools/charclass.hxx> -#include <svtools/syslocale.hxx> +#include <unotools/syslocale.hxx> namespace formula { diff --git a/formula/source/ui/dlg/formula.cxx b/formula/source/ui/dlg/formula.cxx index 897f53b59b..e68775a6fc 100644 --- a/formula/source/ui/dlg/formula.cxx +++ b/formula/source/ui/dlg/formula.cxx @@ -47,9 +47,9 @@ #include <svtools/stdctrl.hxx> #include <svtools/svmedit.hxx> #include <svtools/svtreebx.hxx> -#include <svtools/stritem.hxx> -#include <svtools/zforlist.hxx> -#include <svtools/eitem.hxx> +#include <svl/stritem.hxx> +#include <svl/zforlist.hxx> +#include <svl/eitem.hxx> #include <unotools/charclass.hxx> #include <tools/urlobj.hxx> diff --git a/formula/source/ui/dlg/funcpage.cxx b/formula/source/ui/dlg/funcpage.cxx index 5256450a28..149684f17c 100644 --- a/formula/source/ui/dlg/funcpage.cxx +++ b/formula/source/ui/dlg/funcpage.cxx @@ -37,8 +37,8 @@ #include <sfx2/dispatch.hxx> #include <sfx2/docfile.hxx> -#include <svtools/zforlist.hxx> -#include <svtools/stritem.hxx> +#include <svl/zforlist.hxx> +#include <svl/stritem.hxx> #include "formula/IFunctionDescription.hxx" #include "funcpage.hxx" diff --git a/formula/source/ui/dlg/parawin.cxx b/formula/source/ui/dlg/parawin.cxx index a0c26562a5..ddda38e485 100644 --- a/formula/source/ui/dlg/parawin.cxx +++ b/formula/source/ui/dlg/parawin.cxx @@ -35,8 +35,8 @@ //---------------------------------------------------------------------------- -#include <svtools/zforlist.hxx> -#include <svtools/stritem.hxx> +#include <svl/zforlist.hxx> +#include <svl/stritem.hxx> #include "parawin.hxx" #include "parawin.hrc" diff --git a/formula/source/ui/dlg/structpg.cxx b/formula/source/ui/dlg/structpg.cxx index 1afb1c0fb4..846b32f5dd 100644 --- a/formula/source/ui/dlg/structpg.cxx +++ b/formula/source/ui/dlg/structpg.cxx @@ -35,8 +35,8 @@ //---------------------------------------------------------------------------- -#include <svtools/zforlist.hxx> -#include <svtools/stritem.hxx> +#include <svl/zforlist.hxx> +#include <svl/stritem.hxx> #include "structpg.hxx" #include "formdlgs.hrc" diff --git a/formula/source/ui/inc/ForResId.hrc b/formula/source/ui/inc/ForResId.hrc index a708b90364..e170c08c6d 100644 --- a/formula/source/ui/inc/ForResId.hrc +++ b/formula/source/ui/inc/ForResId.hrc @@ -34,7 +34,7 @@ // include ----------------------------------------------------------- #ifndef _SOLAR_HRC -#include <svtools/solar.hrc> +#include <svl/solar.hrc> #endif #define RID_DIALOG_START RID_FORMULA_START diff --git a/formula/source/ui/resource/ModuleHelper.cxx b/formula/source/ui/resource/ModuleHelper.cxx index e6ea0353ce..8fca1dff65 100644 --- a/formula/source/ui/resource/ModuleHelper.cxx +++ b/formula/source/ui/resource/ModuleHelper.cxx @@ -37,7 +37,7 @@ #include <rtl/uri.hxx> #include <tools/debug.hxx> #ifndef _SOLAR_HRC -#include <svtools/solar.hrc> +#include <svl/solar.hrc> #endif #define EXPAND_PROTOCOL "vnd.sun.star.expand:" diff --git a/fpicker/source/aqua/resourceprovider.cxx b/fpicker/source/aqua/resourceprovider.cxx index 937e6fb962..7f40fa026d 100644 --- a/fpicker/source/aqua/resourceprovider.cxx +++ b/fpicker/source/aqua/resourceprovider.cxx @@ -41,7 +41,7 @@ #include <com/sun/star/ui/dialogs/ExtendedFilePickerElementIds.hpp> #ifndef _SVTOOLS_SVTOOLS_HRC_ -#include <svtools/svtools.hrc> +#include <svl/svtools.hrc> #endif #ifndef _SVTOOLS_FILEDLG2_HRC_ diff --git a/fpicker/source/generic/fpicker.cxx b/fpicker/source/generic/fpicker.cxx index 409e582742..f725a20c1f 100644 --- a/fpicker/source/generic/fpicker.cxx +++ b/fpicker/source/generic/fpicker.cxx @@ -38,7 +38,7 @@ #endif #include "com/sun/star/lang/XMultiComponentFactory.hpp" #include "svtools/miscopt.hxx" -#include "svtools/pickerhistoryaccess.hxx" +#include "svl/pickerhistoryaccess.hxx" #ifndef _SV_APP_HXX #include "vcl/svapp.hxx" diff --git a/fpicker/source/office/OfficeFilePicker.cxx b/fpicker/source/office/OfficeFilePicker.cxx index d357c618b3..7aed16688c 100644 --- a/fpicker/source/office/OfficeFilePicker.cxx +++ b/fpicker/source/office/OfficeFilePicker.cxx @@ -46,7 +46,7 @@ #include <tools/urlobj.hxx> #include <tools/debug.hxx> #define _SVSTDARR_STRINGSDTOR -#include "svtools/svstdarr.hxx" +#include "svl/svstdarr.hxx" #include <com/sun/star/uno/Any.hxx> #include <com/sun/star/ui/dialogs/FilePickerEvent.hpp> #include <com/sun/star/ui/dialogs/FilePreviewImageFormats.hpp> diff --git a/fpicker/source/office/OfficeFilePicker.src b/fpicker/source/office/OfficeFilePicker.src index 908ce7e4af..c841631466 100644 --- a/fpicker/source/office/OfficeFilePicker.src +++ b/fpicker/source/office/OfficeFilePicker.src @@ -28,7 +28,7 @@ * ************************************************************************/ -#include "svtools/svtools.hrc" +#include "svl/svtools.hrc" String STR_SVT_FILEPICKER_AUTO_EXTENSION { diff --git a/fpicker/source/office/OfficeFolderPicker.cxx b/fpicker/source/office/OfficeFolderPicker.cxx index b6d04b0190..d9543a3aee 100644 --- a/fpicker/source/office/OfficeFolderPicker.cxx +++ b/fpicker/source/office/OfficeFolderPicker.cxx @@ -39,7 +39,7 @@ #include <tools/urlobj.hxx> #define _SVSTDARR_STRINGSDTOR -#include "svtools/svstdarr.hxx" +#include "svl/svstdarr.hxx" #include <com/sun/star/container/XContentEnumerationAccess.hpp> #include <com/sun/star/container/XSet.hpp> #include <com/sun/star/uno/Any.hxx> diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx index c2dd487bde..3fc18c6fac 100644 --- a/fpicker/source/office/iodlg.cxx +++ b/fpicker/source/office/iodlg.cxx @@ -44,23 +44,23 @@ #include <unotools/ucbhelper.hxx> #include <ucbhelper/contentbroker.hxx> #include "svtools/ehdl.hxx" -#include "svtools/urihelper.hxx" +#include "svl/urihelper.hxx" #include "unotools/pathoptions.hxx" #include "unotools/viewoptions.hxx" #include "svtools/fileview.hxx" #include "unotools/inetoptions.hxx" #include "svtools/sfxecode.hxx" -#include "svtools/svarray.hxx" +#include "svl/svarray.hxx" #include "svtools/svtabbx.hxx" #define _SVSTDARR_USHORTS #define _SVSTDARR_STRINGSDTOR -#include "svtools/svstdarr.hxx" +#include "svl/svstdarr.hxx" #include <toolkit/helper/vclunohelper.hxx> #include <unotools/localfilehelper.hxx> #ifndef _SVTOOLS_HRC -#include "svtools/svtools.hrc" +#include "svl/svtools.hrc" #endif #ifndef _SVT_HELPID_HRC #include "svtools/helpid.hrc" @@ -72,7 +72,7 @@ #include "asyncfilepicker.hxx" #include "iodlgimp.hxx" #include "svtools/inettbc.hxx" -#include "svtools/syslocale.hxx" +#include "unotools/syslocale.hxx" #include "svtools/QueryFolderName.hxx" #ifndef _RTL_USTRING_HXX #include <rtl/ustring.hxx> diff --git a/fpicker/source/office/iodlg.hrc b/fpicker/source/office/iodlg.hrc index eaaed21f90..ecd5fd98e1 100644 --- a/fpicker/source/office/iodlg.hrc +++ b/fpicker/source/office/iodlg.hrc @@ -32,7 +32,7 @@ #define _SVTOOLS_IODLGIMPL_HRC #ifndef _SVTOOLS_HRC -#include "svtools/svtools.hrc" +#include "svl/svtools.hrc" #endif // ModalDialog DLG_SVT_EXPLORERFILE diff --git a/fpicker/source/office/iodlg.hxx b/fpicker/source/office/iodlg.hxx index c680e394d0..d0a6d1489d 100644 --- a/fpicker/source/office/iodlg.hxx +++ b/fpicker/source/office/iodlg.hxx @@ -46,9 +46,9 @@ #include <com/sun/star/ucb/IOErrorCode.hpp> #include <com/sun/star/ui/dialogs/XDialogClosedListener.hpp> #include <unotools/confignode.hxx> -#include "svtools/inettype.hxx" -#include "svtools/urlfilter.hxx" -#include <svtools/restrictedpaths.hxx> +#include "svl/inettype.hxx" +#include "svl/urlfilter.hxx" +#include <svl/restrictedpaths.hxx> #include "asyncfilepicker.hxx" #include "OfficeControlAccess.hxx" #include "fpsmartcontent.hxx" diff --git a/fpicker/source/office/iodlg.src b/fpicker/source/office/iodlg.src index 91538d1490..56ab98ac22 100644 --- a/fpicker/source/office/iodlg.src +++ b/fpicker/source/office/iodlg.src @@ -29,7 +29,7 @@ ************************************************************************/ // includes ****************************************************************** -#include "svtools/svtools.hrc" +#include "svl/svtools.hrc" #include "svtools/helpid.hrc" #include "iodlg.hrc" diff --git a/fpicker/source/office/iodlgimp.cxx b/fpicker/source/office/iodlgimp.cxx index 1db6c7eb64..db9a62fc96 100644 --- a/fpicker/source/office/iodlgimp.cxx +++ b/fpicker/source/office/iodlgimp.cxx @@ -43,8 +43,8 @@ #include <vcl/lstbox.hxx> #include <vcl/svapp.hxx> // #97148# --------------- -#include "svtools/ctypeitm.hxx" -#include "svtools/eitem.hxx" +#include "svl/ctypeitm.hxx" +#include "svl/eitem.hxx" #include "unotools/viewoptions.hxx" #include "svtools/fileview.hxx" #include "svtools/inettbc.hxx" @@ -62,7 +62,7 @@ #define _SVSTDARR_STRINGSSORTDTOR #define _SVSTDARR_STRINGSDTOR #define _SVSTDARR_USHORTS -#include "svtools/svstdarr.hxx" +#include "svl/svstdarr.hxx" using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; diff --git a/fpicker/source/office/iodlgimp.hxx b/fpicker/source/office/iodlgimp.hxx index 8d9df32ee9..07ad8af65a 100644 --- a/fpicker/source/office/iodlgimp.hxx +++ b/fpicker/source/office/iodlgimp.hxx @@ -37,7 +37,7 @@ #include <vcl/timer.hxx> #include <vcl/group.hxx> -#include "svtools/svarray.hxx" +#include "svl/svarray.hxx" #include <vector> diff --git a/fpicker/source/unx/gnome/resourceprovider.cxx b/fpicker/source/unx/gnome/resourceprovider.cxx index 9197082b24..04c407b3df 100644 --- a/fpicker/source/unx/gnome/resourceprovider.cxx +++ b/fpicker/source/unx/gnome/resourceprovider.cxx @@ -43,7 +43,7 @@ #include <com/sun/star/ui/dialogs/CommonFilePickerElementIds.hpp> #include <com/sun/star/ui/dialogs/ExtendedFilePickerElementIds.hpp> -#include <svtools/svtools.hrc> +#include <svl/svtools.hrc> #include <svtools/filedlg2.hrc> //------------------------------------------------------------ diff --git a/fpicker/source/unx/kde4/KDE4FilePicker.cxx b/fpicker/source/unx/kde4/KDE4FilePicker.cxx index 70742bc955..a018ddbfd1 100644 --- a/fpicker/source/unx/kde4/KDE4FilePicker.cxx +++ b/fpicker/source/unx/kde4/KDE4FilePicker.cxx @@ -65,7 +65,7 @@ #include <com/sun/star/ui/dialogs/ControlActions.hpp> #include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp> -#include <svtools/svtools.hrc> +#include <svl/svtools.hrc> #include <vos/mutex.hxx> diff --git a/fpicker/source/win32/misc/resourceprovider.cxx b/fpicker/source/win32/misc/resourceprovider.cxx index 803339892a..9f609a7769 100644 --- a/fpicker/source/win32/misc/resourceprovider.cxx +++ b/fpicker/source/win32/misc/resourceprovider.cxx @@ -46,7 +46,7 @@ #include <com/sun/star/ui/dialogs/CommonFilePickerElementIds.hpp> #include <com/sun/star/ui/dialogs/ExtendedFilePickerElementIds.hpp> -#include <svtools/svtools.hrc> +#include <svl/svtools.hrc> //------------------------------------------------------------ // namespace directives diff --git a/framework/inc/classes/protocolhandlercache.hxx b/framework/inc/classes/protocolhandlercache.hxx index d51f5ea3cc..e50fa55e2c 100644 --- a/framework/inc/classes/protocolhandlercache.hxx +++ b/framework/inc/classes/protocolhandlercache.hxx @@ -194,6 +194,7 @@ class HandlerCFGAccess : public ::utl::ConfigItem void setCache(HandlerCache* pCache) {m_pCache = pCache;}; virtual void Notify(const css::uno::Sequence< rtl::OUString >& lPropertyNames); + virtual void Commit(); }; } // namespace framework diff --git a/framework/inc/framework.hrc b/framework/inc/framework.hrc index 068bdd0802..f7d9152ba5 100644 --- a/framework/inc/framework.hrc +++ b/framework/inc/framework.hrc @@ -31,7 +31,7 @@ #ifndef _FRAMEWORK_HRC #define _FRAMEWORK_HRC -#include "svtools/solar.hrc" +#include "svl/solar.hrc" #define RID_FWK_START 260 diff --git a/framework/inc/helper/mischelper.hxx b/framework/inc/helper/mischelper.hxx index 435b87a4f2..1bd908b266 100644 --- a/framework/inc/helper/mischelper.hxx +++ b/framework/inc/helper/mischelper.hxx @@ -36,7 +36,7 @@ #include <com/sun/star/frame/XFrame.hpp>
#include <i18npool/lang.h>
-#include <svtools/languageoptions.hxx>
+#include <svl/languageoptions.hxx>
namespace framework
{
diff --git a/framework/inc/helpid.hrc b/framework/inc/helpid.hrc index 89e80a40ed..71f5253833 100644 --- a/framework/inc/helpid.hrc +++ b/framework/inc/helpid.hrc @@ -32,7 +32,7 @@ // include ------------------------------------------------------------------ -#include <svtools/solar.hrc> +#include <svl/solar.hrc> // Help-Ids ----------------------------------------------------------------- diff --git a/framework/inc/pch/precompiled_framework.hxx b/framework/inc/pch/precompiled_framework.hxx index 5d1d114124..fd211dd81e 100644 --- a/framework/inc/pch/precompiled_framework.hxx +++ b/framework/inc/pch/precompiled_framework.hxx @@ -388,24 +388,24 @@ #include "svtools/framestatuslistener.hxx" #include "svtools/helpopt.hxx" #include "unotools/historyoptions.hxx" -#include "svtools/imageitm.hxx" +#include "svl/imageitm.hxx" #include "svtools/imgdef.hxx" -#include "svtools/inettype.hxx" +#include "svl/inettype.hxx" #include "unotools/internaloptions.hxx" -#include "svtools/lstner.hxx" +#include "svl/lstner.hxx" #include "svtools/menuoptions.hxx" #include "svtools/miscopt.hxx" #include "unotools/moduleoptions.hxx" #include "unotools/pathoptions.hxx" #include "svtools/sfxecode.hxx" -#include "svtools/smplhint.hxx" -#include "svtools/solar.hrc" +#include "svl/smplhint.hxx" +#include "svl/solar.hrc" #include "svtools/statusbarcontroller.hxx" -#include "svtools/svarray.hxx" +#include "svl/svarray.hxx" #include "svtools/svmedit.hxx" #include "svtools/toolboxcontroller.hxx" #include "svtools/transfer.hxx" -#include "svtools/urihelper.hxx" +#include "svl/urihelper.hxx" #include "svtools/xtextedt.hxx" #include "toolkit/awt/vclxmenu.hxx" diff --git a/framework/inc/services/licensedlg.hxx b/framework/inc/services/licensedlg.hxx index 7731455a50..a2a833ec9d 100644 --- a/framework/inc/services/licensedlg.hxx +++ b/framework/inc/services/licensedlg.hxx @@ -42,7 +42,7 @@ #include <vcl/dialog.hxx> #include <vcl/scrbar.hxx> #include <svtools/svmedit.hxx> -#include <svtools/lstner.hxx> +#include <svl/lstner.hxx> namespace framework { diff --git a/framework/inc/services/substitutepathvars.hxx b/framework/inc/services/substitutepathvars.hxx index 675d16ceb3..0c891e6ffb 100644 --- a/framework/inc/services/substitutepathvars.hxx +++ b/framework/inc/services/substitutepathvars.hxx @@ -139,6 +139,7 @@ class SubstitutePathVariables_Impl : public utl::ConfigItem /** is called from the ConfigManager before application ends or from the PropertyChangeListener if the sub tree broadcasts changes. */ virtual void Notify( const com::sun::star::uno::Sequence< rtl::OUString >& aPropertyNames ); + virtual void Commit(); private: // Wrapper methods for low-level functions diff --git a/framework/inc/xml/eventsconfiguration.hxx b/framework/inc/xml/eventsconfiguration.hxx index 5431cf1d58..55f0dfe51f 100644 --- a/framework/inc/xml/eventsconfiguration.hxx +++ b/framework/inc/xml/eventsconfiguration.hxx @@ -31,7 +31,7 @@ #ifndef __FRAMEWORK_XML_EVENTSCONFIGURATION_HXX_ #define __FRAMEWORK_XML_EVENTSCONFIGURATION_HXX_ -#include <svtools/svarray.hxx> +#include <svl/svarray.hxx> #include <tools/string.hxx> #include <tools/stream.hxx> #include <com/sun/star/uno/Sequence.hxx> diff --git a/framework/inc/xml/imagesconfiguration.hxx b/framework/inc/xml/imagesconfiguration.hxx index 624508d1b0..613636009d 100644 --- a/framework/inc/xml/imagesconfiguration.hxx +++ b/framework/inc/xml/imagesconfiguration.hxx @@ -31,7 +31,7 @@ #ifndef __FRAMEWORK_XML_IMAGESCONFIGURATION_HXX_ #define __FRAMEWORK_XML_IMAGESCONFIGURATION_HXX_ -#include <svtools/svarray.hxx> +#include <svl/svarray.hxx> #include <tools/string.hxx> #include <tools/stream.hxx> #include <tools/color.hxx> diff --git a/framework/inc/xml/statusbarconfiguration.hxx b/framework/inc/xml/statusbarconfiguration.hxx index ac65225389..550d1fcbc2 100644 --- a/framework/inc/xml/statusbarconfiguration.hxx +++ b/framework/inc/xml/statusbarconfiguration.hxx @@ -1,7 +1,7 @@ #ifndef __FRAMEWORK_CLASSES_STATUSBARCONFIGURATION_HXX_ #define __FRAMEWORK_CLASSES_STATUSBARCONFIGURATION_HXX_ -#include <svtools/svarray.hxx> +#include <svl/svarray.hxx> #include <tools/string.hxx> #include <tools/stream.hxx> #include <vcl/status.hxx> diff --git a/framework/inc/xml/toolboxconfiguration.hxx b/framework/inc/xml/toolboxconfiguration.hxx index 0c35c46687..f1f0949e4e 100644 --- a/framework/inc/xml/toolboxconfiguration.hxx +++ b/framework/inc/xml/toolboxconfiguration.hxx @@ -1,7 +1,7 @@ #ifndef __FRAMEWORK_XML_TOOLBOXCONFIGURATION_HXX_ #define __FRAMEWORK_XML_TOOLBOXCONFIGURATION_HXX_ -#include <svtools/svarray.hxx> +#include <svl/svarray.hxx> #include <vcl/bitmap.hxx> #include <tools/string.hxx> #include <com/sun/star/io/XInputStream.hpp> diff --git a/framework/source/classes/protocolhandlercache.cxx b/framework/source/classes/protocolhandlercache.cxx index 3a1c4131c5..150cae4f0a 100644 --- a/framework/source/classes/protocolhandlercache.cxx +++ b/framework/source/classes/protocolhandlercache.cxx @@ -357,4 +357,8 @@ void HandlerCFGAccess::Notify(const css::uno::Sequence< rtl::OUString >& /*lProp } } +void HandlerCFGAccess::Commit() +{ +} + } // namespace framework diff --git a/framework/source/services/autorecovery.cxx b/framework/source/services/autorecovery.cxx index f223b85012..660846779e 100644 --- a/framework/source/services/autorecovery.cxx +++ b/framework/source/services/autorecovery.cxx @@ -91,7 +91,7 @@ #include <osl/file.hxx> #include <unotools/bootstrap.hxx> #include <unotools/configmgr.hxx> -#include <svtools/documentlockfile.hxx> +#include <svl/documentlockfile.hxx> #include <tools/urlobj.hxx> diff --git a/framework/source/services/backingcomp.cxx b/framework/source/services/backingcomp.cxx index b769e0a89e..f1deffa53b 100644 --- a/framework/source/services/backingcomp.cxx +++ b/framework/source/services/backingcomp.cxx @@ -75,9 +75,9 @@ #include <rtl/ustrbuf.hxx> #ifndef _SOLAR_HRC -#include <svtools/solar.hrc> +#include <svl/solar.hrc> #endif -#include <svtools/urihelper.hxx> +#include <svl/urihelper.hxx> #include <osl/file.hxx> #include <unotools/configmgr.hxx> diff --git a/framework/source/services/backingwindow.cxx b/framework/source/services/backingwindow.cxx index 55a953fa3d..39f4ab8de3 100644 --- a/framework/source/services/backingwindow.cxx +++ b/framework/source/services/backingwindow.cxx @@ -45,7 +45,7 @@ #include "unotools/dynamicmenuoptions.hxx" #include "svtools/imagemgr.hxx" -#include "svtools/svtools.hrc" +#include "svl/svtools.hrc" #include "comphelper/processfactory.hxx" #include "comphelper/sequenceashashmap.hxx" diff --git a/framework/source/services/mediatypedetectionhelper.cxx b/framework/source/services/mediatypedetectionhelper.cxx index b5b7cfe062..74087a50bb 100644 --- a/framework/source/services/mediatypedetectionhelper.cxx +++ b/framework/source/services/mediatypedetectionhelper.cxx @@ -36,7 +36,7 @@ //_________________________________________________________________________________________________________________ #include <services/mediatypedetectionhelper.hxx> #include <services.h> -#include <svtools/inettype.hxx> +#include <svl/inettype.hxx> #include <tools/string.hxx> #include <rtl/logfile.hxx> diff --git a/framework/source/services/substitutepathvars.cxx b/framework/source/services/substitutepathvars.cxx index ee766efeee..3080f7cd8b 100644 --- a/framework/source/services/substitutepathvars.cxx +++ b/framework/source/services/substitutepathvars.cxx @@ -319,6 +319,11 @@ void SubstitutePathVariables_Impl::Notify( const com::sun::star::uno::Sequence< // NOT implemented yet! } +void SubstitutePathVariables_Impl::Commit() +{ +} + + //_________________________________________________________________________________________________________________ // private methods //_________________________________________________________________________________________________________________ diff --git a/framework/source/uielement/controlmenucontroller.cxx b/framework/source/uielement/controlmenucontroller.cxx index bb33aa6c89..56cbdde695 100644 --- a/framework/source/uielement/controlmenucontroller.cxx +++ b/framework/source/uielement/controlmenucontroller.cxx @@ -62,7 +62,7 @@ #include <rtl/ustrbuf.hxx> #include <rtl/strbuf.hxx> #ifndef _SOLAR_HRC -#include <svtools/solar.hrc> +#include <svl/solar.hrc> #endif #include <tools/rcid.h> #include <vcl/image.hxx> diff --git a/framework/source/uielement/langselectionmenucontroller.cxx b/framework/source/uielement/langselectionmenucontroller.cxx index a2f8ec271a..d91d389931 100644 --- a/framework/source/uielement/langselectionmenucontroller.cxx +++ b/framework/source/uielement/langselectionmenucontroller.cxx @@ -68,7 +68,7 @@ #include <com/sun/star/linguistic2/XLanguageGuessing.hpp> #include <map> #include <i18npool/mslangid.hxx> -#include <svtools/languageoptions.hxx> +#include <svl/languageoptions.hxx> #include <com/sun/star/awt/MenuItemStyle.hpp> #include <svtools/langtab.hxx> #include <classes/fwlresid.hxx> diff --git a/framework/source/uielement/langselectionstatusbarcontroller.cxx b/framework/source/uielement/langselectionstatusbarcontroller.cxx index a99c60a10e..00339698d9 100644 --- a/framework/source/uielement/langselectionstatusbarcontroller.cxx +++ b/framework/source/uielement/langselectionstatusbarcontroller.cxx @@ -71,7 +71,7 @@ #include <toolkit/unohlp.hxx> #include <tools/gen.hxx> #include <com/sun/star/awt/Command.hpp> -#include <svtools/languageoptions.hxx> +#include <svl/languageoptions.hxx> #include <com/sun/star/linguistic2/XLanguageGuessing.hpp> #include <dispatch/uieventloghelper.hxx> diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx index 042b907f81..476e7c8837 100644 --- a/framework/source/uielement/toolbarmanager.cxx +++ b/framework/source/uielement/toolbarmanager.cxx @@ -91,7 +91,7 @@ #endif #include <comphelper/mediadescriptor.hxx> #include <svtools/miscopt.hxx> -#include <svtools/imageitm.hxx> +#include <svl/imageitm.hxx> #include <svtools/framestatuslistener.hxx> #include <vcl/svapp.hxx> #include <vcl/menu.hxx> diff --git a/linguistic/inc/misc.hxx b/linguistic/inc/misc.hxx index 307fd2a16b..5b3f4bffe4 100644 --- a/linguistic/inc/misc.hxx +++ b/linguistic/inc/misc.hxx @@ -50,7 +50,6 @@ #include <unotools/charclass.hxx> #include <osl/thread.h> #include <osl/mutex.hxx> -#include <vcl/svapp.hxx> namespace com { namespace sun { namespace star { namespace beans { class XPropertySet; diff --git a/linguistic/source/convdic.cxx b/linguistic/source/convdic.cxx index dcda5d93df..33e25fd9a6 100644 --- a/linguistic/source/convdic.cxx +++ b/linguistic/source/convdic.cxx @@ -68,7 +68,7 @@ #include "convdic.hxx" -#include "convdicxml.hxx" +//#include "convdicxml.hxx" #include "misc.hxx" #include "defs.hxx" @@ -87,7 +87,7 @@ using namespace linguistic; /////////////////////////////////////////////////////////////////////////// - +#if XML void ReadThroughDic( const String &rMainURL, ConvDicXMLImport &rImport ) { if (rMainURL.Len() == 0) @@ -165,7 +165,7 @@ void ReadThroughDic( const String &rMainURL, ConvDicXMLImport &rImport ) { } } - +#endif BOOL IsConvDic( const String &rFileURL, INT16 &nLang, sal_Int16 &nConvType ) { @@ -186,6 +186,7 @@ BOOL IsConvDic( const String &rFileURL, INT16 &nLang, sal_Int16 &nConvType ) // first argument being 0 should stop the file from being parsed // up to the end (reading all entries) when the required // data (language, conversion type) is found. +#if XML ConvDicXMLImport *pImport = new ConvDicXMLImport( 0, rFileURL ); //!! keep a first reference to ensure the lifetime of the object !! @@ -201,6 +202,7 @@ BOOL IsConvDic( const String &rFileURL, INT16 &nLang, sal_Int16 &nConvType ) nLang = pImport->GetLanguage(); nConvType = pImport->GetConversionType(); } +#endif return bRes; } @@ -266,12 +268,12 @@ void ConvDic::Load() //!! prevent function from being called recursively via HasEntry, AddEntry bNeedEntries = FALSE; - +#if XML ConvDicXMLImport *pImport = new ConvDicXMLImport( this, aMainURL ); //!! keep a first reference to ensure the lifetime of the object !! uno::Reference< XInterface > xRef( (document::XFilter *) pImport, UNO_QUERY ); ReadThroughDic( aMainURL, *pImport ); // will implicitly add the entries - +#endif bIsModified = FALSE; } @@ -326,7 +328,7 @@ void ConvDic::Save() // prepare arguments (prepend doc handler to given arguments) uno::Reference< xml::sax::XDocumentHandler > xDocHandler( xSaxWriter, UNO_QUERY ); - +#if XML ConvDicXMLExport *pExport = new ConvDicXMLExport( *this, aMainURL, xDocHandler ); //!! keep a first(!) reference until everything is done to //!! ensure the proper lifetime of the object @@ -335,6 +337,7 @@ void ConvDic::Save() DBG_ASSERT( !pStream->GetError(), "I/O error while writing to stream" ); if (bRet) bIsModified = FALSE; +#endif } DBG_ASSERT( !bIsModified, "dictionary still modified after save. Save failed?" ); } diff --git a/linguistic/source/convdiclist.cxx b/linguistic/source/convdiclist.cxx index 37967955de..1a6243fa6c 100644 --- a/linguistic/source/convdiclist.cxx +++ b/linguistic/source/convdiclist.cxx @@ -36,7 +36,7 @@ #include <unotools/pathoptions.hxx> #include <unotools/useroptions.hxx> #include <unotools/lingucfg.hxx> -#include <vcl/svapp.hxx> +//#include <vcl/svapp.hxx> #include <rtl/instance.hxx> #include <cppuhelper/factory.hxx> // helper for factories #include <unotools/localfilehelper.hxx> diff --git a/linguistic/source/convdiclist.hxx b/linguistic/source/convdiclist.hxx index 65021041d6..36416d5561 100644 --- a/linguistic/source/convdiclist.hxx +++ b/linguistic/source/convdiclist.hxx @@ -36,7 +36,7 @@ #include <com/sun/star/lang/XServiceInfo.hpp> #include <cppuhelper/implbase3.hxx> #include <cppuhelper/interfacecontainer.h> -#include <svtools/svarray.hxx> +#include <svl/svarray.hxx> #include <tools/debug.hxx> #include "misc.hxx" diff --git a/linguistic/source/convdicxml.hxx b/linguistic/source/convdicxml.hxx index 1ada0a8fb8..86c6aee38b 100644 --- a/linguistic/source/convdicxml.hxx +++ b/linguistic/source/convdicxml.hxx @@ -77,7 +77,7 @@ public: void _ExportAutoStyles() {} void _ExportMasterStyles() {} void _ExportContent(); - sal_uInt32 exportDoc( enum ::xmloff::token::XMLTokenEnum eClass ); +// sal_uInt32 exportDoc( enum ::xmloff::token::XMLTokenEnum eClass ); sal_Bool Export(); }; diff --git a/linguistic/source/gciterator.cxx b/linguistic/source/gciterator.cxx index 94caf22eec..c20ec2c3d3 100644 --- a/linguistic/source/gciterator.cxx +++ b/linguistic/source/gciterator.cxx @@ -63,7 +63,6 @@ #include <cppuhelper/interfacecontainer.h> #include <cppuhelper/extract.hxx> #include <cppuhelper/factory.hxx> -#include <vcl/unohelp.hxx> #include <i18npool/mslangid.hxx> #include <unotools/processfactory.hxx> @@ -790,7 +789,10 @@ sal_Int32 GrammarCheckingIterator::GetSuggestedEndOfSentence( uno::Reference< i18n::XBreakIterator > xBreakIterator; if (!m_xBreakIterator.is()) { - m_xBreakIterator = vcl::unohelper::CreateBreakIterator(); + uno::Reference< lang::XMultiServiceFactory > xMSF = ::comphelper::getProcessServiceFactory(); + if ( xMSF.is() ) + xBreakIterator = uno::Reference < i18n::XBreakIterator >( xMSF->createInstance( + ::rtl::OUString::createFromAscii("com.sun.star.i18n.BreakIterator") ), uno::UNO_QUERY ); } sal_Int32 nTextLen = rText.getLength(); sal_Int32 nEndPosition = nTextLen; diff --git a/linguistic/source/grammarchecker.cxx b/linguistic/source/grammarchecker.cxx index 9cac236ea0..931f9455a0 100644 --- a/linguistic/source/grammarchecker.cxx +++ b/linguistic/source/grammarchecker.cxx @@ -34,7 +34,7 @@ #include <cppuhelper/implbase1.hxx> #include <com/sun/star/linguistic2/XGrammarChecker.hpp> #include <com/sun/star/i18n/XBreakIterator.hpp> -#include <vcl/unohelp.hxx> +//#include <vcl/unohelp.hxx> #include <cppuhelper/implbase4.hxx> #include <com/sun/star/lang/XComponent.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> diff --git a/linguistic/source/hyphdsp.cxx b/linguistic/source/hyphdsp.cxx index 7bc8c343af..2c342a67d2 100644 --- a/linguistic/source/hyphdsp.cxx +++ b/linguistic/source/hyphdsp.cxx @@ -41,7 +41,7 @@ #include <i18npool/lang.h> #include <unotools/localedatawrapper.hxx> #include <tools/debug.hxx> -#include <svtools/lngmisc.hxx> +#include <svl/lngmisc.hxx> #include <unotools/processfactory.hxx> #include <osl/mutex.hxx> diff --git a/linguistic/source/hyphdta.cxx b/linguistic/source/hyphdta.cxx index 34ea7299a9..7a8233d0af 100644 --- a/linguistic/source/hyphdta.cxx +++ b/linguistic/source/hyphdta.cxx @@ -39,7 +39,7 @@ #include <rtl/ustrbuf.hxx> #include <tools/debug.hxx> -#include <svtools/lngmisc.hxx> +#include <svl/lngmisc.hxx> #include <unotools/localedatawrapper.hxx> //using namespace utl; diff --git a/linguistic/source/lngopt.cxx b/linguistic/source/lngopt.cxx index 903afa2448..3b819154e1 100644 --- a/linguistic/source/lngopt.cxx +++ b/linguistic/source/lngopt.cxx @@ -36,7 +36,6 @@ #include "misc.hxx" #include <tools/debug.hxx> #include <unotools/lingucfg.hxx> -#include <vcl/svapp.hxx> #include <uno/lbnames.h> // CPPU_CURRENT_LANGUAGE_BINDING_NAME macro, which specify the environment type #include <cppuhelper/implbase1.hxx> // helper for implementations diff --git a/linguistic/source/lngopt.hxx b/linguistic/source/lngopt.hxx index 63a4f63a98..695df4ac6c 100644 --- a/linguistic/source/lngopt.hxx +++ b/linguistic/source/lngopt.hxx @@ -42,15 +42,15 @@ #include <com/sun/star/beans/XPropertyAccess.hpp> #include <com/sun/star/lang/XComponent.hpp> #include <unotools/lingucfg.hxx> -#include <svtools/itemprop.hxx> +#include <svl/itemprop.hxx> #include <unotools/configitem.hxx> #include <com/sun/star/uno/Any.h> #include <tools/solar.h> -#include <vcl/timer.hxx> -#include <svtools/itemprop.hxx> +#include <svl/itemprop.hxx> #include "misc.hxx" #include "defs.hxx" +#include <vos/refernce.hxx> namespace com { namespace sun { namespace star { namespace beans { diff --git a/linguistic/source/lngsvcmgr.cxx b/linguistic/source/lngsvcmgr.cxx index e5d9a39d19..64de21260c 100644 --- a/linguistic/source/lngsvcmgr.cxx +++ b/linguistic/source/lngsvcmgr.cxx @@ -288,7 +288,7 @@ class LngSvcMgrListenerHelper : > { LngSvcMgr &rMyManager; - Timer aLaunchTimer; +// Timer aLaunchTimer; //cppu::OMultiTypeInterfaceContainerHelper aListeners; ::cppu::OInterfaceContainerHelper aLngSvcMgrListeners; @@ -304,7 +304,8 @@ class LngSvcMgrListenerHelper : void LaunchEvent( INT16 nLngSvcEvtFlags ); - DECL_LINK( TimeOut, Timer* ); +// DECL_LINK( TimeOut, Timer* ); + long Timeout(); public: LngSvcMgrListenerHelper( LngSvcMgr &rLngSvcMgr, @@ -363,8 +364,8 @@ LngSvcMgrListenerHelper::LngSvcMgrListenerHelper( //! listeners, and each of them is launching an event of it's own!) //! Thus this behaviour is necessary to avoid unecessary actions of //! this objects listeners! - aLaunchTimer.SetTimeout( 2000 ); - aLaunchTimer.SetTimeoutHdl( LINK( this, LngSvcMgrListenerHelper, TimeOut ) ); +// aLaunchTimer.SetTimeout( 2000 ); +// aLaunchTimer.SetTimeoutHdl( LINK( this, LngSvcMgrListenerHelper, TimeOut ) ); nCombinedLngSvcEvt = 0; } @@ -385,11 +386,12 @@ void SAL_CALL LngSvcMgrListenerHelper::disposing( const lang::EventObject& rSour } -IMPL_LINK( LngSvcMgrListenerHelper, TimeOut, Timer*, pTimer ) +//IMPL_LINK( LngSvcMgrListenerHelper, TimeOut, Timer*, pTimer ) +long LngSvcMgrListenerHelper::Timeout() { osl::MutexGuard aGuard( GetLinguMutex() ); - if (&aLaunchTimer == pTimer) +// if (&aLaunchTimer == pTimer) { // change event source to LinguServiceManager since the listeners // probably do not know (and need not to know) about the specific @@ -416,7 +418,8 @@ IMPL_LINK( LngSvcMgrListenerHelper, TimeOut, Timer*, pTimer ) void LngSvcMgrListenerHelper::AddLngSvcEvt( INT16 nLngSvcEvt ) { nCombinedLngSvcEvt |= nLngSvcEvt; - aLaunchTimer.Start(); +// aLaunchTimer.Start(); + Timeout(); } diff --git a/linguistic/source/lngsvcmgr.hxx b/linguistic/source/lngsvcmgr.hxx index 1c96adea46..7ee9ad0ba6 100644 --- a/linguistic/source/lngsvcmgr.hxx +++ b/linguistic/source/lngsvcmgr.hxx @@ -43,7 +43,7 @@ #include <com/sun/star/linguistic2/XAvailableLocales.hpp> #include <unotools/configitem.hxx> -#include <vcl/timer.hxx> +//#include <vcl/timer.hxx> #include "misc.hxx" #include "defs.hxx" diff --git a/linguistic/source/makefile.mk b/linguistic/source/makefile.mk index ccc9d1343f..6db2fae4da 100644 --- a/linguistic/source/makefile.mk +++ b/linguistic/source/makefile.mk @@ -41,10 +41,12 @@ ENABLE_EXCEPTIONS=TRUE # --- Files -------------------------------------------------------- +# $(SLO)$/convdicxml.obj\ + + SLOFILES = \ $(SLO)$/convdiclist.obj\ $(SLO)$/convdic.obj\ - $(SLO)$/convdicxml.obj\ $(SLO)$/dicimp.obj\ $(SLO)$/dlistimp.obj\ $(SLO)$/hhconvdic.obj\ @@ -72,14 +74,14 @@ SHL1STDLIBS= \ $(VOSLIB) \ $(TOOLSLIB) \ $(I18NISOLANGLIB) \ - $(SVTOOLLIB) \ - $(SVLLIB) \ - $(VCLLIB) \ + $(SVLLIB) \ $(SALLIB) \ $(UCBHELPERLIB) \ $(UNOTOOLSLIB) \ - $(XMLOFFLIB) \ $(ICUUCLIB) + +# $(VCLLIB) \ +# $(XMLOFFLIB) \ # build DLL SHL1LIBS= $(SLB)$/$(TARGET).lib diff --git a/linguistic/source/misc.cxx b/linguistic/source/misc.cxx index d54a5b278a..b45e4eca3f 100644 --- a/linguistic/source/misc.cxx +++ b/linguistic/source/misc.cxx @@ -34,7 +34,7 @@ #include <tools/fsys.hxx> #include <tools/debug.hxx> #include <unotools/pathoptions.hxx> -#include <svtools/lngmisc.hxx> +#include <svl/lngmisc.hxx> #include <ucbhelper/content.hxx> #include <i18npool/mslangid.hxx> #include <com/sun/star/ucb/XCommandEnvironment.hpp> @@ -52,6 +52,7 @@ #include <com/sun/star/linguistic2/XSearchableDictionaryList.hpp> #include <unotools/processfactory.hxx> #include <unotools/localedatawrapper.hxx> +#include <unotools/syslocale.hxx> #include <rtl/instance.hxx> @@ -59,7 +60,7 @@ #include "defs.hxx" #include "lngprops.hxx" #include "hyphdta.hxx" - +#include <i18npool/mslangid.hxx> using namespace utl; using namespace osl; @@ -92,7 +93,7 @@ LocaleDataWrapper & GetLocaleDataWrapper( INT16 nLang ) { static LocaleDataWrapper aLclDtaWrp( getProcessServiceFactory(), - CreateLocale( Application::GetSettings().GetUILanguage() ) ); + CreateLocale( SvtSysLocale().GetUILanguage() ) ); const Locale &rLcl = aLclDtaWrp.getLoadedLocale(); Locale aLcl( CreateLocale( nLang ) ); diff --git a/linguistic/source/spelldsp.cxx b/linguistic/source/spelldsp.cxx index e88a509ccb..2c3c557109 100644 --- a/linguistic/source/spelldsp.cxx +++ b/linguistic/source/spelldsp.cxx @@ -40,7 +40,7 @@ #include <unotools/localedatawrapper.hxx> #include <unotools/processfactory.hxx> #include <tools/debug.hxx> -#include <svtools/lngmisc.hxx> +#include <svl/lngmisc.hxx> #include <osl/mutex.hxx> #include <vector> diff --git a/linguistic/source/thesdsp.cxx b/linguistic/source/thesdsp.cxx index 9ba9f9f9ce..9310b5e213 100644 --- a/linguistic/source/thesdsp.cxx +++ b/linguistic/source/thesdsp.cxx @@ -32,7 +32,7 @@ #include "precompiled_linguistic.hxx" #include <i18npool/lang.h> #include <tools/debug.hxx> -#include <svtools/lngmisc.hxx> +#include <svl/lngmisc.hxx> #include <cppuhelper/factory.hxx> // helper for factories #include <com/sun/star/registry/XRegistryKey.hpp> diff --git a/sfx2/inc/arrdecl.hxx b/sfx2/inc/arrdecl.hxx index faff7e0234..6bd705ecf3 100644 --- a/sfx2/inc/arrdecl.hxx +++ b/sfx2/inc/arrdecl.hxx @@ -31,7 +31,7 @@ #define _SFX_ARRDECL_HXX #include <tools/list.hxx> -#include <svtools/svarray.hxx> +#include <svl/svarray.hxx> #include <sfx2/minarray.hxx> struct CntUpdateResult; diff --git a/sfx2/inc/minfitem.hxx b/sfx2/inc/minfitem.hxx index ce7b0aeaaa..a5423b8784 100644 --- a/sfx2/inc/minfitem.hxx +++ b/sfx2/inc/minfitem.hxx @@ -33,7 +33,7 @@ #include "sal/config.h" #include "sfx2/dllapi.h" #include <tools/string.hxx> -#include <svtools/poolitem.hxx> +#include <svl/poolitem.hxx> class BasicManager; class SFX2_DLLPUBLIC SfxMacroInfoItem: public SfxPoolItem diff --git a/sfx2/inc/msgnodei.hxx b/sfx2/inc/msgnodei.hxx index c26b5e2e8f..b3256bc789 100644 --- a/sfx2/inc/msgnodei.hxx +++ b/sfx2/inc/msgnodei.hxx @@ -32,9 +32,9 @@ #define _MSGNODEI_HXX -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> #include <tools/string.hxx> -#include <svtools/poolitem.hxx> +#include <svl/poolitem.hxx> #include <tools/list.hxx> struct SfxMsgAttachFile { String aFile; diff --git a/sfx2/inc/orgmgr.hxx b/sfx2/inc/orgmgr.hxx index ac29d513cc..d8234f8edd 100644 --- a/sfx2/inc/orgmgr.hxx +++ b/sfx2/inc/orgmgr.hxx @@ -30,7 +30,7 @@ #ifndef _SFX_ORGMGR_HXX #define _SFX_ORGMGR_HXX -#include <svtools/svarray.hxx> +#include <svl/svarray.hxx> class SfxDocumentTemplates; class SfxOrganizeListBox_Impl; diff --git a/sfx2/inc/pch/precompiled_sfx2.hxx b/sfx2/inc/pch/precompiled_sfx2.hxx index 07483990a6..4970d67cf5 100644 --- a/sfx2/inc/pch/precompiled_sfx2.hxx +++ b/sfx2/inc/pch/precompiled_sfx2.hxx @@ -493,104 +493,104 @@ #include "sot/storinfo.hxx" #include "svtools/accessibilityoptions.hxx" #include "svtools/addxmltostorageoptions.hxx" -#include "svtools/adrparse.hxx" -#include "svtools/aeitem.hxx" +#include "unotools/adrparse.hxx" +#include "svl/aeitem.hxx" #include "svtools/asynclink.hxx" -#include "svtools/brdcst.hxx" -#include "svtools/cancel.hxx" -#include "svtools/cntwids.hrc" +#include "svl/brdcst.hxx" +#include "svl/cancel.hxx" +#include "svl/cntwids.hrc" #include "svtools/controldims.hrc" #include "svtools/cstitem.hxx" -#include "svtools/ctypeitm.hxx" +#include "svl/ctypeitm.hxx" #include "svtools/dateitem.hxx" #include "unotools/dynamicmenuoptions.hxx" #include "svtools/ehdl.hxx" -#include "svtools/eitem.hxx" +#include "svl/eitem.hxx" #include "svtools/embedhlp.hxx" #include "svtools/embedtransfer.hxx" #include "unotools/eventcfg.hxx" #include "unotools/extendedsecurityoptions.hxx" -#include "svtools/flagitem.hxx" -#include "svtools/folderrestriction.hxx" +#include "svl/flagitem.hxx" +#include "svl/folderrestriction.hxx" #include "unotools/fontoptions.hxx" #include "svtools/framestatuslistener.hxx" #include "svtools/helpopt.hxx" -#include "svtools/hint.hxx" +#include "svl/hint.hxx" #include "unotools/historyoptions.hxx" #include "svtools/htmlkywd.hxx" #include "svtools/htmltokn.h" -#include "svtools/imageitm.hxx" +#include "svl/imageitm.hxx" #include "svtools/imagemgr.hxx" #include "svtools/imap.hxx" #include "svtools/imgdef.hxx" -#include "svtools/inetdef.hxx" -#include "svtools/inethist.hxx" -#include "svtools/inetmsg.hxx" +#include "svl/inetdef.hxx" +#include "svl/inethist.hxx" +#include "svl/inetmsg.hxx" #include "unotools/inetoptions.hxx" -#include "svtools/inetstrm.hxx" -#include "svtools/inettype.hxx" +#include "svl/inetstrm.hxx" +#include "svl/inettype.hxx" #include "unotools/internaloptions.hxx" -#include "svtools/intitem.hxx" -#include "svtools/isethint.hxx" +#include "svl/intitem.hxx" +#include "svl/isethint.hxx" #include "svtools/itemdel.hxx" -#include "svtools/itemiter.hxx" -#include "svtools/itempool.hxx" -#include "svtools/itemprop.hxx" -#include "svtools/itemset.hxx" +#include "svl/itemiter.hxx" +#include "svl/itempool.hxx" +#include "svl/itemprop.hxx" +#include "svl/itemset.hxx" #include "svtools/javacontext.hxx" -#include "svtools/lckbitem.hxx" +#include "svl/lckbitem.hxx" #include "unotools/localisationoptions.hxx" #include "svtools/localresaccess.hxx" -#include "svtools/lstner.hxx" -#include "svtools/memberid.hrc" +#include "svl/lstner.hxx" +#include "svl/memberid.hrc" #include "svtools/menuoptions.hxx" -#include "svtools/misccfg.hxx" +#include "unotools/misccfg.hxx" #include "svtools/miscopt.hxx" #include "unotools/moduleoptions.hxx" -#include "svtools/ownlist.hxx" +#include "svl/ownlist.hxx" #include "svtools/parhtml.hxx" #include "unotools/pathoptions.hxx" -#include "svtools/pickerhelper.hxx" -#include "svtools/poolitem.hxx" +#include "svl/pickerhelper.hxx" +#include "svl/poolitem.hxx" #include "svtools/printoptions.hxx" #include "unotools/printwarningoptions.hxx" -#include "svtools/rectitem.hxx" +#include "svl/rectitem.hxx" #include "unotools/regoptions.hxx" #include "unotools/saveopt.hxx" #include "unotools/searchopt.hxx" #include "unotools/securityoptions.hxx" #include "svtools/sfxecode.hxx" -#include "svtools/slstitm.hxx" -#include "svtools/smplhint.hxx" +#include "svl/slstitm.hxx" +#include "svl/smplhint.hxx" #include "svtools/soerr.hxx" -#include "svtools/solar.hrc" +#include "svl/solar.hrc" #include "unotools/startoptions.hxx" #include "svtools/statusbarcontroller.hxx" -#include "svtools/stritem.hxx" -#include "svtools/style.hrc" -#include "svtools/style.hxx" -#include "svtools/svarray.hxx" -#include "svtools/svdde.hxx" -#include "svtools/svstdarr.hxx" +#include "svl/stritem.hxx" +#include "svl/style.hrc" +#include "svl/style.hxx" +#include "svl/svarray.hxx" +#include "svl/svdde.hxx" +#include "svl/svstdarr.hxx" #include "svtools/svtdata.hxx" -#include "svtools/svtools.hrc" -#include "svtools/syslocale.hxx" -#include "svtools/syslocaleoptions.hxx" -#include "svtools/szitem.hxx" +#include "svl/svtools.hrc" +#include "unotools/syslocale.hxx" +#include "unotools/syslocaleoptions.hxx" +#include "svl/szitem.hxx" #include "svtools/templatefoldercache.hxx" #include "svtools/toolboxcontroller.hxx" #include "svtools/transfer.hxx" #include "svtools/ttprops.hxx" -#include "svtools/undo.hxx" +#include "svl/undo.hxx" #include "unotools/undoopt.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 "unotools/workingsetoptions.hxx" -#include "svtools/zforlist.hxx" +#include "svl/zforlist.hxx" #include "toolkit/awt/vclxwindow.hxx" #include "toolkit/helper/convert.hxx" #include "tools/bigint.hxx" diff --git a/sfx2/inc/sfx2/app.hxx b/sfx2/inc/sfx2/app.hxx index 39dde5cdc6..d30fd07cac 100644 --- a/sfx2/inc/sfx2/app.hxx +++ b/sfx2/inc/sfx2/app.hxx @@ -34,8 +34,8 @@ #include "sfx2/dllapi.h" #include "sal/types.h" #include <tools/solar.h> -#include <svtools/smplhint.hxx> -#include <svtools/poolitem.hxx> +#include <svl/smplhint.hxx> +#include <svl/poolitem.hxx> #include <tools/ref.hxx> #include <com/sun/star/uno/Reference.hxx> #include <com/sun/star/script/XLibraryContainer.hpp> @@ -94,7 +94,6 @@ class SfxModule; class SfxModuleArr_Impl; class Window; class INetURLObject; -class SfxMiscCfg; struct SfxConstant; struct SfxChildWinFactory; struct SfxMenuCtrlFactory; @@ -229,7 +228,6 @@ public: USHORT GetFreeIndex(); void ReleaseIndex(USHORT i); SfxEventConfiguration* GetEventConfig() const; - SfxMiscCfg* GetMiscConfig(); // Basic/Scripting static sal_Bool IsXScriptURL( const String& rScriptURL ); diff --git a/sfx2/inc/sfx2/appuno.hxx b/sfx2/inc/sfx2/appuno.hxx index bfdd1a2ea9..9a331ad46a 100644 --- a/sfx2/inc/sfx2/appuno.hxx +++ b/sfx2/inc/sfx2/appuno.hxx @@ -65,9 +65,9 @@ // something else header //____________________________________________________________________________________________________________________________________ #include <tools/errcode.hxx> -#include <svtools/svarray.hxx> +#include <svl/svarray.hxx> #define _SVSTDARR_STRINGSDTOR -#include <svtools/svstdarr.hxx> +#include <svl/svstdarr.hxx> #include <sfx2/sfxuno.hxx> //____________________________________________________________________________________________________________________________________ diff --git a/sfx2/inc/sfx2/cntids.hrc b/sfx2/inc/sfx2/cntids.hrc index e73b65afc1..984925d95e 100644 --- a/sfx2/inc/sfx2/cntids.hrc +++ b/sfx2/inc/sfx2/cntids.hrc @@ -32,11 +32,11 @@ #define _CNTIDS_HRC #ifndef _CNTWIDS_HRC -#include <svtools/cntwids.hrc> +#include <svl/cntwids.hrc> #endif #ifndef _SOLAR_HRC -#include <svtools/solar.hrc> +#include <svl/solar.hrc> #endif // Slot-ID's ----------------------------------------------------------------- diff --git a/sfx2/inc/sfx2/ctrlitem.hxx b/sfx2/inc/sfx2/ctrlitem.hxx index 01582644bc..2f40d77ac9 100644 --- a/sfx2/inc/sfx2/ctrlitem.hxx +++ b/sfx2/inc/sfx2/ctrlitem.hxx @@ -33,7 +33,7 @@ #include "sal/config.h" #include "sfx2/dllapi.h" #include "sal/types.h" -#include <svtools/poolitem.hxx> +#include <svl/poolitem.hxx> class SfxPoolItem; class SfxBindings; diff --git a/sfx2/inc/sfx2/dinfdlg.hxx b/sfx2/inc/sfx2/dinfdlg.hxx index ce84acd12a..3fb4174f57 100644 --- a/sfx2/inc/sfx2/dinfdlg.hxx +++ b/sfx2/inc/sfx2/dinfdlg.hxx @@ -37,15 +37,15 @@ #include <vcl/edit.hxx> #include <vcl/field.hxx> #include <svtools/stdctrl.hxx> -#include <svtools/stritem.hxx> +#include <svl/stritem.hxx> #include <svtools/svmedit.hxx> #include <vcl/edit.hxx> #include <vcl/lstbox.hxx> #include <vcl/scrbar.hxx> #include <svtools/headbar.hxx> -#include <svtools/syslocale.hxx> -#include <svtools/zforlist.hxx> +#include <unotools/syslocale.hxx> +#include <svl/zforlist.hxx> #include "tabdlg.hxx" diff --git a/sfx2/inc/sfx2/dispatch.hxx b/sfx2/inc/sfx2/dispatch.hxx index f126da5341..9a13785e20 100644 --- a/sfx2/inc/sfx2/dispatch.hxx +++ b/sfx2/inc/sfx2/dispatch.hxx @@ -37,7 +37,7 @@ #include <stdarg.h> #define _SVSTDARR_USHORTS -#include <svtools/svstdarr.hxx> // SvUShorts +#include <svl/svstdarr.hxx> // SvUShorts #include <sfx2/bindings.hxx> #include <sfx2/viewfrm.hxx> diff --git a/sfx2/inc/sfx2/docfile.hxx b/sfx2/inc/sfx2/docfile.hxx index ad63ad325c..38fba3e5b8 100644 --- a/sfx2/inc/sfx2/docfile.hxx +++ b/sfx2/inc/sfx2/docfile.hxx @@ -48,10 +48,10 @@ #include <tools/stream.hxx> #include <tools/string.hxx> #include <tools/list.hxx> -#include <svtools/lstner.hxx> +#include <svl/lstner.hxx> #include <tools/globname.hxx> -#include <svtools/cancel.hxx> +#include <svl/cancel.hxx> #include <cppuhelper/weak.hxx> #include <ucbhelper/content.hxx> diff --git a/sfx2/inc/sfx2/event.hxx b/sfx2/inc/sfx2/event.hxx index f0b5903be3..217e5910c1 100644 --- a/sfx2/inc/sfx2/event.hxx +++ b/sfx2/inc/sfx2/event.hxx @@ -33,7 +33,7 @@ #include "sal/config.h" #include "sfx2/dllapi.h" #include <tools/string.hxx> -#include <svtools/hint.hxx> +#include <svl/hint.hxx> #include <unotools/eventcfg.hxx> #include <rtl/ustring.hxx> diff --git a/sfx2/inc/sfx2/evntconf.hxx b/sfx2/inc/sfx2/evntconf.hxx index d228f4e4d6..e9001ca642 100644 --- a/sfx2/inc/sfx2/evntconf.hxx +++ b/sfx2/inc/sfx2/evntconf.hxx @@ -38,7 +38,7 @@ #include <vcl/button.hxx> #define _SVSTDARR_USHORTS -#include <svtools/svstdarr.hxx> // SvUShorts +#include <svl/svstdarr.hxx> // SvUShorts #include <sfx2/event.hxx> #include <sfx2/sfxsids.hrc> @@ -46,7 +46,7 @@ #undef ITEMID_MACRO #endif #define ITEMID_MACRO SID_ATTR_MACROITEM -#include <svtools/macitem.hxx> +#include <svl/macitem.hxx> class SfxMacroInfo; class SfxMacroInfoArr_Impl; diff --git a/sfx2/inc/sfx2/fcontnr.hxx b/sfx2/inc/sfx2/fcontnr.hxx index cfed48aa73..b22f1137d7 100644 --- a/sfx2/inc/sfx2/fcontnr.hxx +++ b/sfx2/inc/sfx2/fcontnr.hxx @@ -36,7 +36,7 @@ #include <com/sun/star/uno/Sequence.hxx> #include <com/sun/star/beans/NamedValue.hpp> #include <com/sun/star/container/XNameAccess.hpp> -#include <svtools/poolitem.hxx> +#include <svl/poolitem.hxx> #include <vcl/window.hxx> #include <sfx2/docfilt.hxx> diff --git a/sfx2/inc/sfx2/frame.hxx b/sfx2/inc/sfx2/frame.hxx index c536e7d966..210b0c4a5a 100644 --- a/sfx2/inc/sfx2/frame.hxx +++ b/sfx2/inc/sfx2/frame.hxx @@ -68,9 +68,9 @@ namespace com #include <tools/link.hxx> #include <tools/ref.hxx> #include <tools/string.hxx> -#include <svtools/brdcst.hxx> +#include <svl/brdcst.hxx> #include <tools/list.hxx> -#include <svtools/poolitem.hxx> +#include <svl/poolitem.hxx> class SvBorder; class SfxWorkWindow; diff --git a/sfx2/inc/sfx2/frmdescr.hxx b/sfx2/inc/sfx2/frmdescr.hxx index 1ebf31042b..9de4ab3dc3 100644 --- a/sfx2/inc/sfx2/frmdescr.hxx +++ b/sfx2/inc/sfx2/frmdescr.hxx @@ -34,10 +34,10 @@ #include "sfx2/dllapi.h" #include <sfx2/sfxsids.hrc> -#include <svtools/poolitem.hxx> +#include <svl/poolitem.hxx> #include <tools/urlobj.hxx> #include <tools/string.hxx> -#include <svtools/svarray.hxx> +#include <svl/svarray.hxx> #include <tools/gen.hxx> class SvStream; diff --git a/sfx2/inc/sfx2/itemwrapper.hxx b/sfx2/inc/sfx2/itemwrapper.hxx index 738f1039bc..d7f05ae699 100644 --- a/sfx2/inc/sfx2/itemwrapper.hxx +++ b/sfx2/inc/sfx2/itemwrapper.hxx @@ -33,10 +33,10 @@ #include "sal/config.h" #include "sfx2/dllapi.h" -#include <svtools/eitem.hxx> -#include <svtools/stritem.hxx> -#include <svtools/intitem.hxx> -#include <svtools/itemset.hxx> +#include <svl/eitem.hxx> +#include <svl/stritem.hxx> +#include <svl/intitem.hxx> +#include <svl/itemset.hxx> // ============================================================================ diff --git a/sfx2/inc/sfx2/linkmgr.hxx b/sfx2/inc/sfx2/linkmgr.hxx index de41985a07..bf79f78569 100644 --- a/sfx2/inc/sfx2/linkmgr.hxx +++ b/sfx2/inc/sfx2/linkmgr.hxx @@ -34,7 +34,7 @@ #include "sfx2/dllapi.h" #include <sfx2/linksrc.hxx> #include <tools/string.hxx> -#include <svtools/svarray.hxx> +#include <svl/svarray.hxx> class SfxObjectShell; diff --git a/sfx2/inc/sfx2/macrconf.hxx b/sfx2/inc/sfx2/macrconf.hxx index 02327edd81..35db4e8cd2 100644 --- a/sfx2/inc/sfx2/macrconf.hxx +++ b/sfx2/inc/sfx2/macrconf.hxx @@ -35,7 +35,7 @@ #include "sal/types.h" #include <tools/errcode.hxx> #define _SVSTDARR_USHORTS -#include <svtools/svstdarr.hxx> // SvUShorts +#include <svl/svstdarr.hxx> // SvUShorts #include <sfx2/evntconf.hxx> class SfxMacroInfo; diff --git a/sfx2/inc/sfx2/macropg.hxx b/sfx2/inc/sfx2/macropg.hxx index 9bb03415bd..c1a02a3855 100644 --- a/sfx2/inc/sfx2/macropg.hxx +++ b/sfx2/inc/sfx2/macropg.hxx @@ -35,7 +35,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/sfx2/inc/sfx2/msgpool.hxx b/sfx2/inc/sfx2/msgpool.hxx index 741f79008f..9b14354e17 100644 --- a/sfx2/inc/sfx2/msgpool.hxx +++ b/sfx2/inc/sfx2/msgpool.hxx @@ -36,7 +36,7 @@ #include <sfx2/msg.hxx> #include <tools/string.hxx> -#include <svtools/svarray.hxx> +#include <svl/svarray.hxx> class SfxInterface; class SfxSlot; diff --git a/sfx2/inc/sfx2/objitem.hxx b/sfx2/inc/sfx2/objitem.hxx index b4f359d9a3..98bb320569 100644 --- a/sfx2/inc/sfx2/objitem.hxx +++ b/sfx2/inc/sfx2/objitem.hxx @@ -32,7 +32,7 @@ #include "sal/config.h" #include "sfx2/dllapi.h" -#include <svtools/poolitem.hxx> +#include <svl/poolitem.hxx> #include <sfx2/shell.hxx> diff --git a/sfx2/inc/sfx2/objsh.hxx b/sfx2/inc/sfx2/objsh.hxx index d9996b0d4b..32a242223a 100644 --- a/sfx2/inc/sfx2/objsh.hxx +++ b/sfx2/inc/sfx2/objsh.hxx @@ -58,7 +58,7 @@ //#if 0 // _SOLAR__PRIVATE #include <vcl/timer.hxx> //#endif -#include <svtools/poolitem.hxx> +#include <svl/poolitem.hxx> #include <vcl/timer.hxx> #include <vcl/bitmap.hxx> #include <sot/storage.hxx> diff --git a/sfx2/inc/sfx2/objuno.hxx b/sfx2/inc/sfx2/objuno.hxx index 74083423b1..03969bcebf 100644 --- a/sfx2/inc/sfx2/objuno.hxx +++ b/sfx2/inc/sfx2/objuno.hxx @@ -51,7 +51,7 @@ #include <com/sun/star/io/IOException.hpp> -#include <svtools/itemprop.hxx> +#include <svl/itemprop.hxx> #include <cppuhelper/implbase10.hxx> #include "sfxuno.hxx" diff --git a/sfx2/inc/sfx2/querystatus.hxx b/sfx2/inc/sfx2/querystatus.hxx index 9f7e0e910a..e205f67d7b 100644 --- a/sfx2/inc/sfx2/querystatus.hxx +++ b/sfx2/inc/sfx2/querystatus.hxx @@ -33,7 +33,7 @@ #include "sal/config.h" #include "sfx2/dllapi.h" -#include <svtools/poolitem.hxx> +#include <svl/poolitem.hxx> #include <cppuhelper/weak.hxx> #include <osl/conditn.hxx> #include <com/sun/star/frame/FeatureStateEvent.hpp> diff --git a/sfx2/inc/sfx2/request.hxx b/sfx2/inc/sfx2/request.hxx index 5ec41cd73c..5aba53bfd6 100644 --- a/sfx2/inc/sfx2/request.hxx +++ b/sfx2/inc/sfx2/request.hxx @@ -33,8 +33,8 @@ #include "sal/config.h" #include "sfx2/dllapi.h" #include "sal/types.h" -#include <svtools/itemset.hxx> -#include <svtools/hint.hxx> +#include <svl/itemset.hxx> +#include <svl/hint.hxx> #include <com/sun/star/uno/Sequence.hxx> #include <com/sun/star/beans/PropertyValue.hpp> diff --git a/sfx2/inc/sfx2/sfx.hrc b/sfx2/inc/sfx2/sfx.hrc index ce6b09adbb..45669204cf 100644 --- a/sfx2/inc/sfx2/sfx.hrc +++ b/sfx2/inc/sfx2/sfx.hrc @@ -33,11 +33,11 @@ // include --------------------------------------------------------------- #ifndef _SOLAR_HRC -#include <svtools/solar.hrc> +#include <svl/solar.hrc> #endif #ifndef _MEMBERID_HRC -#include <svtools/memberid.hrc> +#include <svl/memberid.hrc> #endif #define RID_GROUPS_OFFSET 32000 diff --git a/sfx2/inc/sfx2/sfxbasemodel.hxx b/sfx2/inc/sfx2/sfxbasemodel.hxx index e6d68889e4..93a7d1fb37 100644 --- a/sfx2/inc/sfx2/sfxbasemodel.hxx +++ b/sfx2/inc/sfx2/sfxbasemodel.hxx @@ -103,7 +103,7 @@ // include of my own project //________________________________________________________________________________________________________ -#include <svtools/lstner.hxx> +#include <svl/lstner.hxx> //________________________________________________________________________________________________________ // defines diff --git a/sfx2/inc/sfx2/sfxhtml.hxx b/sfx2/inc/sfx2/sfxhtml.hxx index 811db2f4db..ae8e3d0ea0 100644 --- a/sfx2/inc/sfx2/sfxhtml.hxx +++ b/sfx2/inc/sfx2/sfxhtml.hxx @@ -36,7 +36,7 @@ #include "sal/types.h" #include <i18npool/lang.h> #include <svtools/parhtml.hxx> -#include <svtools/macitem.hxx> +#include <svl/macitem.hxx> class ImageMap; diff --git a/sfx2/inc/sfx2/sfxsids.hrc b/sfx2/inc/sfx2/sfxsids.hrc index 09a9849d7c..6ce92380ee 100644 --- a/sfx2/inc/sfx2/sfxsids.hrc +++ b/sfx2/inc/sfx2/sfxsids.hrc @@ -33,7 +33,7 @@ // include --------------------------------------------------------------- #ifndef _SOLAR_HRC -#include <svtools/solar.hrc> +#include <svl/solar.hrc> #endif #define SID_SFX_START 5000 diff --git a/sfx2/inc/sfx2/sfxstatuslistener.hxx b/sfx2/inc/sfx2/sfxstatuslistener.hxx index 57f3beb7dd..fc0c800071 100644 --- a/sfx2/inc/sfx2/sfxstatuslistener.hxx +++ b/sfx2/inc/sfx2/sfxstatuslistener.hxx @@ -33,7 +33,7 @@ #include "sal/config.h" #include "sfx2/dllapi.h" -#include <svtools/poolitem.hxx> +#include <svl/poolitem.hxx> #include <cppuhelper/weak.hxx> #include <osl/conditn.hxx> #include <com/sun/star/frame/FeatureStateEvent.hpp> diff --git a/sfx2/inc/sfx2/shell.hxx b/sfx2/inc/sfx2/shell.hxx index 154cef1257..ba16f98f2c 100644 --- a/sfx2/inc/sfx2/shell.hxx +++ b/sfx2/inc/sfx2/shell.hxx @@ -36,7 +36,7 @@ #include <com/sun/star/embed/VerbDescriptor.hpp> #include <tools/debug.hxx> #include <tools/rtti.hxx> -#include <svtools/brdcst.hxx> +#include <svl/brdcst.hxx> #include <tools/ownlist.hxx> #include <tools/unqid.hxx> diff --git a/sfx2/inc/sfx2/srchitem.hxx b/sfx2/inc/sfx2/srchitem.hxx index 373c0b4e85..b8df62e0c6 100644 --- a/sfx2/inc/sfx2/srchitem.hxx +++ b/sfx2/inc/sfx2/srchitem.hxx @@ -39,7 +39,7 @@ #include <unotools/configitem.hxx> #include <rsc/rscsfx.hxx> #include <tools/string.hxx> -#include <svtools/poolitem.hxx> +#include <svl/poolitem.hxx> #include <sfx2/msg.hxx> #include <sfx2/srchdefs.hxx> @@ -112,6 +112,7 @@ public: // ConfigItem virtual void Notify( const com::sun::star::uno::Sequence< rtl::OUString > &rPropertyNames ); + virtual void Commit(); sal_uInt16 GetCommand() const { return nCommand; } void SetCommand(sal_uInt16 nNewCommand) { nCommand = nNewCommand; } diff --git a/sfx2/inc/sfx2/tabdlg.hxx b/sfx2/inc/sfx2/tabdlg.hxx index ca312124e7..050b135486 100644 --- a/sfx2/inc/sfx2/tabdlg.hxx +++ b/sfx2/inc/sfx2/tabdlg.hxx @@ -37,8 +37,8 @@ #include <vcl/button.hxx> #include <vcl/tabctrl.hxx> #include <vcl/tabpage.hxx> -#include <svtools/itempool.hxx> -#include <svtools/itemset.hxx> +#include <svl/itempool.hxx> +#include <svl/itemset.hxx> #include <com/sun/star/frame/XFrame.hpp> #if ENABLE_LAYOUT diff --git a/sfx2/inc/sfx2/viewfrm.hxx b/sfx2/inc/sfx2/viewfrm.hxx index b551a4942f..89bd00fc5d 100644 --- a/sfx2/inc/sfx2/viewfrm.hxx +++ b/sfx2/inc/sfx2/viewfrm.hxx @@ -33,12 +33,12 @@ #include "sal/config.h" #include "sfx2/dllapi.h" #include "sal/types.h" -#include <svtools/lstner.hxx> +#include <svl/lstner.hxx> #include <sfx2/module.hxx> #include <sfx2/frame.hxx> #include <sfx2/shell.hxx> #include <sfx2/sfxsids.hrc> -#include <svtools/poolitem.hxx> +#include <svl/poolitem.hxx> #include <com/sun/star/frame/status/Verb.hpp> #include <com/sun/star/frame/XModel.hpp> diff --git a/sfx2/inc/sfx2/viewsh.hxx b/sfx2/inc/sfx2/viewsh.hxx index ae45545cba..696be7b565 100644 --- a/sfx2/inc/sfx2/viewsh.hxx +++ b/sfx2/inc/sfx2/viewsh.hxx @@ -36,7 +36,7 @@ #include <com/sun/star/embed/XEmbeddedObject.hpp> #include <com/sun/star/frame/XController.hpp> #include <com/sun/star/uno/Reference.h> -#include <svtools/lstner.hxx> +#include <svl/lstner.hxx> #include <com/sun/star/ui/XContextMenuInterceptor.hpp> #include <com/sun/star/datatransfer/clipboard/XClipboardListener.hpp> #include <cppuhelper/interfacecontainer.hxx> diff --git a/sfx2/inc/sorgitm.hxx b/sfx2/inc/sorgitm.hxx index 9d135df393..4d5e4c2218 100644 --- a/sfx2/inc/sorgitm.hxx +++ b/sfx2/inc/sorgitm.hxx @@ -30,7 +30,7 @@ #ifndef _SFX_SORGITM_HXX #define _SFX_SORGITM_HXX -#include <svtools/stritem.hxx> +#include <svl/stritem.hxx> // class SfxScriptOrganizerItem --------------------------------------------- diff --git a/sfx2/inc/stbitem.hxx b/sfx2/inc/stbitem.hxx index 6a32a70748..c3ee01bd5f 100644 --- a/sfx2/inc/stbitem.hxx +++ b/sfx2/inc/stbitem.hxx @@ -32,7 +32,7 @@ #include "sal/config.h" #include "sfx2/dllapi.h" -#include <svtools/poolitem.hxx> +#include <svl/poolitem.hxx> #include <svtools/statusbarcontroller.hxx> //------------------------------------------------------------------ diff --git a/sfx2/inc/tplpitem.hxx b/sfx2/inc/tplpitem.hxx index 46b437b0f2..8c721391d7 100644 --- a/sfx2/inc/tplpitem.hxx +++ b/sfx2/inc/tplpitem.hxx @@ -34,7 +34,7 @@ #include "sfx2/dllapi.h" #include <tools/string.hxx> #include <tools/rtti.hxx> -#include <svtools/flagitem.hxx> +#include <svl/flagitem.hxx> class SFX2_DLLPUBLIC SfxTemplateItem: public SfxFlagItem { diff --git a/sfx2/source/appl/app.cxx b/sfx2/source/appl/app.cxx index c72d792244..c75033ae71 100644 --- a/sfx2/source/appl/app.cxx +++ b/sfx2/source/appl/app.cxx @@ -45,19 +45,19 @@ #include <tools/config.hxx> #include <basic/basrdll.hxx> #include <svtools/asynclink.hxx> -#include <svtools/stritem.hxx> +#include <svl/stritem.hxx> #ifndef _SOUND_HXX //autogen #include <vcl/sound.hxx> #endif -#include <svtools/eitem.hxx> -#include <svtools/urlbmk.hxx> +#include <svl/eitem.hxx> +#include <svl/urlbmk.hxx> #ifndef _MSGBOX_HXX //autogen #include <vcl/msgbox.hxx> #endif #include <svtools/sfxecode.hxx> #include <svtools/ehdl.hxx> -#include <svtools/svdde.hxx> +#include <svl/svdde.hxx> #include <tools/urlobj.hxx> #include <unotools/tempfile.hxx> #include <osl/file.hxx> @@ -65,7 +65,7 @@ #endif #define _SVSTDARR_STRINGSDTOR -#include <svtools/svstdarr.hxx> +#include <svl/svstdarr.hxx> #include <com/sun/star/uno/Sequence.hxx> #include <com/sun/star/uno/Any.hxx> @@ -153,8 +153,8 @@ #include <unotools/fontoptions.hxx> #include <unotools/internaloptions.hxx> #include <unotools/workingsetoptions.hxx> -#include <svtools/syslocaleoptions.hxx> -#include <svtools/syslocale.hxx> +#include <unotools/syslocaleoptions.hxx> +#include <unotools/syslocale.hxx> #include <framework/addonsoptions.hxx> #include <svtools/ttprops.hxx> #include <unotools/extendedsecurityoptions.hxx> diff --git a/sfx2/source/appl/appbas.cxx b/sfx2/source/appl/appbas.cxx index 194c2b6afd..36b6cd94f8 100644 --- a/sfx2/source/appl/appbas.cxx +++ b/sfx2/source/appl/appbas.cxx @@ -36,15 +36,15 @@ #include <com/sun/star/uno/Reference.h> #include <basic/basrdll.hxx> #include <tools/urlobj.hxx> -#include <svtools/macitem.hxx> +#include <svl/macitem.hxx> #include <basic/sbxfac.hxx> #include <basic/sbx.hxx> #include <vcl/gradient.hxx> -#include <svtools/rectitem.hxx> -#include <svtools/intitem.hxx> -#include <svtools/eitem.hxx> +#include <svl/rectitem.hxx> +#include <svl/intitem.hxx> +#include <svl/eitem.hxx> #include <basic/sbmod.hxx> -#include <svtools/whiter.hxx> +#include <svl/whiter.hxx> #include <basic/sbmeth.hxx> #include <basic/sbstar.hxx> #include <vcl/wrkwin.hxx> diff --git a/sfx2/source/appl/appcfg.cxx b/sfx2/source/appl/appcfg.cxx index 28f2fa072a..fd2afddcb3 100644 --- a/sfx2/source/appl/appcfg.cxx +++ b/sfx2/source/appl/appcfg.cxx @@ -46,24 +46,24 @@ #include <vcl/sound.hxx> #include <vcl/msgbox.hxx> #include <tools/string.hxx> -#include <svtools/itempool.hxx> -#include <svtools/aeitem.hxx> -#include <svtools/slstitm.hxx> -#include <svtools/stritem.hxx> -#include <svtools/intitem.hxx> -#include <svtools/eitem.hxx> -#include <svtools/szitem.hxx> -#include <svtools/undo.hxx> +#include <svl/itempool.hxx> +#include <svl/aeitem.hxx> +#include <svl/slstitm.hxx> +#include <svl/stritem.hxx> +#include <svl/intitem.hxx> +#include <svl/eitem.hxx> +#include <svl/szitem.hxx> +#include <svl/undo.hxx> #define _SVSTDARR_STRINGS -#include <svtools/svstdarr.hxx> +#include <svl/svstdarr.hxx> #include <svtools/ttprops.hxx> #include <sfx2/sfxsids.hrc> #include <sot/exchange.hxx> //#include <svtools/agprop.hxx> //#include <sj2/sjapplet.hxx> -#include <svtools/isethint.hxx> +#include <svl/isethint.hxx> #include <unotools/configmgr.hxx> #include <tools/urlobj.hxx> @@ -79,7 +79,6 @@ #include <unotools/localfilehelper.hxx> #include <comphelper/processfactory.hxx> #include <rtl/ustrbuf.hxx> -#include <svtools/misccfg.hxx> #include <sfx2/app.hxx> #include <sfx2/docfile.hxx> @@ -1075,10 +1074,3 @@ void SfxApplication::NotifyEvent( const SfxEventHint& rEventHint, FASTBOOL bSync IMPL_OBJHINT( SfxStringHint, String ) -SfxMiscCfg* SfxApplication::GetMiscConfig() -{ - if ( !pAppData_Impl->pMiscConfig ) - pAppData_Impl->pMiscConfig = new SfxMiscCfg; - - return pAppData_Impl->pMiscConfig; -} diff --git a/sfx2/source/appl/appchild.cxx b/sfx2/source/appl/appchild.cxx index dec26b4f0c..da7b56c97b 100644 --- a/sfx2/source/appl/appchild.cxx +++ b/sfx2/source/appl/appchild.cxx @@ -33,8 +33,8 @@ #ifndef GCC #endif -#include <svtools/whiter.hxx> -#include <svtools/eitem.hxx> +#include <svl/whiter.hxx> +#include <svl/eitem.hxx> #include <sfx2/app.hxx> #include "appdata.hxx" diff --git a/sfx2/source/appl/appdata.cxx b/sfx2/source/appl/appdata.cxx index d04ebcf822..8f24520a4b 100644 --- a/sfx2/source/appl/appdata.cxx +++ b/sfx2/source/appl/appdata.cxx @@ -33,17 +33,17 @@ #include <tools/cachestr.hxx> #include <tools/config.hxx> #ifndef _INETSTRM_HXX //autogen -#include <svtools/inetstrm.hxx> +#include <svl/inetstrm.hxx> #endif -#include <svtools/stritem.hxx> +#include <svl/stritem.hxx> #define _SVSTDARR_STRINGS -#include <svtools/svstdarr.hxx> +#include <svl/svstdarr.hxx> #include <vos/mutex.hxx> #include <vcl/menu.hxx> #include <vcl/msgbox.hxx> -#include <svtools/dateitem.hxx> +#include <svl/dateitem.hxx> #include <vcl/menu.hxx> #include <vcl/wrkwin.hxx> #include "comphelper/processfactory.hxx" @@ -109,7 +109,6 @@ SfxAppData_Impl::SfxAppData_Impl( SfxApplication* pApp ) : pEventConfig(0), pDisabledSlotList( 0 ), pSecureURLs(0), - pMiscConfig(0), pSaveOptions( 0 ), pUndoOptions( 0 ), pHelpOptions( 0 ), diff --git a/sfx2/source/appl/appdde.cxx b/sfx2/source/appl/appdde.cxx index 0386129c6d..1c282bafd1 100644 --- a/sfx2/source/appl/appdde.cxx +++ b/sfx2/source/appl/appdde.cxx @@ -31,12 +31,12 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sfx2.hxx" #include <vcl/wrkwin.hxx> -#include <svtools/rectitem.hxx> -#include <svtools/eitem.hxx> -#include <svtools/intitem.hxx> +#include <svl/rectitem.hxx> +#include <svl/eitem.hxx> +#include <svl/intitem.hxx> #include <basic/sbstar.hxx> -#include <svtools/stritem.hxx> -#include <svtools/svdde.hxx> +#include <svl/stritem.hxx> +#include <svl/svdde.hxx> #include <sfx2/lnkbase.hxx> #include <sfx2/linkmgr.hxx> diff --git a/sfx2/source/appl/appinit.cxx b/sfx2/source/appl/appinit.cxx index 34fc074e52..5345a050aa 100644 --- a/sfx2/source/appl/appinit.cxx +++ b/sfx2/source/appl/appinit.cxx @@ -38,7 +38,7 @@ #include <com/sun/star/lang/XServiceInfo.hpp> #include <svtools/soerr.hxx> -#include <svtools/svtools.hrc> +#include <svl/svtools.hrc> #include <unotools/saveopt.hxx> #include <unotools/localisationoptions.hxx> #include <tools/config.hxx> @@ -46,9 +46,9 @@ #include <tools/resary.hxx> #endif #include <tools/urlobj.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> #ifndef _MSGBOX_HXX //autogen #include <vcl/msgbox.hxx> #endif diff --git a/sfx2/source/appl/appmain.cxx b/sfx2/source/appl/appmain.cxx index 96cf2a70e7..f4e3dea030 100644 --- a/sfx2/source/appl/appmain.cxx +++ b/sfx2/source/appl/appmain.cxx @@ -37,12 +37,11 @@ #include <stdio.h> #include <tools/urlobj.hxx> -#include <svtools/cstitem.hxx> #include <tools/config.hxx> #include <svtools/ehdl.hxx> #include <unotools/startoptions.hxx> -#include <svtools/itempool.hxx> -#include <svtools/urihelper.hxx> +#include <svl/itempool.hxx> +#include <svl/urihelper.hxx> #include <svtools/helpopt.hxx> #include <vos/process.hxx> #include <framework/sfxhelperfunctions.hxx> diff --git a/sfx2/source/appl/appmisc.cxx b/sfx2/source/appl/appmisc.cxx index 9a4883282b..cf219f6d26 100644 --- a/sfx2/source/appl/appmisc.cxx +++ b/sfx2/source/appl/appmisc.cxx @@ -36,10 +36,10 @@ #include <vos/process.hxx> #endif #include <vos/xception.hxx> -#include <svtools/whiter.hxx> -#include <svtools/stritem.hxx> -#include <svtools/intitem.hxx> -#include <svtools/eitem.hxx> +#include <svl/whiter.hxx> +#include <svl/stritem.hxx> +#include <svl/intitem.hxx> +#include <svl/eitem.hxx> #include <svtools/filter.hxx> #include <unotools/internaloptions.hxx> #include <unotools/pathoptions.hxx> diff --git a/sfx2/source/appl/appopen.cxx b/sfx2/source/appl/appopen.cxx index c0065bea75..e6e0c4bdac 100644 --- a/sfx2/source/appl/appopen.cxx +++ b/sfx2/source/appl/appopen.cxx @@ -64,16 +64,16 @@ #include <comphelper/sequenceasvector.hxx> #include <vcl/wrkwin.hxx> -#include <svtools/intitem.hxx> +#include <svl/intitem.hxx> #include <vcl/msgbox.hxx> -#include <svtools/stritem.hxx> -#include <svtools/eitem.hxx> +#include <svl/stritem.hxx> +#include <svl/eitem.hxx> #include <sfx2/doctempl.hxx> #include <svtools/sfxecode.hxx> #include <framework/preventduplicateinteraction.hxx> #include <svtools/ehdl.hxx> #include <basic/sbxobj.hxx> -#include <svtools/urihelper.hxx> +#include <svl/urihelper.hxx> #include <unotools/localfilehelper.hxx> #include <unotools/pathoptions.hxx> #include <unotools/moduleoptions.hxx> @@ -95,7 +95,7 @@ #include <sfx2/new.hxx> #include <sfx2/objitem.hxx> #include <sfx2/objsh.hxx> -#include <svtools/slstitm.hxx> +#include <svl/slstitm.hxx> #include "objshimp.hxx" #include "openflag.hxx" #include <sfx2/passwd.hxx> @@ -112,7 +112,7 @@ #include <sfx2/event.hxx> #define _SVSTDARR_STRINGSDTOR -#include <svtools/svstdarr.hxx> +#include <svl/svstdarr.hxx> using namespace ::com::sun::star; using namespace ::com::sun::star::beans; diff --git a/sfx2/source/appl/appquit.cxx b/sfx2/source/appl/appquit.cxx index 4dfdbb90b2..fcfa2c50ef 100644 --- a/sfx2/source/appl/appquit.cxx +++ b/sfx2/source/appl/appquit.cxx @@ -36,14 +36,14 @@ #ifdef WIN #define _TL_LANG_SPECIAL #endif -#include <svtools/svdde.hxx> +#include <svl/svdde.hxx> #ifndef _MSGBOX_HXX //autogen #include <vcl/msgbox.hxx> #endif -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> #include <unotools/saveopt.hxx> -#include <svtools/misccfg.hxx> +#include <unotools/misccfg.hxx> #ifndef GCC #endif diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx index cc70813d53..48b976b312 100644 --- a/sfx2/source/appl/appserv.cxx +++ b/sfx2/source/appl/appserv.cxx @@ -62,7 +62,7 @@ #ifndef _SVT_DOC_ADDRESSTEMPLATE_HXX_ #include <svtools/addresstemplate.hxx> #endif -#include <svtools/visitem.hxx> +#include <svl/visitem.hxx> #include <unotools/intlwrapper.hxx> #ifndef _UNOTOOLS_CONFIGMGR_HXX_ @@ -71,10 +71,10 @@ #include <tools/config.hxx> #include <tools/diagnose_ex.h> #include <vcl/msgbox.hxx> -#include <svtools/cancel.hxx> -#include <svtools/intitem.hxx> -#include <svtools/eitem.hxx> -#include <svtools/stritem.hxx> +#include <svl/cancel.hxx> +#include <svl/intitem.hxx> +#include <svl/eitem.hxx> +#include <svl/stritem.hxx> #include <basic/sbstar.hxx> #include <basic/basmgr.hxx> #include <basic/basrdll.hxx> diff --git a/sfx2/source/appl/appuno.cxx b/sfx2/source/appl/appuno.cxx index 81d198412a..b623365c5a 100644 --- a/sfx2/source/appl/appuno.cxx +++ b/sfx2/source/appl/appuno.cxx @@ -43,8 +43,8 @@ #include "sfx2/dllapi.h" #include <basic/sbx.hxx> -#include <svtools/itempool.hxx> -#include <svtools/rectitem.hxx> +#include <svl/itempool.hxx> +#include <svl/rectitem.hxx> #include <tools/debug.hxx> #include <tools/wldcrd.hxx> @@ -60,12 +60,12 @@ #endif #include <basic/sbxcore.hxx> -#include <svtools/ownlist.hxx> -#include <svtools/lckbitem.hxx> -#include <svtools/stritem.hxx> -#include <svtools/slstitm.hxx> -#include <svtools/intitem.hxx> -#include <svtools/eitem.hxx> +#include <svl/ownlist.hxx> +#include <svl/lckbitem.hxx> +#include <svl/stritem.hxx> +#include <svl/slstitm.hxx> +#include <svl/intitem.hxx> +#include <svl/eitem.hxx> #include <com/sun/star/task/XStatusIndicatorFactory.hpp> #include <com/sun/star/task/XInteractionHandler.hpp> #include <com/sun/star/io/XInputStream.hpp> diff --git a/sfx2/source/appl/impldde.cxx b/sfx2/source/appl/impldde.cxx index 75df926968..a74e9def57 100644 --- a/sfx2/source/appl/impldde.cxx +++ b/sfx2/source/appl/impldde.cxx @@ -53,7 +53,7 @@ #include <com/sun/star/uno/Any.hxx> #include <com/sun/star/uno/Sequence.hxx> -#include <svtools/svdde.hxx> +#include <svl/svdde.hxx> #include <sot/formats.hxx> #define DDELINK_COLD 0 diff --git a/sfx2/source/appl/linkmgr2.cxx b/sfx2/source/appl/linkmgr2.cxx index de1c524ec7..4306340dfc 100644 --- a/sfx2/source/appl/linkmgr2.cxx +++ b/sfx2/source/appl/linkmgr2.cxx @@ -47,7 +47,7 @@ #define _SVSTDARR_STRINGSDTOR -#include <svtools/svstdarr.hxx> +#include <svl/svstdarr.hxx> namespace sfx2 diff --git a/sfx2/source/appl/linksrc.cxx b/sfx2/source/appl/linksrc.cxx index 5892f99781..f3565bdb55 100644 --- a/sfx2/source/appl/linksrc.cxx +++ b/sfx2/source/appl/linksrc.cxx @@ -39,7 +39,7 @@ #include <tools/debug.hxx> #include <vcl/timer.hxx> -#include <svtools/svarray.hxx> +#include <svl/svarray.hxx> using namespace ::com::sun::star::uno; diff --git a/sfx2/source/appl/lnkbase2.cxx b/sfx2/source/appl/lnkbase2.cxx index 41a139d19b..9b7a92fff0 100644 --- a/sfx2/source/appl/lnkbase2.cxx +++ b/sfx2/source/appl/lnkbase2.cxx @@ -50,7 +50,7 @@ #include <tools/debug.hxx> -#include <svtools/svdde.hxx> +#include <svl/svdde.hxx> using namespace ::com::sun::star::uno; diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx index baaac7e57a..7421330cf9 100644 --- a/sfx2/source/appl/sfxhelp.cxx +++ b/sfx2/source/appl/sfxhelp.cxx @@ -74,7 +74,7 @@ #define _SVSTDARR_STRINGSDTOR #define _SVSTDARR_ULONGSSORT -#include <svtools/svstdarr.hxx> +#include <svl/svstdarr.hxx> #include <sfx2/sfxsids.hrc> #include <sfx2/app.hxx> @@ -237,6 +237,8 @@ public: ~SfxHelpOptions_Impl(); BOOL HasId( ULONG nId ) { USHORT nDummy; return m_pIds ? m_pIds->Seek_Entry( nId, &nDummy ) : FALSE; } + virtual void Notify( const com::sun::star::uno::Sequence< rtl::OUString >& aPropertyNames ); + virtual void Commit(); }; static Sequence< ::rtl::OUString > GetPropertyNames() @@ -309,6 +311,15 @@ SfxHelpOptions_Impl::~SfxHelpOptions_Impl() delete m_pIds; } + +void SfxHelpOptions_Impl::Notify( const com::sun::star::uno::Sequence< rtl::OUString >& ) +{ +} + +void SfxHelpOptions_Impl::Commit() +{ +} + // class SfxHelp_Impl ---------------------------------------------------- class SfxHelp_Impl diff --git a/sfx2/source/appl/sfxpicklist.cxx b/sfx2/source/appl/sfxpicklist.cxx index 8984347187..b192101b32 100644 --- a/sfx2/source/appl/sfxpicklist.cxx +++ b/sfx2/source/appl/sfxpicklist.cxx @@ -36,9 +36,9 @@ #include <unotools/useroptions.hxx> #include <tools/urlobj.hxx> #include <framework/menuconfiguration.hxx> -#include <svtools/inethist.hxx> -#include <svtools/stritem.hxx> -#include <svtools/eitem.hxx> +#include <svl/inethist.hxx> +#include <svl/stritem.hxx> +#include <svl/eitem.hxx> #include <osl/file.hxx> #include <unotools/localfilehelper.hxx> #include <cppuhelper/implbase1.hxx> diff --git a/sfx2/source/appl/workwin.cxx b/sfx2/source/appl/workwin.cxx index 5e2bb23e93..fc64b7243d 100644 --- a/sfx2/source/appl/workwin.cxx +++ b/sfx2/source/appl/workwin.cxx @@ -57,12 +57,12 @@ #include <vcl/toolbox.hxx> #include <tools/rcid.h> #include <toolkit/helper/vclunohelper.hxx> -#include <svtools/itempool.hxx> -#include <svtools/itemiter.hxx> -#include <svtools/whiter.hxx> -#include <svtools/intitem.hxx> +#include <svl/itempool.hxx> +#include <svl/itemiter.hxx> +#include <svl/whiter.hxx> +#include <svl/intitem.hxx> #ifndef _SFXEITEM_HXX //autogen -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> #endif #include <com/sun/star/ui/XUIElement.hpp> #include <com/sun/star/frame/XLayoutManager.hpp> diff --git a/sfx2/source/bastyp/fltfnc.cxx b/sfx2/source/bastyp/fltfnc.cxx index 82bb158301..c305aa862d 100644 --- a/sfx2/source/bastyp/fltfnc.cxx +++ b/sfx2/source/bastyp/fltfnc.cxx @@ -60,12 +60,12 @@ #include <rtl/ustring.hxx> #endif #include <rtl/ustrbuf.hxx> -#include <svtools/eitem.hxx> -#include <svtools/intitem.hxx> -#include <svtools/stritem.hxx> -#include <svtools/lckbitem.hxx> -#include <svtools/inettype.hxx> -#include <svtools/rectitem.hxx> +#include <svl/eitem.hxx> +#include <svl/intitem.hxx> +#include <svl/stritem.hxx> +#include <svl/lckbitem.hxx> +#include <svl/inettype.hxx> +#include <svl/rectitem.hxx> #include <sot/storage.hxx> #include <com/sun/star/frame/XDispatchProviderInterceptor.hpp> @@ -109,9 +109,9 @@ using namespace ::com::sun::star::ucb; using namespace ::com::sun::star::document; using namespace ::com::sun::star::beans; using namespace ::vos; -#include <svtools/ctypeitm.hxx> +#include <svl/ctypeitm.hxx> #include <svtools/sfxecode.hxx> -#include <svtools/syslocale.hxx> +#include <unotools/syslocale.hxx> #include "sfxhelp.hxx" #include "sfxbasic.hxx" diff --git a/sfx2/source/bastyp/frmhtml.cxx b/sfx2/source/bastyp/frmhtml.cxx index f1071be264..bae22d228f 100644 --- a/sfx2/source/bastyp/frmhtml.cxx +++ b/sfx2/source/bastyp/frmhtml.cxx @@ -38,7 +38,7 @@ #define _SVSTDARR_USHORTS #define _SVSTDARR_ULONGS -#include <svtools/svstdarr.hxx> +#include <svl/svstdarr.hxx> #include <sfx2/sfx.hrc> diff --git a/sfx2/source/bastyp/frmhtmlw.cxx b/sfx2/source/bastyp/frmhtmlw.cxx index d93f99bda7..5371f0697d 100644 --- a/sfx2/source/bastyp/frmhtmlw.cxx +++ b/sfx2/source/bastyp/frmhtmlw.cxx @@ -32,7 +32,7 @@ #include "precompiled_sfx2.hxx" #ifndef _INETDEF_HXX -#include <svtools/inetdef.hxx> +#include <svl/inetdef.hxx> #endif #include "svtools/htmlkywd.hxx" @@ -40,7 +40,7 @@ #include <rtl/tencinfo.h> #include <unotools/configmgr.hxx> -#include "svtools/urihelper.hxx" +#include "svl/urihelper.hxx" #include <tools/datetime.hxx> #include <sfx2/frmhtmlw.hxx> diff --git a/sfx2/source/bastyp/progress.cxx b/sfx2/source/bastyp/progress.cxx index 06791f4435..97dd4da66f 100644 --- a/sfx2/source/bastyp/progress.cxx +++ b/sfx2/source/bastyp/progress.cxx @@ -39,7 +39,7 @@ #include <basic/sbx.hxx> #endif -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> #include <tools/time.hxx> // wg. nRescheduleLocks diff --git a/sfx2/source/bastyp/sfxhtml.cxx b/sfx2/source/bastyp/sfxhtml.cxx index eba014f892..59c25f1910 100644 --- a/sfx2/source/bastyp/sfxhtml.cxx +++ b/sfx2/source/bastyp/sfxhtml.cxx @@ -46,9 +46,9 @@ #include <svtools/imaprect.hxx> #ifndef _SVSTDARR_ULONGS_DECL #define _SVSTDARR_ULONGS -#include <svtools/svstdarr.hxx> +#include <svl/svstdarr.hxx> #endif -#include <svtools/zforlist.hxx> +#include <svl/zforlist.hxx> #include <rtl/tencinfo.h> #include <tools/tenccvt.hxx> diff --git a/sfx2/source/config/evntconf.cxx b/sfx2/source/config/evntconf.cxx index be222b98f1..385260dce6 100644 --- a/sfx2/source/config/evntconf.cxx +++ b/sfx2/source/config/evntconf.cxx @@ -34,7 +34,7 @@ #ifndef _SV_RESARY_HXX #include <tools/resary.hxx> #endif -#include <svtools/lstner.hxx> +#include <svl/lstner.hxx> #include <basic/basmgr.hxx> #include <basic/sbmod.hxx> #include <tools/urlobj.hxx> diff --git a/sfx2/source/control/bindings.cxx b/sfx2/source/control/bindings.cxx index 02efe0aeba..5feac51002 100644 --- a/sfx2/source/control/bindings.cxx +++ b/sfx2/source/control/bindings.cxx @@ -32,13 +32,13 @@ #include "precompiled_sfx2.hxx" #include <hash_map> -#include <svtools/itempool.hxx> -#include <svtools/itemiter.hxx> -#include <svtools/eitem.hxx> -#include <svtools/aeitem.hxx> -#include <svtools/intitem.hxx> -#include <svtools/stritem.hxx> -#include <svtools/visitem.hxx> +#include <svl/itempool.hxx> +#include <svl/itemiter.hxx> +#include <svl/eitem.hxx> +#include <svl/aeitem.hxx> +#include <svl/intitem.hxx> +#include <svl/stritem.hxx> +#include <svl/visitem.hxx> #include <com/sun/star/util/XURLTransformer.hpp> #include <com/sun/star/frame/XDispatchProviderInterceptor.hpp> #include <com/sun/star/frame/XDispatch.hpp> diff --git a/sfx2/source/control/ctrlitem.cxx b/sfx2/source/control/ctrlitem.cxx index 71bfbbb5c0..a4fe8e70db 100644 --- a/sfx2/source/control/ctrlitem.cxx +++ b/sfx2/source/control/ctrlitem.cxx @@ -30,7 +30,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sfx2.hxx" -#include <svtools/itempool.hxx> +#include <svl/itempool.hxx> #ifndef GCC #endif diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx index d76697b6c5..84414e164f 100644 --- a/sfx2/source/control/dispatch.cxx +++ b/sfx2/source/control/dispatch.cxx @@ -33,14 +33,14 @@ #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/frame/XDispatchRecorderSupplier.hpp> #include <com/sun/star/frame/XLayoutManager.hpp> -#include <svtools/itempool.hxx> -#include <svtools/itemiter.hxx> -#include <svtools/whiter.hxx> -#include <svtools/intitem.hxx> +#include <svl/itempool.hxx> +#include <svl/itemiter.hxx> +#include <svl/whiter.hxx> +#include <svl/intitem.hxx> #ifndef _SFXEITEM_HXX //autogen -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> #endif -#include <svtools/undo.hxx> +#include <svl/undo.hxx> #ifndef _WRKWIN_HXX //autogen #include <vcl/wrkwin.hxx> #endif @@ -50,7 +50,7 @@ #include <stdlib.h> // wg. bsearch #define _SVSTDARR_ULONGS -#include <svtools/svstdarr.hxx> +#include <svl/svstdarr.hxx> #include <svtools/helpopt.hxx> #include <com/sun/star/frame/XLayoutManager.hpp> #include <com/sun/star/beans/XPropertySet.hpp> diff --git a/sfx2/source/control/macrconf.cxx b/sfx2/source/control/macrconf.cxx index 84c9f7feb5..baee95519f 100644 --- a/sfx2/source/control/macrconf.cxx +++ b/sfx2/source/control/macrconf.cxx @@ -35,7 +35,7 @@ #ifndef _SBX_HXX //autogen #include <basic/sbx.hxx> #endif -#include <svtools/intitem.hxx> +#include <svl/intitem.hxx> #include <basic/sbmeth.hxx> #include <basic/sbmod.hxx> #ifndef _BASIC_SBUNO_HXX diff --git a/sfx2/source/control/msg.cxx b/sfx2/source/control/msg.cxx index abe1c78620..46e961b71d 100644 --- a/sfx2/source/control/msg.cxx +++ b/sfx2/source/control/msg.cxx @@ -30,8 +30,8 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sfx2.hxx" -#include <svtools/itempool.hxx> -#include <svtools/eitem.hxx> +#include <svl/itempool.hxx> +#include <svl/eitem.hxx> #ifndef GCC #endif diff --git a/sfx2/source/control/querystatus.cxx b/sfx2/source/control/querystatus.cxx index a7448152ef..7a66ad2a33 100644 --- a/sfx2/source/control/querystatus.cxx +++ b/sfx2/source/control/querystatus.cxx @@ -31,13 +31,13 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sfx2.hxx" #include <sfx2/querystatus.hxx> -#include <svtools/poolitem.hxx> -#include <svtools/eitem.hxx> -#include <svtools/stritem.hxx> -#include <svtools/intitem.hxx> -#include <svtools/itemset.hxx> +#include <svl/poolitem.hxx> +#include <svl/eitem.hxx> +#include <svl/stritem.hxx> +#include <svl/intitem.hxx> +#include <svl/itemset.hxx> #include <svtools/itemdel.hxx> -#include <svtools/visitem.hxx> +#include <svl/visitem.hxx> #include <cppuhelper/weak.hxx> #include <comphelper/processfactory.hxx> #include <vos/mutex.hxx> diff --git a/sfx2/source/control/request.cxx b/sfx2/source/control/request.cxx index 80de021867..c00aa9397c 100644 --- a/sfx2/source/control/request.cxx +++ b/sfx2/source/control/request.cxx @@ -39,10 +39,10 @@ #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/util/XURLTransformer.hpp> #include <com/sun/star/frame/XDispatchRecorderSupplier.hpp> -#include <svtools/itemiter.hxx> +#include <svl/itemiter.hxx> #ifndef _ARGS_HXX //autogen -#include <svtools/itempool.hxx> +#include <svl/itempool.hxx> #endif #include <svtools/itemdel.hxx> @@ -51,7 +51,7 @@ #ifndef GCC #endif -#include <svtools/smplhint.hxx> +#include <svl/smplhint.hxx> #include <sfx2/request.hxx> #include <sfx2/dispatch.hxx> diff --git a/sfx2/source/control/sfxstatuslistener.cxx b/sfx2/source/control/sfxstatuslistener.cxx index 4fe13466f4..ee054cf1f6 100644 --- a/sfx2/source/control/sfxstatuslistener.cxx +++ b/sfx2/source/control/sfxstatuslistener.cxx @@ -31,13 +31,13 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sfx2.hxx" #include <sfx2/sfxstatuslistener.hxx> -#include <svtools/poolitem.hxx> -#include <svtools/eitem.hxx> -#include <svtools/stritem.hxx> -#include <svtools/intitem.hxx> -#include <svtools/itemset.hxx> +#include <svl/poolitem.hxx> +#include <svl/eitem.hxx> +#include <svl/stritem.hxx> +#include <svl/intitem.hxx> +#include <svl/itemset.hxx> #include <svtools/itemdel.hxx> -#include <svtools/visitem.hxx> +#include <svl/visitem.hxx> #include <cppuhelper/weak.hxx> #include <comphelper/processfactory.hxx> #include <vos/mutex.hxx> diff --git a/sfx2/source/control/shell.cxx b/sfx2/source/control/shell.cxx index 0518435434..bfd280c786 100644 --- a/sfx2/source/control/shell.cxx +++ b/sfx2/source/control/shell.cxx @@ -33,8 +33,8 @@ #include <com/sun/star/embed/VerbDescriptor.hpp> #include <com/sun/star/embed/VerbAttributes.hpp> #include <basic/sbstar.hxx> -#include <svtools/itempool.hxx> -#include <svtools/undo.hxx> +#include <svl/itempool.hxx> +#include <svl/undo.hxx> #include <svtools/itemdel.hxx> #include <svtools/asynclink.hxx> #include <basic/sbx.hxx> diff --git a/sfx2/source/control/srchitem.cxx b/sfx2/source/control/srchitem.cxx index 62c9e22fac..22b1342244 100644 --- a/sfx2/source/control/srchitem.cxx +++ b/sfx2/source/control/srchitem.cxx @@ -44,7 +44,7 @@ #include <com/sun/star/util/XReplaceDescriptor.hpp> #include <com/sun/star/lang/Locale.hpp> -#include <svtools/memberid.hrc> +#include <svl/memberid.hrc> #include <i18npool/mslangid.hxx> #ifndef GCC @@ -359,6 +359,9 @@ void SvxSearchItem::Notify( const Sequence< ::rtl::OUString > & ) SetTransliterationFlags( SvtSearchOptions().GetTransliterationFlags() ); } +void SvxSearchItem::Commit() +{ +} void SvxSearchItem::SetMatchFullHalfWidthForms( sal_Bool bVal ) { diff --git a/sfx2/source/control/statcach.cxx b/sfx2/source/control/statcach.cxx index 795fb5e9be..39c34ed204 100644 --- a/sfx2/source/control/statcach.cxx +++ b/sfx2/source/control/statcach.cxx @@ -46,10 +46,10 @@ #include <com/sun/star/frame/FrameAction.hpp> #include <com/sun/star/beans/PropertyValue.hpp> #include <cppuhelper/weak.hxx> -#include <svtools/eitem.hxx> -#include <svtools/intitem.hxx> -#include <svtools/stritem.hxx> -#include <svtools/visitem.hxx> +#include <svl/eitem.hxx> +#include <svl/intitem.hxx> +#include <svl/stritem.hxx> +#include <svl/visitem.hxx> #include <comphelper/processfactory.hxx> #ifndef GCC diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx index 11e9fd3d77..3b8fd4cf5c 100644 --- a/sfx2/source/control/unoctitm.cxx +++ b/sfx2/source/control/unoctitm.cxx @@ -32,13 +32,13 @@ #include "precompiled_sfx2.hxx" #include <tools/debug.hxx> -#include <svtools/eitem.hxx> -#include <svtools/stritem.hxx> -#include <svtools/intitem.hxx> -#include <svtools/itemset.hxx> -#include <svtools/visitem.hxx> +#include <svl/eitem.hxx> +#include <svl/stritem.hxx> +#include <svl/intitem.hxx> +#include <svl/itemset.hxx> +#include <svl/visitem.hxx> #include <svtools/javacontext.hxx> -#include <svtools/itempool.hxx> +#include <svl/itempool.hxx> #include <tools/urlobj.hxx> #include <com/sun/star/util/XURLTransformer.hpp> #include <com/sun/star/frame/XController.hpp> diff --git a/sfx2/source/dialog/basedlgs.cxx b/sfx2/source/dialog/basedlgs.cxx index e715063509..432e2ed173 100644 --- a/sfx2/source/dialog/basedlgs.cxx +++ b/sfx2/source/dialog/basedlgs.cxx @@ -37,7 +37,7 @@ #include <vcl/fixed.hxx> #include <vcl/help.hxx> #include <vcl/msgbox.hxx> -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> #include <unotools/viewoptions.hxx> #include <svtools/fixedhyper.hxx> #include <svtools/controldims.hrc> diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx index df3d4222f1..7f55a6070d 100644 --- a/sfx2/source/dialog/dinfdlg.cxx +++ b/sfx2/source/dialog/dinfdlg.cxx @@ -32,12 +32,12 @@ #include "precompiled_sfx2.hxx" #include <tools/urlobj.hxx> #include <vcl/msgbox.hxx> -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> #include <vcl/svapp.hxx> #include <sfx2/filedlghelper.hxx> #include <unotools/localedatawrapper.hxx> #include <comphelper/processfactory.hxx> -#include <svtools/urihelper.hxx> +#include <svl/urihelper.hxx> #include <unotools/useroptions.hxx> #include <svtools/imagemgr.hxx> #include <tools/datetime.hxx> @@ -49,7 +49,7 @@ #include <com/sun/star/security/DocumentSignatureInformation.hpp> #include <com/sun/star/security/XDocumentDigitalSignatures.hpp> #include <unotools/localedatawrapper.hxx> -#include <svtools/syslocale.hxx> +#include <unotools/syslocale.hxx> #include <rtl/math.hxx> #include <com/sun/star/ui/dialogs/TemplateDescription.hpp> #include <com/sun/star/beans/PropertyAttribute.hpp> diff --git a/sfx2/source/dialog/dockwin.cxx b/sfx2/source/dialog/dockwin.cxx index b10283c849..6212b887fc 100644 --- a/sfx2/source/dialog/dockwin.cxx +++ b/sfx2/source/dialog/dockwin.cxx @@ -31,7 +31,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sfx2.hxx" -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> #include <vcl/decoview.hxx> #include <vcl/svapp.hxx> diff --git a/sfx2/source/dialog/filedlghelper.cxx b/sfx2/source/dialog/filedlghelper.cxx index 5c57b91c84..28b1dd24cf 100644 --- a/sfx2/source/dialog/filedlghelper.cxx +++ b/sfx2/source/dialog/filedlghelper.cxx @@ -73,15 +73,15 @@ #include <vcl/mnemonic.hxx> #include <unotools/pathoptions.hxx> #include <unotools/securityoptions.hxx> -#include <svtools/itemset.hxx> -#include <svtools/eitem.hxx> -#include <svtools/intitem.hxx> -#include <svtools/stritem.hxx> +#include <svl/itemset.hxx> +#include <svl/eitem.hxx> +#include <svl/intitem.hxx> +#include <svl/stritem.hxx> #include <svtools/filter.hxx> #include <unotools/viewoptions.hxx> #include <unotools/moduleoptions.hxx> #include <svtools/helpid.hrc> -#include <svtools/pickerhelper.hxx> +#include <svl/pickerhelper.hxx> #include <comphelper/docpasswordrequest.hxx> #include <ucbhelper/content.hxx> #include <ucbhelper/commandenvironment.hxx> diff --git a/sfx2/source/dialog/filedlgimpl.hxx b/sfx2/source/dialog/filedlgimpl.hxx index 09ddcfa868..abcd3125a1 100644 --- a/sfx2/source/dialog/filedlgimpl.hxx +++ b/sfx2/source/dialog/filedlgimpl.hxx @@ -41,7 +41,7 @@ #include <sfx2/fcontnr.hxx> #define _SVSTDARR_STRINGSDTOR -#include <svtools/svstdarr.hxx> +#include <svl/svstdarr.hxx> #include <sfx2/filedlghelper.hxx> #include <comphelper/sequenceasvector.hxx> diff --git a/sfx2/source/dialog/itemconnect.cxx b/sfx2/source/dialog/itemconnect.cxx index ddf97257bc..add294746a 100644 --- a/sfx2/source/dialog/itemconnect.cxx +++ b/sfx2/source/dialog/itemconnect.cxx @@ -34,7 +34,7 @@ #include <boost/shared_ptr.hpp> #include <list> -#include <svtools/itempool.hxx> +#include <svl/itempool.hxx> // ============================================================================ diff --git a/sfx2/source/dialog/mailmodelapi.cxx b/sfx2/source/dialog/mailmodelapi.cxx index c44765deea..3abfb114a8 100644 --- a/sfx2/source/dialog/mailmodelapi.cxx +++ b/sfx2/source/dialog/mailmodelapi.cxx @@ -73,8 +73,8 @@ #include <unotools/tempfile.hxx> #include <vcl/svapp.hxx> -#include <svtools/stritem.hxx> -#include <svtools/eitem.hxx> +#include <svl/stritem.hxx> +#include <svl/eitem.hxx> #include <unotools/useroptions.hxx> #include <comphelper/processfactory.hxx> #include <comphelper/extract.hxx> diff --git a/sfx2/source/dialog/mgetempl.cxx b/sfx2/source/dialog/mgetempl.cxx index 24d08ee3e4..5a69e4e2fe 100644 --- a/sfx2/source/dialog/mgetempl.cxx +++ b/sfx2/source/dialog/mgetempl.cxx @@ -37,9 +37,9 @@ #include <vcl/msgbox.hxx> #endif #include <vcl/field.hxx> -#include <svtools/eitem.hxx> -#include <svtools/intitem.hxx> -#include <svtools/style.hxx> +#include <svl/eitem.hxx> +#include <svl/intitem.hxx> +#include <svl/style.hxx> #ifndef GCC #endif @@ -57,7 +57,7 @@ #include "mgetempl.hrc" #ifndef _SFX_STYLE_HRC -#include <svtools/style.hrc> +#include <svl/style.hrc> #endif // SfxManageStyleSheetPage ----------------------------------------------- diff --git a/sfx2/source/dialog/newstyle.cxx b/sfx2/source/dialog/newstyle.cxx index 192f5917f3..642c87d75a 100644 --- a/sfx2/source/dialog/newstyle.cxx +++ b/sfx2/source/dialog/newstyle.cxx @@ -32,7 +32,7 @@ #include "precompiled_sfx2.hxx" // INCLUDE --------------------------------------------------------------- -#include <svtools/style.hxx> +#include <svl/style.hxx> #ifndef GCC #endif diff --git a/sfx2/source/dialog/printopt.cxx b/sfx2/source/dialog/printopt.cxx index 49fc373fda..c73874f646 100644 --- a/sfx2/source/dialog/printopt.cxx +++ b/sfx2/source/dialog/printopt.cxx @@ -36,7 +36,7 @@ #include <vcl/msgbox.hxx> #include <unotools/printwarningoptions.hxx> #include <svtools/printoptions.hxx> -#include <svtools/flagitem.hxx> +#include <svl/flagitem.hxx> #include "printopt.hrc" diff --git a/sfx2/source/dialog/recfloat.cxx b/sfx2/source/dialog/recfloat.cxx index bb9ad7b9a5..fc95e472a8 100644 --- a/sfx2/source/dialog/recfloat.cxx +++ b/sfx2/source/dialog/recfloat.cxx @@ -38,7 +38,7 @@ #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> #include <svtools/generictoolboxcontroller.hxx> #include <vcl/msgbox.hxx> #include <comphelper/processfactory.hxx> diff --git a/sfx2/source/dialog/styledlg.cxx b/sfx2/source/dialog/styledlg.cxx index dfb7076089..bedb46152b 100644 --- a/sfx2/source/dialog/styledlg.cxx +++ b/sfx2/source/dialog/styledlg.cxx @@ -32,8 +32,8 @@ #include "precompiled_sfx2.hxx" // include --------------------------------------------------------------- -#include <svtools/whiter.hxx> -#include <svtools/style.hxx> +#include <svl/whiter.hxx> +#include <svl/style.hxx> #ifndef _MSGBOX_HXX //autogen #include <vcl/msgbox.hxx> #endif diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx index 6ddc4bb7d2..51a3ce757a 100644 --- a/sfx2/source/dialog/tabdlg.cxx +++ b/sfx2/source/dialog/tabdlg.cxx @@ -37,7 +37,7 @@ #include <unotools/viewoptions.hxx> #define _SVSTDARR_USHORTS -#include <svtools/svstdarr.hxx> +#include <svl/svstdarr.hxx> #include "appdata.hxx" #include "sfxtypes.hxx" diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx index 2cc7b52d25..11eca63637 100644 --- a/sfx2/source/dialog/templdlg.cxx +++ b/sfx2/source/dialog/templdlg.cxx @@ -34,14 +34,14 @@ #ifndef _MENU_HXX //autogen #include <vcl/menu.hxx> #endif -#include <svtools/intitem.hxx> -#include <svtools/stritem.hxx> -#include <svtools/style.hxx> +#include <svl/intitem.hxx> +#include <svl/stritem.hxx> +#include <svl/style.hxx> #ifndef GCC #endif #define _SVSTDARR_STRINGSDTOR -#include <svtools/svstdarr.hxx> +#include <svl/svstdarr.hxx> #include <comphelper/processfactory.hxx> #include <comphelper/sequenceashashmap.hxx> #include <unotools/intlwrapper.hxx> diff --git a/sfx2/source/dialog/tplcitem.cxx b/sfx2/source/dialog/tplcitem.cxx index 03103837b2..fa0e93d1d0 100644 --- a/sfx2/source/dialog/tplcitem.cxx +++ b/sfx2/source/dialog/tplcitem.cxx @@ -33,7 +33,7 @@ // INCLUDE --------------------------------------------------------------- -#include <svtools/intitem.hxx> +#include <svl/intitem.hxx> #include <vcl/svapp.hxx> #ifndef GCC diff --git a/sfx2/source/dialog/versdlg.cxx b/sfx2/source/dialog/versdlg.cxx index f6e5602e44..fe75d4d0c1 100644 --- a/sfx2/source/dialog/versdlg.cxx +++ b/sfx2/source/dialog/versdlg.cxx @@ -34,17 +34,17 @@ #ifndef _UNOTOOLS_PROCESSFACTORY_HXX #include <comphelper/processfactory.hxx> #endif -#include <svtools/eitem.hxx> -#include <svtools/intitem.hxx> -#include <svtools/stritem.hxx> -#include <svtools/itemset.hxx> +#include <svl/eitem.hxx> +#include <svl/intitem.hxx> +#include <svl/stritem.hxx> +#include <svl/itemset.hxx> #include <unotools/useroptions.hxx> #include <vcl/msgbox.hxx> #include <vcl/svapp.hxx> #include <tools/datetime.hxx> #define _SVSTDARR_STRINGSDTOR -#include <svtools/svstdarr.hxx> +#include <svl/svstdarr.hxx> #include "versdlg.hrc" #include "versdlg.hxx" diff --git a/sfx2/source/doc/doc.src b/sfx2/source/doc/doc.src index 3f8ab1ae71..c914d9fe29 100644 --- a/sfx2/source/doc/doc.src +++ b/sfx2/source/doc/doc.src @@ -30,7 +30,7 @@ #include <sfx2/sfx.hrc> #include "doc.hrc" #define __RSC -#include <svtools/inetdef.hxx> +#include <svl/inetdef.hxx> //#include <so3/so2defs.hxx> // ----------------------------------------------------------------------- diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx index d6a57d4129..a318cbeb36 100644 --- a/sfx2/source/doc/docfile.cxx +++ b/sfx2/source/doc/docfile.cxx @@ -90,19 +90,19 @@ #ifndef _MSGBOX_HXX //autogen #include <vcl/msgbox.hxx> #endif -#include <svtools/stritem.hxx> -#include <svtools/eitem.hxx> -#include <svtools/lckbitem.hxx> +#include <svl/stritem.hxx> +#include <svl/eitem.hxx> +#include <svl/lckbitem.hxx> #include <svtools/sfxecode.hxx> -#include <svtools/itemset.hxx> -#include <svtools/intitem.hxx> +#include <svl/itemset.hxx> +#include <svl/intitem.hxx> #include <svtools/svparser.hxx> // SvKeyValue #include <cppuhelper/weakref.hxx> #include <cppuhelper/implbase1.hxx> #define _SVSTDARR_ULONGS #define _SVSTDARR_STRINGSDTOR -#include <svtools/svstdarr.hxx> +#include <svl/svstdarr.hxx> #include <unotools/streamwrap.hxx> @@ -123,7 +123,7 @@ using namespace ::com::sun::star::io; #include <unotools/ucblockbytes.hxx> #include <unotools/pathoptions.hxx> #include <svtools/asynclink.hxx> -#include <svtools/inettype.hxx> +#include <svl/inettype.hxx> #include <ucbhelper/contentbroker.hxx> #include <ucbhelper/commandenvironment.hxx> #include <unotools/localfilehelper.hxx> @@ -134,7 +134,7 @@ using namespace ::com::sun::star::io; #include <ucbhelper/interactionrequest.hxx> #include <sot/stg.hxx> #include <unotools/saveopt.hxx> -#include <svtools/documentlockfile.hxx> +#include <svl/documentlockfile.hxx> #include "opostponedtruncationstream.hxx" #include "helper.hxx" diff --git a/sfx2/source/doc/docinsert.cxx b/sfx2/source/doc/docinsert.cxx index 5e2f3776d8..629c54a1dc 100644 --- a/sfx2/source/doc/docinsert.cxx +++ b/sfx2/source/doc/docinsert.cxx @@ -48,13 +48,13 @@ #include <com/sun/star/lang/IllegalArgumentException.hpp> #include <tools/urlobj.hxx> #include <vcl/msgbox.hxx> -#include <svtools/itemset.hxx> -#include <svtools/eitem.hxx> -#include <svtools/intitem.hxx> -#include <svtools/stritem.hxx> +#include <svl/itemset.hxx> +#include <svl/eitem.hxx> +#include <svl/intitem.hxx> +#include <svl/stritem.hxx> #define _SVSTDARR_STRINGSDTOR -#include <svtools/svstdarr.hxx> +#include <svl/svstdarr.hxx> using namespace ::com::sun::star::lang; using namespace ::com::sun::star::ui::dialogs; diff --git a/sfx2/source/doc/doctdlg.cxx b/sfx2/source/doc/doctdlg.cxx index 40fafa0b16..a0258f2e8c 100644 --- a/sfx2/source/doc/doctdlg.cxx +++ b/sfx2/source/doc/doctdlg.cxx @@ -34,7 +34,7 @@ #ifndef _MSGBOX_HXX //autogen #include <vcl/msgbox.hxx> #endif -#include <svtools/stritem.hxx> +#include <svl/stritem.hxx> #ifndef GCC #endif diff --git a/sfx2/source/doc/docvor.cxx b/sfx2/source/doc/docvor.cxx index ea0eced3d2..e18ec15f88 100644 --- a/sfx2/source/doc/docvor.cxx +++ b/sfx2/source/doc/docvor.cxx @@ -44,9 +44,9 @@ #include <vcl/menubtn.hxx> #include <vcl/msgbox.hxx> #include <vcl/print.hxx> -#include <svtools/style.hxx> -#include <svtools/stritem.hxx> -#include <svtools/eitem.hxx> +#include <svl/style.hxx> +#include <svl/stritem.hxx> +#include <svl/eitem.hxx> #include <svtools/sfxecode.hxx> #include <svtools/ehdl.hxx> #include <svtools/imagemgr.hxx> @@ -81,7 +81,7 @@ #endif #include <comphelper/processfactory.hxx> #define _SVSTDARR_STRINGSDTOR -#include <svtools/svstdarr.hxx> +#include <svl/svstdarr.hxx> static const char cDelim = ':'; BOOL SfxOrganizeListBox_Impl::bDropMoveOk = TRUE; diff --git a/sfx2/source/doc/frmdescr.cxx b/sfx2/source/doc/frmdescr.cxx index 3db8bf61ed..2cf885323c 100644 --- a/sfx2/source/doc/frmdescr.cxx +++ b/sfx2/source/doc/frmdescr.cxx @@ -34,7 +34,7 @@ #include <sot/object.hxx> #include <tools/stream.hxx> #include <vcl/splitwin.hxx> -#include <svtools/itemset.hxx> +#include <svl/itemset.hxx> #ifndef GCC #endif diff --git a/sfx2/source/doc/guisaveas.cxx b/sfx2/source/doc/guisaveas.cxx index 6d0a885747..de934f5548 100644 --- a/sfx2/source/doc/guisaveas.cxx +++ b/sfx2/source/doc/guisaveas.cxx @@ -64,8 +64,7 @@ #include <unotools/pathoptions.hxx> #include <unotools/pathoptions.hxx> -#include <svtools/itemset.hxx> -#include <svtools/adrparse.hxx> +#include <svl/itemset.hxx> #include <unotools/useroptions.hxx> #include <unotools/saveopt.hxx> #include <tools/debug.hxx> diff --git a/sfx2/source/doc/new.cxx b/sfx2/source/doc/new.cxx index 726e0bbfc5..bcef29a045 100644 --- a/sfx2/source/doc/new.cxx +++ b/sfx2/source/doc/new.cxx @@ -37,8 +37,8 @@ #ifndef _SVMEDIT_HXX #include <svtools/svmedit.hxx> #endif -#include <svtools/itemset.hxx> -#include <svtools/eitem.hxx> +#include <svl/itemset.hxx> +#include <svl/eitem.hxx> #include <svtools/sfxecode.hxx> #include <svtools/ehdl.hxx> #include <tools/urlobj.hxx> diff --git a/sfx2/source/doc/objcont.cxx b/sfx2/source/doc/objcont.cxx index c2c4ee717f..7797bd37ef 100644 --- a/sfx2/source/doc/objcont.cxx +++ b/sfx2/source/doc/objcont.cxx @@ -41,15 +41,15 @@ #include <com/sun/star/beans/XFastPropertySet.hpp> #include <tools/cachestr.hxx> #include <vcl/msgbox.hxx> -#include <svtools/style.hxx> +#include <svl/style.hxx> #include <vcl/wrkwin.hxx> -#include <svtools/stritem.hxx> -#include <svtools/intitem.hxx> -#include <svtools/rectitem.hxx> -#include <svtools/eitem.hxx> -#include <svtools/urihelper.hxx> -#include <svtools/ctloptions.hxx> +#include <svl/stritem.hxx> +#include <svl/intitem.hxx> +#include <svl/rectitem.hxx> +#include <svl/eitem.hxx> +#include <svl/urihelper.hxx> +#include <svl/ctloptions.hxx> #include <comphelper/processfactory.hxx> #include <comphelper/storagehelper.hxx> #include <unotools/securityoptions.hxx> diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx index d6cce3c0fe..bfc2d96310 100644 --- a/sfx2/source/doc/objmisc.cxx +++ b/sfx2/source/doc/objmisc.cxx @@ -32,12 +32,12 @@ #include "precompiled_sfx2.hxx" #ifndef _INETMSG_HXX //autogen -#include <svtools/inetmsg.hxx> +#include <svl/inetmsg.hxx> #endif #include <tools/diagnose_ex.h> -#include <svtools/eitem.hxx> -#include <svtools/stritem.hxx> -#include <svtools/intitem.hxx> +#include <svl/eitem.hxx> +#include <svl/stritem.hxx> +#include <svl/intitem.hxx> #include <svtools/svparser.hxx> // SvKeyValue #include <vos/mutex.hxx> #include <cppuhelper/exc_hlp.hxx> @@ -115,8 +115,8 @@ using namespace ::com::sun::star::container; #include <unotools/ucbhelper.hxx> #include <tools/inetmime.hxx> #include <tools/urlobj.hxx> -#include <svtools/inettype.hxx> -#include <svtools/sharecontrolfile.hxx> +#include <svl/inettype.hxx> +#include <svl/sharecontrolfile.hxx> #include <osl/file.hxx> #include <rtl/bootstrap.hxx> #include <vcl/svapp.hxx> diff --git a/sfx2/source/doc/objserv.cxx b/sfx2/source/doc/objserv.cxx index f9c5148754..cf6310bd2e 100644 --- a/sfx2/source/doc/objserv.cxx +++ b/sfx2/source/doc/objserv.cxx @@ -54,10 +54,10 @@ #include <com/sun/star/security/DocumentSignatureInformation.hpp> #include <com/sun/star/security/XDocumentDigitalSignatures.hpp> #include <tools/urlobj.hxx> -#include <svtools/whiter.hxx> +#include <svl/whiter.hxx> #include <vcl/msgbox.hxx> -#include <svtools/intitem.hxx> -#include <svtools/eitem.hxx> +#include <svl/intitem.hxx> +#include <svl/eitem.hxx> #include <vcl/wrkwin.hxx> #include <svtools/sfxecode.hxx> #include <svtools/ehdl.hxx> diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx index 23ada65f9a..e293fc3673 100644 --- a/sfx2/source/doc/objstor.cxx +++ b/sfx2/source/doc/objstor.cxx @@ -34,9 +34,9 @@ #ifndef _MSGBOX_HXX //autogen #include <vcl/msgbox.hxx> #endif -#include <svtools/eitem.hxx> -#include <svtools/stritem.hxx> -#include <svtools/intitem.hxx> +#include <svl/eitem.hxx> +#include <svl/stritem.hxx> +#include <svl/intitem.hxx> #include <tools/zcodec.hxx> #include <com/sun/star/frame/XStorable.hpp> #include <com/sun/star/frame/XModel.hpp> diff --git a/sfx2/source/doc/objuno.cxx b/sfx2/source/doc/objuno.cxx index e9e37a44c5..367325208d 100644 --- a/sfx2/source/doc/objuno.cxx +++ b/sfx2/source/doc/objuno.cxx @@ -59,7 +59,7 @@ #include <vos/mutex.hxx> #include <tools/errcode.hxx> -#include <svtools/cntwids.hrc> +#include <svl/cntwids.hrc> #include <comphelper/string.hxx> #include <comphelper/sequenceasvector.hxx> #include <comphelper/storagehelper.hxx> diff --git a/sfx2/source/doc/objxtor.cxx b/sfx2/source/doc/objxtor.cxx index 596aedef70..8f80ffbe1b 100644 --- a/sfx2/source/doc/objxtor.cxx +++ b/sfx2/source/doc/objxtor.cxx @@ -54,12 +54,12 @@ #include <vcl/wrkwin.hxx> #endif #include <vcl/svapp.hxx> -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> #include <tools/rtti.hxx> -#include <svtools/lstner.hxx> +#include <svl/lstner.hxx> #include <sfxhelp.hxx> #include <basic/sbstar.hxx> -#include <svtools/stritem.hxx> +#include <svl/stritem.hxx> #include <basic/sbx.hxx> #include <unotools/eventcfg.hxx> @@ -82,9 +82,9 @@ #include <com/sun/star/document/XEmbeddedScripts.hpp> #include <com/sun/star/document/XScriptInvocationContext.hpp> -#include <svtools/urihelper.hxx> +#include <svl/urihelper.hxx> #include <unotools/pathoptions.hxx> -#include <svtools/sharecontrolfile.hxx> +#include <svl/sharecontrolfile.hxx> #include <unotools/localfilehelper.hxx> #include <unotools/ucbhelper.hxx> #include <svtools/asynclink.hxx> diff --git a/sfx2/source/doc/printhelper.cxx b/sfx2/source/doc/printhelper.cxx index ca0e28d322..957c245fb3 100755 --- a/sfx2/source/doc/printhelper.cxx +++ b/sfx2/source/doc/printhelper.cxx @@ -43,10 +43,10 @@ #include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/lang/EventObject.hpp> -#include <svtools/lstner.hxx> -#include <svtools/stritem.hxx> -#include <svtools/intitem.hxx> -#include <svtools/eitem.hxx> +#include <svl/lstner.hxx> +#include <svl/stritem.hxx> +#include <svl/intitem.hxx> +#include <svl/eitem.hxx> #include <unotools/tempfile.hxx> #include <unotools/localfilehelper.hxx> #include <osl/file.hxx> diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx index 25d2d964e9..f87a65d3f2 100644 --- a/sfx2/source/doc/sfxbasemodel.cxx +++ b/sfx2/source/doc/sfxbasemodel.cxx @@ -73,9 +73,9 @@ #include <cppuhelper/exc_hlp.hxx> #include <comphelper/processfactory.hxx> // can be removed when this is a "real" service #include <comphelper/componentcontext.hxx> -#include <svtools/itemset.hxx> -#include <svtools/stritem.hxx> -#include <svtools/eitem.hxx> +#include <svl/itemset.hxx> +#include <svl/stritem.hxx> +#include <svl/eitem.hxx> #include <basic/sbx.hxx> #include <basic/sbuno.hxx> #include <tools/urlobj.hxx> diff --git a/sfx2/source/explorer/nochaos.cxx b/sfx2/source/explorer/nochaos.cxx index a5f69a2e9c..a76f0d0bbe 100644 --- a/sfx2/source/explorer/nochaos.cxx +++ b/sfx2/source/explorer/nochaos.cxx @@ -31,9 +31,9 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sfx2.hxx" -#include <svtools/itempool.hxx> -#include <svtools/poolitem.hxx> -#include <svtools/stritem.hxx> +#include <svl/itempool.hxx> +#include <svl/poolitem.hxx> +#include <svl/stritem.hxx> #include <nochaos.hxx> #include <sfx2/sfxuno.hxx> diff --git a/sfx2/source/inc/appdata.hxx b/sfx2/source/inc/appdata.hxx index 402ca3bdae..555b2cc498 100644 --- a/sfx2/source/inc/appdata.hxx +++ b/sfx2/source/inc/appdata.hxx @@ -32,7 +32,7 @@ #include <tools/link.hxx> #include <tools/list.hxx> -#include <svtools/lstner.hxx> +#include <svl/lstner.hxx> #include <vcl/timer.hxx> #include <tools/string.hxx> #include "rtl/ref.hxx" @@ -58,7 +58,6 @@ class SfxFilterMatcher; class SfxCancelManager; class SfxStatusDispatcher; class SfxDdeTriggerTopic_Impl; -class SfxMiscCfg; class SfxDocumentTemplates; class SfxFrameArr_Impl; class SvtSaveOptions; @@ -122,7 +121,6 @@ public: SfxEventConfiguration* pEventConfig; SvUShorts* pDisabledSlotList; SvStrings* pSecureURLs; - SfxMiscCfg* pMiscConfig; SvtSaveOptions* pSaveOptions; SvtUndoOptions* pUndoOptions; SvtHelpOptions* pHelpOptions; diff --git a/sfx2/source/inc/applet.hxx b/sfx2/source/inc/applet.hxx index ee53c7dd66..73c9092ff5 100644 --- a/sfx2/source/inc/applet.hxx +++ b/sfx2/source/inc/applet.hxx @@ -43,8 +43,8 @@ #include <cppuhelper/implbase6.hxx> #include <rtl/ustring.hxx> -#include <svtools/ownlist.hxx> -#include <svtools/itemprop.hxx> +#include <svl/ownlist.hxx> +#include <svl/itemprop.hxx> namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; diff --git a/sfx2/source/inc/eventsupplier.hxx b/sfx2/source/inc/eventsupplier.hxx index 1593ed3a58..e6a2c96608 100644 --- a/sfx2/source/inc/eventsupplier.hxx +++ b/sfx2/source/inc/eventsupplier.hxx @@ -57,7 +57,7 @@ #include <vos/mutex.hxx> #include <cppuhelper/interfacecontainer.hxx> -#include <svtools/lstner.hxx> +#include <svl/lstner.hxx> #include <unotools/eventcfg.hxx> //-------------------------------------------------------------------------------------------------------- diff --git a/sfx2/source/inc/helpid.hrc b/sfx2/source/inc/helpid.hrc index 8e7643975d..eae960fc7a 100644 --- a/sfx2/source/inc/helpid.hrc +++ b/sfx2/source/inc/helpid.hrc @@ -32,7 +32,7 @@ // include ------------------------------------------------------------------ -#include <svtools/solar.hrc> +#include <svl/solar.hrc> // Help-Ids ----------------------------------------------------------------- diff --git a/sfx2/source/inc/iframe.hxx b/sfx2/source/inc/iframe.hxx index 332aaa171f..f67ec1f591 100644 --- a/sfx2/source/inc/iframe.hxx +++ b/sfx2/source/inc/iframe.hxx @@ -45,8 +45,8 @@ #include <cppuhelper/implbase6.hxx> #include <rtl/ustring.hxx> -#include <svtools/ownlist.hxx> -#include <svtools/itemprop.hxx> +#include <svl/ownlist.hxx> +#include <svl/itemprop.hxx> #include <sfx2/sfxuno.hxx> #include <sfx2/frmdescr.hxx> diff --git a/sfx2/source/inc/plugin.hxx b/sfx2/source/inc/plugin.hxx index 6c545e2fb2..f2dbfbdb03 100644 --- a/sfx2/source/inc/plugin.hxx +++ b/sfx2/source/inc/plugin.hxx @@ -45,8 +45,8 @@ #include <cppuhelper/implbase5.hxx> #include <rtl/ustring.hxx> -#include <svtools/ownlist.hxx> -#include <svtools/itemprop.hxx> +#include <svl/ownlist.hxx> +#include <svl/itemprop.hxx> #include <sfx2/sfxuno.hxx> diff --git a/sfx2/source/inc/sfxpicklist.hxx b/sfx2/source/inc/sfxpicklist.hxx index 5097112f6a..618bb0b2c1 100644 --- a/sfx2/source/inc/sfxpicklist.hxx +++ b/sfx2/source/inc/sfxpicklist.hxx @@ -34,7 +34,7 @@ #include <osl/mutex.hxx> #include <tools/string.hxx> #include <vcl/menu.hxx> -#include <svtools/lstner.hxx> +#include <svl/lstner.hxx> #include <com/sun/star/util/XStringWidth.hpp> #include <vector> diff --git a/sfx2/source/inc/templdgi.hxx b/sfx2/source/inc/templdgi.hxx index 55e7a317d2..f7f7740264 100644 --- a/sfx2/source/inc/templdgi.hxx +++ b/sfx2/source/inc/templdgi.hxx @@ -41,12 +41,12 @@ class SfxTemplateControllerItem; #ifndef _LSTBOX_HXX //autogen #include <vcl/lstbox.hxx> #endif -#include <svtools/lstner.hxx> +#include <svl/lstner.hxx> #include <svtools/svtreebx.hxx> -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> #define _SVSTDARR_USHORTS -#include <svtools/svstdarr.hxx> // SvUShorts +#include <svl/svstdarr.hxx> // SvUShorts #include <rsc/rscsfx.hxx> #include <tools/rtti.hxx> diff --git a/sfx2/source/inc/virtmenu.hxx b/sfx2/source/inc/virtmenu.hxx index 5e2436db51..f939ac775d 100644 --- a/sfx2/source/inc/virtmenu.hxx +++ b/sfx2/source/inc/virtmenu.hxx @@ -32,7 +32,7 @@ #define _SFXVIRTMENU_HXX -#include <svtools/svarray.hxx> +#include <svl/svarray.hxx> #include <sfx2/mnuitem.hxx> #include "mnucfga.hxx" diff --git a/sfx2/source/inc/workwin.hxx b/sfx2/source/inc/workwin.hxx index dc231c1af7..8735e24b90 100644 --- a/sfx2/source/inc/workwin.hxx +++ b/sfx2/source/inc/workwin.hxx @@ -42,7 +42,7 @@ #include <cppuhelper/propshlp.hxx> #define _SVSTDARR_USHORTS -#include <svtools/svstdarr.hxx> // SvUShorts +#include <svl/svstdarr.hxx> // SvUShorts #include <rtl/ustring.hxx> #include <vos/mutex.hxx> diff --git a/sfx2/source/inet/inettbc.cxx b/sfx2/source/inet/inettbc.cxx index beae0e9a1a..27ce878499 100644 --- a/sfx2/source/inet/inettbc.cxx +++ b/sfx2/source/inet/inettbc.cxx @@ -40,11 +40,11 @@ #include <com/sun/star/frame/XFramesSupplier.hpp> #endif #include <com/sun/star/task/XInteractionHandler.hpp> -#include <svtools/eitem.hxx> -#include <svtools/stritem.hxx> -#include <svtools/cancel.hxx> +#include <svl/eitem.hxx> +#include <svl/stritem.hxx> +#include <svl/cancel.hxx> #include <unotools/historyoptions.hxx> -#include <svtools/folderrestriction.hxx> +#include <svl/folderrestriction.hxx> #include <vcl/toolbox.hxx> #ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_ #include <toolkit/unohlp.hxx> @@ -57,8 +57,8 @@ #endif #include <rtl/ustring.hxx> -#include <svtools/itemset.hxx> -#include <svtools/urihelper.hxx> +#include <svl/itemset.hxx> +#include <svl/urihelper.hxx> #include <unotools/pathoptions.hxx> #include <svtools/asynclink.hxx> #include <svtools/inettbc.hxx> diff --git a/sfx2/source/layout/sfxtabdialog.cxx b/sfx2/source/layout/sfxtabdialog.cxx index 0478fb0ea9..92454ae62f 100644 --- a/sfx2/source/layout/sfxtabdialog.cxx +++ b/sfx2/source/layout/sfxtabdialog.cxx @@ -37,7 +37,7 @@ #include <unotools/viewoptions.hxx> #define _SVSTDARR_USHORTS -#include <svtools/svstdarr.hxx> +#include <svl/svstdarr.hxx> #include "appdata.hxx" #include "sfxtypes.hxx" diff --git a/sfx2/source/menu/mnuitem.cxx b/sfx2/source/menu/mnuitem.cxx index 1974c4e59a..b4bab6168b 100644 --- a/sfx2/source/menu/mnuitem.cxx +++ b/sfx2/source/menu/mnuitem.cxx @@ -51,8 +51,8 @@ #include <comphelper/processfactory.hxx> #endif #include <tools/urlobj.hxx> -#include <svtools/eitem.hxx> -#include <svtools/stritem.hxx> +#include <svl/eitem.hxx> +#include <svl/stritem.hxx> #include <svtools/imagemgr.hxx> #include <svtools/menuoptions.hxx> #include <framework/menuconfiguration.hxx> diff --git a/sfx2/source/menu/mnumgr.cxx b/sfx2/source/menu/mnumgr.cxx index 4200054df0..356582c7ac 100644 --- a/sfx2/source/menu/mnumgr.cxx +++ b/sfx2/source/menu/mnumgr.cxx @@ -60,7 +60,7 @@ #include <sfx2/mnumgr.hxx> #define _SVSTDARR_USHORTS -#include <svtools/svstdarr.hxx> +#include <svl/svstdarr.hxx> #include <svtools/menuoptions.hxx> #include "virtmenu.hxx" diff --git a/sfx2/source/menu/objmnctl.cxx b/sfx2/source/menu/objmnctl.cxx index 27b500d7ff..85829a5338 100644 --- a/sfx2/source/menu/objmnctl.cxx +++ b/sfx2/source/menu/objmnctl.cxx @@ -38,7 +38,7 @@ #include <vcl/menu.hxx> #endif #ifndef _SXSTRITEM_HXX //autogen -#include <svtools/stritem.hxx> +#include <svl/stritem.hxx> #endif #ifndef GCC #endif diff --git a/sfx2/source/menu/virtmenu.cxx b/sfx2/source/menu/virtmenu.cxx index 5c42c0ef42..86f573097f 100644 --- a/sfx2/source/menu/virtmenu.cxx +++ b/sfx2/source/menu/virtmenu.cxx @@ -34,7 +34,7 @@ #include <sot/factory.hxx> #include <svtools/menuoptions.hxx> #include <svtools/imagemgr.hxx> -#include <svtools/imageitm.hxx> +#include <svl/imageitm.hxx> #include <com/sun/star/container/XEnumeration.hpp> #include <com/sun/star/frame/XDesktop.hpp> #include <com/sun/star/frame/XFramesSupplier.hpp> diff --git a/sfx2/source/notify/eventsupplier.cxx b/sfx2/source/notify/eventsupplier.cxx index ae1453f3fd..c1f6ee3767 100644 --- a/sfx2/source/notify/eventsupplier.cxx +++ b/sfx2/source/notify/eventsupplier.cxx @@ -42,7 +42,7 @@ #include <com/sun/star/util/XURLTransformer.hpp> #endif #include <tools/urlobj.hxx> -#include <svtools/macitem.hxx> +#include <svl/macitem.hxx> #include <sfx2/appuno.hxx> #include <sfx2/objsh.hxx> #include <sfx2/sfxbasemodel.hxx> diff --git a/sfx2/source/statbar/stbitem.cxx b/sfx2/source/statbar/stbitem.cxx index 6ceb8803de..7aa9ac545e 100644 --- a/sfx2/source/statbar/stbitem.cxx +++ b/sfx2/source/statbar/stbitem.cxx @@ -30,7 +30,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sfx2.hxx" -#include <svtools/stritem.hxx> +#include <svl/stritem.hxx> #ifndef GCC #endif #include <com/sun/star/util/URL.hpp> @@ -57,9 +57,9 @@ #include <sfx2/sfx.hrc> #include <comphelper/processfactory.hxx> -#include <svtools/eitem.hxx> -#include <svtools/stritem.hxx> -#include <svtools/intitem.hxx> +#include <svl/eitem.hxx> +#include <svl/stritem.hxx> +#include <svl/intitem.hxx> #ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_ #include <toolkit/unohlp.hxx> #endif diff --git a/sfx2/source/toolbox/tbxitem.cxx b/sfx2/source/toolbox/tbxitem.cxx index 905004bcd8..33e8d69c0c 100644 --- a/sfx2/source/toolbox/tbxitem.cxx +++ b/sfx2/source/toolbox/tbxitem.cxx @@ -58,12 +58,12 @@ #include <com/sun/star/ui/XUIFunctionListener.hpp> #include <com/sun/star/frame/status/Visibility.hpp> #include <com/sun/star/document/CorruptedFilterConfigurationException.hpp> -#include <svtools/eitem.hxx> -#include <svtools/stritem.hxx> -#include <svtools/intitem.hxx> -#include <svtools/imageitm.hxx> -#include <svtools/visitem.hxx> -#include <svtools/urlbmk.hxx> +#include <svl/eitem.hxx> +#include <svl/stritem.hxx> +#include <svl/intitem.hxx> +#include <svl/imageitm.hxx> +#include <svl/visitem.hxx> +#include <svl/urlbmk.hxx> #include <vcl/toolbox.hxx> #include <unotools/moduleoptions.hxx> diff --git a/sfx2/source/view/frame.cxx b/sfx2/source/view/frame.cxx index e5d7ca0693..9b6d39b195 100644 --- a/sfx2/source/view/frame.cxx +++ b/sfx2/source/view/frame.cxx @@ -43,12 +43,12 @@ #ifndef _MENU_HXX //autogen #include <vcl/menu.hxx> #endif -#include <svtools/intitem.hxx> +#include <svl/intitem.hxx> #ifndef _SPLITWIN_HXX //autogen #include <vcl/splitwin.hxx> #endif -#include <svtools/eitem.hxx> -#include <svtools/stritem.hxx> +#include <svl/eitem.hxx> +#include <svl/stritem.hxx> #ifndef _TOOLKIT_UNOHLP_HXX #include <toolkit/helper/vclunohelper.hxx> #endif diff --git a/sfx2/source/view/frmload.cxx b/sfx2/source/view/frmload.cxx index fa0a6fe75d..b439dca4ff 100644 --- a/sfx2/source/view/frmload.cxx +++ b/sfx2/source/view/frmload.cxx @@ -62,10 +62,10 @@ #include <rtl/ustring.h> #include <rtl/logfile.hxx> -#include <svtools/itemset.hxx> +#include <svl/itemset.hxx> #include <vcl/window.hxx> -#include <svtools/eitem.hxx> -#include <svtools/stritem.hxx> +#include <svl/eitem.hxx> +#include <svl/stritem.hxx> #include <tools/urlobj.hxx> #include <vos/mutex.hxx> #include <svtools/sfxecode.hxx> diff --git a/sfx2/source/view/impframe.cxx b/sfx2/source/view/impframe.cxx index 5c22507979..d57771c1ae 100644 --- a/sfx2/source/view/impframe.cxx +++ b/sfx2/source/view/impframe.cxx @@ -36,7 +36,7 @@ #include "impframe.hxx" -#include <svtools/smplhint.hxx> +#include <svl/smplhint.hxx> #include <sfx2/frame.hxx> #include <sfx2/bindings.hxx> diff --git a/sfx2/source/view/impframe.hxx b/sfx2/source/view/impframe.hxx index de5995dfb8..ff40ec6f20 100644 --- a/sfx2/source/view/impframe.hxx +++ b/sfx2/source/view/impframe.hxx @@ -31,7 +31,7 @@ #ifndef _SFX_IMPFRAME_HXX #define _SFX_IMPFRAME_HXX -#include <svtools/cancel.hxx> +#include <svl/cancel.hxx> #include <sfx2/frame.hxx> #include <sfx2/viewfrm.hxx> // SvBorder diff --git a/sfx2/source/view/ipclient.cxx b/sfx2/source/view/ipclient.cxx index 18fe96ebb0..1a8754d651 100644 --- a/sfx2/source/view/ipclient.cxx +++ b/sfx2/source/view/ipclient.cxx @@ -72,7 +72,7 @@ #include <toolkit/helper/convert.hxx> #include <tools/fract.hxx> #include <tools/gen.hxx> -#include <svtools/rectitem.hxx> +#include <svl/rectitem.hxx> #include <svtools/soerr.hxx> #include <comphelper/processfactory.hxx> diff --git a/sfx2/source/view/prnmon.cxx b/sfx2/source/view/prnmon.cxx index ba397cb672..b840c40a25 100644 --- a/sfx2/source/view/prnmon.cxx +++ b/sfx2/source/view/prnmon.cxx @@ -40,7 +40,7 @@ #include <svtools/asynclink.hxx> #include <unotools/printwarningoptions.hxx> -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> #ifndef GCC #endif diff --git a/sfx2/source/view/topfrm.cxx b/sfx2/source/view/topfrm.cxx index 0ed183c6fc..5d03bb3e61 100644 --- a/sfx2/source/view/topfrm.cxx +++ b/sfx2/source/view/topfrm.cxx @@ -60,14 +60,14 @@ #include <com/sun/star/beans/XMaterialHolder.hpp> #include <com/sun/star/awt/XWindow2.hpp> #include <vcl/menu.hxx> -#include <svtools/rectitem.hxx> -#include <svtools/intitem.hxx> -#include <svtools/eitem.hxx> -#include <svtools/stritem.hxx> +#include <svl/rectitem.hxx> +#include <svl/intitem.hxx> +#include <svl/eitem.hxx> +#include <svl/stritem.hxx> #include <svtools/asynclink.hxx> #include <svtools/sfxecode.hxx> #include <vcl/dialog.hxx> -#include <svtools/urihelper.hxx> +#include <svl/urihelper.hxx> #include <unotools/moduleoptions.hxx> #include <unotools/configmgr.hxx> #include <unotools/bootstrap.hxx> diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx index 3b6f43f358..577c9a8b07 100644 --- a/sfx2/source/view/viewfrm.cxx +++ b/sfx2/source/view/viewfrm.cxx @@ -45,12 +45,12 @@ #include <vcl/splitwin.hxx> #endif #include <unotools/moduleoptions.hxx> -#include <svtools/intitem.hxx> -#include <svtools/stritem.hxx> -#include <svtools/eitem.hxx> -#include <svtools/slstitm.hxx> -#include <svtools/whiter.hxx> -#include <svtools/undo.hxx> +#include <svl/intitem.hxx> +#include <svl/stritem.hxx> +#include <svl/eitem.hxx> +#include <svl/slstitm.hxx> +#include <svl/whiter.hxx> +#include <svl/undo.hxx> #ifndef _MSGBOX_HXX //autogen #include <vcl/msgbox.hxx> #endif @@ -90,7 +90,7 @@ #include <basic/sbx.hxx> #include <comphelper/storagehelper.hxx> #include <svtools/asynclink.hxx> -#include <svtools/sharecontrolfile.hxx> +#include <svl/sharecontrolfile.hxx> using namespace ::com::sun::star; using namespace ::com::sun::star::uno; diff --git a/sfx2/source/view/viewprn.cxx b/sfx2/source/view/viewprn.cxx index 8da29780c7..b9cb144f27 100644 --- a/sfx2/source/view/viewprn.cxx +++ b/sfx2/source/view/viewprn.cxx @@ -33,7 +33,7 @@ #include <com/sun/star/document/XDocumentProperties.hpp> #include <com/sun/star/view/PrintableState.hpp> -#include <svtools/itempool.hxx> +#include <svl/itempool.hxx> #ifndef _MSGBOX_HXX //autogen #include <vcl/msgbox.hxx> #endif @@ -43,10 +43,10 @@ #ifndef _SV_PRNSETUP_HXX //autogen #include <svtools/prnsetup.hxx> #endif -#include <svtools/flagitem.hxx> -#include <svtools/stritem.hxx> -#include <svtools/intitem.hxx> -#include <svtools/eitem.hxx> +#include <svl/flagitem.hxx> +#include <svl/stritem.hxx> +#include <svl/intitem.hxx> +#include <svl/eitem.hxx> #include <sfx2/app.hxx> #include <unotools/useroptions.hxx> #include <unotools/printwarningoptions.hxx> diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx index 43564e1488..71007a0d97 100644 --- a/sfx2/source/view/viewsh.cxx +++ b/sfx2/source/view/viewsh.cxx @@ -30,12 +30,12 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sfx2.hxx" -#include <svtools/stritem.hxx> -#include <svtools/eitem.hxx> -#include <svtools/whiter.hxx> +#include <svl/stritem.hxx> +#include <svl/eitem.hxx> +#include <svl/whiter.hxx> #include <vcl/msgbox.hxx> #include <vcl/toolbox.hxx> -#include <svtools/intitem.hxx> +#include <svl/intitem.hxx> #include <svtools/sfxecode.hxx> #include <svtools/ehdl.hxx> #include <com/sun/star/frame/XLayoutManager.hpp> diff --git a/svx/inc/bolnitem.hxx b/svx/inc/bolnitem.hxx index 9a05a6910e..117b0d24a4 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 4f2b665408..050c92f6ee 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 1cff33a509..739bde77eb 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 d1ba824d6d..6a53f92fde 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 773b84773e..40563867d6 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 f77f9dd09d..8c9f7a60d4 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 8b840a44cf..380464c06e 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 6acf482ef5..f0fd60cc7f 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 2f294295a3..df48708e34 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 b2d03ec397..54d9fef468 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 9bb53a2942..fccbc48fb5 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 0d00d17f39..540fb9e59f 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 82efbf7dbe..b83f593bb9 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 7f5367a47a..12a4662222 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 b1e619c218..b86057e353 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 5611332119..5f1aae5e30 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 07570c76d8..be86dfb13a 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 6c508c2311..454ef9f20c 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 d19fac542e..53ee747d5b 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 2ff2d26d60..20279338e9 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 78b24e8d15..82d1c31a4a 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 22d3175fa1..675acefa1e 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 70541df263..30f90f7c7b 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 785bddde20..98b114085d 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 e3d3a5dfbb..bb13dfc0e4 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 57e48f6492..3b01a4c374 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 8be5742c6d..a16e3316b0 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 61bae7ff80..2d8241db3b 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 c219a9e542..fb17b4b5c8 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 4d6b6a0040..0d55fa4638 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 d118cfbb40..aea1b42c8f 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 f0a15bc7f3..c6871a7e16 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 7771e5ba73..0b1cf0c12f 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 8f510cf8ba..ab94837ffe 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 fc8ddbab23..4a9b3e3765 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 6314e3ba00..1fc02c558d 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 7237316d4f..b9186a61db 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 1df6e3da9f..411d2f941e 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 51400570db..05b44e3a8a 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 818c3c8596..f82c492c46 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 54e7785b81..059f301efe 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 81473875b4..c2644b9bce 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 37430bc883..7f5d7bb7f5 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 2337c66f79..1e117d040f 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 82736c7410..a4ad27dc6f 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 30fd5ea1a7..eaa800a899 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 baf4b12ff5..901c489a34 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 b23e3c6c15..0d5a901f7e 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 d81fbf6567..67933f26b2 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 9a635dac25..36a7f38f7b 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 76179a11bc..625ec28ca5 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 fc8e5d19bc..fa9bc7da76 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 08b80f77d5..bcc09258b0 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 b8d300e14a..da04d2120f 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 4ee7fdb7dc..caa835b89a 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 8b70601dc8..5d12e900f5 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 5056451c63..2f24e8786a 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 64949e46d0..de8af1ee9b 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 90a13b7114..f2b1aaabdf 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 f7aab6ba52..8d5c18b302 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 ed18f2bfab..a75e157ef3 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 3dd2489b30..cc98e695ce 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 e36b6b3502..61a1cbe353 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 0957d8554f..4e1f301aea 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 8eccd5be30..a24b5a5cab 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 03435c4e96..b88ba95bf8 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 9cb082031a..e50298f551 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 3e68978b1b..70df9f75d5 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 8a969eb6d3..b717aed3b5 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 cfb0e3a30e..770fafb8a1 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 133f7bd1e3..97fffef06e 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 a17c608759..321e53fdbe 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 cd2eb35fb7..19f6b17f9a 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 d909434804..dc4d43c9f0 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 87a26e1df1..1513c15e2b 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 708e59aab9..57ee9cb29c 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 b99411663d..5723dd113e 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 bc40b396ec..b0ed4d1a38 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 73eeb648e9..6d97d9cab8 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 87eeb33d66..75f253487b 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 af53769190..81a1972f23 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 d3d8b57aa2..b6734dc5a4 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 229d8bcf19..7a6e48a909 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 2cf00190af..b3a284f068 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 6453898898..b93f930529 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 79f9f6443d..6c84d71aac 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 394c440a12..a8455819e2 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 95ad1193f6..f9b1caa8da 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 c86064a30d..b05cf29646 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 a259c16848..d5ccefd748 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 ff46ab5937..6e6acff2a9 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 58aef4c972..b58839bdeb 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 d153c7b27f..a6966ed089 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 7850623dec..58c7f8a943 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 cecea4f7b1..7571b8ffe8 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 163172c1da..fa8105da68 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 a98dc7a0e2..f678492366 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 9327fe343b..4a46bdc53a 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 dbe6a946af..680d828849 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 e4d74645e6..5d6886d9e7 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 599f12f6ad..ed78dc85d2 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 b0bf892e4a..cd96f03ca0 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 701dcaf728..b04fee0384 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 a1874fad6a..2a37c9161f 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 70de9aeb57..2b5e7df3a1 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 bf00ce12fb..2704f946f5 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 72e17855b5..5d1a69e986 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 eaac7692a2..81e9554149 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 165d62c1b6..5874c830d2 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 b7517ef973..70dc5dc54f 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 e5ee89aa12..d37e006d62 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 81c3e08c23..aa2f4bdcb2 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 6160dbeebe..323e4a06fc 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 c4fe591783..9f6fa35af3 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 c5ee7b6e74..ca255a6128 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 29d0001298..4a12a22dcf 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 4120f9b103..ea38817559 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 dba9f72cf6..7bc21a7816 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 473802d7cf..0fd8967c1a 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 56c0e8550e..7238b80915 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 93bf3a1479..548d78a778 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 3aa7330a6f..81cd87a87d 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 33fd3d0812..4620a13264 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 de73a88333..159e5c38ab 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 ecbdc32cb4..cfa5b648b1 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 a9ea7d22b1..2bff30ee10 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 0651f7cd7d..26d34abb10 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 335ecd3373..7f1c8aaa75 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 eb35d48735..275c7c7f23 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 8974d9f29a..8800b7cb46 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 78ab0344d4..36c481d267 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 bb051652a4..daeebaac51 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 9c11b8b112..ad7916e8a3 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 8157d4cc79..a0faab3317 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 ab8e35de0e..0095b40d85 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 3f86b5e899..2dfa5fb3d6 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 2fbce30fb7..eb972d4148 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 1ecd7c317b..eae1cf6926 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 373396588c..efe8d8f9ff 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 6e907000cc..e3112f0c56 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 d19bc696af..b335886b9e 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 0a8a3a0cec..267b0adb69 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 1e4dc79301..edd17a9ac6 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 aeb65776ab..67417ac88c 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 d46f51322f..d5b328361a 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 32f546955b..87d2262b76 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 b6601ff93a..b60ec2d586 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 d0985f2b66..96b11fda51 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 9d59807ce0..a84360ccb8 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 fcef2c605b..98156d5d25 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 e516b1bc8f..fd95b762dc 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 7366f1acf0..73c4c45bf4 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 fb06d47343..da5c79c2ed 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 97d1b9349f..563bd01abd 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 93575b270e..513a56822f 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 fe553574bd..f63cfbc48c 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 0f320b9612..27885c61ad 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 ded8976ca4..6807b47999 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 2b50f9d309..8ba3e394e5 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 59a9dff68d..ffb69ae225 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 2742542bac..73c3e43329 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 ff4e898c29..f192de55be 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 e4b5174e90..4766860a7a 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 eb22a47016..4fbfda9dec 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 39eabd4d41..fbd0885750 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 0aee56400d..747a999b95 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 1d1d8d5eb5..a912b4348b 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 ba2159d7c0..627a5e4969 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 83b283ea77..63fa08c7d5 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 582cc0f6ac..ae0d5ab995 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 c50514ff0d..1ed03ddb9c 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 56c234a549..71373c9fdf 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 040e347de5..c06e1ae718 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 87fe4d5457..cb706080e9 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 fbbdc09769..57af63d210 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 f085f31ff6..87b35afccc 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 d4630827e4..4c8693e69c 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 c98573cb02..98a79b0f2f 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 35b78558aa..59d7d131b6 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 acaad7220c..74d3c447ff 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 9b9f1a8d97..db58c3a070 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 ce755f4e1c..7d72bbaef5 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 5b8d309739..3af01e45c4 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 50cda7eb59..11d56f5fd8 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 5976c7d35f..c4805a413c 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 a9b900a230..be49f3c470 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 e11ea53c74..33d96c1852 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 f55bbd6e3e..b89182723f 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 58cf4bea94..7bf94b7ad9 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 044cff3805..3bdd30c3d9 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 b72d237b28..0350140910 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 627a93f054..d3921e7a9a 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 e5c00cba79..311eb4a058 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 35caf4059b..9ba2a52684 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 c725f5784e..e68d47ad17 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 3f0435b309..fffb5e3a36 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 51c87bc7d1..3427999306 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 6d0720e0e0..ffb19792b8 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 8e63b8a8b5..e46a91634a 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 ee35055b1f..64c7aab92a 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 e5ce32d620..d94f1fbbb5 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 52d14999f5..c75bb76833 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; diff --git a/svx/source/accessibility/AccessibleEmptyEditSource.cxx b/svx/source/accessibility/AccessibleEmptyEditSource.cxx index e4afee69da..0ed80a5af8 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 a3737c181a..83350ae116 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 26c855ba69..89382818f4 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 9de0626fe3..f7b8981b84 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 43e0bb5bae..e57b3e854c 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 d115544cfb..5ff1042fcb 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 77538a9a66..20b58020cb 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 4da7f0d8d8..67e5a2d5a0 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 4e70365223..079d1273be 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 1ab5a45b9e..fa0b1bc6b1 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 2931be6c17..249c25a875 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 4aee5295e2..8bbbb8828a 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 2925fd9e7f..caa287a821 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 b519823466..a5626c9fc4 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 9df95d970d..03985bbb89 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 0f789ee0b8..789babe064 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 c67c6f40c8..8a53d6fd50 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 8965dc9105..bf9346b127 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 de9b1ec86c..d4be1f525a 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 9bba07f614..cbc640c750 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 7788ea7e80..b811022361 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 a66c7b3c10..0c81cfb8e1 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 4549d9c7b3..aa27b0d828 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 23b1ceeccf..3115830c44 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 1696462522..c1a5345a2c 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 5290fd1cc2..eaf217a3df 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 72147f49e6..dd4e40f173 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 ff3582ae3a..c8080fefb8 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 238cfb4432..b1a2f9df3e 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 7ed9b2a508..b264b131bf 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 9cbbaca680..29b52a50e4 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 0a38f57481..5a06145e07 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 303687300e..84c25b2047 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 08508314b1..277d74abb8 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 c6639a66bb..ff3f3c6fbc 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 d4dc239aaa..df4355dc7a 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 aabc03766f..e0a7d7f376 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 90b0f8042d..40e25ca418 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 2e76c5be4a..55725565df 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 6a8ed9a030..5f3ff2a793 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 8058041662..0a6332f0b6 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 4dce9737d2..b9a65739cc 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 3d72463198..3fbbaad0a6 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 266c0a715c..203574617a 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 cb4fe626f8..448ac80b9d 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 ed8f8a46f3..2a7b234590 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 55476b1120..59605a090a 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 f705df676b..9e62945494 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 31f1de9cbe..49e5ecb428 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 614cd5259f..fa72be99d5 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 faa0d971b7..7a8720aa32 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 d0c00b121f..6777894832 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 26d775cab7..c554bdea1f 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 166d17fb18..e299180ccf 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 9827d9a36b..39f561ee8b 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 f3a795f09e..a03639f84e 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 53f9cc695c..026674be36 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 16dd8ae5d3..4859af4741 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 be9cdfd096..cc981a82ed 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 437f5f0fc5..19443c0dae 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 25668f4149..e5d4d87ef1 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 2ebbf8bcde..446bca13a4 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 2275e0d8fe..df4253147a 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 5c50d1a433..a7f9f47c24 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 af327d5705..359dae6b8d 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 f5e9f719ce..56bccc68e9 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 83e0e33bd8..8f81e5485a 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 b649a8e306..4cb3f8cc16 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 b746b7d650..abc84ddc9b 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 ae5f2d7365..1dc7580bef 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 b4f40e15ab..023e0f5135 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 b3aecc4405..0af3c55d7e 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 24a4a1ba90..8fccd7bc03 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 961c878df2..8a0b813e0e 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 538e8eb523..ad3b896330 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 32da416f0c..74f1a1162b 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 78fc77a336..97281f8714 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 e8f40b49dd..7e88b933e0 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 ed94bcf075..f53d79bf5b 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 2fad91e12e..1ce09428f0 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 a663bc6fcf..c1561822cf 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 1b33ad47ac..4c0bd9a87e 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 a81eba3cb1..6d5475fff7 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 7258c2ca4a..f0827a25e7 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 84f5debf8c..9406c09672 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 becd5ad806..0a05a75b3d 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 fe75592b6e..79d0490720 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 57e9296dbe..a1fd1e8bbd 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 d76dd9a4a2..8e016995a0 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 f83c7608ac..f1174bde5c 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 9ba5238dea..1d8e3a5491 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 4956823903..f5c56a58e7 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 62cb5a4839..06b26d7562 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 85fe1b9057..f57679299c 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 31d108dfe0..507b03d30d 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 51005adb84..4a2303149f 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 9abaeb6b38..6ca40f2486 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 552d2e862b..d81ec83ceb 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 5e67d87e28..74257dec75 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 515959fb03..3f117045b2 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 c6d5101a9d..a472b92946 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 6a4aecc293..10a572d43a 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 13d479b294..66c437c7ad 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 78fb5fc85a..8e5170b6d6 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 460212a112..71bc790664 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 692557307d..28b8f493dc 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 4d455987bd..439691d4ca 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 a24b1697c3..818ae1f710 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 eb4e7caf8b..78764a0c9a 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 90efe213b6..0828f9dc4e 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 e0d5fc27e9..4aba92347e 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 80027fff73..67f8cb69ad 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 fa1fa19db7..f023ad546d 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 d8f0a332b9..f0c9d0403f 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 0ec73b2dd6..ff0928954e 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 2fb92641ef..09768f67bf 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 1396a89307..0399553998 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 4079f53348..8ab5389ee1 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 ce23a1e00e..0951d2c6e4 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 65c1b6c516..39100e88ab 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 51dff075be..cc5e08e5f7 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 adf6afb7c2..39cbb85a8e 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 6be5fc0ef0..769a5c7ca0 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 8316d9a94f..a51824ec34 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 fde4e22e8c..02535744fe 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 05ed752fbf..42fbfdb669 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 02a0cf267b..fd3028493d 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 85c35f03cb..d7274e3cb0 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 f43e372e34..cd6ee50e8d 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 5079f527bc..05de87c705 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 aee39a7f10..7eac30e0b7 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 f79731a982..4633985e45 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 2723e11ddc..f38c341847 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 b7d117b3de..215e74d72f 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 7f9680e879..70b7de5662 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 55d92e07a0..e511a2e0ba 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 a0c7541f48..355b2114a0 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 645787b518..fc2fe241a3 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 58ad4d641e..c986ba991c 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 66acca4748..b6a11292f1 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 15a843ee88..32a245120f 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 7555b3d30d..7dafa98b75 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 6f3c9f5a75..c81875174e 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 2fc7022f73..32e3b85930 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 4e28c62a83..dfd7ff7b33 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 c5a5eb2391..6d9a24d070 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 0898dcdb2b..5a8baa8086 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 289ff4379c..e0ae02dde3 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 ca5df8ff16..6aee6b1f81 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 c7f058ca80..e7375dbfff 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 9acea83d4a..b2d09177d6 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 c76cdce576..655a5f11e0 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 85923590f3..db97446f93 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 351ff3d77e..3f7b1ce174 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 c84d8d5ae5..8046f0ee42 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 bb008a0727..2d664f9e2b 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 2cbbcb2fe4..03fe48776f 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 867d82dd7c..f01a9fc415 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 0e13eedb31..021f23d921 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 3c71698f06..ae6cbfda52 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 fab29dbba6..e7ae4fd9c5 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 5f093b375e..33b84ce08e 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 8edb9c773d..9235e212ba 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 66cac43b3b..5731087c48 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 a29ea00665..fbe7d9b09f 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 b2fae878a7..9155d5049e 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 f588a7035a..26b4a4cfb8 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 361b8d1750..486debf4b2 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 5b1bef3c9c..1a92eb889e 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 96ce38d50b..1e90d7699b 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 e01db0cffb..5268071f9c 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 aee8cf13fe..5fc1e51908 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 8460558e67..b241e08996 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 c3cd979955..221bd147fc 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 ddb8671064..0e93d05e90 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 5b478be7b0..c279e75633 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 30251b6b3a..492a8d692c 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 cd1731d23d..8f38b47739 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 d88542e014..68eddf861c 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 8b6b11eaba..5c8682a25e 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 60ef1a1143..f6d3ebd769 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 cf72c9cc5d..128abb3936 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 43fea6e316..7812afe440 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 9f41159053..c1ee8fe2a0 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 f290864808..e247942df3 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 036a7d24e1..1b60bf32f5 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 71387e4789..8f92442f30 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 8bd8c3b6b6..b19cf91773 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 5781e7bbeb..2253195261 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 115493a205..ce545b0315 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 789381c3a3..3e19d34a8a 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 cf5dfd3d72..9012768fcb 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 9c7810ea46..3b6f853e71 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 417445b7d7..1d28beae6a 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 9538cba1b5..aaa885fb2a 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 c7b82b7c11..e3ce0ada1d 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 535d48d283..2e7cf36079 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 f47c2e9793..78f1a865ee 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 576d9ffed5..7ed8a62e33 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 53bef66057..5d55b764a8 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 de3021062b..bd1f683c5e 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 5726758b72..cf64c99da8 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 830a97c4e3..a6c9147c4f 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 4f3a8d7a5d..4fd21ddc24 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 e0590d5987..a31bfe8697 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 28ebae1b9a..713e62811a 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 c2c74b8d16..a706a24af9 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 f0d1af1590..5cd05f714e 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 69921e4227..2a180810e0 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 f04140dfac..e5d01d2c6c 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 45df3911ed..a721e7fb65 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 7bd657ddc5..681bfa8728 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 baace122db..c60c2008d9 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 fe317a495a..b1e45843ed 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 229ba89db5..f545b24fc2 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 de03c1459e..f4a1d35ddb 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 545ce1d83c..9f4fe8b45f 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 843c845426..92035ffcb7 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 a5376ab390..3292783154 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 c2f34c9c20..c25dfbf14f 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 554366c9f1..82ea343bf9 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 867c0956ca..37366c4f36 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 76c3c3f3ab..cd35046601 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 adca082371..a5089da2b5 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 a9019ed200..60a96b1722 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 52bfccdc0c..f9f4ad2070 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 c8e2066bf5..4c67ed985c 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 21eef709ef..2ba06a6b80 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 991582d84b..5bf35f2398 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 f8220ad472..294c742f6a 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 828cd948ff..6fed224ea8 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 ae5686b2c6..a6f3f8fcf7 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 8630d2c1d1..13b5f4a3a2 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 363fa04a3c..39d67e0646 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 1c89bbbd70..8c927b1146 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 67d02ac706..fad9cfaa5b 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 d1966d1bfc..70cfe07549 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 975d5dea92..38f92739ca 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 1e89aab1b0..ceabd38c04 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 8b6d05ca9e..9153794e9d 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 a0116cd1d9..5d1b83146c 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 5768def141..41d7b3af7b 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 077ddce02e..3aa4ef82d9 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 ff7d82c523..d5d09aea94 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 07258ef669..0191eee99e 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 4a6484c230..a55e2d8740 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 9d4917efbc..1dad4b45ce 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 0df23e7bb0..79972849be 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 cf0034903e..eadfd6580e 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 93c0024ecc..83588ab129 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 3d8285b895..63643f178d 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 896e4d4aee..d55c311f14 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 92b64f3501..c64937043e 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 b86fba9d0c..fa97fe1b29 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 4d717d4dfa..5effd864f1 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 471b00d497..ca87b02088 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 8808a1dfd9..8e4587909d 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 5d96e0cfc4..84ebe26156 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 0f399fa73d..22b5a774b9 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 3be461adce..bdf6cf0537 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 d639b3e884..00d09251cd 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 4d6eb39511..2cf9c2be96 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 50388d6e5c..d3e22e9c0a 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 01f68240f9..24c237ee72 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 7cb779974b..3637cfa505 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 0afb9e8571..0982e843db 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 87e65ec556..c42ac872ac 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 18101465bc..734afcd45b 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 864fcd6d22..a35bcb6f9e 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 2cc1f4a43e..7c3b8b1201 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 7d522a9e01..99a2fb0657 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 fa56bc2111..7f9d4228cc 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 1c9ccdfd55..88967319d4 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 287ed3513d..9de79579d3 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 11130e35c6..b0ba9cbd8c 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 691d23ab43..c56203ea0c 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 ef1848cf3e..630d05228d 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 5d4effba94..79a9b78fc1 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 0296bc060f..f9d1ad5f0e 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 61854aa9cf..b560e9286e 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 b23dc0e6b3..7eec2700c1 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 879b13ad5e..2fa0cf4abc 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 9e17cc99e3..1cdb92d7f0 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 329905c31d..bb46cf14ff 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 25a72b0f8b..87d0d53e8c 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 9b3a4ec7df..6309b48b0a 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 1e7645df15..a2a6f8c6dd 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 638c27fe68..c010c7da47 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 8e4cd15b1c..f90b8ec83b 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 75c4d7ab68..224926e462 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 172f8a5f69..e6b03af1c4 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 ffeba43289..7efc794107 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 20807d46ff..0a357002aa 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 96eef1c0b0..6faf19938a 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 0706db84a9..c70b63a1e6 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 186f980c7c..249fd71d4e 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 77ad6522bf..5dbf7cc707 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 8a0f6f95dd..96a2956f63 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 f8b01a727c..08aed66ede 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 092540886a..966b467aa9 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 2b9002aa46..b3a797f956 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 1e527885b7..eb47f435ad 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 f34e9859aa..d0f2052526 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 40e7804adc..0bdaf792bb 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 fe81d0f8bd..f583b2edde 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 57e56fdec0..747a9c873b 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 e2a3ad1902..a3b2e6d6b3 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 4f43f10ce2..75f41bb262 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 90eba033e8..3e5bed7505 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 f83e6c35f3..1e48f30c13 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> diff --git a/svx/workben/edittest.cxx b/svx/workben/edittest.cxx index 13cd4ea698..fa1b80b97e 100644 --- a/svx/workben/edittest.cxx +++ b/svx/workben/edittest.cxx @@ -89,10 +89,10 @@ #include <fwdtitem.hxx> // SVTOOLS -#include <svtools/undo.hxx> -#include <svtools/itemset.hxx> -#include <svtools/itempool.hxx> -#include <svtools/poolitem.hxx> +#include <svl/undo.hxx> +#include <svl/itemset.hxx> +#include <svl/itempool.hxx> +#include <svl/poolitem.hxx> #include <svtools/printdlg.hxx> #include <osl/file.hxx> diff --git a/svx/workben/msview/msview.cxx b/svx/workben/msview/msview.cxx index 7e6cf43cff..208ba5b714 100644 --- a/svx/workben/msview/msview.cxx +++ b/svx/workben/msview/msview.cxx @@ -37,7 +37,7 @@ #include <boost/shared_ptr.hpp> #include <sot/storage.hxx> #ifndef _SVTOOLS_HRC -#include <svtools/svtools.hrc> +#include <svl/svtools.hrc> #endif #include <sal/main.h> diff --git a/uui/source/cookiedg.cxx b/uui/source/cookiedg.cxx index 98a91fd9f5..34e3d96a8a 100644 --- a/uui/source/cookiedg.cxx +++ b/uui/source/cookiedg.cxx @@ -28,7 +28,7 @@ * ************************************************************************/ -#include <svtools/httpcook.hxx> +#include <svl/httpcook.hxx> #include <tools/urlobj.hxx> #include <vcl/msgbox.hxx> diff --git a/uui/source/iahndl.cxx b/uui/source/iahndl.cxx index 127a9bcbd6..cc65580aec 100644 --- a/uui/source/iahndl.cxx +++ b/uui/source/iahndl.cxx @@ -113,8 +113,8 @@ #include "vos/mutex.hxx" #include "tools/rcid.h" #include "vcl/svapp.hxx" -#include "svtools/svtools.hrc" -#include "svtools/httpcook.hxx" +#include "svl/svtools.hrc" +#include "svl/httpcook.hxx" #include "svtools/sfxecode.hxx" #include "toolkit/helper/vclunohelper.hxx" #include "comphelper/sequenceashashmap.hxx" @@ -140,7 +140,7 @@ #include "loginerr.hxx" #include <comphelper/processfactory.hxx> -#include <svtools/zforlist.hxx> +#include <svl/zforlist.hxx> using namespace com::sun; namespace csss = ::com::sun::star::security; diff --git a/uui/source/ids.hrc b/uui/source/ids.hrc index bbfcaf7764..de76cced22 100644 --- a/uui/source/ids.hrc +++ b/uui/source/ids.hrc @@ -32,7 +32,7 @@ #define UUI_IDS_HRC #ifndef _SOLAR_HRC -#include "svtools/solar.hrc" +#include "svl/solar.hrc" #endif #ifndef _ERRCODE_HXX #include "tools/errcode.hxx" diff --git a/xmloff/inc/pch/precompiled_xmloff.hxx b/xmloff/inc/pch/precompiled_xmloff.hxx index 907f3682fe..1346445aca 100644 --- a/xmloff/inc/pch/precompiled_xmloff.hxx +++ b/xmloff/inc/pch/precompiled_xmloff.hxx @@ -436,15 +436,15 @@ #include "sot/clsids.hxx" -#include "svtools/cntnrsrt.hxx" -#include "svtools/itemset.hxx" +#include "svl/cntnrsrt.hxx" +#include "svl/itemset.hxx" #include "unotools/moduleoptions.hxx" -#include "svtools/nfsymbol.hxx" -#include "svtools/numuno.hxx" -#include "svtools/poolitem.hxx" -#include "svtools/svarray.hxx" -#include "svtools/svstdarr.hxx" -#include "svtools/urihelper.hxx" +#include "svl/nfsymbol.hxx" +#include "svl/numuno.hxx" +#include "svl/poolitem.hxx" +#include "svl/svarray.hxx" +#include "svl/svstdarr.hxx" +#include "svl/urihelper.hxx" #include "tools/bigint.hxx" diff --git a/xmloff/inc/xmlcnitm.hxx b/xmloff/inc/xmlcnitm.hxx index add06ae3f3..b63697781a 100644 --- a/xmloff/inc/xmlcnitm.hxx +++ b/xmloff/inc/xmlcnitm.hxx @@ -31,7 +31,7 @@ #ifndef _XMLOFF_XMLCNITM_HXX #define _XMLOFF_XMLCNITM_HXX -#include <svtools/poolitem.hxx> +#include <svl/poolitem.hxx> class SvXMLNamespaceMap; namespace rtl { class OUString; } diff --git a/xmloff/inc/xmloff/xmlcnimp.hxx b/xmloff/inc/xmloff/xmlcnimp.hxx index b7306d5158..2482369d63 100644 --- a/xmloff/inc/xmloff/xmlcnimp.hxx +++ b/xmloff/inc/xmloff/xmlcnimp.hxx @@ -35,11 +35,11 @@ #include "xmloff/dllapi.h" #include "sal/types.h" #include <com/sun/star/container/XNameAccess.hpp> -#include <svtools/svarray.hxx> +#include <svl/svarray.hxx> #include <xmloff/nmspmap.hxx> #define _SVSTDARR_USHORTS -#include <svtools/svstdarr.hxx> +#include <svl/svstdarr.hxx> namespace rtl { class OUString; } diff --git a/xmloff/source/core/i18nmap.cxx b/xmloff/source/core/i18nmap.cxx index 5f5d1a60c0..89cb16c9c2 100644 --- a/xmloff/source/core/i18nmap.cxx +++ b/xmloff/source/core/i18nmap.cxx @@ -32,7 +32,7 @@ #include "precompiled_xmloff.hxx" #include <rtl/ustring.hxx> #include <tools/debug.hxx> -#include <svtools/svarray.hxx> +#include <svl/svarray.hxx> #include "i18nmap.hxx" using namespace rtl; diff --git a/xmloff/source/core/xmlexp.cxx b/xmloff/source/core/xmlexp.cxx index f97e7cbfa3..26ce46ee60 100644 --- a/xmloff/source/core/xmlexp.cxx +++ b/xmloff/source/core/xmlexp.cxx @@ -86,7 +86,7 @@ #include <comphelper/extract.hxx> #include "PropertySetMerger.hxx" -#include "svtools/urihelper.hxx" +#include "svl/urihelper.hxx" #include "xformsexport.hxx" #include <unotools/docinfohelper.hxx> diff --git a/xmloff/source/core/xmlimp.cxx b/xmloff/source/core/xmlimp.cxx index e42dfecbe7..1dc3caf249 100644 --- a/xmloff/source/core/xmlimp.cxx +++ b/xmloff/source/core/xmlimp.cxx @@ -36,7 +36,7 @@ #include <osl/mutex.hxx> #include <rtl/uuid.h> #include <rtl/memory.h> -#include <svtools/svarray.hxx> +#include <svl/svarray.hxx> #include "unointerfacetouniqueidentifiermapper.hxx" #include <xmloff/nmspmap.hxx> #include <xmloff/xmluconv.hxx> diff --git a/xmloff/source/core/xmltkmap.cxx b/xmloff/source/core/xmltkmap.cxx index 9463dea06c..1d8583dbcd 100644 --- a/xmloff/source/core/xmltkmap.cxx +++ b/xmloff/source/core/xmltkmap.cxx @@ -32,7 +32,7 @@ #include "precompiled_xmloff.hxx" #include <tools/debug.hxx> #include <rtl/ustring.hxx> -#include <svtools/svarray.hxx> +#include <svl/svarray.hxx> #include <xmloff/xmltkmap.hxx> #include <xmloff/xmltoken.hxx> diff --git a/xmloff/source/draw/ximpstyl.cxx b/xmloff/source/draw/ximpstyl.cxx index e47b144ff7..0254d6ddf1 100644 --- a/xmloff/source/draw/ximpstyl.cxx +++ b/xmloff/source/draw/ximpstyl.cxx @@ -52,7 +52,7 @@ #include <xmloff/xmlprcon.hxx> #include <xmloff/families.hxx> #include <com/sun/star/container/XNameContainer.hpp> -#include <svtools/zforlist.hxx> +#include <svl/zforlist.hxx> #include "PropertySetMerger.hxx" #include "sdpropls.hxx" #include "layerimp.hxx" diff --git a/xmloff/source/style/XMLFontAutoStylePool.cxx b/xmloff/source/style/XMLFontAutoStylePool.cxx index f45fb244b8..363393bd73 100644 --- a/xmloff/source/style/XMLFontAutoStylePool.cxx +++ b/xmloff/source/style/XMLFontAutoStylePool.cxx @@ -31,7 +31,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_xmloff.hxx" #include <tools/debug.hxx> -#include <svtools/cntnrsrt.hxx> +#include <svl/cntnrsrt.hxx> #include <vcl/vclenum.hxx> #include "xmlnmspe.hxx" #include <xmloff/xmltoken.hxx> diff --git a/xmloff/source/style/impastpl.hxx b/xmloff/source/style/impastpl.hxx index 64aca01b6a..9b1bbca72b 100644 --- a/xmloff/source/style/impastpl.hxx +++ b/xmloff/source/style/impastpl.hxx @@ -33,7 +33,7 @@ #include <sal/types.h> #include <tools/list.hxx> -#include <svtools/cntnrsrt.hxx> +#include <svl/cntnrsrt.hxx> #include <rtl/ustring.hxx> #include <vector> #include <com/sun/star/uno/Reference.h> diff --git a/xmloff/source/style/numehelp.cxx b/xmloff/source/style/numehelp.cxx index 530f32c97a..d7ed9b35d7 100644 --- a/xmloff/source/style/numehelp.cxx +++ b/xmloff/source/style/numehelp.cxx @@ -40,7 +40,7 @@ #include <xmloff/xmlexp.hxx> #include <com/sun/star/uno/Reference.h> #include <rtl/ustring.hxx> -#include <svtools/zforlist.hxx> +#include <svl/zforlist.hxx> #include <com/sun/star/util/NumberFormat.hpp> #include <rtl/math.hxx> #include <tools/debug.hxx> diff --git a/xmloff/source/style/styleexp.cxx b/xmloff/source/style/styleexp.cxx index fa1877b481..4317107268 100644 --- a/xmloff/source/style/styleexp.cxx +++ b/xmloff/source/style/styleexp.cxx @@ -33,7 +33,7 @@ #include <tools/debug.hxx> #ifndef _SVSTDARR_STRINGSSORTDTOR_DECL #define _SVSTDARR_STRINGSSORTDTOR -#include <svtools/svstdarr.hxx> +#include <svl/svstdarr.hxx> #endif #include <xmloff/nmspmap.hxx> #include "xmlnmspe.hxx" diff --git a/xmloff/source/style/xmlexppr.cxx b/xmloff/source/style/xmlexppr.cxx index eac3d834cc..caf36c88c3 100644 --- a/xmloff/source/style/xmlexppr.cxx +++ b/xmloff/source/style/xmlexppr.cxx @@ -54,7 +54,7 @@ #ifndef _SVSTDARR_USHORTS #define _SVSTDARR_USHORTS -#include <svtools/svstdarr.hxx> +#include <svl/svstdarr.hxx> #endif using ::rtl::OUString; diff --git a/xmloff/source/style/xmlnumfe.cxx b/xmloff/source/style/xmlnumfe.cxx index 1fb40b3d05..61c1617bb1 100644 --- a/xmloff/source/style/xmlnumfe.cxx +++ b/xmloff/source/style/xmlnumfe.cxx @@ -34,10 +34,10 @@ #define _SVSTDARR_ULONGS #define _ZFORLIST_DECLARE_TABLE -#include <svtools/svstdarr.hxx> -#include <svtools/zforlist.hxx> -#include <svtools/zformat.hxx> -#include <svtools/numuno.hxx> +#include <svl/svstdarr.hxx> +#include <svl/zforlist.hxx> +#include <svl/zformat.hxx> +#include <svl/numuno.hxx> #include <i18npool/mslangid.hxx> #include <tools/debug.hxx> #include <rtl/math.hxx> @@ -60,8 +60,8 @@ #include <xmloff/xmlnumfi.hxx> // SvXMLNumFmtDefaults #define _SVSTDARR_USHORTS -#include <svtools/svstdarr.hxx> -#include <svtools/nfsymbol.hxx> +#include <svl/svstdarr.hxx> +#include <svl/nfsymbol.hxx> #include <xmloff/xmltoken.hxx> #include <xmloff/xmlexp.hxx> diff --git a/xmloff/source/style/xmlnumfi.cxx b/xmloff/source/style/xmlnumfi.cxx index c61e7a87ca..b8ccfdf909 100644 --- a/xmloff/source/style/xmlnumfi.cxx +++ b/xmloff/source/style/xmlnumfi.cxx @@ -31,13 +31,13 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_xmloff.hxx" -#include <svtools/syslocale.hxx> +#include <unotools/syslocale.hxx> #define _ZFORLIST_DECLARE_TABLE -#include <svtools/zforlist.hxx> +#include <svl/zforlist.hxx> -#include <svtools/zformat.hxx> -#include <svtools/numuno.hxx> +#include <svl/zformat.hxx> +#include <svl/numuno.hxx> #include <rtl/math.hxx> #include <i18npool/mslangid.hxx> #include <tools/debug.hxx> diff --git a/xmloff/source/style/xmlnumi.cxx b/xmloff/source/style/xmlnumi.cxx index b96c7e9bb8..0c88e2d27b 100644 --- a/xmloff/source/style/xmlnumi.cxx +++ b/xmloff/source/style/xmlnumi.cxx @@ -73,7 +73,7 @@ #include <xmloff/xmlnumi.hxx> #define _SVSTDARR_USHORTS -#include <svtools/svstdarr.hxx> +#include <svl/svstdarr.hxx> using ::rtl::OUString; using ::rtl::OUStringBuffer; diff --git a/xmloff/source/style/xmlstyle.cxx b/xmloff/source/style/xmlstyle.cxx index 2a77dd0566..21ecbb0ea0 100644 --- a/xmloff/source/style/xmlstyle.cxx +++ b/xmloff/source/style/xmlstyle.cxx @@ -46,8 +46,8 @@ #endif #include <tools/debug.hxx> #include <tools/list.hxx> -#include <svtools/cntnrsrt.hxx> -#include <svtools/itemset.hxx> +#include <svl/cntnrsrt.hxx> +#include <svl/itemset.hxx> #include <xmloff/nmspmap.hxx> #include "xmlnmspe.hxx" #include <xmloff/xmltoken.hxx> diff --git a/xmloff/source/style/xmltabi.cxx b/xmloff/source/style/xmltabi.cxx index e365ca3aac..35508f7909 100644 --- a/xmloff/source/style/xmltabi.cxx +++ b/xmloff/source/style/xmltabi.cxx @@ -44,7 +44,7 @@ #include "xmltabi.hxx" #define _SVSTDARR_USHORTS -#include <svtools/svstdarr.hxx> +#include <svl/svstdarr.hxx> using ::rtl::OUString; using ::rtl::OUStringBuffer; diff --git a/xmloff/source/text/XMLTextColumnsContext.cxx b/xmloff/source/text/XMLTextColumnsContext.cxx index 5bb67f6986..7a9a62c2f3 100644 --- a/xmloff/source/text/XMLTextColumnsContext.cxx +++ b/xmloff/source/text/XMLTextColumnsContext.cxx @@ -43,7 +43,7 @@ #include <xmloff/xmltoken.hxx> #include "XMLTextColumnsContext.hxx" #define _SVSTDARR_USHORTS -#include <svtools/svstdarr.hxx> +#include <svl/svstdarr.hxx> using ::rtl::OUString; using ::rtl::OUStringBuffer; diff --git a/xmloff/source/text/XMLTextListAutoStylePool.cxx b/xmloff/source/text/XMLTextListAutoStylePool.cxx index 26a4c4309e..a0a62cab85 100644 --- a/xmloff/source/text/XMLTextListAutoStylePool.cxx +++ b/xmloff/source/text/XMLTextListAutoStylePool.cxx @@ -31,7 +31,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_xmloff.hxx" #include <tools/debug.hxx> -#include <svtools/cntnrsrt.hxx> +#include <svl/cntnrsrt.hxx> #include <com/sun/star/ucb/XAnyCompareFactory.hpp> #include <com/sun/star/container/XNamed.hpp> #include <com/sun/star/container/XIndexReplace.hpp> diff --git a/xmloff/source/text/txtimp.cxx b/xmloff/source/text/txtimp.cxx index 23422c10f6..a0ad13d6a9 100644 --- a/xmloff/source/text/txtimp.cxx +++ b/xmloff/source/text/txtimp.cxx @@ -34,7 +34,7 @@ #include <tools/debug.hxx> #ifndef _SVSTDARR_STRINGSDTOR_DECL #define _SVSTDARR_STRINGSDTOR -#include <svtools/svstdarr.hxx> +#include <svl/svstdarr.hxx> #endif #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/beans/PropertyValue.hpp> diff --git a/xmloff/source/text/txtparae.cxx b/xmloff/source/text/txtparae.cxx index d5e88e8719..b47ed6ec6b 100644 --- a/xmloff/source/text/txtparae.cxx +++ b/xmloff/source/text/txtparae.cxx @@ -34,9 +34,9 @@ #include <tools/debug.hxx> #ifndef _SVSTDARR_LONGS_DECL #define _SVSTDARR_LONGS -#include <svtools/svstdarr.hxx> +#include <svl/svstdarr.hxx> #endif -#include <svtools/svarray.hxx> +#include <svl/svarray.hxx> #include <rtl/ustrbuf.hxx> #include <sal/types.h> diff --git a/xmloff/source/text/txtparai.cxx b/xmloff/source/text/txtparai.cxx index fa68a86bdf..ceeb676e8b 100644 --- a/xmloff/source/text/txtparai.cxx +++ b/xmloff/source/text/txtparai.cxx @@ -36,7 +36,7 @@ #include <tools/debug.hxx> #include <tools/string.hxx> -#include <svtools/svarray.hxx> +#include <svl/svarray.hxx> #include <com/sun/star/text/XTextFrame.hpp> #include <com/sun/star/text/XTextCursor.hpp> #include <com/sun/star/beans/XPropertySet.hpp> diff --git a/xmloff/source/text/txtparaimphint.hxx b/xmloff/source/text/txtparaimphint.hxx index e0975411a5..4a4a1228a0 100644 --- a/xmloff/source/text/txtparaimphint.hxx +++ b/xmloff/source/text/txtparaimphint.hxx @@ -33,7 +33,7 @@ #include <rtl/ustring.hxx> #include <rtl/ustrbuf.hxx> #include <tools/debug.hxx> -#include <svtools/svarray.hxx> +#include <svl/svarray.hxx> #include <xmloff/xmlimp.hxx> #include "XMLTextFrameContext.hxx" #include <xmloff/XMLEventsImportContext.hxx> |