diff options
Diffstat (limited to 'sd/source/ui/dlg')
25 files changed, 47 insertions, 47 deletions
diff --git a/sd/source/ui/dlg/LayerDialogContent.cxx b/sd/source/ui/dlg/LayerDialogContent.cxx index ac3149d4cadf..735af8c95042 100644 --- a/sd/source/ui/dlg/LayerDialogContent.cxx +++ b/sd/source/ui/dlg/LayerDialogContent.cxx @@ -38,7 +38,7 @@ #include <svx/gallery.hxx> #include <svx/colritem.hxx> #include <sfx2/dispatch.hxx> -#include <svtools/aeitem.hxx> +#include <svl/aeitem.hxx> #include <vcl/msgbox.hxx> #include "sdattr.hxx" diff --git a/sd/source/ui/dlg/animobjs.cxx b/sd/source/ui/dlg/animobjs.cxx index 84d030867abb..9b0e9d118927 100644 --- a/sd/source/ui/dlg/animobjs.cxx +++ b/sd/source/ui/dlg/animobjs.cxx @@ -39,7 +39,7 @@ #include <svx/xoutbmp.hxx> #include <time.h> -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> #include <svx/svdograf.hxx> #include <svx/svdogrp.hxx> #include <sfx2/dispatch.hxx> diff --git a/sd/source/ui/dlg/celltempl.cxx b/sd/source/ui/dlg/celltempl.cxx index 0acea6b8d033..b0a353c42b2f 100644 --- a/sd/source/ui/dlg/celltempl.cxx +++ b/sd/source/ui/dlg/celltempl.cxx @@ -35,8 +35,8 @@ #undef SD_DLLIMPLEMENTATION #endif -#include <svtools/style.hxx> -#include <svtools/intitem.hxx> +#include <svl/style.hxx> +#include <svl/intitem.hxx> #include <svx/dialogs.hrc> #include <svx/drawitem.hxx> diff --git a/sd/source/ui/dlg/dlgass.cxx b/sd/source/ui/dlg/dlgass.cxx index 13ad351c7b24..ea89fba79500 100644 --- a/sd/source/ui/dlg/dlgass.cxx +++ b/sd/source/ui/dlg/dlgass.cxx @@ -41,7 +41,7 @@ #include <vcl/lstbox.hxx> #include <vcl/combobox.hxx> #include <sfx2/doctempl.hxx> -#include <svtools/lstner.hxx> +#include <svl/lstner.hxx> #include <sfx2/objsh.hxx> #include <svtools/ehdl.hxx> #include <svtools/sfxecode.hxx> @@ -49,7 +49,7 @@ #include <com/sun/star/presentation/FadeEffect.hpp> #include <fadedef.h> #include <sfx2/sfxsids.hrc> -#include <svtools/undo.hxx> +#include <svl/undo.hxx> #include "DrawDocShell.hxx" #include <vcl/gdimtf.hxx> #include <vcl/wintypes.hxx> @@ -66,7 +66,7 @@ #include <com/sun/star/ucb/XSimpleFileAccess.hpp> #include <com/sun/star/ui/XModuleUIConfigurationManagerSupplier.hpp> #include <com/sun/star/ui/XImageManager.hpp> -#include <svtools/historyoptions.hxx> +#include <unotools/historyoptions.hxx> #include <tools/urlobj.hxx> #include <osl/file.hxx> #include <sfx2/filedlghelper.hxx> diff --git a/sd/source/ui/dlg/dlgassim.cxx b/sd/source/ui/dlg/dlgassim.cxx index 0b394d57702b..a1781ec2d9dc 100644 --- a/sd/source/ui/dlg/dlgassim.cxx +++ b/sd/source/ui/dlg/dlgassim.cxx @@ -36,7 +36,7 @@ #endif #include <sfx2/docfile.hxx> #include <tools/urlobj.hxx> -#include <svtools/pathoptions.hxx> +#include <unotools/pathoptions.hxx> #include "sdpage.hxx" #include "Outliner.hxx" diff --git a/sd/source/ui/dlg/dlgassim.hxx b/sd/source/ui/dlg/dlgassim.hxx index 33b3a777b68b..d4a75fb8dd3d 100644 --- a/sd/source/ui/dlg/dlgassim.hxx +++ b/sd/source/ui/dlg/dlgassim.hxx @@ -28,7 +28,7 @@ * ************************************************************************/ -#include <svtools/dateitem.hxx> +#include <svl/dateitem.hxx> #include "drawdoc.hxx" #include <svx/svdotext.hxx> #include <svtools/svtreebx.hxx> diff --git a/sd/source/ui/dlg/dlgchar.cxx b/sd/source/ui/dlg/dlgchar.cxx index 6cee99175fcc..254e3f6dcfa2 100644 --- a/sd/source/ui/dlg/dlgchar.cxx +++ b/sd/source/ui/dlg/dlgchar.cxx @@ -44,7 +44,7 @@ #include "sdresid.hxx" #include "dlg_char.hxx" #include <svx/svxids.hrc> -#include <svtools/intitem.hxx> +#include <svl/intitem.hxx> /************************************************************************* |* diff --git a/sd/source/ui/dlg/dlgfield.cxx b/sd/source/ui/dlg/dlgfield.cxx index 99fcace44186..19fb96a6e4d9 100644 --- a/sd/source/ui/dlg/dlgfield.cxx +++ b/sd/source/ui/dlg/dlgfield.cxx @@ -40,12 +40,12 @@ #include <svx/editeng.hxx> #include <svx/eeitem.hxx> #include <svx/flditem.hxx> -#include <svtools/zforlist.hxx> +#include <svl/zforlist.hxx> #include <sfx2/objsh.hxx> #include <sfx2/docfile.hxx> -#include <svtools/itemset.hxx> +#include <svl/itemset.hxx> #include <svx/langitem.hxx> -#include <svtools/useroptions.hxx> +#include <unotools/useroptions.hxx> #include "strings.hrc" #include "dlgfield.hrc" diff --git a/sd/source/ui/dlg/dlgolbul.cxx b/sd/source/ui/dlg/dlgolbul.cxx index a7988b850214..dbe0e252f7eb 100644 --- a/sd/source/ui/dlg/dlgolbul.cxx +++ b/sd/source/ui/dlg/dlgolbul.cxx @@ -48,11 +48,11 @@ #include <svx/numitem.hxx> #include <svx/dialogs.hrc> -#include <svtools/intitem.hxx> +#include <svl/intitem.hxx> #include <svx/svdmark.hxx> #include "View.hxx" #include <svx/svdobj.hxx> -#include <svtools/style.hxx> +#include <svl/style.hxx> #include <drawdoc.hxx> #ifndef _SD_SDRESID_HXX @@ -64,7 +64,7 @@ #include "bulmaper.hxx" #include "DrawDocShell.hxx" #include <svx/svxids.hrc> -#include <svtools/aeitem.hxx> +#include <svl/aeitem.hxx> namespace sd { diff --git a/sd/source/ui/dlg/dlgpage.cxx b/sd/source/ui/dlg/dlgpage.cxx index bf5eb5da7c39..2145e477e476 100644 --- a/sd/source/ui/dlg/dlgpage.cxx +++ b/sd/source/ui/dlg/dlgpage.cxx @@ -35,7 +35,7 @@ #undef SD_DLLIMPLEMENTATION #endif -#include <svtools/intitem.hxx> +#include <svl/intitem.hxx> #ifndef _SVX_DIALOGS_HRC #include <svx/dialogs.hrc> #endif @@ -48,7 +48,7 @@ #include "dlgpage.hxx" #include "DrawDocShell.hxx" -#include <svtools/aeitem.hxx> +#include <svl/aeitem.hxx> #include <svx/flagsdef.hxx> #include <svx/svxenum.hxx> diff --git a/sd/source/ui/dlg/dlgsnap.cxx b/sd/source/ui/dlg/dlgsnap.cxx index 5a232649251e..fc541e7925e8 100644 --- a/sd/source/ui/dlg/dlgsnap.cxx +++ b/sd/source/ui/dlg/dlgsnap.cxx @@ -38,8 +38,8 @@ #include <svx/svxids.hrc> #include <svx/dlgutil.hxx> -#include <svtools/itempool.hxx> -#include <svtools/aeitem.hxx> +#include <svl/itempool.hxx> +#include <svl/aeitem.hxx> #include "dlgsnap.hrc" #include "sdattr.hxx" diff --git a/sd/source/ui/dlg/gluectrl.cxx b/sd/source/ui/dlg/gluectrl.cxx index 1fea04cf31ab..a4f4e99d2463 100644 --- a/sd/source/ui/dlg/gluectrl.cxx +++ b/sd/source/ui/dlg/gluectrl.cxx @@ -36,7 +36,7 @@ #include <svx/dialogs.hrc> #include <svx/svdglue.hxx> -#include <svtools/intitem.hxx> +#include <svl/intitem.hxx> #include <sfx2/app.hxx> #include <sfx2/dispatch.hxx> #include <vcl/toolbox.hxx> diff --git a/sd/source/ui/dlg/layeroptionsdlg.cxx b/sd/source/ui/dlg/layeroptionsdlg.cxx index cb9ade5336f8..3414f779cad8 100644 --- a/sd/source/ui/dlg/layeroptionsdlg.cxx +++ b/sd/source/ui/dlg/layeroptionsdlg.cxx @@ -34,7 +34,7 @@ #ifdef SD_DLLIMPLEMENTATION #undef SD_DLLIMPLEMENTATION #endif -#include <svtools/itemset.hxx> +#include <svl/itemset.hxx> #include "strings.hrc" #include "sdattr.hxx" diff --git a/sd/source/ui/dlg/morphdlg.cxx b/sd/source/ui/dlg/morphdlg.cxx index 6d34834ccab9..f43472d58ace 100644 --- a/sd/source/ui/dlg/morphdlg.cxx +++ b/sd/source/ui/dlg/morphdlg.cxx @@ -47,8 +47,8 @@ #include <svx/xlineit0.hxx> #include <svx/xenum.hxx> #include <svx/svdobj.hxx> -#include <svtools/itemset.hxx> -#include <svtools/itempool.hxx> +#include <svl/itemset.hxx> +#include <svl/itempool.hxx> namespace sd { diff --git a/sd/source/ui/dlg/navigatr.cxx b/sd/source/ui/dlg/navigatr.cxx index f251f6964263..db2e69e6038c 100644 --- a/sd/source/ui/dlg/navigatr.cxx +++ b/sd/source/ui/dlg/navigatr.cxx @@ -36,11 +36,11 @@ #include <unotools/localfilehelper.hxx> #include <sfx2/imgmgr.hxx> #include <sfx2/fcontnr.hxx> -#include <svtools/eitem.hxx> -#include <svtools/stritem.hxx> +#include <svl/eitem.hxx> +#include <svl/stritem.hxx> #include <sfx2/docfilt.hxx> #include <sfx2/docfile.hxx> -#include <svtools/intitem.hxx> +#include <svl/intitem.hxx> #include <sfx2/dispatch.hxx> #include <svx/svxids.hrc> #include <vcl/menu.hxx> diff --git a/sd/source/ui/dlg/paragr.cxx b/sd/source/ui/dlg/paragr.cxx index 2ebdf316af34..eeefcda29f3d 100644 --- a/sd/source/ui/dlg/paragr.cxx +++ b/sd/source/ui/dlg/paragr.cxx @@ -37,9 +37,9 @@ #include <vcl/field.hxx> -#include <svtools/cjkoptions.hxx> -#include <svtools/eitem.hxx> -#include <svtools/intitem.hxx> +#include <svl/cjkoptions.hxx> +#include <svl/eitem.hxx> +#include <svl/intitem.hxx> #include <svx/editdata.hxx> #include <svx/dialogs.hrc> diff --git a/sd/source/ui/dlg/present.cxx b/sd/source/ui/dlg/present.cxx index d881c45070d3..e624e3b23320 100644 --- a/sd/source/ui/dlg/present.cxx +++ b/sd/source/ui/dlg/present.cxx @@ -38,7 +38,7 @@ #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/container/XIndexAccess.hpp> #include <comphelper/processfactory.hxx> -#include <svtools/itemset.hxx> +#include <svl/itemset.hxx> #include "sdattr.hxx" #include "present.hxx" diff --git a/sd/source/ui/dlg/prltempl.cxx b/sd/source/ui/dlg/prltempl.cxx index 748d34a94c6c..b7a65b0d5b6e 100644 --- a/sd/source/ui/dlg/prltempl.cxx +++ b/sd/source/ui/dlg/prltempl.cxx @@ -41,7 +41,7 @@ #include <svx/dialogs.hrc> #include <svx/flstitem.hxx> #include <svx/drawitem.hxx> -#include <svtools/style.hxx> +#include <svl/style.hxx> #include <svx/tabline.hxx> #include <svx/bulitem.hxx> #include <svx/eeitem.hxx> @@ -49,7 +49,7 @@ #include <vcl/graph.hxx> #include <svx/lrspitem.hxx> #include <svx/numitem.hxx> -#include <svtools/cjkoptions.hxx> +#include <svl/cjkoptions.hxx> #include "DrawDocShell.hxx" #include "glob.hrc" @@ -59,7 +59,7 @@ #include "enumdlg.hrc" //#include "enumdlg.hxx" #include "bulmaper.hxx" -#include <svtools/intitem.hxx> +#include <svl/intitem.hxx> #include <svx/svxgrahicitem.hxx> #include <svx/flagsdef.hxx> #include "drawdoc.hxx" diff --git a/sd/source/ui/dlg/prntopts.cxx b/sd/source/ui/dlg/prntopts.cxx index 225919f32280..6a74ffaf206f 100644 --- a/sd/source/ui/dlg/prntopts.cxx +++ b/sd/source/ui/dlg/prntopts.cxx @@ -42,7 +42,7 @@ #include "sdresid.hxx" #include "prntopts.hxx" #include "app.hrc" -#include <svtools/intitem.hxx> +#include <svl/intitem.hxx> #include <sfx2/request.hxx> // STATIC DATA ----------------------------------------------------------- diff --git a/sd/source/ui/dlg/sdpreslt.cxx b/sd/source/ui/dlg/sdpreslt.cxx index b57474906567..1f97ce8d4cf2 100644 --- a/sd/source/ui/dlg/sdpreslt.cxx +++ b/sd/source/ui/dlg/sdpreslt.cxx @@ -36,7 +36,7 @@ #endif -#include <svtools/itemset.hxx> +#include <svl/itemset.hxx> #include <sfx2/new.hxx> #include <vcl/msgbox.hxx> diff --git a/sd/source/ui/dlg/sdtreelb.cxx b/sd/source/ui/dlg/sdtreelb.cxx index 9d335b859e31..bd93b07beb9a 100644 --- a/sd/source/ui/dlg/sdtreelb.cxx +++ b/sd/source/ui/dlg/sdtreelb.cxx @@ -35,7 +35,7 @@ #include <sot/formats.hxx> #include <sot/storage.hxx> #include <vcl/msgbox.hxx> -#include <svtools/urihelper.hxx> +#include <svl/urihelper.hxx> #include <svx/svditer.hxx> #include <sfx2/docfile.hxx> #include <svx/svdoole2.hxx> diff --git a/sd/source/ui/dlg/tabtempl.cxx b/sd/source/ui/dlg/tabtempl.cxx index 98a4959abdb8..5ce27def13a6 100644 --- a/sd/source/ui/dlg/tabtempl.cxx +++ b/sd/source/ui/dlg/tabtempl.cxx @@ -40,18 +40,18 @@ #include <svx/svxids.hrc> #include <svx/drawitem.hxx> -#include <svtools/intitem.hxx> +#include <svl/intitem.hxx> #include <svx/ofaitem.hxx> #include <svx/svxgrahicitem.hxx> #include <svx/svdmodel.hxx> -#include <svtools/cjkoptions.hxx> +#include <svl/cjkoptions.hxx> #include <svx/dialogs.hrc> #include <svx/svxdlg.hxx> #include <svx/tabline.hxx> -#include <svtools/style.hxx> +#include <svl/style.hxx> #include <svx/xtable.hxx> #include "DrawDocShell.hxx" diff --git a/sd/source/ui/dlg/tpaction.cxx b/sd/source/ui/dlg/tpaction.cxx index 2148b33d95d3..80ba0b78c9f9 100644 --- a/sd/source/ui/dlg/tpaction.cxx +++ b/sd/source/ui/dlg/tpaction.cxx @@ -54,10 +54,10 @@ #include <vcl/waitobj.hxx> #include <osl/file.hxx> #include <sfx2/app.hxx> -#include <svtools/pathoptions.hxx> +#include <unotools/pathoptions.hxx> #include <svx/svdpagv.hxx> #include <unotools/localfilehelper.hxx> -#include <svtools/aeitem.hxx> +#include <svl/aeitem.hxx> #include <svx/colritem.hxx> #include <svx/svdoole2.hxx> #include <sfx2/docfile.hxx> @@ -68,7 +68,7 @@ #include <svx/xtable.hxx> #include <vcl/svapp.hxx> #include <vcl/mnemonic.hxx> -#include <svtools/urihelper.hxx> +#include <svl/urihelper.hxx> #include <sfx2/filedlghelper.hxx> #include <svx/drawitem.hxx> #include "View.hxx" diff --git a/sd/source/ui/dlg/tpoption.cxx b/sd/source/ui/dlg/tpoption.cxx index b22ad4e32dbd..102c95a9b3e5 100644 --- a/sd/source/ui/dlg/tpoption.cxx +++ b/sd/source/ui/dlg/tpoption.cxx @@ -58,7 +58,7 @@ #include "tpoption.hxx" #include "strings.hrc" #include "app.hrc" -#include <svtools/intitem.hxx> +#include <svl/intitem.hxx> #include <sfx2/request.hxx> #define DLGWIN this->GetParent()->GetParent() diff --git a/sd/source/ui/dlg/unchss.cxx b/sd/source/ui/dlg/unchss.cxx index dc0ea3d63827..e42012d4b75d 100644 --- a/sd/source/ui/dlg/unchss.cxx +++ b/sd/source/ui/dlg/unchss.cxx @@ -32,9 +32,9 @@ #include "precompiled_sd.hxx" -#include <svtools/itemset.hxx> -#include <svtools/style.hxx> -#include <svtools/smplhint.hxx> +#include <svl/itemset.hxx> +#include <svl/style.hxx> +#include <svl/smplhint.hxx> #include <svx/svdobj.hxx> #include "unchss.hxx" |