diff options
150 files changed, 680 insertions, 905 deletions
diff --git a/sd/inc/Outliner.hxx b/sd/inc/Outliner.hxx index f2852ee2a519..0c14dec72583 100644 --- a/sd/inc/Outliner.hxx +++ b/sd/inc/Outliner.hxx @@ -32,7 +32,7 @@ #include <svx/svdoutl.hxx> #include "pres.hxx" #include "OutlinerIterator.hxx" -#include <svx/SpellPortions.hxx> +#include <editeng/SpellPortions.hxx> #include <memory> #include <boost/shared_ptr.hpp> @@ -118,7 +118,7 @@ public: <const>OUTLINERMODE_TITLEOBJECT</const>, <const>OUTLINERMODE_OUTLINEOBJECT</const>, and <const>OUTLINERMODE_OUTLINEVIEW</const> are defined in - svx/outliner.hxx. + editeng/outliner.hxx. */ Outliner( SdDrawDocument* pDoc, USHORT nMode ); virtual ~Outliner(); diff --git a/sd/inc/eetext.hxx b/sd/inc/eetext.hxx index 0192b14f43ad..1bae1de6c1e9 100644 --- a/sd/inc/eetext.hxx +++ b/sd/inc/eetext.hxx @@ -27,7 +27,7 @@ #ifndef _EETEXT_HXX #define _EETEXT_HXX -#include <svx/outliner.hxx> +#include <editeng/outliner.hxx> #endif // EETEXT_HXX diff --git a/sd/inc/pch/precompiled_sd.hxx b/sd/inc/pch/precompiled_sd.hxx index 16b83aeaa518..fdf5f8c7db18 100644 --- a/sd/inc/pch/precompiled_sd.hxx +++ b/sd/inc/pch/precompiled_sd.hxx @@ -407,7 +407,7 @@ #include "cppuhelper/weakref.hxx" -#include "goodies/grfmgr.hxx" +#include "svtools/grfmgr.hxx" #include "helper/simplereferencecomponent.hxx" @@ -564,21 +564,21 @@ #include "svx/SpellDialogChildWindow.hxx" -#include "svx/SpellPortions.hxx" +#include "editeng/SpellPortions.hxx" #include "svx/UnoNamespaceMap.hxx" -#include "svx/adjitem.hxx" +#include "editeng/adjitem.hxx" #include "svx/algitem.hxx" #include "svx/bmpmask.hxx" -#include "svx/boxitem.hxx" -#include "svx/brshitem.hxx" -#include "svx/bulitem.hxx" +#include "editeng/boxitem.hxx" +#include "editeng/brshitem.hxx" +#include "editeng/bulitem.hxx" #include "svx/camera3d.hxx" -#include "svx/charreliefitem.hxx" +#include "editeng/charreliefitem.hxx" #include "svx/clipboardctl.hxx" #include "svx/clipfmtitem.hxx" -#include "svx/cntritem.hxx" -#include "svx/colritem.hxx" -#include "svx/crsditem.hxx" +#include "editeng/cntritem.hxx" +#include "editeng/colritem.hxx" +#include "editeng/crsditem.hxx" #include "svx/cube3d.hxx" #include "svx/dataaccessdescriptor.hxx" #include "svx/dbexch.hrc" @@ -586,35 +586,35 @@ #include "svx/dialogs.hrc" #include "svx/dlgctrl.hxx" #include "svx/e3dundo.hxx" -#include "svx/editdata.hxx" -#include "svx/editeng.hxx" -#include "svx/editobj.hxx" -#include "svx/editstat.hxx" -#include "svx/editund2.hxx" -#include "svx/editview.hxx" -#include "svx/eeitem.hxx" +#include "editeng/editdata.hxx" +#include "editeng/editeng.hxx" +#include "editeng/editobj.hxx" +#include "editeng/editstat.hxx" +#include "editeng/editund2.hxx" +#include "editeng/editview.hxx" +#include "editeng/eeitem.hxx" #include "filter/msfilter/escherex.hxx" -#include "svx/escpitem.hxx" +#include "editeng/escpitem.hxx" #include "svx/extrusionbar.hxx" #include "svx/f3dchild.hxx" -#include "svx/fhgtitem.hxx" +#include "editeng/fhgtitem.hxx" #include "svx/fillctrl.hxx" #include "svx/flagsdef.hxx" -#include "svx/flditem.hxx" -#include "svx/flstitem.hxx" +#include "editeng/flditem.hxx" +#include "editeng/flstitem.hxx" #include "svx/fmdmod.hxx" #include "svx/fmglob.hxx" #include "svx/fmobjfac.hxx" #include "svx/fmpage.hxx" #include "svx/fntctl.hxx" #include "svx/fntszctl.hxx" -#include "svx/fontitem.hxx" +#include "editeng/fontitem.hxx" #include "svx/fontwork.hxx" #include "svx/fontworkbar.hxx" #include "svx/fontworkgallery.hxx" -#include "svx/forbiddencharacterstable.hxx" +#include "editeng/forbiddencharacterstable.hxx" #include "svx/formatpaintbrushctrl.hxx" -#include "svx/frmdiritem.hxx" +#include "editeng/frmdiritem.hxx" #include "svx/galbrws.hxx" #include "svx/gallery.hxx" #include "svx/globl3d.hxx" @@ -625,43 +625,42 @@ #include "svx/hyperdlg.hxx" #include "svx/hyprlink.hxx" #include "svx/imapdlg.hxx" -#include "svx/impgrf.hxx" #include "svx/itemwin.hxx" #include "svx/langbox.hxx" -#include "svx/langitem.hxx" +#include "editeng/langitem.hxx" #include "svx/lathe3d.hxx" #include "svx/lboxctrl.hxx" #include "svx/linectrl.hxx" -#include "svx/linkmgr.hxx" -#include "svx/lrspitem.hxx" -#include "svx/lspcitem.hxx" +#include "sfx2/linkmgr.hxx" +#include "editeng/lrspitem.hxx" +#include "editeng/lspcitem.hxx" #include "svx/modctrl.hxx" #include "svx/msdffdef.hxx" #include "filter/msfilter/msocximex.hxx" #include "filter/msfilter/msoleexp.hxx" -#include "svx/numitem.hxx" +#include "editeng/numitem.hxx" #include "svx/obj3d.hxx" #include "svx/objfac3d.hxx" #include "svx/ofaitem.hxx" -#include "svx/opengrf.hxx" +#include "sfx2/opengrf.hxx" #include "svx/optgrid.hxx" -#include "svx/outliner.hxx" -#include "svx/outlobj.hxx" -#include "svx/paperinf.hxx" -#include "svx/pbinitem.hxx" +#include "editeng/outliner.hxx" +#include "editeng/outlobj.hxx" +#include "editeng/paperinf.hxx" +#include "editeng/pbinitem.hxx" #include "svx/pfiledlg.hxx" #include "svx/polysc3d.hxx" #include "svx/postattr.hxx" -#include "svx/postitem.hxx" -#include "svx/protitem.hxx" +#include "editeng/postitem.hxx" +#include "editeng/protitem.hxx" #include "svx/prtqry.hxx" #include "svx/pszctrl.hxx" #include "svx/rectenum.hxx" #include "svx/ruler.hxx" #include "svx/rulritem.hxx" #include "svx/scene3d.hxx" -#include "svx/scriptspaceitem.hxx" -#include "svx/scripttypeitem.hxx" +#include "editeng/scriptspaceitem.hxx" +#include "editeng/scripttypeitem.hxx" #include "svx/sdasitm.hxx" #include "svx/sderitm.hxx" #include "svx/sdr/contact/displayinfo.hxx" @@ -678,15 +677,15 @@ #include "svx/sdtagitm.hxx" #include "svx/sdtakitm.hxx" #include "svx/sdtmfitm.hxx" -#include "svx/shaditem.hxx" -#include "svx/shdditem.hxx" +#include "editeng/shaditem.hxx" +#include "editeng/shdditem.hxx" #include "svx/sphere3d.hxx" #include "svx/srchdlg.hxx" #include "svx/strarray.hxx" #include "svx/svdattr.hxx" #include "svx/svddef.hxx" #include "svx/svdetc.hxx" -#include "svx/svdfield.hxx" +#include "editeng/measfld.hxx" #include "svx/svdglue.hxx" #include "svx/svditer.hxx" #include "svx/svdlayer.hxx" @@ -716,9 +715,9 @@ #include "svx/svdviter.hxx" #include "svx/svx3ditems.hxx" #include "svx/svxdlg.hxx" -#include "svx/svxenum.hxx" +#include "editeng/svxenum.hxx" #include "svx/svxerr.hxx" -#include "svx/svxfont.hxx" +#include "editeng/svxfont.hxx" #include "svx/svxgrahicitem.hxx" #include "svx/svxids.hrc" #include "filter/msfilter/svxmsbas.hxx" @@ -730,23 +729,23 @@ #include "svx/tbcontrl.hxx" #include "svx/tbxcolor.hxx" #include "svx/tbxcustomshapes.hxx" -#include "svx/tstpitem.hxx" -#include "svx/udlnitem.hxx" -#include "svx/ulspitem.hxx" +#include "editeng/tstpitem.hxx" +#include "editeng/udlnitem.hxx" +#include "editeng/ulspitem.hxx" #include "svx/unoapi.hxx" -#include "svx/unoedhlp.hxx" -#include "svx/unoedsrc.hxx" +#include "editeng/unoedhlp.hxx" +#include "editeng/unoedsrc.hxx" #include "svx/unofill.hxx" -#include "svx/unoforou.hxx" -#include "svx/unoipset.hxx" -#include "svx/unolingu.hxx" +#include "editeng/unoforou.hxx" +#include "editeng/unoipset.hxx" +#include "editeng/unolingu.hxx" #include "svx/unomaster.hxx" #include "svx/unomodel.hxx" -#include "svx/unonrule.hxx" -#include "svx/unoviwou.hxx" +#include "editeng/unonrule.hxx" +#include "editeng/unoviwou.hxx" #include "svx/verttexttbxctrl.hxx" -#include "svx/wghtitem.hxx" -#include "svx/writingmodeitem.hxx" +#include "editeng/wghtitem.hxx" +#include "editeng/writingmodeitem.hxx" #include "svx/xbtmpit.hxx" #include "svx/xcolit.hxx" #include "svx/xdash.hxx" @@ -782,7 +781,7 @@ #include "svx/xlnstit.hxx" #include "svx/xlnstwit.hxx" #include "svx/xlnwtit.hxx" -#include "svx/xmlcnitm.hxx" +#include "editeng/xmlcnitm.hxx" #include "svx/xmlsecctrl.hxx" #include "svx/xoutbmp.hxx" #include "svx/xpoly.hxx" diff --git a/sd/inc/stlfamily.hxx b/sd/inc/stlfamily.hxx index 60895836c794..ecb3f6996a28 100644 --- a/sd/inc/stlfamily.hxx +++ b/sd/inc/stlfamily.hxx @@ -45,7 +45,7 @@ #include <svl/style.hxx> -#include <svx/unoipset.hxx> +#include <editeng/unoipset.hxx> class SdStyleSheet; class SdPage; diff --git a/sd/inc/stlsheet.hxx b/sd/inc/stlsheet.hxx index efbad91c7e90..138b06ae077d 100644 --- a/sd/inc/stlsheet.hxx +++ b/sd/inc/stlsheet.hxx @@ -43,7 +43,7 @@ #include <svl/style.hxx> -#include <svx/unoipset.hxx> +#include <editeng/unoipset.hxx> #include <boost/scoped_ptr.hpp> diff --git a/sd/inc/textapi.hxx b/sd/inc/textapi.hxx index 52b31ffa2404..ced8a48c5bb6 100644 --- a/sd/inc/textapi.hxx +++ b/sd/inc/textapi.hxx @@ -28,10 +28,14 @@ #ifndef _SD_TEXTAPI_HXX_ #define _SD_TEXTAPI_HXX_ -#include <svx/unoedsrc.hxx> -#include <svx/unotext.hxx> -#include <svx/eeitem.hxx> +#include <editeng/unoedsrc.hxx> +#include <editeng/unotext.hxx> +#include <editeng/eeitem.hxx> #include <rtl/ref.hxx> +#include <editeng/outliner.hxx> +#include <editeng/unoprnms.hxx> +#include <editeng/unoforou.hxx> +#include <editeng/unoipset.hxx> class SdDrawDocument; diff --git a/sd/sdi/sdslots.hrc b/sd/sdi/sdslots.hrc index b6f277f2f5c9..472f794be479 100644 --- a/sd/sdi/sdslots.hrc +++ b/sd/sdi/sdslots.hrc @@ -26,6 +26,8 @@ ************************************************************************/ #include <sfx2/sfx.hrc> #include <sfx2/sfxsids.hrc> +#include <editeng/editids.hrc> +#include <editeng/memberids.hrc> #include <svx/svxids.hrc> #include <app.hrc> #include <sdattr.hrc> diff --git a/sd/source/core/anminfo.cxx b/sd/source/core/anminfo.cxx index a321d9402acf..a2aed2388e28 100644 --- a/sd/source/core/anminfo.cxx +++ b/sd/source/core/anminfo.cxx @@ -32,8 +32,8 @@ #include "svx/xtable.hxx" #include <svx/svdopath.hxx> #include <svl/urihelper.hxx> -#include <svx/flditem.hxx> -#include <svx/eeitem.hxx> +#include <editeng/flditem.hxx> +#include <editeng/eeitem.hxx> #include "anminfo.hxx" #include "glob.hxx" diff --git a/sd/source/core/drawdoc.cxx b/sd/source/core/drawdoc.cxx index f130a797d2b1..4294a55aee4d 100644 --- a/sd/source/core/drawdoc.cxx +++ b/sd/source/core/drawdoc.cxx @@ -32,39 +32,39 @@ #include <com/sun/star/text/WritingMode.hpp> #include <com/sun/star/document/PrinterIndependentLayout.hpp> #include <com/sun/star/i18n/ScriptType.hpp> -#include <svx/forbiddencharacterstable.hxx> +#include <editeng/forbiddencharacterstable.hxx> #include <svx/svxids.hrc> -#include <sfx2/srchitem.hxx> -#include <svx/eeitem.hxx> -#include <svx/scriptspaceitem.hxx> +#include <svl/srchitem.hxx> +#include <editeng/eeitem.hxx> +#include <editeng/scriptspaceitem.hxx> #include <unotools/useroptions.hxx> #include <sfx2/printer.hxx> #include <sfx2/topfrm.hxx> #include <sfx2/app.hxx> -#include <svx/linkmgr.hxx> +#include <sfx2/linkmgr.hxx> #include <svx/dialogs.hrc> #include "Outliner.hxx" #include "app.hxx" -#include <svx/eeitem.hxx> -#include <svx/editstat.hxx> -#include <svx/fontitem.hxx> +#include <editeng/eeitem.hxx> +#include <editeng/editstat.hxx> +#include <editeng/fontitem.hxx> #include <svl/flagitem.hxx> #include <svx/svdoattr.hxx> #include <svx/svdotext.hxx> -#include <svx/bulitem.hxx> -#include <svx/numitem.hxx> +#include <editeng/bulitem.hxx> +#include <editeng/numitem.hxx> #include <svx/svditer.hxx> -#include <svx/unolingu.hxx> +#include <editeng/unolingu.hxx> #include <svl/itempool.hxx> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <svx/xtable.hxx> #include <com/sun/star/linguistic2/XHyphenator.hpp> #include <com/sun/star/linguistic2/XSpellChecker1.hpp> #include <com/sun/star/beans/XPropertySet.hpp> -#include <svx/outlobj.hxx> +#include <editeng/outlobj.hxx> #include <unotools/saveopt.hxx> #include <comphelper/extract.hxx> #include <i18npool/mslangid.hxx> @@ -281,7 +281,7 @@ SdDrawDocument::SdDrawDocument(DocumentType eType, SfxObjectShell* pDrDocSh) if (mpDocSh) { - SetLinkManager( new SvxLinkManager(mpDocSh) ); + SetLinkManager( new sfx2::LinkManager(mpDocSh) ); } ULONG nCntrl = rOutliner.GetControlWord(); diff --git a/sd/source/core/drawdoc2.cxx b/sd/source/core/drawdoc2.cxx index 85502759e0c4..092549428a42 100644 --- a/sd/source/core/drawdoc2.cxx +++ b/sd/source/core/drawdoc2.cxx @@ -37,21 +37,21 @@ #ifndef SD_OUTLINE_HXX #include "Outliner.hxx" #endif -#include <svx/paperinf.hxx> +#include <editeng/paperinf.hxx> #include <svx/svdopage.hxx> #include <svx/svdoole2.hxx> #include <svx/svdotext.hxx> #include <svx/svdograf.hxx> #include <svx/svdundo.hxx> #include <vcl/svapp.hxx> -#include <svx/eeitem.hxx> -#include <svx/langitem.hxx> +#include <editeng/eeitem.hxx> +#include <editeng/langitem.hxx> #include <svl/itempool.hxx> #include <svx/svdpool.hxx> -#include <svx/flditem.hxx> +#include <editeng/flditem.hxx> -#include <svx/linkmgr.hxx> -#include <svx/editdata.hxx> +#include <sfx2/linkmgr.hxx> +#include <editeng/editdata.hxx> #include <svx/dialogs.hrc> #include <svx/dialmgr.hxx> // SVX_RESSTR @@ -920,7 +920,7 @@ BOOL SdDrawDocument::MovePages(USHORT nTargetPage) /************************************************************************* |* -|* Anzahl der Links im LinkManager zurueckgeben +|* Anzahl der Links im sfx2::LinkManager zurueckgeben |* \************************************************************************/ diff --git a/sd/source/core/drawdoc3.cxx b/sd/source/core/drawdoc3.cxx index e789858f7973..103a197d5a1f 100644 --- a/sd/source/core/drawdoc3.cxx +++ b/sd/source/core/drawdoc3.cxx @@ -48,7 +48,7 @@ #include <svx/svdopath.hxx> #include <svx/svditer.hxx> #include <svl/style.hxx> -#include <svx/linkmgr.hxx> +#include <sfx2/linkmgr.hxx> #include <svx/svdpagv.hxx> #include <svx/svdogrp.hxx> #include <svx/svdundo.hxx> diff --git a/sd/source/core/drawdoc4.cxx b/sd/source/core/drawdoc4.cxx index a4f623786be2..b615c7e76c05 100644 --- a/sd/source/core/drawdoc4.cxx +++ b/sd/source/core/drawdoc4.cxx @@ -36,47 +36,47 @@ #include <sfx2/dispatch.hxx> #include "Outliner.hxx" #include <comphelper/processfactory.hxx> -#include <svx/outliner.hxx> +#include <editeng/outliner.hxx> #include "../ui/inc/DrawDocShell.hxx" -#include <svx/eeitem.hxx> +#include <editeng/eeitem.hxx> #include <vcl/svapp.hxx> #include <eetext.hxx> -#include <svx/akrnitem.hxx> +#include <editeng/akrnitem.hxx> #include <svx/svxids.hrc> -#include <sfx2/srchitem.hxx> -#include <svx/lrspitem.hxx> -#include <svx/ulspitem.hxx> -#include <svx/lspcitem.hxx> -#include <svx/adjitem.hxx> +#include <svl/srchitem.hxx> +#include <editeng/lrspitem.hxx> +#include <editeng/ulspitem.hxx> +#include <editeng/lspcitem.hxx> +#include <editeng/adjitem.hxx> #include <svx/dialogs.hrc> #include <svx/dialmgr.hxx> // SVX_RESSTR -#include <svx/bulitem.hxx> +#include <editeng/bulitem.hxx> #include <svx/xtable.hxx> #include <svx/sxmsuitm.hxx> -#include <svx/borderline.hxx> -#include <svx/boxitem.hxx> +#include <editeng/borderline.hxx> +#include <editeng/boxitem.hxx> #include <svx/xit.hxx> #include <svx/xlineit0.hxx> #include <svx/sdshitm.hxx> #include <svx/svdotext.hxx> #include <svx/xfillit0.hxx> #include <svx/sdshcitm.hxx> -#include <svx/editstat.hxx> -#include <svx/colritem.hxx> -#include <svx/fhgtitem.hxx> -#include <svx/wghtitem.hxx> -#include <svx/postitem.hxx> -#include <svx/crsditem.hxx> -#include <svx/udlnitem.hxx> -#include <svx/cntritem.hxx> +#include <editeng/editstat.hxx> +#include <editeng/colritem.hxx> +#include <editeng/fhgtitem.hxx> +#include <editeng/wghtitem.hxx> +#include <editeng/postitem.hxx> +#include <editeng/crsditem.hxx> +#include <editeng/udlnitem.hxx> +#include <editeng/cntritem.hxx> #ifndef _SVX_EMPHITEM_HXX -#include <svx/emphitem.hxx> +#include <editeng/emphitem.hxx> #endif -#include <svx/fontitem.hxx> -#include <svx/shdditem.hxx> +#include <editeng/fontitem.hxx> +#include <editeng/shdditem.hxx> #include <svx/xbtmpit.hxx> #include <svx/xflhtit.hxx> #include <svx/xflgrit.hxx> @@ -86,7 +86,7 @@ #include <svx/xlnedwit.hxx> #include <svx/xlnstwit.hxx> #include <svx/xlnedit.hxx> -#include <svx/charreliefitem.hxx> +#include <editeng/charreliefitem.hxx> #include <svx/xlnstit.hxx> #include <svx/xlndsit.hxx> #include <svx/xlnwtit.hxx> @@ -94,16 +94,16 @@ #include <svx/svditer.hxx> #include <svx/svdogrp.hxx> #include <tools/shl.hxx> -#include <svx/numitem.hxx> -#include <svx/editeng.hxx> -#include <svx/unolingu.hxx> +#include <editeng/numitem.hxx> +#include <editeng/editeng.hxx> +#include <editeng/unolingu.hxx> #include <com/sun/star/linguistic2/XHyphenator.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <svl/itempool.hxx> -#include <svx/outlobj.hxx> +#include <editeng/outlobj.hxx> #include <sfx2/viewfrm.hxx> -#include <svx/langitem.hxx> -#include <svx/frmdiritem.hxx> +#include <editeng/langitem.hxx> +#include <editeng/frmdiritem.hxx> #include "sdresid.hxx" #include "drawdoc.hxx" diff --git a/sd/source/core/pglink.cxx b/sd/source/core/pglink.cxx index e112cbbb4781..61988c886feb 100644 --- a/sd/source/core/pglink.cxx +++ b/sd/source/core/pglink.cxx @@ -29,7 +29,7 @@ #include "precompiled_sd.hxx" #ifndef _SVXLINK_HXX -#include <svx/linkmgr.hxx> +#include <sfx2/linkmgr.hxx> #endif #include "pglink.hxx" @@ -74,7 +74,7 @@ void SdPageLink::DataChanged( const String& , const ::com::sun::star::uno::Any& ) { SdDrawDocument* pDoc = (SdDrawDocument*) pPage->GetModel(); - SvxLinkManager* pLinkManager = pDoc!=NULL ? pDoc->GetLinkManager() : NULL; + sfx2::LinkManager* pLinkManager = pDoc!=NULL ? pDoc->GetLinkManager() : NULL; if (pLinkManager) { diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx index 52ac22d5929f..aad4bfca227b 100644 --- a/sd/source/core/sdpage.cxx +++ b/sd/source/core/sdpage.cxx @@ -34,34 +34,34 @@ #include <vcl/svapp.hxx> #include "eetext.hxx" -#include <svx/eeitem.hxx> +#include <editeng/eeitem.hxx> #include <svx/svdoutl.hxx> -#include <svx/editdata.hxx> +#include <editeng/editdata.hxx> #include <svx/pageitem.hxx> -#include <svx/lrspitem.hxx> -#include <svx/bulitem.hxx> +#include <editeng/lrspitem.hxx> +#include <editeng/bulitem.hxx> #include <svx/svdpagv.hxx> -#include <svx/fhgtitem.hxx> -#include <svx/outlobj.hxx> +#include <editeng/fhgtitem.hxx> +#include <editeng/outlobj.hxx> #include <svx/svdoole2.hxx> #include <svx/svdograf.hxx> #include <svx/svdopage.hxx> #include <svx/svdopage.hxx> #include <sfx2/printer.hxx> #include <basic/basmgr.hxx> -#include <svx/pbinitem.hxx> +#include <editeng/pbinitem.hxx> #include <svx/svdundo.hxx> #include <svl/smplhint.hxx> -#include <svx/adjitem.hxx> -#include <svx/editobj.hxx> +#include <editeng/adjitem.hxx> +#include <editeng/editobj.hxx> #ifndef _SVX_SRIPTTYPEITEM_HXX -#include <svx/scripttypeitem.hxx> +#include <editeng/scripttypeitem.hxx> #endif #include <svx/unopage.hxx> -#include <svx/flditem.hxx> +#include <editeng/flditem.hxx> #include <svx/sdr/contact/displayinfo.hxx> -#include <svx/adjitem.hxx> +#include <editeng/adjitem.hxx> #include "../ui/inc/DrawDocShell.hxx" #include "Outliner.hxx" diff --git a/sd/source/core/sdpage2.cxx b/sd/source/core/sdpage2.cxx index 1047a07c0a62..ac6acb35abbc 100644 --- a/sd/source/core/sdpage2.cxx +++ b/sd/source/core/sdpage2.cxx @@ -29,15 +29,15 @@ #include "precompiled_sd.hxx" #include <sfx2/docfile.hxx> #include <vcl/svapp.hxx> -#include <svx/outliner.hxx> +#include <editeng/outliner.hxx> #ifndef _SVXLINK_HXX -#include <svx/linkmgr.hxx> +#include <sfx2/linkmgr.hxx> #endif #include <svx/svdotext.hxx> #include <tools/urlobj.hxx> -#include <svx/outlobj.hxx> +#include <editeng/outlobj.hxx> #include <svl/urihelper.hxx> -#include <svx/xmlcnitm.hxx> +#include <editeng/xmlcnitm.hxx> #include <svx/svditer.hxx> #include <tools/list.hxx> @@ -323,13 +323,13 @@ FASTBOOL SdPage::IsReadOnly() const /************************************************************************* |* -|* Beim LinkManager anmelden +|* Beim sfx2::LinkManager anmelden |* \************************************************************************/ void SdPage::ConnectLink() { - SvxLinkManager* pLinkManager = pModel!=NULL ? pModel->GetLinkManager() : NULL; + sfx2::LinkManager* pLinkManager = pModel!=NULL ? pModel->GetLinkManager() : NULL; if (pLinkManager && !mpPageLink && maFileName.Len() && maBookmarkName.Len() && mePageKind==PK_STANDARD && !IsMasterPage() && @@ -356,13 +356,13 @@ void SdPage::ConnectLink() /************************************************************************* |* -|* Beim LinkManager abmelden +|* Beim sfx2::LinkManager abmelden |* \************************************************************************/ void SdPage::DisconnectLink() { - SvxLinkManager* pLinkManager = pModel!=NULL ? pModel->GetLinkManager() : NULL; + sfx2::LinkManager* pLinkManager = pModel!=NULL ? pModel->GetLinkManager() : NULL; if (pLinkManager && mpPageLink) { diff --git a/sd/source/core/sdpage_animations.cxx b/sd/source/core/sdpage_animations.cxx index dbbbb181e0bc..df2bfcdfdb18 100644 --- a/sd/source/core/sdpage_animations.cxx +++ b/sd/source/core/sdpage_animations.cxx @@ -32,7 +32,7 @@ #include <com/sun/star/presentation/EffectNodeType.hpp> #include <comphelper/processfactory.hxx> #include <vos/mutex.hxx> -#include <svx/outliner.hxx> +#include <editeng/outliner.hxx> #include "CustomAnimationCloner.hxx" #include "drawdoc.hxx" #include "sdpage.hxx" diff --git a/sd/source/core/stlfamily.cxx b/sd/source/core/stlfamily.cxx index 64a23282b371..a1a9879b1213 100644 --- a/sd/source/core/stlfamily.cxx +++ b/sd/source/core/stlfamily.cxx @@ -30,6 +30,7 @@ #include <com/sun/star/lang/DisposedException.hpp> #include <com/sun/star/lang/IllegalAccessException.hpp> +#include <comphelper/serviceinfohelper.hxx> #include <vos/mutex.hxx> #include <vcl/svapp.hxx> @@ -195,7 +196,7 @@ OUString SAL_CALL SdStyleFamily::getImplementationName() throw(RuntimeException) sal_Bool SAL_CALL SdStyleFamily::supportsService( const OUString& ServiceName ) throw(RuntimeException) { - return SvxServiceInfoHelper::supportsService( ServiceName, getSupportedServiceNames() ); + return comphelper::ServiceInfoHelper::supportsService( ServiceName, getSupportedServiceNames() ); } // ---------------------------------------------------------- diff --git a/sd/source/core/stlpool.cxx b/sd/source/core/stlpool.cxx index 764ce3172ff3..e592ba45a27e 100644 --- a/sd/source/core/stlpool.cxx +++ b/sd/source/core/stlpool.cxx @@ -29,38 +29,38 @@ #include "precompiled_sd.hxx" #include <com/sun/star/lang/DisposedException.hpp> -#include <svx/eeitem.hxx> -#include <svx/fhgtitem.hxx> -#include <svx/colritem.hxx> -#include <svx/cntritem.hxx> -#include <svx/shdditem.hxx> -#include <svx/crsditem.hxx> -#include <svx/udlnitem.hxx> -#include <svx/wghtitem.hxx> -#include <svx/postitem.hxx> -#include <svx/fontitem.hxx> +#include <editeng/eeitem.hxx> +#include <editeng/fhgtitem.hxx> +#include <editeng/colritem.hxx> +#include <editeng/cntritem.hxx> +#include <editeng/shdditem.hxx> +#include <editeng/crsditem.hxx> +#include <editeng/udlnitem.hxx> +#include <editeng/wghtitem.hxx> +#include <editeng/postitem.hxx> +#include <editeng/fontitem.hxx> #include <svl/poolitem.hxx> #include <svx/xfillit0.hxx> #include <svx/xlineit0.hxx> -#include <svx/ulspitem.hxx> -#include <svx/numitem.hxx> -#include <svx/brshitem.hxx> -#include <svx/editeng.hxx> +#include <editeng/ulspitem.hxx> +#include <editeng/numitem.hxx> +#include <editeng/brshitem.hxx> +#include <editeng/editeng.hxx> #include <svl/smplhint.hxx> -#include <svx/langitem.hxx> -#include <svx/charreliefitem.hxx> +#include <editeng/langitem.hxx> +#include <editeng/charreliefitem.hxx> #ifndef _SVX_EMPHITEM_HXX -#include <svx/emphitem.hxx> +#include <editeng/emphitem.hxx> #endif #include <svx/sdr/table/tabledesign.hxx> -#include <svx/akrnitem.hxx> +#include <editeng/akrnitem.hxx> #include <svx/svdattr.hxx> #include "eetext.hxx" #include <svx/xtable.hxx> // fuer RGB_Color -#include <svx/bulitem.hxx> -#include <svx/lrspitem.hxx> -#include <svx/adjitem.hxx> +#include <editeng/bulitem.hxx> +#include <editeng/lrspitem.hxx> +#include <editeng/adjitem.hxx> #include <svl/itempool.hxx> #define _SDR_POSITIVE diff --git a/sd/source/core/stlsheet.cxx b/sd/source/core/stlsheet.cxx index 4a47fa958b0c..7e090d0e9a98 100644 --- a/sd/source/core/stlsheet.cxx +++ b/sd/source/core/stlsheet.cxx @@ -35,24 +35,24 @@ #include <osl/mutex.hxx> #include <vos/mutex.hxx> #include <vcl/svapp.hxx> - +#include <comphelper/serviceinfohelper.hxx> #include <boost/bind.hpp> #include "eetext.hxx" -#include <svx/eeitem.hxx> -#include <svx/fhgtitem.hxx> +#include <editeng/eeitem.hxx> +#include <editeng/fhgtitem.hxx> #include <svx/svdoattr.hxx> -#include <svx/ulspitem.hxx> +#include <editeng/ulspitem.hxx> #include <svl/smplhint.hxx> #include <svl/itemset.hxx> #include <svx/xflbmtit.hxx> #include <svx/xflbstit.hxx> -#include <svx/bulitem.hxx> -#include <svx/lrspitem.hxx> +#include <editeng/bulitem.hxx> +#include <editeng/lrspitem.hxx> #include <svx/unoshprp.hxx> #include <svx/unoshape.hxx> - +#include <svx/svdpool.hxx> #include "stlsheet.hxx" #include "sdresid.hxx" #include "sdpage.hxx" @@ -101,7 +101,7 @@ static SvxItemPropertySet& GetStylePropertySet() {0,0,0,0,0,0} }; - static SvxItemPropertySet aPropSet( aFullPropertyMap_Impl ); + static SvxItemPropertySet aPropSet( aFullPropertyMap_Impl, SdrObject::GetGlobalDrawObjectItemPool() ); return aPropSet; } @@ -962,7 +962,7 @@ OUString SAL_CALL SdStyleSheet::getImplementationName() throw(RuntimeException) sal_Bool SAL_CALL SdStyleSheet::supportsService( const OUString& ServiceName ) throw(RuntimeException) { - return SvxServiceInfoHelper::supportsService( ServiceName, getSupportedServiceNames() ); + return comphelper::ServiceInfoHelper::supportsService( ServiceName, getSupportedServiceNames() ); } // -------------------------------------------------------------------- @@ -1167,7 +1167,7 @@ void SAL_CALL SdStyleSheet::setPropertyValue( const OUString& aPropertyName, con } else if(!SvxUnoTextRangeBase::SetPropertyValueHelper( aSet, pEntry, aValue, aSet )) { - GetStylePropertySet().setPropertyValue( pEntry, aValue, aSet ); + SvxItemPropertySet_setPropertyValue( GetStylePropertySet(), pEntry, aValue, aSet ); } rStyleSet.Put( aSet ); @@ -1246,7 +1246,7 @@ Any SAL_CALL SdStyleSheet::getPropertyValue( const OUString& PropertyName ) thro return aAny; // Hole Wert aus ItemSet - aAny = GetStylePropertySet().getPropertyValue( pEntry, aSet ); + aAny = SvxItemPropertySet_getPropertyValue( GetStylePropertySet(),pEntry, aSet ); } if( *pEntry->pType != aAny.getValueType() ) @@ -1433,7 +1433,7 @@ Any SAL_CALL SdStyleSheet::getPropertyDefault( const OUString& aPropertyName ) t SfxItemPool& rMyPool = GetPool().GetPool(); SfxItemSet aSet( rMyPool, pEntry->nWID, pEntry->nWID); aSet.Put( rMyPool.GetDefaultItem( pEntry->nWID ) ); - aRet = GetStylePropertySet().getPropertyValue( pEntry, aSet ); + aRet = SvxItemPropertySet_getPropertyValue( GetStylePropertySet(), pEntry, aSet ); } return aRet; } diff --git a/sd/source/core/text/textapi.cxx b/sd/source/core/text/textapi.cxx index 0ec57a5c9cbd..0856e867f4e1 100644 --- a/sd/source/core/text/textapi.cxx +++ b/sd/source/core/text/textapi.cxx @@ -34,10 +34,11 @@ #include <textapi.hxx> #include <drawdoc.hxx> -#include <svx/eeitem.hxx> -#include <svx/editeng.hxx> -#include <svx/outlobj.hxx> +#include <editeng/eeitem.hxx> +#include <editeng/editeng.hxx> +#include <editeng/outlobj.hxx> #include "Outliner.hxx" +#include <svx/svdpool.hxx> using ::rtl::OUString; @@ -137,7 +138,7 @@ const SvxItemPropertySet* ImplGetSdTextPortionPropertyMap() {MAP_CHAR_LEN("ParaUserDefinedAttributes"), EE_PARA_XMLATTRIBS, &::getCppuType((const Reference< XNameContainer >*)0) , 0, 0}, {0,0,0,0,0,0} }; - static SvxItemPropertySet aSdTextPortionPropertyMap( aSdTextPortionPropertyEntries ); + static SvxItemPropertySet aSdTextPortionPropertyMap( aSdTextPortionPropertyEntries, SdrObject::GetGlobalDrawObjectItemPool() ); return &aSdTextPortionPropertyMap; } diff --git a/sd/source/core/typemap.cxx b/sd/source/core/typemap.cxx index 810dfe1bfdc9..fb5939e21dd3 100644 --- a/sd/source/core/typemap.cxx +++ b/sd/source/core/typemap.cxx @@ -29,43 +29,43 @@ #include "precompiled_sd.hxx" #include "eetext.hxx" -#include <svx/eeitem.hxx> -#include <svx/langitem.hxx> -#include <svx/fhgtitem.hxx> -#include <svx/colritem.hxx> -#include <svx/cntritem.hxx> -#include <svx/shdditem.hxx> -#include <svx/crsditem.hxx> -#include <svx/udlnitem.hxx> -#include <svx/wghtitem.hxx> -#include <svx/postitem.hxx> -#include <svx/fontitem.hxx> +#include <editeng/eeitem.hxx> +#include <editeng/langitem.hxx> +#include <editeng/fhgtitem.hxx> +#include <editeng/colritem.hxx> +#include <editeng/cntritem.hxx> +#include <editeng/shdditem.hxx> +#include <editeng/crsditem.hxx> +#include <editeng/udlnitem.hxx> +#include <editeng/wghtitem.hxx> +#include <editeng/postitem.hxx> +#include <editeng/fontitem.hxx> #include <svl/poolitem.hxx> -#include <svx/tstpitem.hxx> -#include <svx/lrspitem.hxx> -#include <svx/protitem.hxx> +#include <editeng/tstpitem.hxx> +#include <editeng/lrspitem.hxx> +#include <editeng/protitem.hxx> #include <svx/chrtitem.hxx> - +#include <sfx2/msg.hxx> #include <svl/globalnameitem.hxx> #include <svx/hlnkitem.hxx> #include <svx/postattr.hxx> -#include <svx/editdata.hxx> +#include <editeng/editdata.hxx> #include <svx/srchdlg.hxx> #include <svx/rulritem.hxx> #include <svx/clipfmtitem.hxx> -#include <sfx2/srchitem.hxx> -#include <svx/sizeitem.hxx> -#include <svx/svxenum.hxx> +#include <svl/srchitem.hxx> +#include <editeng/sizeitem.hxx> +#include <editeng/svxenum.hxx> #include <svx/algitem.hxx> #include <svx/zoomitem.hxx> #include <svx/pageitem.hxx> #include <svx/svdattr.hxx> #include <svx/grafctrl.hxx> -#include <svx/boxitem.hxx> -#include <svx/bolnitem.hxx> +#include <editeng/boxitem.hxx> +#include <editeng/bolnitem.hxx> #include "sdattr.hxx" #include <svx/zoomslideritem.hxx> - +#include <editeng/memberids.hrc> #include <svx/xftstit.hxx> #include <svx/xlnwtit.hxx> #include <svx/xlineit0.hxx> diff --git a/sd/source/filter/eppt/eppt.cxx b/sd/source/filter/eppt/eppt.cxx index 68061053c959..d0603ea4d5d4 100644 --- a/sd/source/filter/eppt/eppt.cxx +++ b/sd/source/filter/eppt/eppt.cxx @@ -53,14 +53,14 @@ #include <com/sun/star/geometry/RealPoint2D.hpp> #include <com/sun/star/util/DateTime.hpp> #include <tools/zcodec.hxx> -#include <svx/svxenum.hxx> +#include <editeng/svxenum.hxx> #include <sot/storinfo.hxx> #include <filter/msfilter/msoleexp.hxx> #include <vcl/virdev.hxx> #include <svtools/wmf.hxx> #include <filter/msfilter/msdffimp.hxx> #include <filter/msfilter/svxmsbas.hxx> -#include <svx/flditem.hxx> +#include <editeng/flditem.hxx> #include <sfx2/docinf.hxx> #define PPT_TRANSITION_TYPE_NONE 0 diff --git a/sd/source/filter/eppt/epptso.cxx b/sd/source/filter/eppt/epptso.cxx index b82bf7601d8b..cda15e75831d 100644 --- a/sd/source/filter/eppt/epptso.cxx +++ b/sd/source/filter/eppt/epptso.cxx @@ -47,7 +47,7 @@ //#ifndef _SVX_XIT_HXX //#include <svx/xit.hxx> //#endif -#include <svx/svxenum.hxx> +#include <editeng/svxenum.hxx> #include <svx/unoapi.hxx> #include <svx/svdoashp.hxx> #include <com/sun/star/style/VerticalAlignment.hpp> @@ -100,10 +100,10 @@ #include <sot/clsids.hxx> #include <unotools/ucbstreamhelper.hxx> #include <com/sun/star/text/FontRelief.hpp> -#include <svx/frmdiritem.hxx> +#include <editeng/frmdiritem.hxx> /* -#include <svx/outliner.hxx> -#include <svx/outlobj.hxx> +#include <editeng/outliner.hxx> +#include <editeng/outlobj.hxx> #include <svx/svdmodel.hxx> */ #include <svtools/fltcall.hxx> @@ -1992,7 +1992,7 @@ void PortionObj::ImplGetPortionValues( FontCollection& rFontCollection, sal_Bool mnCharHeight = 24; if ( GetPropertyValue( mAny, mXPropSet, aCharHeightName, sal_False ) ) { - float fVal; + float fVal(0.0); if ( mAny >>= fVal ) { mnCharHeight = (sal_uInt16)( fVal + 0.5 ); @@ -2001,7 +2001,7 @@ void PortionObj::ImplGetPortionValues( FontCollection& rFontCollection, sal_Bool } if ( GetPropertyValue( mAny, mXPropSet, aCharWeightName, sal_False ) ) { - float fFloat; + float fFloat(0.0); if ( mAny >>= fFloat ) { if ( fFloat >= ::com::sun::star::awt::FontWeight::SEMIBOLD ) @@ -2037,7 +2037,7 @@ void PortionObj::ImplGetPortionValues( FontCollection& rFontCollection, sal_Bool if ( ImplGetPropertyValue( String( RTL_CONSTASCII_USTRINGPARAM( "CharUnderline" ) ), bGetPropStateValue ) ) { - sal_Int16 nVal; + sal_Int16 nVal(0); mAny >>= nVal; switch ( nVal ) { @@ -2052,7 +2052,7 @@ void PortionObj::ImplGetPortionValues( FontCollection& rFontCollection, sal_Bool if ( ImplGetPropertyValue( String( RTL_CONSTASCII_USTRINGPARAM( "CharShadowed" ) ), bGetPropStateValue ) ) { - sal_Bool bBool; + sal_Bool bBool(sal_False); mAny >>= bBool; if ( bBool ) mnCharAttr |= 0x10; @@ -2062,7 +2062,7 @@ void PortionObj::ImplGetPortionValues( FontCollection& rFontCollection, sal_Bool if ( ImplGetPropertyValue( String( RTL_CONSTASCII_USTRINGPARAM( "CharRelief" ) ), bGetPropStateValue ) ) { - sal_Int16 nVal; + sal_Int16 nVal(0); mAny >>= nVal; if ( nVal != ::com::sun::star::text::FontRelief::NONE ) mnCharAttr |= 512; diff --git a/sd/source/filter/eppt/pptexanimations.cxx b/sd/source/filter/eppt/pptexanimations.cxx index c10df3f5bb87..4e4b50007443 100644 --- a/sd/source/filter/eppt/pptexanimations.cxx +++ b/sd/source/filter/eppt/pptexanimations.cxx @@ -72,8 +72,8 @@ #include <vcl/vclenum.hxx> #include <svx/svdotext.hxx> -#include <svx/outlobj.hxx> -#include <svx/editobj.hxx> +#include <editeng/outlobj.hxx> +#include <editeng/editobj.hxx> #include <pptexanimations.hxx> #include <osl/endian.h> diff --git a/sd/source/filter/grf/sdgrffilter.cxx b/sd/source/filter/grf/sdgrffilter.cxx index 90c4dee5c99c..0d91df41500f 100644 --- a/sd/source/filter/grf/sdgrffilter.cxx +++ b/sd/source/filter/grf/sdgrffilter.cxx @@ -64,7 +64,6 @@ #include <sfx2/filedlghelper.hxx> #include <tools/urlobj.hxx> #include <svtools/filter.hxx> -#include <svx/impgrf.hxx> #include <svx/xoutbmp.hxx> // -- @@ -208,7 +207,7 @@ sal_Bool SdGRFFilter::Import() { Graphic aGraphic; const String aFileName( mrMedium.GetURLObject().GetMainURL( INetURLObject::NO_DECODE ) ); - GraphicFilter* pGraphicFilter = GetGrfFilter(); + GraphicFilter* pGraphicFilter = GraphicFilter::GetGraphicFilter(); const USHORT nFilter = pGraphicFilter->GetImportFormatNumberForTypeName( mrMedium.GetFilter()->GetTypeName() ); sal_Bool bRet = sal_False; @@ -310,7 +309,7 @@ sal_Bool SdGRFFilter::Export() { uno::Reference< lang::XComponent > xSource( pPage->getUnoPage(), uno::UNO_QUERY ); SfxItemSet* pSet = mrMedium.GetItemSet(); - GraphicFilter* pGraphicFilter = GetGrfFilter(); + GraphicFilter* pGraphicFilter = GraphicFilter::GetGraphicFilter(); if ( pSet && pGraphicFilter && xSource.is() ) { const String aTypeName( mrMedium.GetFilter()->GetTypeName() ); @@ -478,7 +477,7 @@ void SdGRFFilter::SaveGraphic( const ::com::sun::star::uno::Reference< ::com::su // populate filter dialog filter list and select default filter to match graphic mime type - GraphicFilter& rGF = *GetGrfFilter(); + GraphicFilter& rGF = *GraphicFilter::GetGraphicFilter(); Reference<XFilterManager> xFltMgr(xFP, UNO_QUERY); OUString aDefaultFormatName; USHORT nCount = rGF.GetExportFormatCount(); diff --git a/sd/source/filter/html/htmlex.cxx b/sd/source/filter/html/htmlex.cxx index 7e5c8216770f..82fabc73aed2 100644 --- a/sd/source/filter/html/htmlex.cxx +++ b/sd/source/filter/html/htmlex.cxx @@ -54,8 +54,8 @@ #include <svtools/imappoly.hxx> #include <vcl/msgbox.hxx> #include <sfx2/app.hxx> -#include <svx/outlobj.hxx> -#include <svx/editobj.hxx> +#include <editeng/outlobj.hxx> +#include <editeng/editobj.hxx> #include <svx/svdopath.hxx> #include <svx/xoutbmp.hxx> #include <svtools/htmlout.hxx> @@ -63,28 +63,23 @@ #include <vcl/cvtgrf.hxx> #include <svtools/colorcfg.hxx> #include <svtools/filter.hxx> -#include <svx/colritem.hxx> -#include <svx/editeng.hxx> -#include <svx/wghtitem.hxx> -#include <svx/udlnitem.hxx> -#include <svx/postitem.hxx> -#include <svx/crsditem.hxx> -#include <svx/flditem.hxx> +#include <editeng/colritem.hxx> +#include <editeng/editeng.hxx> +#include <editeng/wghtitem.hxx> +#include <editeng/udlnitem.hxx> +#include <editeng/postitem.hxx> +#include <editeng/crsditem.hxx> +#include <editeng/flditem.hxx> #include <sfx2/dispatch.hxx> #include <sfx2/fcontnr.hxx> #include <svl/style.hxx> #define _SVSTDARR_USHORTS #include <svl/svstdarr.hxx> -//#ifndef _SVDETC_HXX -//#include <svx/svdetc.hxx> -//#endif -#include <svx/frmdiritem.hxx> +#include <editeng/frmdiritem.hxx> #include <svx/svdoutl.hxx> -#include <svx/impgrf.hxx> // FillFilter() #include <tools/urlobj.hxx> // INetURLObject #include <vcl/bmpacc.hxx> #include <svtools/sfxecode.hxx> -#include <svx/impgrf.hxx> #include <com/sun/star/beans/PropertyState.hpp> #include <tools/resmgr.hxx> #include "comphelper/anytostring.hxx" diff --git a/sd/source/filter/html/pubdlg.cxx b/sd/source/filter/html/pubdlg.cxx index 45817e470165..55e141f8d4cb 100644 --- a/sd/source/filter/html/pubdlg.cxx +++ b/sd/source/filter/html/pubdlg.cxx @@ -49,9 +49,8 @@ #include <svtools/valueset.hxx> #include <vcl/graph.hxx> #include <svl/eitem.hxx> -#include <svx/impgrf.hxx> #include <svtools/colrdlg.hxx> -#include <svx/colritem.hxx> +#include <editeng/colritem.hxx> #include <tools/list.hxx> #include <sdiocmpt.hxx> #include <sfx2/docfile.hxx> diff --git a/sd/source/filter/html/sdhtmlfilter.cxx b/sd/source/filter/html/sdhtmlfilter.cxx index e8f36693d31e..f447e2039c70 100644 --- a/sd/source/filter/html/sdhtmlfilter.cxx +++ b/sd/source/filter/html/sdhtmlfilter.cxx @@ -38,7 +38,6 @@ #include <sfx2/docfile.hxx> #include <sfx2/docfilt.hxx> #include <sfx2/frame.hxx> -#include <svx/impgrf.hxx> #include <svx/svdograf.hxx> #include <svx/svdpagv.hxx> #include <svx/xoutbmp.hxx> diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx index 27c6935b3a81..89c823dc6493 100644 --- a/sd/source/filter/ppt/pptin.cxx +++ b/sd/source/filter/ppt/pptin.cxx @@ -28,7 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sd.hxx" -#include <svx/numitem.hxx> +#include <editeng/numitem.hxx> #include <unotools/ucbstreamhelper.hxx> #include <vcl/wrkwin.hxx> @@ -43,19 +43,19 @@ #include <vcl/msgbox.hxx> #include <svl/style.hxx> #include <svx/xflclit.hxx> -#include <svx/eeitem.hxx> -#include <svx/colritem.hxx> +#include <editeng/eeitem.hxx> +#include <editeng/colritem.hxx> #include <svl/whiter.hxx> #include <svx/xgrad.hxx> #include <svx/xflgrit.hxx> #include <svx/xbtmpit.hxx> #include <svx/xlnclit.hxx> -#include <svx/adjitem.hxx> -#include <svx/editeng.hxx> -#include <svx/bulitem.hxx> -#include <svx/lrspitem.hxx> -#include <svx/lspcitem.hxx> -#include <svx/tstpitem.hxx> +#include <editeng/adjitem.hxx> +#include <editeng/editeng.hxx> +#include <editeng/bulitem.hxx> +#include <editeng/lrspitem.hxx> +#include <editeng/lspcitem.hxx> +#include <editeng/tstpitem.hxx> #include <sfx2/docinf.hxx> @@ -71,9 +71,9 @@ #include "anminfo.hxx" #include <svx/gallery.hxx> #include <tools/urlobj.hxx> -#include <svx/numitem.hxx> +#include <editeng/numitem.hxx> #include <svl/itempool.hxx> -#include <svx/fhgtitem.hxx> +#include <editeng/fhgtitem.hxx> #include <svx/svdopage.hxx> #include <svx/svdomedia.hxx> #include <svx/svdogrp.hxx> @@ -88,7 +88,7 @@ #include <unotools/fltrcfg.hxx> #include <sfx2/progress.hxx> #include <unotools/localfilehelper.hxx> -#include <svx/editstat.hxx> +#include <editeng/editstat.hxx> #include <unotools/pathoptions.hxx> #include <sfx2/docfac.hxx> #define MAX_USER_MOVE 2 diff --git a/sd/source/filter/ppt/pptinanimations.cxx b/sd/source/filter/ppt/pptinanimations.cxx index c94b8ce61dbf..16fc1a99dd8a 100644 --- a/sd/source/filter/ppt/pptinanimations.cxx +++ b/sd/source/filter/ppt/pptinanimations.cxx @@ -68,8 +68,8 @@ #include <vcl/vclenum.hxx> #include <svx/svdotext.hxx> -#include <svx/outlobj.hxx> -#include <svx/editobj.hxx> +#include <editeng/outlobj.hxx> +#include <editeng/editobj.hxx> #include <pptinanimations.hxx> #include <pptatom.hxx> #include "pptin.hxx" diff --git a/sd/source/filter/xml/sdtransform.cxx b/sd/source/filter/xml/sdtransform.cxx index 2d120598df96..8abafc84055e 100644 --- a/sd/source/filter/xml/sdtransform.cxx +++ b/sd/source/filter/xml/sdtransform.cxx @@ -34,12 +34,12 @@ #include <svl/whiter.hxx> #include <svx/svdoutl.hxx> -#include <svx/xmlcnitm.hxx> +#include <editeng/xmlcnitm.hxx> #include <svx/svdotext.hxx> #include <svx/svdogrp.hxx> -#include <svx/eeitem.hxx> -#include <svx/lrspitem.hxx> -#include <svx/numitem.hxx> +#include <editeng/eeitem.hxx> +#include <editeng/lrspitem.hxx> +#include <editeng/numitem.hxx> #include "drawdoc.hxx" #include "glob.hxx" diff --git a/sd/source/ui/accessibility/AccessibleOutlineEditSource.cxx b/sd/source/ui/accessibility/AccessibleOutlineEditSource.cxx index 225e9f69802a..6862634df9a0 100644 --- a/sd/source/ui/accessibility/AccessibleOutlineEditSource.cxx +++ b/sd/source/ui/accessibility/AccessibleOutlineEditSource.cxx @@ -27,7 +27,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sd.hxx" -#include <svx/unoedhlp.hxx> +#include <editeng/unoedhlp.hxx> #include <svx/svdoutl.hxx> #ifndef SD_ACCESSIBILITY_ACCESSIBLE_OUTLINE_EDIT_SOURCE_HXX diff --git a/sd/source/ui/animations/CustomAnimationDialog.cxx b/sd/source/ui/animations/CustomAnimationDialog.cxx index 664b07b94fcd..7f942562b951 100644 --- a/sd/source/ui/animations/CustomAnimationDialog.cxx +++ b/sd/source/ui/animations/CustomAnimationDialog.cxx @@ -69,7 +69,7 @@ #include <svx/svxids.hrc> #endif #include <svx/dialmgr.hxx> -#include <svx/flstitem.hxx> +#include <editeng/flstitem.hxx> #include <svx/drawitem.hxx> #include <svx/xtable.hxx> diff --git a/sd/source/ui/annotations/annotationmanager.cxx b/sd/source/ui/annotations/annotationmanager.cxx index dd54fb4000eb..36c824e1b919 100644 --- a/sd/source/ui/annotations/annotationmanager.cxx +++ b/sd/source/ui/annotations/annotationmanager.cxx @@ -38,7 +38,7 @@ #include <com/sun/star/geometry/RealPoint2D.hpp> #include <com/sun/star/text/XText.hpp> #include <com/sun/star/document/XEventBroadcaster.hpp> - +#include <svx/svxids.hrc> #include <vcl/menu.hxx> #include <vcl/msgbox.hxx> @@ -57,15 +57,15 @@ #include <sfx2/objface.hxx> #include <sfx2/imagemgr.hxx> -#include <svx/editeng.hxx> -#include <svx/eeitem.hxx> -#include <svx/fontitem.hxx> -#include <svx/fhgtitem.hxx> -#include <svx/outlobj.hxx> -#include <svx/postitem.hxx> -#include <svx/wghtitem.hxx> -#include <svx/udlnitem.hxx> -#include <svx/crsditem.hxx> +#include <editeng/editeng.hxx> +#include <editeng/eeitem.hxx> +#include <editeng/fontitem.hxx> +#include <editeng/fhgtitem.hxx> +#include <editeng/outlobj.hxx> +#include <editeng/postitem.hxx> +#include <editeng/wghtitem.hxx> +#include <editeng/udlnitem.hxx> +#include <editeng/crsditem.hxx> #include <svx/svdetc.hxx> diff --git a/sd/source/ui/annotations/annotationwindow.cxx b/sd/source/ui/annotations/annotationwindow.cxx index 87989506527c..eaacc332725d 100644 --- a/sd/source/ui/annotations/annotationwindow.cxx +++ b/sd/source/ui/annotations/annotationwindow.cxx @@ -27,32 +27,32 @@ #include "precompiled_sd.hxx" -#include <svx/fontitem.hxx> -#include <svx/eeitem.hxx> -#include <svx/fhgtitem.hxx> -#include <svx/bulitem.hxx> -#include <svx/udlnitem.hxx> -#include <svx/shdditem.hxx> -#include <svx/flditem.hxx> -#include <svx/frmdir.hxx> -#include <svx/frmdiritem.hxx> -#include <svx/langitem.hxx> -#include <svx/adjitem.hxx> -#include <svx/editview.hxx> +#include <editeng/fontitem.hxx> +#include <editeng/eeitem.hxx> +#include <editeng/fhgtitem.hxx> +#include <editeng/bulitem.hxx> +#include <editeng/udlnitem.hxx> +#include <editeng/shdditem.hxx> +#include <editeng/flditem.hxx> +#include <editeng/frmdir.hxx> +#include <editeng/frmdiritem.hxx> +#include <editeng/langitem.hxx> +#include <editeng/adjitem.hxx> +#include <editeng/editview.hxx> #include <svx/svdview.hxx> #include <svx/sdrpaintwindow.hxx> #include <svx/sdr/overlay/overlaymanager.hxx> -#include <svx/editstat.hxx> //EditEngine flags -#include <svx/outliner.hxx> -#include <svx/editeng.hxx> -#include <svx/editobj.hxx> -#include <svx/unolingu.hxx> -#include <svx/outlobj.hxx> -#include <svx/postitem.hxx> -#include <svx/wghtitem.hxx> -#include <svx/udlnitem.hxx> -#include <svx/crsditem.hxx> - +#include <editeng/editstat.hxx> //EditEngine flags +#include <editeng/outliner.hxx> +#include <editeng/editeng.hxx> +#include <editeng/editobj.hxx> +#include <editeng/unolingu.hxx> +#include <editeng/outlobj.hxx> +#include <editeng/postitem.hxx> +#include <editeng/wghtitem.hxx> +#include <editeng/udlnitem.hxx> +#include <editeng/crsditem.hxx> +#include <svx/svxids.hrc> #include <svtools/langtab.hxx> #include <svl/slstitm.hxx> #include <unotools/securityoptions.hxx> diff --git a/sd/source/ui/annotations/annotationwindow.hxx b/sd/source/ui/annotations/annotationwindow.hxx index f252e0c7b11c..ba82d4e862d3 100644 --- a/sd/source/ui/annotations/annotationwindow.hxx +++ b/sd/source/ui/annotations/annotationwindow.hxx @@ -40,7 +40,7 @@ #include <basegfx/polygon/b2dpolygon.hxx> #include <svx/sdr/overlay/overlayobject.hxx> -#include <svx/editstat.hxx> +#include <editeng/editstat.hxx> class OutlinerView; class Outliner; diff --git a/sd/source/ui/app/sddll.cxx b/sd/source/ui/app/sddll.cxx index 0cfe6424e2a3..02945586d013 100644 --- a/sd/source/ui/app/sddll.cxx +++ b/sd/source/ui/app/sddll.cxx @@ -27,18 +27,15 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sd.hxx" -#include <svx/eeitem.hxx> +#include <editeng/eeitem.hxx> -#include <svx/editeng.hxx> +#include <editeng/editeng.hxx> #include <svx/svdobj.hxx> #include <unotools/moduleoptions.hxx> -#ifndef _FM_FMOBJFAC_HXX #include <svx/fmobjfac.hxx> -#endif #include <svx/svdfield.hxx> #include <svx/objfac3d.hxx> - #include "sddll.hxx" #include "DrawDocShell.hxx" #include "GraphicDocShell.hxx" @@ -53,7 +50,6 @@ #include <sfx2/docfile.hxx> #include <sfx2/fcontnr.hxx> #include <tools/urlobj.hxx> -#include <svx/impgrf.hxx> #include <svtools/FilterConfigItem.hxx> #include <com/sun/star/util/XArchiver.hpp> #include <comphelper/processfactory.hxx> @@ -153,181 +149,3 @@ void SdDLL::Exit() (*ppShlPtr) = NULL; } -/* -ULONG SdDLL::DetectFilter(SfxMedium& rMedium, const SfxFilter** ppFilter, - SfxFilterFlags nMust, SfxFilterFlags nDont) -{ - ULONG nReturn = ERRCODE_ABORT; // Erkennung fehlgeschlagen, Filter ungueltig - BOOL bStorage = FALSE; - - if( *ppFilter && (*ppFilter)->GetFilterFlags() & SFX_FILTER_PACKED ) - { - uno::Reference< lang::XMultiServiceFactory > xSMgr( ::comphelper::getProcessServiceFactory() ); - uno::Reference< util::XArchiver > xPacker( xSMgr->createInstance( OUString::createFromAscii( "com.sun.star.util.Archiver" ) ), uno::UNO_QUERY ); - if( xPacker.is() ) - { - // extract extra data - OUString aPath( rMedium.GetOrigURL() ); - OUString aExtraData( xPacker->getExtraData( aPath ) ); - const OUString aSig1= OUString::createFromAscii( "private:" ); - String aTmp; - aTmp += sal_Unicode( '?' ); - aTmp += String::CreateFromAscii("simpress"); - const OUString aSig2( aTmp ); - INT32 nIndex1 = aExtraData.indexOf( aSig1 ); - INT32 nIndex2 = aExtraData.indexOf( aSig2 ); - if( nIndex1 == 0 && nIndex2 != -1 ) - return ERRCODE_NONE; - } - } - else if (rMedium.GetError() == SVSTREAM_OK) - { - if ( rMedium.IsStorage() ) - { - bStorage = TRUE; - SotStorageRef xStorage = rMedium.GetStorage(); - if ( !xStorage.Is() ) - return ULONG_MAX; - - if( SvtModuleOptions().IsImpress() ) - { - // Erkennung ueber contained streams (PowerPoint 97-Filter) - String aStreamName = UniString::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "PowerPoint Document" ) ); - if ( xStorage->IsContained( aStreamName ) && xStorage->IsStream( aStreamName ) ) - { - String aFileName(rMedium.GetName()); - aFileName.ToUpperAscii(); - - if( aFileName.SearchAscii( ".POT" ) == STRING_NOTFOUND ) - *ppFilter = SfxFilter::GetFilterByName( pFilterPowerPoint97); - else - *ppFilter = SfxFilter::GetFilterByName( pFilterPowerPoint97Template ); - - return ERRCODE_NONE; - } - } - - const SfxFilter* pFilter = *ppFilter; - if ( *ppFilter ) - { - if ( (*ppFilter)->GetFormat() == xStorage->GetFormat() ) - pFilter = *ppFilter; - } - - if( !pFilter && SvtModuleOptions().IsImpress() ) - { - SfxFilterMatcher aMatcher( String::CreateFromAscii("simpress") ); - pFilter = aMatcher.GetFilter4ClipBoardId( xStorage->GetFormat() ); - if ( pFilter ) - *ppFilter = pFilter; - } - - if( !pFilter && SvtModuleOptions().IsDraw() ) - { - SfxFilterMatcher aMatcher( String::CreateFromAscii("sdraw") ); - pFilter = aMatcher.GetFilter4ClipBoardId( xStorage->GetFormat() ); - if ( pFilter ) - *ppFilter = pFilter; - } - - if ( pFilter && - ( pFilter->GetFilterFlags() & nMust ) == nMust && - ( pFilter->GetFilterFlags() & nDont ) == 0 ) - { - *ppFilter = pFilter; - nReturn = ERRCODE_NONE; - } - else - { - *ppFilter = NULL; - nReturn = ERRCODE_NONE; - } - } - - String aFileName( rMedium.GetName() ); - aFileName.ToUpperAscii(); - - if ( nReturn == ERRCODE_ABORT ) - { - if( bStorage ) // aber keine Clipboard-Id #55337# - { - *ppFilter = NULL; - } - else - { - // Vektorgraphik? - SvStream* pStm = rMedium.GetInStream(); - - if( !pStm ) - nReturn = ERRCODE_IO_GENERAL; - else - { - pStm->Seek( STREAM_SEEK_TO_BEGIN ); - - const String aFileName( rMedium.GetURLObject().GetMainURL( INetURLObject::NO_DECODE ) ); - GraphicDescriptor aDesc( *pStm, &aFileName ); - GraphicFilter* pGrfFilter = GetGrfFilter(); - - if( !aDesc.Detect( FALSE ) ) - { - if( SvtModuleOptions().IsImpress() ) - { - *ppFilter = NULL; - nReturn = ERRCODE_ABORT; - INetURLObject aURL( aFileName ); - if( aURL.getExtension().equalsIgnoreAsciiCaseAscii( "cgm" ) ) - { - sal_uInt8 n8; - pStm->Seek( STREAM_SEEK_TO_BEGIN ); - *pStm >> n8; - if ( ( n8 & 0xf0 ) == 0 ) // we are supporting binary cgm format only, so - { // this is a small test to exclude cgm text - const String aName = UniString::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "CGM - Computer Graphics Metafile" ) ); - SfxFilterMatcher aMatch( String::CreateFromAscii("simpress") ); - *ppFilter = aMatch.GetFilter4FilterName( aName ); - nReturn = ERRCODE_NONE; - } - } - } - } - else - { - if( SvtModuleOptions().IsDraw() ) - { - String aShortName( aDesc.GetImportFormatShortName( aDesc.GetFileFormat() ) ); - const String aName( pGrfFilter->GetImportFormatTypeName( pGrfFilter->GetImportFormatNumberForShortName( aShortName ) ) ); - - if ( *ppFilter && aShortName.EqualsIgnoreCaseAscii( "PCD" ) ) // there is a multiple pcd selection possible - { - sal_Int32 nBase = 2; // default Base0 - String aFilterTypeName( (*ppFilter)->GetRealTypeName() ); - if ( aFilterTypeName.CompareToAscii( "pcd_Photo_CD_Base4" ) == COMPARE_EQUAL ) - nBase = 1; - else if ( aFilterTypeName.CompareToAscii( "pcd_Photo_CD_Base16" ) == COMPARE_EQUAL ) - nBase = 0; - String aFilterConfigPath( RTL_CONSTASCII_USTRINGPARAM( "Office.Common/Filter/Graphic/Import/PCD" ) ); - FilterConfigItem aFilterConfigItem( aFilterConfigPath ); - aFilterConfigItem.WriteInt32( String( RTL_CONSTASCII_USTRINGPARAM( "Resolution" ) ), nBase ); - } - - SfxFilterMatcher aMatch( String::CreateFromAscii("draw") ); - *ppFilter = aMatch.GetFilter4FilterName( aName ); - nReturn = ERRCODE_NONE; - } - else - { - nReturn = ERRCODE_ABORT; - *ppFilter = NULL; - } - } - } - } - } - } - else - { - nReturn = rMedium.GetError(); - } - - return nReturn; -} */ diff --git a/sd/source/ui/app/sddll2.cxx b/sd/source/ui/app/sddll2.cxx index 9b55f05808e7..50143367944a 100644 --- a/sd/source/ui/app/sddll2.cxx +++ b/sd/source/ui/app/sddll2.cxx @@ -30,12 +30,12 @@ -#include <svx/editdata.hxx> +#include <editeng/editdata.hxx> #include "eetext.hxx" #include <svx/svxids.hrc> -#include <svx/eeitem.hxx> +#include <editeng/eeitem.hxx> -#include <svx/flditem.hxx> +#include <editeng/flditem.hxx> #include <svx/imapdlg.hxx> #include <svx/bmpmask.hxx> #include <svx/galbrws.hxx> diff --git a/sd/source/ui/app/sdmod.cxx b/sd/source/ui/app/sdmod.cxx index 55f99c1eb15d..fb180509cff9 100644 --- a/sd/source/ui/app/sdmod.cxx +++ b/sd/source/ui/app/sdmod.cxx @@ -48,7 +48,7 @@ #include <svtools/ehdl.hxx> #include <svx/svxids.hrc> -#include <sfx2/srchitem.hxx> +#include <svl/srchitem.hxx> #include <svx/svxerr.hxx> #include <svx/xmlsecctrl.hxx> diff --git a/sd/source/ui/app/sdmod1.cxx b/sd/source/ui/app/sdmod1.cxx index bd634da53eb4..fcc22b73f424 100644 --- a/sd/source/ui/app/sdmod1.cxx +++ b/sd/source/ui/app/sdmod1.cxx @@ -36,16 +36,16 @@ #include <svx/dialogs.hrc> -#include <svx/langitem.hxx> -#include <svx/editdata.hxx> +#include <editeng/langitem.hxx> +#include <editeng/editdata.hxx> #include <vcl/msgbox.hxx> -#include <svx/svxenum.hxx> +#include <editeng/svxenum.hxx> #include <sfx2/dispatch.hxx> #include <sfx2/request.hxx> #include <sfx2/printer.hxx> #include <sfx2/docfile.hxx> -#include <svx/paperinf.hxx> -#include <svx/eeitem.hxx> +#include <editeng/paperinf.hxx> +#include <editeng/eeitem.hxx> #include <unotools/useroptions.hxx> #include "app.hrc" diff --git a/sd/source/ui/app/sdmod2.cxx b/sd/source/ui/app/sdmod2.cxx index 652f70a2ff5c..9aa36ddd3f82 100644 --- a/sd/source/ui/app/sdmod2.cxx +++ b/sd/source/ui/app/sdmod2.cxx @@ -27,8 +27,8 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sd.hxx" -#include <svx/eeitem.hxx> -#include <svx/flditem.hxx> +#include <editeng/eeitem.hxx> +#include <editeng/flditem.hxx> #include <sfx2/printer.hxx> #include <svl/inethist.hxx> #include <svl/poolitem.hxx> @@ -40,9 +40,9 @@ #include <sfx2/docfile.hxx> #include <sfx2/request.hxx> -#include <svx/svdfield.hxx> -#include <svx/editstat.hxx> -#include <svx/editeng.hxx> +#include <editeng/measfld.hxx> +#include <editeng/editstat.hxx> +#include <editeng/editeng.hxx> #include <svx/dialogs.hrc> #include <svx/svdotext.hxx> @@ -487,7 +487,7 @@ SfxItemSet* SdModule::CreateItemSet( USHORT nSlot ) nMetric = (FieldUnit)pOptions->GetMetric(); if( nMetric == (FieldUnit)0xffff ) - nMetric = GetModuleFieldUnit(); + nMetric = GetFieldUnit(); pRet->Put( SfxUInt16Item( SID_ATTR_METRIC, (UINT16)nMetric ) ); diff --git a/sd/source/ui/app/sdpopup.cxx b/sd/source/ui/app/sdpopup.cxx index f97de2da26c1..63d6fc0b195c 100644 --- a/sd/source/ui/app/sdpopup.cxx +++ b/sd/source/ui/app/sdpopup.cxx @@ -29,10 +29,10 @@ #include "precompiled_sd.hxx" -#include <svx/eeitem.hxx> +#include <editeng/eeitem.hxx> -#include <svx/editeng.hxx> -#include <svx/flditem.hxx> +#include <editeng/editeng.hxx> +#include <editeng/flditem.hxx> #include <svl/zforlist.hxx> #include <sfx2/objsh.hxx> #include <sfx2/docfile.hxx> diff --git a/sd/source/ui/app/sdxfer.cxx b/sd/source/ui/app/sdxfer.cxx index ecf0819fa5ef..ddbc0698a341 100644 --- a/sd/source/ui/app/sdxfer.cxx +++ b/sd/source/ui/app/sdxfer.cxx @@ -36,24 +36,24 @@ #ifndef _UNTOOLS_TEMPFILE_HXX #include <unotools/tempfile.hxx> #endif -#include <svx/eeitem.hxx> -#include <svx/flditem.hxx> +#include <editeng/eeitem.hxx> +#include <editeng/flditem.hxx> #include <svx/svdpagv.hxx> #include <sfx2/app.hxx> #include <vcl/msgbox.hxx> #include <svx/svdoole2.hxx> #include <svx/svdograf.hxx> #include <svx/svdotext.hxx> -#include <svx/outlobj.hxx> +#include <editeng/outlobj.hxx> #include <sot/storage.hxx> #include <svl/itempool.hxx> -#include <svx/editobj.hxx> +#include <editeng/editobj.hxx> #include <svx/fmglob.hxx> #include <svx/svdouno.hxx> #include <tools/urlobj.hxx> #include <sot/formats.hxx> #include <svl/urlbmk.hxx> -#include <svx/outliner.hxx> +#include <editeng/outliner.hxx> //#ifndef _SVDETC_HXX //autogen //#include <svx/svdetc.hxx> diff --git a/sd/source/ui/dlg/LayerDialogContent.cxx b/sd/source/ui/dlg/LayerDialogContent.cxx index d8707f8f4020..7420319ab491 100644 --- a/sd/source/ui/dlg/LayerDialogContent.cxx +++ b/sd/source/ui/dlg/LayerDialogContent.cxx @@ -33,7 +33,7 @@ #include <com/sun/star/presentation/AnimationSpeed.hpp> #include <svx/gallery.hxx> -#include <svx/colritem.hxx> +#include <editeng/colritem.hxx> #include <sfx2/dispatch.hxx> #include <svl/aeitem.hxx> #include <vcl/msgbox.hxx> diff --git a/sd/source/ui/dlg/celltempl.cxx b/sd/source/ui/dlg/celltempl.cxx index 6c9fb9536bd7..4938263b97d7 100644 --- a/sd/source/ui/dlg/celltempl.cxx +++ b/sd/source/ui/dlg/celltempl.cxx @@ -37,10 +37,10 @@ #include <svx/dialogs.hrc> #include <svx/drawitem.hxx> -#include <svx/bulitem.hxx> -#include <svx/eeitem.hxx> -#include <svx/lrspitem.hxx> -#include <svx/numitem.hxx> +#include <editeng/bulitem.hxx> +#include <editeng/eeitem.hxx> +#include <editeng/lrspitem.hxx> +#include <editeng/numitem.hxx> #include <svx/svdmodel.hxx> #include "DrawDocShell.hxx" diff --git a/sd/source/ui/dlg/copydlg.cxx b/sd/source/ui/dlg/copydlg.cxx index a703b19ea33b..6b3c04346f31 100644 --- a/sd/source/ui/dlg/copydlg.cxx +++ b/sd/source/ui/dlg/copydlg.cxx @@ -114,7 +114,7 @@ CopyDlg::CopyDlg( maBtnSetDefault.SetClickHdl( LINK( this, CopyDlg, SetDefault ) ); - FieldUnit eFUnit( GetModuleFieldUnit() ); + FieldUnit eFUnit( SfxModule::GetCurrentFieldUnit() ); SetFieldUnit( maMtrFldMoveX, eFUnit, TRUE ); SetFieldUnit( maMtrFldMoveY, eFUnit, TRUE ); diff --git a/sd/source/ui/dlg/dlgchar.cxx b/sd/source/ui/dlg/dlgchar.cxx index b366c8f4b2ad..d0c412ca6f10 100644 --- a/sd/source/ui/dlg/dlgchar.cxx +++ b/sd/source/ui/dlg/dlgchar.cxx @@ -34,7 +34,7 @@ #include <svx/dialogs.hrc> -#include <svx/flstitem.hxx> +#include <editeng/flstitem.hxx> #include <svx/flagsdef.hxx> #include <sfx2/objsh.hxx> diff --git a/sd/source/ui/dlg/dlgfield.cxx b/sd/source/ui/dlg/dlgfield.cxx index a7229c193586..6778f073aaa9 100644 --- a/sd/source/ui/dlg/dlgfield.cxx +++ b/sd/source/ui/dlg/dlgfield.cxx @@ -34,14 +34,14 @@ -#include <svx/editeng.hxx> -#include <svx/eeitem.hxx> -#include <svx/flditem.hxx> +#include <editeng/editeng.hxx> +#include <editeng/eeitem.hxx> +#include <editeng/flditem.hxx> #include <svl/zforlist.hxx> #include <sfx2/objsh.hxx> #include <sfx2/docfile.hxx> #include <svl/itemset.hxx> -#include <svx/langitem.hxx> +#include <editeng/langitem.hxx> #include <unotools/useroptions.hxx> #include "strings.hrc" diff --git a/sd/source/ui/dlg/dlgolbul.cxx b/sd/source/ui/dlg/dlgolbul.cxx index bf90814302e4..bbd32f6bd807 100644 --- a/sd/source/ui/dlg/dlgolbul.cxx +++ b/sd/source/ui/dlg/dlgolbul.cxx @@ -39,10 +39,10 @@ #endif #include <sfx2/objsh.hxx> #include <svx/drawitem.hxx> -#include <svx/bulitem.hxx> -#include <svx/eeitem.hxx> +#include <editeng/bulitem.hxx> +#include <editeng/eeitem.hxx> -#include <svx/numitem.hxx> +#include <editeng/numitem.hxx> #include <svx/dialogs.hrc> #include <svl/intitem.hxx> diff --git a/sd/source/ui/dlg/dlgpage.cxx b/sd/source/ui/dlg/dlgpage.cxx index 36015adcae30..f2dea0f67e2f 100644 --- a/sd/source/ui/dlg/dlgpage.cxx +++ b/sd/source/ui/dlg/dlgpage.cxx @@ -47,7 +47,7 @@ #include "DrawDocShell.hxx" #include <svl/aeitem.hxx> #include <svx/flagsdef.hxx> -#include <svx/svxenum.hxx> +#include <editeng/svxenum.hxx> /************************************************************************* |* diff --git a/sd/source/ui/dlg/filedlg.cxx b/sd/source/ui/dlg/filedlg.cxx index cb401d4ac2e5..182c70954111 100644 --- a/sd/source/ui/dlg/filedlg.cxx +++ b/sd/source/ui/dlg/filedlg.cxx @@ -47,14 +47,11 @@ #include <vos/mutex.hxx> #include <vcl/svapp.hxx> #include <sfx2/filedlghelper.hxx> - -#include <svx/impgrf.hxx> - #include <avmedia/mediawindow.hxx> #include "filedlg.hxx" #include "sdresid.hxx" #include "strings.hrc" - +#include <svtools/filter.hxx> //----------------------------------------------------------------------------- @@ -349,7 +346,7 @@ SdExportFileDialog::SdExportFileDialog(BOOL bHaveCheckbox) : { // setup filter const String aHTMLFilter( SdResId( STR_EXPORT_HTML_NAME ) ); - GraphicFilter* pFilter = GetGrfFilter(); + GraphicFilter* pFilter = GraphicFilter::GetGraphicFilter(); const USHORT nFilterCount = pFilter->GetExportFormatCount(); // add HTML filter diff --git a/sd/source/ui/dlg/headerfooterdlg.cxx b/sd/source/ui/dlg/headerfooterdlg.cxx index d4bd3ca0ad88..d6e358cc5411 100644 --- a/sd/source/ui/dlg/headerfooterdlg.cxx +++ b/sd/source/ui/dlg/headerfooterdlg.cxx @@ -35,12 +35,12 @@ #ifndef _SVX_DIALOGS_HRC #include <svx/dialogs.hrc> #endif -#include <svx/eeitem.hxx> -#include <svx/flditem.hxx> -#include <svx/langitem.hxx> +#include <editeng/eeitem.hxx> +#include <editeng/flditem.hxx> +#include <editeng/langitem.hxx> #include <svx/langbox.hxx> #include <svx/svdotext.hxx> -#include <svx/editeng.hxx> +#include <editeng/editeng.hxx> #include <sfx2/viewfrm.hxx> #ifndef _SD_SDRESID_HXX diff --git a/sd/source/ui/dlg/paragr.cxx b/sd/source/ui/dlg/paragr.cxx index c11f2680a05d..e407efc5d443 100644 --- a/sd/source/ui/dlg/paragr.cxx +++ b/sd/source/ui/dlg/paragr.cxx @@ -38,9 +38,9 @@ #include <svl/eitem.hxx> #include <svl/intitem.hxx> -#include <svx/editdata.hxx> +#include <editeng/editdata.hxx> #include <svx/dialogs.hrc> -#include <svx/eeitem.hxx> +#include <editeng/eeitem.hxx> #include <svx/flagsdef.hxx> #include "eetext.hxx" diff --git a/sd/source/ui/dlg/prltempl.cxx b/sd/source/ui/dlg/prltempl.cxx index 770412f72976..98667c3362cf 100644 --- a/sd/source/ui/dlg/prltempl.cxx +++ b/sd/source/ui/dlg/prltempl.cxx @@ -36,16 +36,16 @@ #include "eetext.hxx" #include <svx/dialogs.hrc> -#include <svx/flstitem.hxx> +#include <editeng/flstitem.hxx> #include <svx/drawitem.hxx> #include <svl/style.hxx> #include <svx/tabline.hxx> -#include <svx/bulitem.hxx> -#include <svx/eeitem.hxx> -#include <svx/brshitem.hxx> +#include <editeng/bulitem.hxx> +#include <editeng/eeitem.hxx> +#include <editeng/brshitem.hxx> #include <vcl/graph.hxx> -#include <svx/lrspitem.hxx> -#include <svx/numitem.hxx> +#include <editeng/lrspitem.hxx> +#include <editeng/numitem.hxx> #include <svl/cjkoptions.hxx> #include "DrawDocShell.hxx" diff --git a/sd/source/ui/dlg/tabtempl.cxx b/sd/source/ui/dlg/tabtempl.cxx index ab9cdf0e7f83..5fd9af68eee0 100644 --- a/sd/source/ui/dlg/tabtempl.cxx +++ b/sd/source/ui/dlg/tabtempl.cxx @@ -32,7 +32,7 @@ #undef SD_DLLIMPLEMENTATION #endif -#include <svx/flstitem.hxx> +#include <editeng/flstitem.hxx> #include <svx/svxids.hrc> diff --git a/sd/source/ui/dlg/tpaction.cxx b/sd/source/ui/dlg/tpaction.cxx index a389c613f375..ebe0243f7d99 100644 --- a/sd/source/ui/dlg/tpaction.cxx +++ b/sd/source/ui/dlg/tpaction.cxx @@ -32,7 +32,7 @@ #undef SD_DLLIMPLEMENTATION #endif - +#include <svx/svxids.hrc> #include <com/sun/star/presentation/AnimationEffect.hpp> #include <com/sun/star/presentation/ClickAction.hpp> #include <com/sun/star/presentation/AnimationSpeed.hpp> @@ -55,7 +55,7 @@ #include <svx/svdpagv.hxx> #include <unotools/localfilehelper.hxx> #include <svl/aeitem.hxx> -#include <svx/colritem.hxx> +#include <editeng/colritem.hxx> #include <svx/svdoole2.hxx> #include <sfx2/docfile.hxx> #include <sot/storage.hxx> diff --git a/sd/source/ui/dlg/tpoption.cxx b/sd/source/ui/dlg/tpoption.cxx index 166d9b8496d8..bdb4cc230537 100644 --- a/sd/source/ui/dlg/tpoption.cxx +++ b/sd/source/ui/dlg/tpoption.cxx @@ -296,7 +296,7 @@ SdTpOptionsMisc::SdTpOptionsMisc( Window* pParent, const SfxItemSet& rInAttrs ) eFUnit = (FieldUnit)rItem.GetValue(); } else - eFUnit = GetModuleFieldUnit(); + eFUnit = SfxModule::GetCurrentFieldUnit(); SetFieldUnit( aMtrFldTabstop, eFUnit ); diff --git a/sd/source/ui/docshell/docshel3.cxx b/sd/source/ui/docshell/docshel3.cxx index dc29d3b472b1..6bcdbe76accf 100644 --- a/sd/source/ui/docshell/docshel3.cxx +++ b/sd/source/ui/docshell/docshel3.cxx @@ -42,15 +42,15 @@ #include <svx/ofaitem.hxx> #include <svx/svxerr.hxx> #include <svx/dialmgr.hxx> -#include <sfx2/srchitem.hxx> +#include <svl/srchitem.hxx> #include <svx/srchdlg.hxx> #ifdef _OUTLINER_HXX -#include <svx/outliner.hxx> +#include <editeng/outliner.hxx> #endif #include <sfx2/request.hxx> #include <svl/style.hxx> #include <svx/drawitem.hxx> -#include <svx/unolingu.hxx> +#include <editeng/unolingu.hxx> #include <com/sun/star/i18n/TextConversionOption.hpp> diff --git a/sd/source/ui/docshell/docshel4.cxx b/sd/source/ui/docshell/docshel4.cxx index 7f84cd98eee2..29218a7b985a 100644 --- a/sd/source/ui/docshell/docshel4.cxx +++ b/sd/source/ui/docshell/docshel4.cxx @@ -36,8 +36,8 @@ #ifndef _SVXIDS_HRC #include <svx/svxids.hrc> #endif -#include <svx/flstitem.hxx> -#include <svx/eeitem.hxx> +#include <editeng/flstitem.hxx> +#include <editeng/eeitem.hxx> #include <svl/aeitem.hxx> #include <svl/flagitem.hxx> #include <sot/storage.hxx> diff --git a/sd/source/ui/docshell/docshell.cxx b/sd/source/ui/docshell/docshell.cxx index 83567bc6c68a..1dbd1b1ce923 100644 --- a/sd/source/ui/docshell/docshell.cxx +++ b/sd/source/ui/docshell/docshell.cxx @@ -38,9 +38,9 @@ #ifndef _SVXIDS_HRC #include <svx/svxids.hrc> #endif -#include <sfx2/srchitem.hxx> +#include <svl/srchitem.hxx> #include <svx/srchdlg.hxx> -#include <svx/flstitem.hxx> +#include <editeng/flstitem.hxx> #include <svl/eitem.hxx> #include <svl/intitem.hxx> #include <sfx2/printer.hxx> @@ -48,7 +48,7 @@ #include <sfx2/docfile.hxx> #endif #include <svx/drawitem.hxx> -#include <svx/flstitem.hxx> +#include <editeng/flstitem.hxx> #include <svx/drawitem.hxx> #include <svx/srchdlg.hxx> #include <sfx2/dispatch.hxx> diff --git a/sd/source/ui/docshell/grdocsh.cxx b/sd/source/ui/docshell/grdocsh.cxx index dd25cc4e6397..38dff2996fcf 100644 --- a/sd/source/ui/docshell/grdocsh.cxx +++ b/sd/source/ui/docshell/grdocsh.cxx @@ -32,7 +32,7 @@ #include <svx/svxids.hrc> #endif #include <sfx2/app.hxx> -#include <sfx2/srchitem.hxx> +#include <svl/srchitem.hxx> #include <tools/globname.hxx> #ifndef _SO_CLSIDS_HXX //autogen diff --git a/sd/source/ui/func/bulmaper.cxx b/sd/source/ui/func/bulmaper.cxx index 8c979bfc94b8..1a6e8992a10e 100644 --- a/sd/source/ui/func/bulmaper.cxx +++ b/sd/source/ui/func/bulmaper.cxx @@ -38,23 +38,23 @@ //-> Fonts & Items #include <vcl/font.hxx> -#include <svx/fontitem.hxx> -#include <svx/fhgtitem.hxx> -#include <svx/wghtitem.hxx> -#include <svx/udlnitem.hxx> -#include <svx/crsditem.hxx> -#include <svx/postitem.hxx> -#include <svx/cntritem.hxx> -#include <svx/shdditem.hxx> +#include <editeng/fontitem.hxx> +#include <editeng/fhgtitem.hxx> +#include <editeng/wghtitem.hxx> +#include <editeng/udlnitem.hxx> +#include <editeng/crsditem.hxx> +#include <editeng/postitem.hxx> +#include <editeng/cntritem.hxx> +#include <editeng/shdditem.hxx> //<- Fonts & Items -#include <svx/bulitem.hxx> -#include <svx/brshitem.hxx> +#include <editeng/bulitem.hxx> +#include <editeng/brshitem.hxx> #include <vcl/graph.hxx> #include <svl/itemset.hxx> #include <svl/itempool.hxx> -#include <svx/numitem.hxx> -#include <svx/eeitem.hxx> +#include <editeng/numitem.hxx> +#include <editeng/eeitem.hxx> #include "bulmaper.hxx" diff --git a/sd/source/ui/func/fubullet.cxx b/sd/source/ui/func/fubullet.cxx index 7abae3a62006..f45ed82f4d3e 100644 --- a/sd/source/ui/func/fubullet.cxx +++ b/sd/source/ui/func/fubullet.cxx @@ -34,9 +34,9 @@ #ifndef _BINDING_HXX //autogen #include <sfx2/bindings.hxx> #endif -#include <svx/eeitem.hxx> +#include <editeng/eeitem.hxx> #include <svl/poolitem.hxx> -#include <svx/fontitem.hxx> +#include <editeng/fontitem.hxx> #include "OutlineViewShell.hxx" #include "DrawViewShell.hxx" #include "Window.hxx" diff --git a/sd/source/ui/func/fuchar.cxx b/sd/source/ui/func/fuchar.cxx index 29ac48d66abf..f43b33c8318a 100644 --- a/sd/source/ui/func/fuchar.cxx +++ b/sd/source/ui/func/fuchar.cxx @@ -33,9 +33,9 @@ #include <sfx2/viewfrm.hxx> -#include <svx/editdata.hxx> +#include <editeng/editdata.hxx> #include <svx/svxids.hrc> -#include <svx/eeitem.hxx> +#include <editeng/eeitem.hxx> #include <vcl/msgbox.hxx> #include <sfx2/bindings.hxx> #include <sfx2/request.hxx> diff --git a/sd/source/ui/func/fuconcs.cxx b/sd/source/ui/func/fuconcs.cxx index 0a4466569b70..0627abdd62fc 100644 --- a/sd/source/ui/func/fuconcs.cxx +++ b/sd/source/ui/func/fuconcs.cxx @@ -52,7 +52,7 @@ #include <svx/svdocirc.hxx> #include <svl/intitem.hxx> #include <sfx2/request.hxx> -#include <svx/adjitem.hxx> +#include <editeng/adjitem.hxx> #include <svx/xtable.hxx> #include <svx/sdasitm.hxx> #include <svx/tbxcustomshapes.hxx> @@ -68,7 +68,7 @@ #include "ViewShellBase.hxx" #include "ToolBarManager.hxx" // #109583# -#include <svx/writingmodeitem.hxx> +#include <editeng/writingmodeitem.hxx> #include <svx/gallery.hxx> #include <svl/itempool.hxx> #include <com/sun/star/uno/Any.hxx> diff --git a/sd/source/ui/func/fuconrec.cxx b/sd/source/ui/func/fuconrec.cxx index 2354e7dbe80f..ef7eaae17004 100644 --- a/sd/source/ui/func/fuconrec.cxx +++ b/sd/source/ui/func/fuconrec.cxx @@ -52,7 +52,7 @@ #include <svx/svdocirc.hxx> #include <svl/intitem.hxx> #include <sfx2/request.hxx> -#include <svx/adjitem.hxx> +#include <editeng/adjitem.hxx> #include <svx/xtable.hxx> // #88751# @@ -64,7 +64,7 @@ #include "ViewShellBase.hxx" #include "ToolBarManager.hxx" // #109583# -#include <svx/writingmodeitem.hxx> +#include <editeng/writingmodeitem.hxx> #include <basegfx/polygon/b2dpolygontools.hxx> #include <basegfx/polygon/b2dpolygon.hxx> diff --git a/sd/source/ui/func/fudraw.cxx b/sd/source/ui/func/fudraw.cxx index 7d7edb2d61f9..bbe13c114931 100644 --- a/sd/source/ui/func/fudraw.cxx +++ b/sd/source/ui/func/fudraw.cxx @@ -29,10 +29,10 @@ #include "precompiled_sd.hxx" #include <sot/object.hxx> -#include <svx/eeitem.hxx> +#include <editeng/eeitem.hxx> #include <vcl/waitobj.hxx> -#include <svx/flditem.hxx> +#include <editeng/flditem.hxx> #include <svx/svdogrp.hxx> #include <tools/urlobj.hxx> #include <vcl/help.hxx> diff --git a/sd/source/ui/func/fuexpand.cxx b/sd/source/ui/func/fuexpand.cxx index 4785ce71e174..281e4c692228 100644 --- a/sd/source/ui/func/fuexpand.cxx +++ b/sd/source/ui/func/fuexpand.cxx @@ -36,7 +36,7 @@ #include <svx/xlineit0.hxx> #include <svx/svdundo.hxx> #include <sfx2/printer.hxx> -#include <svx/outlobj.hxx> +#include <editeng/outlobj.hxx> #include <svx/svdetc.hxx> #include "app.hrc" @@ -53,7 +53,7 @@ #include "optsitem.hxx" #include "sdmod.hxx" #include <sfx2/dispatch.hxx> -#include <svx/eeitem.hxx> +#include <editeng/eeitem.hxx> namespace sd { diff --git a/sd/source/ui/func/fuformatpaintbrush.cxx b/sd/source/ui/func/fuformatpaintbrush.cxx index 81c3b16dccae..0d43ea73c964 100644 --- a/sd/source/ui/func/fuformatpaintbrush.cxx +++ b/sd/source/ui/func/fuformatpaintbrush.cxx @@ -37,9 +37,9 @@ #include <svx/globl3d.hxx> #include <svx/svxids.hrc> #include <svx/svdotable.hxx> -#include <svx/outliner.hxx> -#include <svx/eeitem.hxx> -#include <svx/editeng.hxx> +#include <editeng/outliner.hxx> +#include <editeng/eeitem.hxx> +#include <editeng/editeng.hxx> #define _SD_DLL // fuer SD_MOD() #include "sdmod.hxx" diff --git a/sd/source/ui/func/fuhhconv.cxx b/sd/source/ui/func/fuhhconv.cxx index 77ed7215e4df..a7f96a5b50d2 100644 --- a/sd/source/ui/func/fuhhconv.cxx +++ b/sd/source/ui/func/fuhhconv.cxx @@ -36,9 +36,9 @@ #include <cppuhelper/bootstrap.hxx> #include <vcl/msgbox.hxx> #include <svl/style.hxx> -#include <svx/eeitem.hxx> -#include <svx/langitem.hxx> -#include <svx/fontitem.hxx> +#include <editeng/eeitem.hxx> +#include <editeng/langitem.hxx> +#include <editeng/fontitem.hxx> #include <fuhhconv.hxx> #include "drawdoc.hxx" diff --git a/sd/source/ui/func/fuinsert.cxx b/sd/source/ui/func/fuinsert.cxx index e0695ae98ae8..931ff3a10cb8 100644 --- a/sd/source/ui/func/fuinsert.cxx +++ b/sd/source/ui/func/fuinsert.cxx @@ -49,9 +49,8 @@ #include <svl/globalnameitem.hxx> #include <unotools/pathoptions.hxx> #include <svx/pfiledlg.hxx> -#include <svx/impgrf.hxx> #include <svx/dialogs.hrc> -#include <svx/linkmgr.hxx> +#include <sfx2/linkmgr.hxx> #include <svx/svdetc.hxx> #include <avmedia/mediawindow.hxx> #ifndef _UNOTOOLS_UCBSTREAMHELPER_HXX @@ -67,7 +66,7 @@ #include <svx/svdoole2.hxx> #include <svx/svdomedia.hxx> #ifndef _EDITENG_HXX //autogen -#include <svx/editeng.hxx> +#include <editeng/editeng.hxx> #endif #include <sot/storage.hxx> #include <sot/formats.hxx> @@ -75,7 +74,7 @@ #ifndef _MSGBOX_HXX //autogen #include <vcl/msgbox.hxx> #endif -#include <svx/opengrf.hxx> +#include <sfx2/opengrf.hxx> #include <sfx2/viewfrm.hxx> @@ -184,7 +183,7 @@ void FuInsertGraphic::DoExecute( SfxRequest& ) } else { - SdGRFFilter::HandleGraphicFilterError( (USHORT)nError, GetGrfFilter()->GetLastError().nStreamError ); + SdGRFFilter::HandleGraphicFilterError( (USHORT)nError, GraphicFilter::GetGraphicFilter()->GetLastError().nStreamError ); } } } diff --git a/sd/source/ui/func/fuinsfil.cxx b/sd/source/ui/func/fuinsfil.cxx index 9b4ff8cf95ae..d14a5859d47b 100644 --- a/sd/source/ui/func/fuinsfil.cxx +++ b/sd/source/ui/func/fuinsfil.cxx @@ -31,9 +31,9 @@ #include "fuinsfil.hxx" #include <vcl/wrkwin.hxx> #include <sfx2/progress.hxx> -#include <svx/outliner.hxx> +#include <editeng/outliner.hxx> #ifndef _EDITENG_HXX -#include <svx/editeng.hxx> +#include <editeng/editeng.hxx> #endif #include <svl/stritem.hxx> #include <sfx2/request.hxx> @@ -46,7 +46,7 @@ #include <sfx2/filedlghelper.hxx> #include <sot/formats.hxx> #include <svl/urihelper.hxx> -#include <svx/forbiddencharacterstable.hxx> +#include <editeng/forbiddencharacterstable.hxx> #include <tools/urlobj.hxx> #include <sfx2/docfile.hxx> #include <sfx2/docfilt.hxx> diff --git a/sd/source/ui/func/fulink.cxx b/sd/source/ui/func/fulink.cxx index fd8e0f950eff..a87cb63883e7 100644 --- a/sd/source/ui/func/fulink.cxx +++ b/sd/source/ui/func/fulink.cxx @@ -31,7 +31,7 @@ #include "fulink.hxx" -#include <svx/linkmgr.hxx> +#include <sfx2/linkmgr.hxx> #include <sfx2/bindings.hxx> #include <sfx2/viewfrm.hxx> @@ -76,7 +76,7 @@ FunctionReference FuLink::Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd:: void FuLink::DoExecute( SfxRequest& ) { - SvxLinkManager* pLinkManager = mpDoc->GetLinkManager(); + sfx2::LinkManager* pLinkManager = mpDoc->GetLinkManager(); SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); SfxAbstractLinksDialog* pDlg = pFact->CreateLinksDialog( mpViewShell->GetActiveWindow(), pLinkManager ); diff --git a/sd/source/ui/func/fumorph.cxx b/sd/source/ui/func/fumorph.cxx index 0ea3e1210653..1dc2d40fefd3 100644 --- a/sd/source/ui/func/fumorph.cxx +++ b/sd/source/ui/func/fumorph.cxx @@ -37,7 +37,7 @@ #include <tools/poly.hxx> #include <svx/svdopath.hxx> #include <svx/svdogrp.hxx> -#include <svx/eeitem.hxx> +#include <editeng/eeitem.hxx> #include "View.hxx" #include "ViewShell.hxx" diff --git a/sd/source/ui/func/fuoaprms.cxx b/sd/source/ui/func/fuoaprms.cxx index 13c1a8b8f15d..b348d6533930 100644 --- a/sd/source/ui/func/fuoaprms.cxx +++ b/sd/source/ui/func/fuoaprms.cxx @@ -33,7 +33,7 @@ #include "sdattr.hxx" #include <svx/svdpagv.hxx> -#include <svx/colritem.hxx> +#include <editeng/colritem.hxx> #include <svx/svdundo.hxx> #include <vcl/group.hxx> #include <vcl/fixed.hxx> diff --git a/sd/source/ui/func/fuolbull.cxx b/sd/source/ui/func/fuolbull.cxx index 2d5c73dec78e..32ca9d3278b3 100644 --- a/sd/source/ui/func/fuolbull.cxx +++ b/sd/source/ui/func/fuolbull.cxx @@ -32,12 +32,12 @@ #include "fuolbull.hxx" #include <vcl/msgbox.hxx> #include <svl/intitem.hxx> -#include <svx/outliner.hxx> -#include <svx/eeitem.hxx> +#include <editeng/outliner.hxx> +#include <editeng/eeitem.hxx> #include <sfx2/request.hxx> #include <svl/intitem.hxx> -#include <svx/editdata.hxx> +#include <editeng/editdata.hxx> #include <svx/svxids.hrc> #include "OutlineView.hxx" #include "OutlineViewShell.hxx" diff --git a/sd/source/ui/func/fuoltext.cxx b/sd/source/ui/func/fuoltext.cxx index d6b8b9501e18..2797631d12db 100644 --- a/sd/source/ui/func/fuoltext.cxx +++ b/sd/source/ui/func/fuoltext.cxx @@ -32,9 +32,9 @@ #include "fuoltext.hxx" #include <sfx2/viewfrm.hxx> -#include <svx/outliner.hxx> -#include <svx/eeitem.hxx> -#include <svx/flditem.hxx> +#include <editeng/outliner.hxx> +#include <editeng/eeitem.hxx> +#include <editeng/flditem.hxx> #include <sfx2/bindings.hxx> #include <sfx2/docfile.hxx> #include <sfx2/dispatch.hxx> diff --git a/sd/source/ui/func/fuoutl.cxx b/sd/source/ui/func/fuoutl.cxx index 922563acefc5..2bb056f55e42 100644 --- a/sd/source/ui/func/fuoutl.cxx +++ b/sd/source/ui/func/fuoutl.cxx @@ -31,7 +31,7 @@ #include "fuoutl.hxx" -#include <svx/outliner.hxx> +#include <editeng/outliner.hxx> #include "OutlineView.hxx" #include "OutlineViewShell.hxx" #ifndef SD_WINDOW_SHELL_HXX diff --git a/sd/source/ui/func/fupage.cxx b/sd/source/ui/func/fupage.cxx index be1d1db8caa4..134646f2368e 100644 --- a/sd/source/ui/func/fupage.cxx +++ b/sd/source/ui/func/fupage.cxx @@ -52,23 +52,23 @@ #ifndef _SVX_SVDUNDO_HXX #include <svx/svdundo.hxx> #endif -#include <svx/eeitem.hxx> -#include <svx/frmdiritem.hxx> +#include <editeng/eeitem.hxx> +#include <editeng/frmdiritem.hxx> #include <svx/xbtmpit.hxx> #include <svx/xsetit.hxx> #include <svl/itempool.hxx> -#include <svx/ulspitem.hxx> -#include <svx/lrspitem.hxx> +#include <editeng/ulspitem.hxx> +#include <editeng/lrspitem.hxx> #include "glob.hrc" -#include <svx/shaditem.hxx> -#include <svx/boxitem.hxx> -#include <svx/sizeitem.hxx> -#include <svx/ulspitem.hxx> -#include <svx/lrspitem.hxx> -#include <svx/pbinitem.hxx> +#include <editeng/shaditem.hxx> +#include <editeng/boxitem.hxx> +#include <editeng/sizeitem.hxx> +#include <editeng/ulspitem.hxx> +#include <editeng/lrspitem.hxx> +#include <editeng/pbinitem.hxx> #include <sfx2/app.hxx> -#include <svx/opengrf.hxx> +#include <sfx2/opengrf.hxx> #include "strings.hrc" #include "sdpage.hxx" diff --git a/sd/source/ui/func/fuparagr.cxx b/sd/source/ui/func/fuparagr.cxx index 92edfddf7033..68f8a3e922d0 100644 --- a/sd/source/ui/func/fuparagr.cxx +++ b/sd/source/ui/func/fuparagr.cxx @@ -30,7 +30,7 @@ #include "fuparagr.hxx" -#include <svx/eeitem.hxx> +#include <editeng/eeitem.hxx> #ifndef _MSGBOX_HXX //autogen #include <vcl/msgbox.hxx> #endif @@ -38,8 +38,8 @@ #include <sfx2/request.hxx> #include <sfx2/viewfrm.hxx> #include <svx/svxids.hrc> -#include <svx/editdata.hxx> -#include <svx/lrspitem.hxx> +#include <editeng/editdata.hxx> +#include <editeng/lrspitem.hxx> #include <svx/svdoutl.hxx> #include "app.hrc" diff --git a/sd/source/ui/func/fupoor.cxx b/sd/source/ui/func/fupoor.cxx index 07d7aeff7eca..bb6f6e7b6908 100644 --- a/sd/source/ui/func/fupoor.cxx +++ b/sd/source/ui/func/fupoor.cxx @@ -71,7 +71,7 @@ #include <svx/svditer.hxx> // #98533# -#include <svx/editeng.hxx> +#include <editeng/editeng.hxx> using namespace ::com::sun::star; using ::com::sun::star::uno::Reference; diff --git a/sd/source/ui/func/fuprlout.cxx b/sd/source/ui/func/fuprlout.cxx index 250212d31c11..0d6f0b5aa565 100644 --- a/sd/source/ui/func/fuprlout.cxx +++ b/sd/source/ui/func/fuprlout.cxx @@ -63,7 +63,7 @@ #include "sdresid.hxx" #include "drawview.hxx" #include "eetext.hxx" -#include <svx/editdata.hxx> +#include <editeng/editdata.hxx> #include "sdabstdlg.hxx" namespace sd diff --git a/sd/source/ui/func/fuprobjs.cxx b/sd/source/ui/func/fuprobjs.cxx index 629074eaa879..d65bc8aaffe3 100644 --- a/sd/source/ui/func/fuprobjs.cxx +++ b/sd/source/ui/func/fuprobjs.cxx @@ -34,7 +34,7 @@ #include <vcl/msgbox.hxx> #endif #include <svl/style.hxx> -#include <svx/outliner.hxx> +#include <editeng/outliner.hxx> #include <svl/smplhint.hxx> diff --git a/sd/source/ui/func/fusearch.cxx b/sd/source/ui/func/fusearch.cxx index 61b83e56e9cb..82007fe61893 100644 --- a/sd/source/ui/func/fusearch.cxx +++ b/sd/source/ui/func/fusearch.cxx @@ -34,7 +34,7 @@ #include <sfx2/viewfrm.hxx> #include <svx/svxids.hrc> -#include <sfx2/srchitem.hxx> +#include <svl/srchitem.hxx> #include <svx/srchdlg.hxx> #include <sfx2/bindings.hxx> #include "fupoor.hxx" diff --git a/sd/source/ui/func/fusel.cxx b/sd/source/ui/func/fusel.cxx index bb4d78d20aec..2ddf6a5fb885 100644 --- a/sd/source/ui/func/fusel.cxx +++ b/sd/source/ui/func/fusel.cxx @@ -50,8 +50,8 @@ #include <tools/urlobj.hxx> #include <sfx2/docfile.hxx> #include <tools/debug.hxx> -#include <svx/eeitem.hxx> -#include <svx/flditem.hxx> +#include <editeng/eeitem.hxx> +#include <editeng/flditem.hxx> #include <svx/svdotable.hxx> diff --git a/sd/source/ui/func/fuspell.cxx b/sd/source/ui/func/fuspell.cxx index a7149fc0d503..526efb0087e4 100644 --- a/sd/source/ui/func/fuspell.cxx +++ b/sd/source/ui/func/fuspell.cxx @@ -31,7 +31,7 @@ #include "fuspell.hxx" -#include <svx/outliner.hxx> +#include <editeng/outliner.hxx> #include <sfx2/bindings.hxx> #include <sfx2/viewfrm.hxx> diff --git a/sd/source/ui/func/fusumry.cxx b/sd/source/ui/func/fusumry.cxx index d118e85d3e04..3ed152d1f862 100644 --- a/sd/source/ui/func/fusumry.cxx +++ b/sd/source/ui/func/fusumry.cxx @@ -30,11 +30,11 @@ #include "fusumry.hxx" -#include <svx/eeitem.hxx> +#include <editeng/eeitem.hxx> #include <svx/svdotext.hxx> #include <svx/svdundo.hxx> #include <sfx2/printer.hxx> -#include <svx/outlobj.hxx> +#include <editeng/outlobj.hxx> #include "strings.hrc" diff --git a/sd/source/ui/func/futempl.cxx b/sd/source/ui/func/futempl.cxx index bd1bf9c1d265..43572c2af8a4 100644 --- a/sd/source/ui/func/futempl.cxx +++ b/sd/source/ui/func/futempl.cxx @@ -35,18 +35,18 @@ #include "futempl.hxx" -#include <svx/editdata.hxx> -#include <svx/bulitem.hxx> +#include <editeng/editdata.hxx> +#include <editeng/bulitem.hxx> #include <svx/svxids.hrc> // fuer SID_OBJECT_SELECT #include <sfx2/bindings.hxx> #include <svl/aeitem.hxx> #include <sfx2/dispatch.hxx> #include <vcl/msgbox.hxx> -#include <svx/eeitem.hxx> +#include <editeng/eeitem.hxx> #include <sfx2/request.hxx> -#include <svx/numitem.hxx> -#include <svx/editeng.hxx> -#include <svx/lrspitem.hxx> +#include <editeng/numitem.hxx> +#include <editeng/editeng.hxx> +#include <editeng/lrspitem.hxx> #include <svx/svdopage.hxx> #include <svx/svditer.hxx> diff --git a/sd/source/ui/func/futext.cxx b/sd/source/ui/func/futext.cxx index 3b96ac7f4765..2fd808dcda3e 100644 --- a/sd/source/ui/func/futext.cxx +++ b/sd/source/ui/func/futext.cxx @@ -30,38 +30,37 @@ #include "futext.hxx" -#include <svx/eeitem.hxx> +#include <editeng/eeitem.hxx> +#include <editeng/editerr.hxx> #include <svx/dlgutil.hxx> #include <svx/svxerr.hxx> #include <tools/urlobj.hxx> #include <vcl/help.hxx> -#include <svx/editstat.hxx> +#include <editeng/editstat.hxx> #include <svl/aeitem.hxx> #include <svl/intitem.hxx> #include <svx/svdotext.hxx> -#ifndef _SVDOGROUP_HXX //autogen #include <svx/svdogrp.hxx> -#endif -#include <svx/flditem.hxx> +#include <editeng/flditem.hxx> #include <svl/style.hxx> #include <svx/svdpagv.hxx> #include <sfx2/viewfrm.hxx> #include <sfx2/dispatch.hxx> #include <sfx2/bindings.hxx> #include <sfx2/request.hxx> -#include <svx/editeng.hxx> +#include <editeng/editeng.hxx> #include <svx/svdoutl.hxx> #include <svx/svxids.hrc> #include <sfx2/docfile.hxx> #include <comphelper/processfactory.hxx> -#include <svx/outlobj.hxx> - +#include <editeng/outlobj.hxx> +#include <svtools/langtab.hxx> // #104122# -#include <svx/frmdiritem.hxx> +#include <editeng/frmdiritem.hxx> #include <svx/svdetc.hxx> -#include <svx/editview.hxx> +#include <editeng/editview.hxx> #include "sdresid.hxx" #include "app.hrc" @@ -1382,7 +1381,7 @@ void FuText::ReceiveRequest(SfxRequest& rReq) IMPL_LINK( FuText, SpellError, void *, nLang ) { - String aError( ::GetLanguageString( (LanguageType)(ULONG)nLang ) ); + String aError( SvtLanguageTable::GetLanguageString( (LanguageType)(ULONG)nLang ) ); ErrorHandler::HandleError(* new StringErrorInfo( ERRCODE_SVX_LINGU_LANGUAGENOTEXISTS, aError) ); return 0; diff --git a/sd/source/ui/func/futhes.cxx b/sd/source/ui/func/futhes.cxx index 4e032b913f3c..2ec18c0f019a 100644 --- a/sd/source/ui/func/futhes.cxx +++ b/sd/source/ui/func/futhes.cxx @@ -32,16 +32,16 @@ #include "futhes.hxx" #include <tools/pstm.hxx> -#include <svx/outliner.hxx> +#include <editeng/outliner.hxx> #include <vcl/msgbox.hxx> #include <svx/svdobj.hxx> #include <svx/svdotext.hxx> -#include <svx/eeitem.hxx> +#include <editeng/eeitem.hxx> #include <svx/dialogs.hrc> #include <svx/svxerr.hxx> #include <svx/dialmgr.hxx> -#include <svx/unolingu.hxx> +#include <editeng/unolingu.hxx> #include <comphelper/processfactory.hxx> #include "app.hrc" #include "strings.hrc" diff --git a/sd/source/ui/func/outlinfo.cxx b/sd/source/ui/func/outlinfo.cxx index d9286cd5bf3b..0a52da329b20 100644 --- a/sd/source/ui/func/outlinfo.cxx +++ b/sd/source/ui/func/outlinfo.cxx @@ -29,10 +29,10 @@ #include "precompiled_sd.hxx" #include <vcl/metric.hxx> -#include <svx/outliner.hxx> +#include <editeng/outliner.hxx> #include <svx/svdorect.hxx> #include <svx/svdoutl.hxx> -#include <svx/svxfont.hxx> +#include <editeng/svxfont.hxx> #include "drawdoc.hxx" #include "outlinfo.hxx" #include <algorithm> @@ -49,7 +49,7 @@ #ifndef _COM_SUN_STAR_I18N_CHARACTERITERATORMODE_HDL_ #include <com/sun/star/i18n/CharacterIteratorMode.hdl> #endif -#include <svx/unolingu.hxx> +#include <editeng/unolingu.hxx> using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; diff --git a/sd/source/ui/inc/AccessibleDocumentViewBase.hxx b/sd/source/ui/inc/AccessibleDocumentViewBase.hxx index 18ecf61da5eb..b070db968959 100644 --- a/sd/source/ui/inc/AccessibleDocumentViewBase.hxx +++ b/sd/source/ui/inc/AccessibleDocumentViewBase.hxx @@ -28,9 +28,9 @@ #ifndef SD_ACCESSIBILITY_ACCESSIBLE_DOCUMENT_VIEW_BASE_HXX #define SD_ACCESSIBILITY_ACCESSIBLE_DOCUMENT_VIEW_BASE_HXX -#include <svx/AccessibleContextBase.hxx> -#include <svx/AccessibleComponentBase.hxx> -#include <svx/AccessibleSelectionBase.hxx> +#include <editeng/AccessibleContextBase.hxx> +#include <editeng/AccessibleComponentBase.hxx> +#include <editeng/AccessibleSelectionBase.hxx> #include "AccessibleViewForwarder.hxx" #include "AccessiblePageShape.hxx" #include <svx/ChildrenManager.hxx> diff --git a/sd/source/ui/inc/AccessibleOutlineEditSource.hxx b/sd/source/ui/inc/AccessibleOutlineEditSource.hxx index ca7453006825..a398d31ffbda 100644 --- a/sd/source/ui/inc/AccessibleOutlineEditSource.hxx +++ b/sd/source/ui/inc/AccessibleOutlineEditSource.hxx @@ -32,10 +32,10 @@ #include <vcl/svapp.hxx> #include <svl/brdcst.hxx> #include <svl/lstner.hxx> -#include <svx/unoedsrc.hxx> -#include <svx/editdata.hxx> -#include <svx/unoforou.hxx> -#include <svx/unoviwou.hxx> +#include <editeng/unoedsrc.hxx> +#include <editeng/editdata.hxx> +#include <editeng/unoforou.hxx> +#include <editeng/unoviwou.hxx> class OutlinerView; class SdrOutliner; diff --git a/sd/source/ui/inc/OutlineView.hxx b/sd/source/ui/inc/OutlineView.hxx index 5a756ab27cf7..710ee3a96cf7 100644 --- a/sd/source/ui/inc/OutlineView.hxx +++ b/sd/source/ui/inc/OutlineView.hxx @@ -29,7 +29,7 @@ #define SD_OUTLINE_VIEW_HXX #include <vcl/image.hxx> -#include <svx/lrspitem.hxx> +#include <editeng/lrspitem.hxx> #include "View.hxx" class SdPage; diff --git a/sd/source/ui/inc/futext.hxx b/sd/source/ui/inc/futext.hxx index be63388bf9d3..052f4099ef21 100644 --- a/sd/source/ui/inc/futext.hxx +++ b/sd/source/ui/inc/futext.hxx @@ -29,7 +29,7 @@ #define SD_FU_TEXT_HXX #ifndef _EDITDATA_HXX -#include <svx/editdata.hxx> +#include <editeng/editdata.hxx> #endif #include "fuconstr.hxx" #include <svx/svdotext.hxx> diff --git a/sd/source/ui/inc/optsitem.hxx b/sd/source/ui/inc/optsitem.hxx index d1dc4f01b633..dcf53fc6ffc3 100644 --- a/sd/source/ui/inc/optsitem.hxx +++ b/sd/source/ui/inc/optsitem.hxx @@ -171,7 +171,7 @@ public: BOOL IsDragStripes() const { Init(); return (BOOL) bDragStripes; } BOOL IsHandlesBezier() const { Init(); return (BOOL) bHandlesBezier; } BOOL IsHelplines() const { Init(); return (BOOL) bHelplines; } - UINT16 GetMetric() const { Init(); return( ( 0xffff == nMetric ) ? (UINT16)GetModuleFieldUnit() : nMetric ); } + UINT16 GetMetric() const { Init(); return( ( 0xffff == nMetric ) ? (UINT16)SfxModule::GetCurrentFieldUnit() : nMetric ); } UINT16 GetDefTab() const { Init(); return nDefTab; } void SetRulerVisible( BOOL bOn = TRUE ) { if( bRuler != bOn ) { OptionsChanged(); bRuler = bOn; } } diff --git a/sd/source/ui/inc/slideshow.hxx b/sd/source/ui/inc/slideshow.hxx index 2a4b15a102e0..bc4df5aa44f5 100644 --- a/sd/source/ui/inc/slideshow.hxx +++ b/sd/source/ui/inc/slideshow.hxx @@ -38,7 +38,7 @@ #include <cppuhelper/compbase2.hxx> #include <cppuhelper/basemutex.hxx> -#include <svx/unoipset.hxx> +#include <editeng/unoipset.hxx> #include <memory> #include <boost/shared_ptr.hpp> diff --git a/sd/source/ui/inc/unomodel.hxx b/sd/source/ui/inc/unomodel.hxx index 532e12db99ee..4881a053aaff 100644 --- a/sd/source/ui/inc/unomodel.hxx +++ b/sd/source/ui/inc/unomodel.hxx @@ -53,7 +53,7 @@ #include <sfx2/sfxbasemodel.hxx> #include <svx/fmdmod.hxx> -#include <svx/unoipset.hxx> +#include <editeng/unoipset.hxx> #include <comphelper/servicehelper.hxx> diff --git a/sd/source/ui/inc/unosrch.hxx b/sd/source/ui/inc/unosrch.hxx index 496a5d92f99c..e30605181c4c 100644 --- a/sd/source/ui/inc/unosrch.hxx +++ b/sd/source/ui/inc/unosrch.hxx @@ -36,8 +36,8 @@ #include <com/sun/star/lang/XUnoTunnel.hpp> #include <comphelper/servicehelper.hxx> -#include <svx/editdata.hxx> -#include <svx/unoipset.hxx> +#include <editeng/editdata.hxx> +#include <editeng/unoipset.hxx> class SdrObject; class SvxItemPropertySet; diff --git a/sd/source/ui/notes/EditWindow.cxx b/sd/source/ui/notes/EditWindow.cxx index 4e0c1aa6a34a..54e3589bc87e 100755 --- a/sd/source/ui/notes/EditWindow.cxx +++ b/sd/source/ui/notes/EditWindow.cxx @@ -33,19 +33,19 @@ #include "sdmod.hxx" #include <i18npool/mslangid.hxx> #include <com/sun/star/i18n/ScriptType.hpp> -#include <svx/editeng.hxx> -#include <svx/editview.hxx> +#include <editeng/editeng.hxx> +#include <editeng/editview.hxx> #include <vcl/scrbar.hxx> -#include <svx/eeitem.hxx> +#include <editeng/eeitem.hxx> #include "sdresid.hxx" #include <svl/itempool.hxx> -#include <svx/fhgtitem.hxx> +#include <editeng/fhgtitem.hxx> #include <vos/mutex.hxx> #include <vcl/svapp.hxx> #include <unotools/linguprops.hxx> #include <unotools/lingucfg.hxx> -#include <svx/fontitem.hxx> -#include <svx/editstat.hxx> +#include <editeng/fontitem.hxx> +#include <editeng/editstat.hxx> #define SCROLL_LINE 24 diff --git a/sd/source/ui/notes/EditWindow.hxx b/sd/source/ui/notes/EditWindow.hxx index 931b7767ff30..010a6bd09697 100755 --- a/sd/source/ui/notes/EditWindow.hxx +++ b/sd/source/ui/notes/EditWindow.hxx @@ -31,7 +31,7 @@ #include <vcl/window.hxx> #include <svtools/transfer.hxx> #include <vcl/timer.hxx> -#include <svx/editdata.hxx> +#include <editeng/editdata.hxx> #include <svtools/colorcfg.hxx> class EditEngine; diff --git a/sd/source/ui/presenter/PresenterTextView.cxx b/sd/source/ui/presenter/PresenterTextView.cxx index 0c86355ac2d6..3734f488d370 100644 --- a/sd/source/ui/presenter/PresenterTextView.cxx +++ b/sd/source/ui/presenter/PresenterTextView.cxx @@ -35,12 +35,12 @@ #include <svl/itemset.hxx> #include <unotools/linguprops.hxx> #include <unotools/lingucfg.hxx> -#include <svx/colritem.hxx> -#include <svx/editeng.hxx> -#include <svx/editstat.hxx> -#include <svx/eeitem.hxx> -#include <svx/fhgtitem.hxx> -#include <svx/fontitem.hxx> +#include <editeng/colritem.hxx> +#include <editeng/editeng.hxx> +#include <editeng/editstat.hxx> +#include <editeng/eeitem.hxx> +#include <editeng/fhgtitem.hxx> +#include <editeng/fontitem.hxx> #include <svx/xflclit.hxx> #include <vcl/bitmapex.hxx> #include <vcl/svapp.hxx> diff --git a/sd/source/ui/slideshow/slideshow.cxx b/sd/source/ui/slideshow/slideshow.cxx index 23ad64281486..421129b8dba7 100644 --- a/sd/source/ui/slideshow/slideshow.cxx +++ b/sd/source/ui/slideshow/slideshow.cxx @@ -32,6 +32,7 @@ #include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/drawing/framework/XControllerManager.hpp> #include <com/sun/star/container/XIndexAccess.hpp> +#include <comphelper/serviceinfohelper.hxx> #include <cppuhelper/bootstrap.hxx> @@ -40,7 +41,7 @@ #include <vcl/svapp.hxx> #include <vcl/wrkwin.hxx> - +#include <svx/svdpool.hxx> #include <svl/itemprop.hxx> #include <sfx2/topfrm.hxx> @@ -148,7 +149,7 @@ const SfxItemPropertyMapEntry* ImplGetPresentationPropertyMap() SlideShow::SlideShow( SdDrawDocument* pDoc ) : SlideshowBase( m_aMutex ) -, maPropSet(ImplGetPresentationPropertyMap()) +, maPropSet(ImplGetPresentationPropertyMap(), SdrObject::GetGlobalDrawObjectItemPool()) , mbIsInStartup(false) , mpDoc( pDoc ) , mpCurrentViewShellBase( 0 ) @@ -275,7 +276,7 @@ OUString SAL_CALL SlideShow::getImplementationName( ) throw(RuntimeException) sal_Bool SAL_CALL SlideShow::supportsService( const OUString& ServiceName ) throw(RuntimeException) { - return SvxServiceInfoHelper::supportsService( ServiceName, getSupportedServiceNames( ) ); + return comphelper::ServiceInfoHelper::supportsService( ServiceName, getSupportedServiceNames( ) ); } // -------------------------------------------------------------------- diff --git a/sd/source/ui/table/TableDesignPane.cxx b/sd/source/ui/table/TableDesignPane.cxx index df2b6e2eb6fd..678fdf6ccda7 100644 --- a/sd/source/ui/table/TableDesignPane.cxx +++ b/sd/source/ui/table/TableDesignPane.cxx @@ -30,36 +30,27 @@ #include "sddll.hxx" -//#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/beans/XMultiPropertyStates.hpp> #include <com/sun/star/frame/XController.hpp> #include <com/sun/star/view/XSelectionSupplier.hpp> #include <com/sun/star/style/XStyle.hpp> #include <com/sun/star/style/XStyleFamiliesSupplier.hpp> -//#include <com/sun/star/ui/XUIElementFactory.hpp> #include <comphelper/processfactory.hxx> - -//#include <toolkit/helper/vclunohelper.hxx> - #include <sfx2/viewfrm.hxx> - #include <vcl/bmpacc.hxx> -//#include <vcl/toolbox.hxx> - #include <svl/style.hxx> - #include <sfx2/viewfrm.hxx> #include <sfx2/bindings.hxx> #include <sfx2/app.hxx> #include <sfx2/request.hxx> #include <sfx2/dispatch.hxx> - +#include <svx/svxids.hrc> #include <svx/svdetc.hxx> -#include <svx/boxitem.hxx> -#include <svx/borderline.hxx> -#include <svx/colritem.hxx> -#include <svx/eeitem.hxx> +#include <editeng/boxitem.hxx> +#include <editeng/borderline.hxx> +#include <editeng/colritem.hxx> +#include <editeng/eeitem.hxx> #include <svx/sdr/table/tabledesign.hxx> #include "TableDesignPane.hxx" diff --git a/sd/source/ui/table/tablefunction.cxx b/sd/source/ui/table/tablefunction.cxx index 5f39596cec32..9d3de5904f43 100644 --- a/sd/source/ui/table/tablefunction.cxx +++ b/sd/source/ui/table/tablefunction.cxx @@ -43,12 +43,12 @@ #include <svx/sdr/overlay/overlayobjectcell.hxx> #include <svx/sdr/overlay/overlaymanager.hxx> #include <svx/svxids.hrc> -#include <svx/outlobj.hxx> +#include <editeng/outlobj.hxx> #include <svx/svdoutl.hxx> #include <svx/svdpagv.hxx> #include <svx/svdetc.hxx> -#include <svx/editstat.hxx> -#include <svx/unolingu.hxx> +#include <editeng/editstat.hxx> +#include <editeng/unolingu.hxx> #include <svx/sdrpagewindow.hxx> #include <svx/sdr/table/tabledesign.hxx> #include <svx/svxdlg.hxx> diff --git a/sd/source/ui/tools/PreviewRenderer.cxx b/sd/source/ui/tools/PreviewRenderer.cxx index a2075dfcf37e..b791454bd10a 100644 --- a/sd/source/ui/tools/PreviewRenderer.cxx +++ b/sd/source/ui/tools/PreviewRenderer.cxx @@ -38,8 +38,8 @@ #include <vcl/virdev.hxx> #include <svx/svdpagv.hxx> #include <svx/svdoutl.hxx> -#include <svx/eeitem.hxx> -#include <svx/editstat.hxx> +#include <editeng/eeitem.hxx> +#include <editeng/editstat.hxx> #include <tools/link.hxx> #include <vcl/svapp.hxx> diff --git a/sd/source/ui/unoidl/UnoDocumentSettings.cxx b/sd/source/ui/unoidl/UnoDocumentSettings.cxx index 83899904aaa8..ed47e57b2130 100644 --- a/sd/source/ui/unoidl/UnoDocumentSettings.cxx +++ b/sd/source/ui/unoidl/UnoDocumentSettings.cxx @@ -67,7 +67,7 @@ #else #include <svx/svdoutl.hxx> #endif -#include <svx/editstat.hxx> +#include <editeng/editstat.hxx> #include <svx/unoapi.hxx> #define MAP_LEN(x) x, sizeof(x)-1 diff --git a/sd/source/ui/unoidl/sddetect.cxx b/sd/source/ui/unoidl/sddetect.cxx index 48f48a855d03..90767a332609 100644 --- a/sd/source/ui/unoidl/sddetect.cxx +++ b/sd/source/ui/unoidl/sddetect.cxx @@ -37,9 +37,7 @@ #include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/awt/XWindow.hpp> #include <com/sun/star/lang/XUnoTunnel.hpp> -#ifndef _UNOTOOLS_PROCESSFACTORY_HXX #include <comphelper/processfactory.hxx> -#endif #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/io/XInputStream.hpp> @@ -49,15 +47,10 @@ #include <com/sun/star/ucb/InteractiveAppException.hpp> #include <com/sun/star/ucb/XContent.hpp> #include <com/sun/star/packages/zip/ZipIOException.hpp> - - #include <framework/interaction.hxx> - -#ifndef _TOOLKIT_UNOHLP_HXX #include <toolkit/helper/vclunohelper.hxx> -#endif #include <ucbhelper/simpleinteractionrequest.hxx> - +#include <svtools/filter.hxx> #include <rtl/ustring.h> #include <rtl/logfile.hxx> #include <svl/itemset.hxx> @@ -77,7 +70,6 @@ #include <sfx2/docfilt.hxx> #include <sfx2/fcontnr.hxx> #include <sfx2/brokenpackageint.hxx> -#include <svx/impgrf.hxx> #include <svtools/FilterConfigItem.hxx> #include <sot/storage.hxx> #include <unotools/moduleoptions.hxx> @@ -375,7 +367,7 @@ SdFilterDetect::~SdFilterDetect() const String aFileName( aMedium.GetURLObject().GetMainURL( INetURLObject::NO_DECODE ) ); GraphicDescriptor aDesc( *pStm, &aFileName ); - GraphicFilter* pGrfFilter = GetGrfFilter(); + GraphicFilter* pGrfFilter = GraphicFilter::GetGraphicFilter(); if( !aDesc.Detect( FALSE ) ) { pFilter = 0; diff --git a/sd/source/ui/unoidl/unocpres.cxx b/sd/source/ui/unoidl/unocpres.cxx index 4980f1a218ba..b8f48a6928aa 100644 --- a/sd/source/ui/unoidl/unocpres.cxx +++ b/sd/source/ui/unoidl/unocpres.cxx @@ -33,6 +33,7 @@ #include <vcl/svapp.hxx> #include <svx/svdpage.hxx> #include <comphelper/extract.hxx> +#include <comphelper/serviceinfohelper.hxx> #include "unohelp.hxx" #include "unomodel.hxx" @@ -81,7 +82,7 @@ OUString SAL_CALL SdXCustomPresentation::getImplementationName() sal_Bool SAL_CALL SdXCustomPresentation::supportsService( const OUString& ServiceName ) throw(uno::RuntimeException) { - return SvxServiceInfoHelper::supportsService( ServiceName, getSupportedServiceNames() ); + return comphelper::ServiceInfoHelper::supportsService( ServiceName, getSupportedServiceNames() ); } uno::Sequence< OUString > SAL_CALL SdXCustomPresentation::getSupportedServiceNames() @@ -302,7 +303,7 @@ OUString SAL_CALL SdXCustomPresentationAccess::getImplementationName() sal_Bool SAL_CALL SdXCustomPresentationAccess::supportsService( const OUString& ServiceName ) throw(uno::RuntimeException) { - return SvxServiceInfoHelper::supportsService( ServiceName, getSupportedServiceNames() ); + return comphelper::ServiceInfoHelper::supportsService( ServiceName, getSupportedServiceNames() ); } uno::Sequence< OUString > SAL_CALL SdXCustomPresentationAccess::getSupportedServiceNames() diff --git a/sd/source/ui/unoidl/unolayer.cxx b/sd/source/ui/unoidl/unolayer.cxx index c64a5066db41..5ad9fe3fd555 100644 --- a/sd/source/ui/unoidl/unolayer.cxx +++ b/sd/source/ui/unoidl/unolayer.cxx @@ -36,6 +36,7 @@ #include <svx/svdpagv.hxx> #include <svx/unoshape.hxx> #include <svx/svdobj.hxx> +#include <comphelper/serviceinfohelper.hxx> // folgende fuer InsertSdPage() #include <svx/svdlayer.hxx> @@ -49,7 +50,7 @@ #include <unomodel.hxx> #include "unoprnms.hxx" #include <com/sun/star/lang/NoSupportException.hpp> - +#include <svx/svdpool.hxx> #include "unohelp.hxx" #include "FrameView.hxx" #include "DrawViewShell.hxx" @@ -91,7 +92,7 @@ const SvxItemPropertySet* ImplGetSdLayerPropertySet() { MAP_CHAR_LEN("Description"), WID_LAYER_DESC, &::getCppuType((const OUString*)0), 0, 0 }, { 0,0,0,0,0,0} }; - static SvxItemPropertySet aSDLayerPropertySet_Impl( aSdLayerPropertyMap_Impl ); + static SvxItemPropertySet aSDLayerPropertySet_Impl( aSdLayerPropertyMap_Impl, SdrObject::GetGlobalDrawObjectItemPool() ); return &aSDLayerPropertySet_Impl; } @@ -179,7 +180,7 @@ OUString SAL_CALL SdLayer::getImplementationName() sal_Bool SAL_CALL SdLayer::supportsService( const OUString& ServiceName ) throw(uno::RuntimeException) { - return SvxServiceInfoHelper::supportsService( ServiceName, getSupportedServiceNames() ); + return comphelper::ServiceInfoHelper::supportsService( ServiceName, getSupportedServiceNames() ); } uno::Sequence< OUString > SAL_CALL SdLayer::getSupportedServiceNames() @@ -520,7 +521,7 @@ OUString SAL_CALL SdLayerManager::getImplementationName() sal_Bool SAL_CALL SdLayerManager::supportsService( const OUString& ServiceName ) throw(uno::RuntimeException) { - return SvxServiceInfoHelper::supportsService( ServiceName, getSupportedServiceNames() ); + return comphelper::ServiceInfoHelper::supportsService( ServiceName, getSupportedServiceNames() ); } uno::Sequence< OUString > SAL_CALL SdLayerManager::getSupportedServiceNames() diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx index f38a5c345779..47f3818f6ddc 100644 --- a/sd/source/ui/unoidl/unomodel.cxx +++ b/sd/source/ui/unoidl/unomodel.cxx @@ -40,21 +40,20 @@ #include <com/sun/star/presentation/XPresentation2.hpp> #include <osl/mutex.hxx> +#include <comphelper/serviceinfohelper.hxx> -#ifndef _UTL_SEQUENCE_HXX_ #include <comphelper/sequence.hxx> -#endif #include <rtl/uuid.h> #include <rtl/memory.h> -#include <svx/unofield.hxx> +#include <editeng/unofield.hxx> #include <unomodel.hxx> #include <sfx2/dispatch.hxx> #include <sfx2/bindings.hxx> #include <vcl/svapp.hxx> -#include <svx/UnoForbiddenCharsTable.hxx> +#include <editeng/UnoForbiddenCharsTable.hxx> #include <svx/svdoutl.hxx> -#include <svx/forbiddencharacterstable.hxx> +#include <editeng/forbiddencharacterstable.hxx> #include <svx/UnoNamespaceMap.hxx> #include <svx/svdlayer.hxx> #include <svx/svdsob.hxx> @@ -62,17 +61,16 @@ #include <svx/unofill.hxx> #include <svx/unopool.hxx> #include <svx/svdorect.hxx> -#include <svx/flditem.hxx> +#include <editeng/flditem.hxx> #include <vos/mutex.hxx> #include <toolkit/awt/vclxdevice.hxx> - -#include <svtools/unoimap.hxx> -#include <svx/unolingu.hxx> +#include <svx/svdpool.hxx> +#include <editeng/unolingu.hxx> #include <svx/svdpagv.hxx> - +#include <svtools/unoimap.hxx> #include <svx/unoshape.hxx> -#include <svx/unonrule.hxx> -#include <svx/eeitem.hxx> +#include <editeng/unonrule.hxx> +#include <editeng/eeitem.hxx> // #99870# Support creation of GraphicObjectResolver and EmbeddedObjectResolver #include <svx/xmleohlp.hxx> @@ -209,7 +207,7 @@ const SvxItemPropertySet* ImplGetDrawModelPropertySet() { MAP_CHAR_LEN(sUNO_Prop_HasValidSignatures), WID_MODEL_HASVALIDSIGNATURES, &::getCppuType(static_cast< const sal_Bool * >(0)), beans::PropertyAttribute::READONLY, 0 }, { 0,0,0,0,0,0 } }; - static SvxItemPropertySet aDrawModelPropertySet_Impl( aDrawModelPropertyMap_Impl ); + static SvxItemPropertySet aDrawModelPropertySet_Impl( aDrawModelPropertyMap_Impl, SdrObject::GetGlobalDrawObjectItemPool() ); return &aDrawModelPropertySet_Impl; } @@ -3031,7 +3029,7 @@ OUString SAL_CALL SdDocLinkTargets::getImplementationName() sal_Bool SAL_CALL SdDocLinkTargets::supportsService( const OUString& ServiceName ) throw(uno::RuntimeException) { - return SvxServiceInfoHelper::supportsService( ServiceName, getSupportedServiceNames() ); + return comphelper::ServiceInfoHelper::supportsService( ServiceName, getSupportedServiceNames() ); } uno::Sequence< OUString > SAL_CALL SdDocLinkTargets::getSupportedServiceNames() diff --git a/sd/source/ui/unoidl/unoobj.cxx b/sd/source/ui/unoidl/unoobj.cxx index fe385de2b189..54c3f88a6916 100644 --- a/sd/source/ui/unoidl/unoobj.cxx +++ b/sd/source/ui/unoidl/unoobj.cxx @@ -39,7 +39,7 @@ #include <vos/mutex.hxx> #include <svl/itemprop.hxx> #include <svl/style.hxx> - +#include <svx/svdpool.hxx> #include <sfx2/viewfrm.hxx> #include <sfx2/app.hxx> #include <svtools/unoimap.hxx> @@ -55,10 +55,11 @@ #include <svx/svdopath.hxx> #include <svx/svdoole2.hxx> #include <svx/svdograf.hxx> -#include <svx/outlobj.hxx> +#include <editeng/outlobj.hxx> #include "CustomAnimationPreset.hxx" #include "Outliner.hxx" #include "sdresid.hxx" +#include <comphelper/serviceinfohelper.hxx> #include "anminfo.hxx" #include "unohelp.hxx" @@ -244,12 +245,12 @@ static SdTypesCache gImplTypesCache; { if( bGraphicObj ) { - static SvxItemPropertySet aImpress_SdXShapePropertyGraphicSet_Impl( lcl_GetImpress_SdXShapePropertyGraphicMap_Impl()); + static SvxItemPropertySet aImpress_SdXShapePropertyGraphicSet_Impl( lcl_GetImpress_SdXShapePropertyGraphicMap_Impl(), SdrObject::GetGlobalDrawObjectItemPool()); pRet = &aImpress_SdXShapePropertyGraphicSet_Impl; } else { - static SvxItemPropertySet aImpress_SdXShapePropertySet_Impl(lcl_GetImpress_SdXShapePropertySimpleMap_Impl()); + static SvxItemPropertySet aImpress_SdXShapePropertySet_Impl(lcl_GetImpress_SdXShapePropertySimpleMap_Impl(), SdrObject::GetGlobalDrawObjectItemPool()); pRet = &aImpress_SdXShapePropertySet_Impl; } } @@ -257,12 +258,12 @@ static SdTypesCache gImplTypesCache; { if( bGraphicObj ) { - static SvxItemPropertySet aDraw_SdXShapePropertyGraphicSet_Impl(lcl_GetDraw_SdXShapePropertyGraphicMap_Impl()); + static SvxItemPropertySet aDraw_SdXShapePropertyGraphicSet_Impl(lcl_GetDraw_SdXShapePropertyGraphicMap_Impl(), SdrObject::GetGlobalDrawObjectItemPool()); pRet = &aDraw_SdXShapePropertyGraphicSet_Impl; } else { - static SvxItemPropertySet aDraw_SdXShapePropertySet_Impl( lcl_GetDraw_SdXShapePropertySimpleMap_Impl()); + static SvxItemPropertySet aDraw_SdXShapePropertySet_Impl( lcl_GetDraw_SdXShapePropertySimpleMap_Impl(), SdrObject::GetGlobalDrawObjectItemPool()); pRet = &aDraw_SdXShapePropertySet_Impl; } } @@ -279,7 +280,7 @@ static SdTypesCache gImplTypesCache; static const SvxItemPropertySet* lcl_GetEmpty_SdXShapePropertySet_Impl() { - static SvxItemPropertySet aEmptyPropSet( lcl_GetEmpty_SdXShapePropertyMap_Impl() ); + static SvxItemPropertySet aEmptyPropSet( lcl_GetEmpty_SdXShapePropertyMap_Impl(), SdrObject::GetGlobalDrawObjectItemPool() ); return &aEmptyPropSet; } const SvEventDescription* ImplGetSupportedMacroItems() @@ -954,7 +955,7 @@ uno::Sequence< ::rtl::OUString > SAL_CALL SdXShape::getSupportedServiceNames() t { uno::Sequence< OUString > aSeq( mpShape->_getSupportedServiceNames() ); - SvxServiceInfoHelper::addToSequence( aSeq, 2, "com.sun.star.presentation.Shape", + comphelper::ServiceInfoHelper::addToSequence( aSeq, 2, "com.sun.star.presentation.Shape", "com.sun.star.document.LinkTarget" ); SdrObject* pObj = mpShape->GetSdrObject(); @@ -964,10 +965,10 @@ uno::Sequence< ::rtl::OUString > SAL_CALL SdXShape::getSupportedServiceNames() t switch( nInventor ) { case OBJ_TITLETEXT: - SvxServiceInfoHelper::addToSequence( aSeq, 1, "com.sun.star.presentation.TitleTextShape" ); + comphelper::ServiceInfoHelper::addToSequence( aSeq, 1, "com.sun.star.presentation.TitleTextShape" ); break; case OBJ_OUTLINETEXT: - SvxServiceInfoHelper::addToSequence( aSeq, 1, "com.sun.star.presentation.OutlinerShape" ); + comphelper::ServiceInfoHelper::addToSequence( aSeq, 1, "com.sun.star.presentation.OutlinerShape" ); break; } } diff --git a/sd/source/ui/unoidl/unoobj.hxx b/sd/source/ui/unoidl/unoobj.hxx index df7c298839f6..3e7c3fab7d3c 100644 --- a/sd/source/ui/unoidl/unoobj.hxx +++ b/sd/source/ui/unoidl/unoobj.hxx @@ -37,7 +37,7 @@ #include <svx/svdpool.hxx> #include <svx/unomaster.hxx> -#include <svx/unoipset.hxx> +#include <editeng/unoipset.hxx> #include <cppuhelper/implbase2.hxx> diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx index a7b780e9ffc5..834d79bcd5e4 100644 --- a/sd/source/ui/unoidl/unopage.cxx +++ b/sd/source/ui/unoidl/unopage.cxx @@ -41,23 +41,17 @@ #include <rtl/ustrbuf.hxx> #include <vcl/bitmapex.hxx> #include <vcl/metaact.hxx> -#ifndef _TOOLKIT_UNOIFACE_HXX #include <toolkit/unohlp.hxx> -#endif #include <vcl/svapp.hxx> #include <vcl/settings.hxx> #include <unomodel.hxx> #include <unopage.hxx> -#ifndef _SVX_SVXIDS_HRC #include <svx/svxids.hrc> -#endif #include <svl/itemset.hxx> #include <svx/svdmodel.hxx> #include <sdresid.hxx> #include <glob.hrc> -#ifndef _SD_PAGE_HXX //autogen #include <sdpage.hxx> -#endif #include <unoprnms.hxx> #include <sdattr.hxx> #include <drawdoc.hxx> @@ -68,13 +62,14 @@ #include <svl/style.hxx> #include <rtl/uuid.h> #include <rtl/memory.h> +#include <comphelper/serviceinfohelper.hxx> #include <comphelper/extract.hxx> #include <list> #include <svx/svditer.hxx> #include <svtools/wmf.hxx> #include <svx/svdoole2.hxx> - +#include <svx/svdpool.hxx> #include <svx/svdview.hxx> #include "misc.hxx" #include "View.hxx" @@ -256,19 +251,19 @@ const SvxItemPropertySet* ImplGetDrawPagePropertySet( sal_Bool bImpress, PageKin if( ePageKind == PK_STANDARD ) { //PK_STANDARD always has a background property - static SvxItemPropertySet aDrawPagePropertySet_Impl( aDrawPagePropertyMap_Impl ); + static SvxItemPropertySet aDrawPagePropertySet_Impl( aDrawPagePropertyMap_Impl, SdrObject::GetGlobalDrawObjectItemPool() ); pRet = &aDrawPagePropertySet_Impl; } else { if(bWithoutBackground) { - static SvxItemPropertySet aDrawPageNotesHandoutPropertyNoBackSet_Impl( aDrawPageNotesHandoutPropertyNoBackMap_Impl ); + static SvxItemPropertySet aDrawPageNotesHandoutPropertyNoBackSet_Impl( aDrawPageNotesHandoutPropertyNoBackMap_Impl, SdrObject::GetGlobalDrawObjectItemPool() ); pRet = &aDrawPageNotesHandoutPropertyNoBackSet_Impl; } else { - static SvxItemPropertySet aDrawPageNotesHandoutPropertySet_Impl( aDrawPageNotesHandoutPropertyMap_Impl ); + static SvxItemPropertySet aDrawPageNotesHandoutPropertySet_Impl( aDrawPageNotesHandoutPropertyMap_Impl, SdrObject::GetGlobalDrawObjectItemPool() ); pRet = &aDrawPageNotesHandoutPropertySet_Impl; } } @@ -277,12 +272,12 @@ const SvxItemPropertySet* ImplGetDrawPagePropertySet( sal_Bool bImpress, PageKin { if(bWithoutBackground) { - static SvxItemPropertySet aGraphicPagePropertyNoBackSet_Impl( aGraphicPagePropertyNoBackMap_Impl ); + static SvxItemPropertySet aGraphicPagePropertyNoBackSet_Impl( aGraphicPagePropertyNoBackMap_Impl, SdrObject::GetGlobalDrawObjectItemPool() ); pRet = &aGraphicPagePropertyNoBackSet_Impl; } else { - static SvxItemPropertySet aGraphicPagePropertySet_Impl( aGraphicPagePropertyMap_Impl ); + static SvxItemPropertySet aGraphicPagePropertySet_Impl( aGraphicPagePropertyMap_Impl, SdrObject::GetGlobalDrawObjectItemPool() ); pRet = &aGraphicPagePropertySet_Impl; } } @@ -339,12 +334,12 @@ const SvxItemPropertySet* ImplGetMasterPagePropertySet( PageKind ePageKind ) const SvxItemPropertySet* pRet = 0; if( ePageKind == PK_HANDOUT ) { - static SvxItemPropertySet aHandoutMasterPagePropertySet_Impl( aHandoutMasterPagePropertyMap_Impl ); + static SvxItemPropertySet aHandoutMasterPagePropertySet_Impl( aHandoutMasterPagePropertyMap_Impl, SdrObject::GetGlobalDrawObjectItemPool() ); pRet = &aHandoutMasterPagePropertySet_Impl; } else { - static SvxItemPropertySet aMasterPagePropertySet_Impl( aMasterPagePropertyMap_Impl ); + static SvxItemPropertySet aMasterPagePropertySet_Impl( aMasterPagePropertyMap_Impl, SdrObject::GetGlobalDrawObjectItemPool() ); pRet = &aMasterPagePropertySet_Impl; } return pRet; @@ -1444,7 +1439,7 @@ Sequence< OUString > SAL_CALL SdGenericDrawPage::getSupportedServiceNames() throw(uno::RuntimeException) { Sequence< OUString > aSeq( SvxFmDrawPage::getSupportedServiceNames() ); - SvxServiceInfoHelper::addToSequence( aSeq, 3, "com.sun.star.drawing.GenericDrawPage", + comphelper::ServiceInfoHelper::addToSequence( aSeq, 3, "com.sun.star.drawing.GenericDrawPage", "com.sun.star.document.LinkTarget", "com.sun.star.document.LinkTargetSupplier"); return aSeq; @@ -1984,7 +1979,7 @@ OUString SAL_CALL SdPageLinkTargets::getImplementationName() sal_Bool SAL_CALL SdPageLinkTargets::supportsService( const OUString& ServiceName ) throw(uno::RuntimeException) { - return SvxServiceInfoHelper::supportsService( ServiceName, getSupportedServiceNames() ); + return comphelper::ServiceInfoHelper::supportsService( ServiceName, getSupportedServiceNames() ); } Sequence< OUString > SAL_CALL SdPageLinkTargets::getSupportedServiceNames() @@ -2216,10 +2211,10 @@ Sequence< OUString > SAL_CALL SdDrawPage::getSupportedServiceNames() throw(uno:: throwIfDisposed(); Sequence< OUString > aSeq( SdGenericDrawPage::getSupportedServiceNames() ); - SvxServiceInfoHelper::addToSequence( aSeq, 1, "com.sun.star.drawing.DrawPage" ); + comphelper::ServiceInfoHelper::addToSequence( aSeq, 1, "com.sun.star.drawing.DrawPage" ); if( mbIsImpressDocument ) - SvxServiceInfoHelper::addToSequence( aSeq, 1, "com.sun.star.presentation.DrawPage" ); + comphelper::ServiceInfoHelper::addToSequence( aSeq, 1, "com.sun.star.presentation.DrawPage" ); return aSeq; } @@ -2804,10 +2799,10 @@ Sequence< OUString > SAL_CALL SdMasterPage::getSupportedServiceNames() throw(uno throwIfDisposed(); Sequence< OUString > aSeq( SdGenericDrawPage::getSupportedServiceNames() ); - SvxServiceInfoHelper::addToSequence( aSeq, 1, "com.sun.star.drawing.MasterPage" ); + comphelper::ServiceInfoHelper::addToSequence( aSeq, 1, "com.sun.star.drawing.MasterPage" ); if( SvxFmDrawPage::mpPage && ((SdPage*)SvxFmDrawPage::mpPage)->GetPageKind() == PK_HANDOUT ) - SvxServiceInfoHelper::addToSequence( aSeq, 1, "com.sun.star.presentation.HandoutMasterPage" ); + comphelper::ServiceInfoHelper::addToSequence( aSeq, 1, "com.sun.star.presentation.HandoutMasterPage" ); return aSeq; } diff --git a/sd/source/ui/unoidl/unopback.cxx b/sd/source/ui/unoidl/unopback.cxx index 1ff5268a598d..341cd0c53d40 100644 --- a/sd/source/ui/unoidl/unopback.cxx +++ b/sd/source/ui/unoidl/unopback.cxx @@ -31,7 +31,7 @@ #include <vos/mutex.hxx> #include <vcl/svapp.hxx> #include <svl/itemset.hxx> - +#include <svx/svdpool.hxx> #include <comphelper/extract.hxx> #include <rtl/uuid.h> #include <rtl/memory.h> @@ -40,6 +40,7 @@ #include <svx/svdobj.hxx> #include <svx/unoprov.hxx> #include <svx/unoshape.hxx> +#include <comphelper/serviceinfohelper.hxx> #include "unopback.hxx" #include "unohelp.hxx" @@ -58,7 +59,7 @@ const SvxItemPropertySet* ImplGetPageBackgroundPropertySet() {0,0,0,0,0,0} }; - static SvxItemPropertySet aPageBackgroundPropertySet_Impl( aPageBackgroundPropertyMap_Impl ); + static SvxItemPropertySet aPageBackgroundPropertySet_Impl( aPageBackgroundPropertyMap_Impl, SdrObject::GetGlobalDrawObjectItemPool() ); return &aPageBackgroundPropertySet_Impl; } @@ -209,7 +210,7 @@ OUString SAL_CALL SdUnoPageBackground::getImplementationName() sal_Bool SAL_CALL SdUnoPageBackground::supportsService( const OUString& ServiceName ) throw(uno::RuntimeException) { - return SvxServiceInfoHelper::supportsService( ServiceName, getSupportedServiceNames() ); + return comphelper::ServiceInfoHelper::supportsService( ServiceName, getSupportedServiceNames() ); } uno::Sequence< OUString > SAL_CALL SdUnoPageBackground::getSupportedServiceNames() @@ -275,7 +276,7 @@ void SAL_CALL SdUnoPageBackground::setPropertyValue( const OUString& aPropertyNa } else { - mpPropSet->setPropertyValue( pEntry, aValue, aSet ); + SvxItemPropertySet_setPropertyValue( *mpPropSet, pEntry, aValue, aSet ); } mpSet->Put( aSet ); @@ -329,7 +330,7 @@ uno::Any SAL_CALL SdUnoPageBackground::getPropertyValue( const OUString& Propert aSet.Put( rPool.GetDefaultItem( pEntry->nWID ) ); // Hole Wert aus ItemSet - aAny = mpPropSet->getPropertyValue( pEntry, aSet ); + aAny = SvxItemPropertySet_getPropertyValue( *mpPropSet, pEntry, aSet ); } } else @@ -457,7 +458,7 @@ uno::Any SAL_CALL SdUnoPageBackground::getPropertyDefault( const OUString& aProp SfxItemSet aSet( rPool, pEntry->nWID, pEntry->nWID); aSet.Put( rPool.GetDefaultItem( pEntry->nWID ) ); - aAny = mpPropSet->getPropertyValue( pEntry, aSet ); + aAny = SvxItemPropertySet_getPropertyValue( *mpPropSet, pEntry, aSet ); } } return aAny; diff --git a/sd/source/ui/unoidl/unopback.hxx b/sd/source/ui/unoidl/unopback.hxx index 6c99d5f5eaaf..dfe876cc95b8 100644 --- a/sd/source/ui/unoidl/unopback.hxx +++ b/sd/source/ui/unoidl/unopback.hxx @@ -33,7 +33,7 @@ #include <com/sun/star/lang/XUnoTunnel.hpp> #include <svx/unoshprp.hxx> -#include <svx/unoipset.hxx> +#include <editeng/unoipset.hxx> #include <comphelper/servicehelper.hxx> diff --git a/sd/source/ui/unoidl/unopool.cxx b/sd/source/ui/unoidl/unopool.cxx index abd9c7865a06..21ac567edc70 100644 --- a/sd/source/ui/unoidl/unopool.cxx +++ b/sd/source/ui/unoidl/unopool.cxx @@ -29,7 +29,7 @@ #include "precompiled_sd.hxx" #include <i18npool/mslangid.hxx> #include <comphelper/propertysetinfo.hxx> -#include <svx/eeitem.hxx> +#include <editeng/eeitem.hxx> #include <svx/unopool.hxx> #include "drawdoc.hxx" diff --git a/sd/source/ui/unoidl/unosrch.cxx b/sd/source/ui/unoidl/unosrch.cxx index e1bd4afa6aa9..a1cd11861d3a 100644 --- a/sd/source/ui/unoidl/unosrch.cxx +++ b/sd/source/ui/unoidl/unosrch.cxx @@ -30,11 +30,10 @@ #include <vcl/svapp.hxx> #include <vos/mutex.hxx> -#ifndef SVX_UNOSHAPE_HXX #include <svx/unoshape.hxx> -#endif +#include <svx/svdpool.hxx> #include <svx/unoprov.hxx> -#include <svx/unotext.hxx> +#include <editeng/unotext.hxx> #include <comphelper/extract.hxx> #include <rtl/uuid.h> @@ -729,7 +728,7 @@ UNO3_GETIMPLEMENTATION_IMPL( SdUnoSearchReplaceDescriptor ); SdUnoSearchReplaceDescriptor::SdUnoSearchReplaceDescriptor( sal_Bool bReplace ) throw() { - mpPropSet = new SvxItemPropertySet(ImplGetSearchPropertyMap()); + mpPropSet = new SvxItemPropertySet(ImplGetSearchPropertyMap(), SdrObject::GetGlobalDrawObjectItemPool()); mbBackwards = sal_False; mbCaseSensitive = sal_False; diff --git a/sd/source/ui/view/DocumentRenderer.cxx b/sd/source/ui/view/DocumentRenderer.cxx index fc4ecc3ab26a..a23d8b2ad908 100644 --- a/sd/source/ui/view/DocumentRenderer.cxx +++ b/sd/source/ui/view/DocumentRenderer.cxx @@ -46,8 +46,8 @@ #include <basegfx/polygon/b2dpolypolygon.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> #include <sfx2/printer.hxx> -#include <svx/editstat.hxx> -#include <svx/outlobj.hxx> +#include <editeng/editstat.hxx> +#include <editeng/outlobj.hxx> #include <svx/svdetc.hxx> #include <svx/svditer.hxx> #include <svx/svdopage.hxx> diff --git a/sd/source/ui/view/Outliner.cxx b/sd/source/ui/view/Outliner.cxx index 2cd7fda0aed7..5314f6dbe768 100644 --- a/sd/source/ui/view/Outliner.cxx +++ b/sd/source/ui/view/Outliner.cxx @@ -30,35 +30,33 @@ #include "Outliner.hxx" #include <vcl/wrkwin.hxx> -#include <sfx2/srchitem.hxx> -#include <svx/colritem.hxx> -#include <svx/eeitem.hxx> -#include <svx/editstat.hxx> +#include <svl/srchitem.hxx> +#include <editeng/colritem.hxx> +#include <editeng/eeitem.hxx> +#include <editeng/editstat.hxx> #include <vcl/outdev.hxx> -#ifndef _DLGUTIL_HXX #include <svx/dlgutil.hxx> -#endif #include <svx/xtable.hxx> #include <vcl/msgbox.hxx> #include <sfx2/dispatch.hxx> #include <sfx2/printer.hxx> #include <svx/svxerr.hxx> #include <svx/svdotext.hxx> -#include <svx/unolingu.hxx> +#include <editeng/unolingu.hxx> #include <svx/svditer.hxx> #include <comphelper/extract.hxx> #include <com/sun/star/linguistic2/XSpellChecker1.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <comphelper/processfactory.hxx> -#include <svx/eeitem.hxx> -#include <svx/forbiddencharacterstable.hxx> +#include <editeng/eeitem.hxx> +#include <editeng/forbiddencharacterstable.hxx> #include <svx/srchdlg.hxx> #include <unotools/linguprops.hxx> #include <unotools/lingucfg.hxx> -#include <svx/editeng.hxx> +#include <editeng/editeng.hxx> #include <vcl/metric.hxx> #include <sfx2/viewfrm.hxx> - +#include <svtools/langtab.hxx> #include "strings.hrc" #include "sdstring.hrc" #include "eetext.hxx" @@ -77,6 +75,8 @@ #include "SpellDialogChildWindow.hxx" #include "ToolBarManager.hxx" #include "framework/FrameworkHelper.hxx" +#include <svx/svxids.hrc> +#include <editeng/editerr.hxx> using ::rtl::OUString; using namespace ::com::sun::star; @@ -1392,7 +1392,7 @@ void Outliner::EnterEditMode (BOOL bGrabFocus) IMPL_LINK_INLINE_START( Outliner, SpellError, void *, nLang ) { mbError = true; - String aError( ::GetLanguageString( (LanguageType)(ULONG)nLang ) ); + String aError( SvtLanguageTable::GetLanguageString( (LanguageType)(ULONG)nLang ) ); ErrorHandler::HandleError(* new StringErrorInfo( ERRCODE_SVX_LINGU_LANGUAGENOTEXISTS, aError) ); return 0; diff --git a/sd/source/ui/view/bmcache.cxx b/sd/source/ui/view/bmcache.cxx index f32bf76d7c1a..d8781733c520 100644 --- a/sd/source/ui/view/bmcache.cxx +++ b/sd/source/ui/view/bmcache.cxx @@ -31,7 +31,7 @@ #include <limits.h> // LONG_MAX #include <tools/solar.h> -#include <goodies/grfmgr.hxx> +#include <svtools/grfmgr.hxx> #include "bmcache.hxx" // eine Struktur fuer die Cache-Eintraege diff --git a/sd/source/ui/view/drawview.cxx b/sd/source/ui/view/drawview.cxx index a13bb1c788ac..304b9bf3de4b 100644 --- a/sd/source/ui/view/drawview.cxx +++ b/sd/source/ui/view/drawview.cxx @@ -34,7 +34,7 @@ #include <svx/svdpagv.hxx> #include <sfx2/request.hxx> #include <svl/style.hxx> -#include <svx/outliner.hxx> +#include <editeng/outliner.hxx> #ifndef _VIEW3D_HXX //autogen #include <svx/view3d.hxx> #endif @@ -46,10 +46,10 @@ #include <svx/svdogrp.hxx> #include <svx/svdorect.hxx> #include <svl/poolitem.hxx> -#include <svx/eeitem.hxx> -#include <svx/bulitem.hxx> +#include <editeng/eeitem.hxx> +#include <editeng/bulitem.hxx> #include <svl/itempool.hxx> -#include <svx/numitem.hxx> +#include <editeng/numitem.hxx> #include <svl/whiter.hxx> #include <sfx2/viewfrm.hxx> diff --git a/sd/source/ui/view/drtxtob.cxx b/sd/source/ui/view/drtxtob.cxx index 5f82310e90a6..bcff1c573b14 100644 --- a/sd/source/ui/view/drtxtob.cxx +++ b/sd/source/ui/view/drtxtob.cxx @@ -30,10 +30,11 @@ #include "TextObjectBar.hxx" +#include <svx/svxids.hrc> -#include <svx/ulspitem.hxx> -#include <svx/lspcitem.hxx> -#include <svx/adjitem.hxx> +#include <editeng/ulspitem.hxx> +#include <editeng/lspcitem.hxx> +#include <editeng/adjitem.hxx> #include <vcl/vclenum.hxx> #include <sfx2/app.hxx> #include <svl/whiter.hxx> @@ -41,13 +42,13 @@ #include <svl/style.hxx> #include <svl/languageoptions.hxx> #include <sfx2/tplpitem.hxx> -#include <svx/escpitem.hxx> +#include <editeng/escpitem.hxx> #include <svx/svdoutl.hxx> #include <svl/intitem.hxx> -#include <svx/scripttypeitem.hxx> -#include <svx/outlobj.hxx> -#include <svx/writingmodeitem.hxx> -#include <svx/frmdiritem.hxx> +#include <editeng/scripttypeitem.hxx> +#include <editeng/outlobj.hxx> +#include <editeng/writingmodeitem.hxx> +#include <editeng/frmdiritem.hxx> #include <sfx2/objface.hxx> diff --git a/sd/source/ui/view/drtxtob1.cxx b/sd/source/ui/view/drtxtob1.cxx index 7f7f1985262f..4ca26501fedb 100644 --- a/sd/source/ui/view/drtxtob1.cxx +++ b/sd/source/ui/view/drtxtob1.cxx @@ -30,17 +30,12 @@ #include "TextObjectBar.hxx" +#include <svx/svxids.hrc> -#include <svx/outliner.hxx> -#ifndef _ULSPITEM_HXX -#include <svx/ulspitem.hxx> -#endif -#ifndef _LSPCITEM_HXX -#include <svx/lspcitem.hxx> -#endif -#ifndef _ADJITEM_HXX -#include <svx/adjitem.hxx> -#endif +#include <editeng/outliner.hxx> +#include <editeng/ulspitem.hxx> +#include <editeng/lspcitem.hxx> +#include <editeng/adjitem.hxx> #include <vcl/vclenum.hxx> #include <sfx2/app.hxx> #include <svl/whiter.hxx> @@ -50,25 +45,23 @@ #include <sfx2/request.hxx> #include <sfx2/viewfrm.hxx> #include <sfx2/dispatch.hxx> -#include <svx/escpitem.hxx> -#include <svx/wghtitem.hxx> -#include <svx/postitem.hxx> -#include <svx/udlnitem.hxx> -#include <svx/crsditem.hxx> -#include <svx/cntritem.hxx> -#include <svx/shdditem.hxx> +#include <editeng/escpitem.hxx> +#include <editeng/wghtitem.hxx> +#include <editeng/postitem.hxx> +#include <editeng/udlnitem.hxx> +#include <editeng/crsditem.hxx> +#include <editeng/cntritem.hxx> +#include <editeng/shdditem.hxx> #include <svx/xtable.hxx> #include <svx/svdobj.hxx> -#include <svx/outlobj.hxx> -#include <svx/flstitem.hxx> -#include <svx/editeng.hxx> +#include <editeng/outlobj.hxx> +#include <editeng/flstitem.hxx> +#include <editeng/editeng.hxx> #include <svl/intitem.hxx> -#ifndef _SVX_SRIPTTYPEITEM_HXX //autogen -#include <svx/scripttypeitem.hxx> -#endif +#include <editeng/scripttypeitem.hxx> #include <svx/svdoutl.hxx> -#include <svx/writingmodeitem.hxx> -#include <svx/frmdiritem.hxx> +#include <editeng/writingmodeitem.hxx> +#include <editeng/frmdiritem.hxx> #include <svl/itemiter.hxx> diff --git a/sd/source/ui/view/drviews1.cxx b/sd/source/ui/view/drviews1.cxx index b3aaba4e58ee..4b9aecb02ac5 100644 --- a/sd/source/ui/view/drviews1.cxx +++ b/sd/source/ui/view/drviews1.cxx @@ -55,7 +55,7 @@ #include <svx/fmshell.hxx> #include <svx/globl3d.hxx> #include <svx/fmglob.hxx> -#include <svx/outliner.hxx> +#include <editeng/outliner.hxx> #include "misc.hxx" @@ -550,7 +550,7 @@ SvxRuler* DrawViewShell::CreateHRuler (::sd::Window* pWin, BOOL bIsFirst) UINT16 nMetric = (UINT16)GetDoc()->GetUIUnit(); if( nMetric == 0xffff ) - nMetric = (UINT16)GetModuleFieldUnit(); + nMetric = (UINT16)GetViewShellBase().GetViewFrame()->GetDispatcher()->GetModule()->GetFieldUnit(); pRuler->SetUnit( FieldUnit( nMetric ) ); @@ -584,7 +584,7 @@ SvxRuler* DrawViewShell::CreateVRuler(::sd::Window* pWin) UINT16 nMetric = (UINT16)GetDoc()->GetUIUnit(); if( nMetric == 0xffff ) - nMetric = (UINT16)GetModuleFieldUnit(); + nMetric = (UINT16)GetViewShellBase().GetViewFrame()->GetDispatcher()->GetModule()->GetFieldUnit(); pRuler->SetUnit( FieldUnit( nMetric ) ); diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx index 8ba30db44c49..aa1a0f53c15a 100644 --- a/sd/source/ui/view/drviews2.cxx +++ b/sd/source/ui/view/drviews2.cxx @@ -41,7 +41,7 @@ #include <svx/zoomitem.hxx> #endif #ifndef _EDITDATA_HXX -#include <svx/editdata.hxx> +#include <editeng/editdata.hxx> #endif #include <basic/sberrors.hxx> #include <vcl/msgbox.hxx> @@ -50,9 +50,9 @@ #include <svx/xfillit0.hxx> #include <svx/xflclit.hxx> #include <svl/aeitem.hxx> -#include <svx/eeitem.hxx> +#include <editeng/eeitem.hxx> #include <basic/sbstar.hxx> -#include <svx/flditem.hxx> +#include <editeng/flditem.hxx> #include <svx/xlineit0.hxx> #include <svx/xfillit0.hxx> diff --git a/sd/source/ui/view/drviews3.cxx b/sd/source/ui/view/drviews3.cxx index 3c8e85fc2baa..e7ea82bb345a 100644 --- a/sd/source/ui/view/drviews3.cxx +++ b/sd/source/ui/view/drviews3.cxx @@ -31,11 +31,11 @@ #include "DrawViewShell.hxx" #include <sfx2/viewfrm.hxx> -#include <svx/eeitem.hxx> -#include <svx/tstpitem.hxx> -#include <svx/lrspitem.hxx> -#include <svx/protitem.hxx> -#include <svx/frmdiritem.hxx> +#include <editeng/eeitem.hxx> +#include <editeng/tstpitem.hxx> +#include <editeng/lrspitem.hxx> +#include <editeng/protitem.hxx> +#include <editeng/frmdiritem.hxx> #include <svx/ruler.hxx> #ifndef _SVX_RULERITEM_HXX #include <svx/rulritem.hxx> diff --git a/sd/source/ui/view/drviews4.cxx b/sd/source/ui/view/drviews4.cxx index cd5cd5e88425..88027d360806 100644 --- a/sd/source/ui/view/drviews4.cxx +++ b/sd/source/ui/view/drviews4.cxx @@ -36,9 +36,9 @@ #include <svx/svdpagv.hxx> #include <svx/svdundo.hxx> #include <svx/fmglob.hxx> -#include <svx/eeitem.hxx> +#include <editeng/eeitem.hxx> #ifndef _FLDITEM_HXX -#include <svx/flditem.hxx> +#include <editeng/flditem.hxx> #endif #ifndef _SVXIDS_HRC #include <svx/svxids.hrc> @@ -47,7 +47,7 @@ #ifndef _GLOBL3D_HXX #include <svx/globl3d.hxx> #endif -#include <svx/outliner.hxx> +#include <editeng/outliner.hxx> #ifndef _SFX_CLIENTSH_HXX #include <sfx2/ipclient.hxx> #endif @@ -55,7 +55,7 @@ #include <sfx2/dispatch.hxx> #include <svx/svdopath.hxx> #include <sfx2/viewfrm.hxx> -#include <svx/editview.hxx> +#include <editeng/editview.hxx> #include <vcl/cursor.hxx> diff --git a/sd/source/ui/view/drviews5.cxx b/sd/source/ui/view/drviews5.cxx index 09ca2ea6100c..f3f4d3ded05e 100644 --- a/sd/source/ui/view/drviews5.cxx +++ b/sd/source/ui/view/drviews5.cxx @@ -30,7 +30,7 @@ #include "DrawViewShell.hxx" #include "PresentationViewShell.hxx" -#include <svx/outliner.hxx> +#include <editeng/outliner.hxx> #ifndef _SVXIDS_HXX #include <svx/svxids.hrc> #endif @@ -40,7 +40,7 @@ #include <vcl/scrbar.hxx> #include <tools/poly.hxx> #include <svx/fmshell.hxx> -#include <svx/eeitem.hxx> +#include <editeng/eeitem.hxx> #include <svtools/colorcfg.hxx> #include "AccessibleDrawDocumentView.hxx" diff --git a/sd/source/ui/view/drviews7.cxx b/sd/source/ui/view/drviews7.cxx index 1f46b8343e3f..f718bc46ba93 100644 --- a/sd/source/ui/view/drviews7.cxx +++ b/sd/source/ui/view/drviews7.cxx @@ -33,9 +33,9 @@ #include <svx/fmglob.hxx> #include <svx/globl3d.hxx> #include <svx/svdouno.hxx> -#include <svx/eeitem.hxx> +#include <editeng/eeitem.hxx> #ifndef _FLDITEM_HXX -#include <svx/flditem.hxx> +#include <editeng/flditem.hxx> #endif #ifndef _SVXIDS_HXX #include <svx/svxids.hrc> @@ -50,7 +50,7 @@ #include <svl/whiter.hxx> #include <sfx2/dispatch.hxx> #include <svx/svdograf.hxx> -#include <svx/unolingu.hxx> +#include <editeng/unolingu.hxx> #include <svx/extrusionbar.hxx> #include <svx/fontworkbar.hxx> diff --git a/sd/source/ui/view/drviewsa.cxx b/sd/source/ui/view/drviewsa.cxx index 2887e57223a9..4d30831f4e2a 100644 --- a/sd/source/ui/view/drviewsa.cxx +++ b/sd/source/ui/view/drviewsa.cxx @@ -32,7 +32,7 @@ #include <cppuhelper/implbase1.hxx> #include <comphelper/processfactory.hxx> #ifndef _SVX_SIZEITEM -#include <svx/sizeitem.hxx> +#include <editeng/sizeitem.hxx> #endif #include <svx/svdlayer.hxx> #ifndef _SVX_ZOOMITEM diff --git a/sd/source/ui/view/drviewsb.cxx b/sd/source/ui/view/drviewsb.cxx index 965a458757c3..2574032e3d99 100644 --- a/sd/source/ui/view/drviewsb.cxx +++ b/sd/source/ui/view/drviewsb.cxx @@ -38,9 +38,9 @@ #include <sfx2/viewfrm.hxx> #include <svx/hlnkitem.hxx> #include <tools/urlobj.hxx> -#include <svx/eeitem.hxx> +#include <editeng/eeitem.hxx> #ifndef _FLDITEM_HXX -#include <svx/flditem.hxx> +#include <editeng/flditem.hxx> #endif #include <vcl/msgbox.hxx> #include <sfx2/request.hxx> diff --git a/sd/source/ui/view/drviewse.cxx b/sd/source/ui/view/drviewse.cxx index 94c1f27395e0..d3ae49a1f068 100644 --- a/sd/source/ui/view/drviewse.cxx +++ b/sd/source/ui/view/drviewse.cxx @@ -38,7 +38,7 @@ #include "undo/undomanager.hxx" #include <vcl/waitobj.hxx> #include <svl/aeitem.hxx> -#include <svx/editstat.hxx> +#include <editeng/editstat.hxx> #include <vcl/msgbox.hxx> #include <svl/urlbmk.hxx> #include <svx/svdpagv.hxx> @@ -49,12 +49,12 @@ #include <svx/svdorect.hxx> #include <svx/svdograf.hxx> #include <svl/eitem.hxx> -#include <svx/eeitem.hxx> +#include <editeng/eeitem.hxx> #include <sfx2/dispatch.hxx> #include <sfx2/viewfrm.hxx> #include <sfx2/request.hxx> #include <svx/svxids.hrc> -#include <svx/flditem.hxx> +#include <editeng/flditem.hxx> #include <svx/ruler.hxx> #include <svx/obj3d.hxx> #include <svx/fmglob.hxx> diff --git a/sd/source/ui/view/drviewsf.cxx b/sd/source/ui/view/drviewsf.cxx index 72c94a0e81d2..e5af6dcf991a 100644 --- a/sd/source/ui/view/drviewsf.cxx +++ b/sd/source/ui/view/drviewsf.cxx @@ -39,9 +39,9 @@ #include <svx/globl3d.hxx> #endif #include <svx/hlnkitem.hxx> -#include <svx/eeitem.hxx> +#include <editeng/eeitem.hxx> #ifndef _FLDITEM_HXX -#include <svx/flditem.hxx> +#include <editeng/flditem.hxx> #endif #include <sfx2/viewfrm.hxx> #include <svl/whiter.hxx> diff --git a/sd/source/ui/view/drviewsi.cxx b/sd/source/ui/view/drviewsi.cxx index 338b7ea73105..17ebe33ea540 100644 --- a/sd/source/ui/view/drviewsi.cxx +++ b/sd/source/ui/view/drviewsi.cxx @@ -32,10 +32,10 @@ #include <svx/xtable.hxx> #include "sdattr.hxx" #include <svl/aeitem.hxx> -#include <svx/eeitem.hxx> +#include <editeng/eeitem.hxx> #include <sfx2/request.hxx> #include <svx/svditer.hxx> -#include <svx/colritem.hxx> +#include <editeng/colritem.hxx> #include <sfx2/viewfrm.hxx> #ifndef _SVXIDS_HRC #include <svx/svxids.hrc> diff --git a/sd/source/ui/view/drviewsj.cxx b/sd/source/ui/view/drviewsj.cxx index 25fc00c45101..ca69aeac0e59 100644 --- a/sd/source/ui/view/drviewsj.cxx +++ b/sd/source/ui/view/drviewsj.cxx @@ -37,9 +37,9 @@ #ifndef _GLOBL3D_HXX //autogen #include <svx/globl3d.hxx> #endif -#include <svx/eeitem.hxx> +#include <editeng/eeitem.hxx> #ifndef _FLDITEM_HXX -#include <svx/flditem.hxx> +#include <editeng/flditem.hxx> #endif #include <svx/svdogrp.hxx> #include <svx/svdograf.hxx> diff --git a/sd/source/ui/view/outlnvs2.cxx b/sd/source/ui/view/outlnvs2.cxx index 86016f5e9d3c..2acf143ff0b3 100644 --- a/sd/source/ui/view/outlnvs2.cxx +++ b/sd/source/ui/view/outlnvs2.cxx @@ -42,9 +42,9 @@ #include <svx/zoomitem.hxx> #endif #include <vcl/msgbox.hxx> -#include <svx/eeitem.hxx> -#include <svx/flditem.hxx> -#include <svx/editstat.hxx> +#include <editeng/eeitem.hxx> +#include <editeng/flditem.hxx> +#include <editeng/editstat.hxx> #include "optsitem.hxx" #include <unotools/useroptions.hxx> diff --git a/sd/source/ui/view/outlnvsh.cxx b/sd/source/ui/view/outlnvsh.cxx index ed525deead64..65e92b26c420 100644 --- a/sd/source/ui/view/outlnvsh.cxx +++ b/sd/source/ui/view/outlnvsh.cxx @@ -42,8 +42,8 @@ #include <sot/exchange.hxx> #include <svx/ruler.hxx> #include <svx/zoomitem.hxx> -#include <svx/eeitem.hxx> -#include <svx/flditem.hxx> +#include <editeng/eeitem.hxx> +#include <editeng/flditem.hxx> #include <sfx2/shell.hxx> #include <sfx2/templdlg.hxx> #include <sfx2/viewfac.hxx> @@ -53,7 +53,7 @@ #include <sfx2/dispatch.hxx> #include <vcl/scrbar.hxx> #include <svl/whiter.hxx> -#include <svx/editstat.hxx> +#include <editeng/editstat.hxx> #include <svl/itempool.hxx> #include <sfx2/tplpitem.hxx> #include <svx/svdorect.hxx> @@ -61,13 +61,13 @@ #include <sfx2/topfrm.hxx> #include <com/sun/star/linguistic2/XThesaurus.hpp> #include <com/sun/star/i18n/TransliterationModules.hdl> -#include <svx/unolingu.hxx> +#include <editeng/unolingu.hxx> #include <comphelper/processfactory.hxx> -#include <svx/outlobj.hxx> +#include <editeng/outlobj.hxx> #include <svl/cjkoptions.hxx> #include <svtools/cliplistener.hxx> -#include <sfx2/srchitem.hxx> -#include <svx/editobj.hxx> +#include <svl/srchitem.hxx> +#include <editeng/editobj.hxx> #include "fubullet.hxx" #include "optsitem.hxx" diff --git a/sd/source/ui/view/outlview.cxx b/sd/source/ui/view/outlview.cxx index 51a535a174c1..15b2f0f15d0f 100644 --- a/sd/source/ui/view/outlview.cxx +++ b/sd/source/ui/view/outlview.cxx @@ -30,14 +30,14 @@ #include "OutlineView.hxx" #include <memory> -#include <svx/forbiddencharacterstable.hxx> +#include <editeng/forbiddencharacterstable.hxx> #include <sfx2/progress.hxx> #include <vcl/wrkwin.hxx> #include <svx/svxids.hrc> #include "eetext.hxx" -#include <svx/eeitem.hxx> -#include <svx/editstat.hxx> -#include <svx/lrspitem.hxx> +#include <editeng/eeitem.hxx> +#include <editeng/editstat.hxx> +#include <editeng/lrspitem.hxx> #include <svx/svdotext.hxx> #include <sfx2/printer.hxx> #include <sfx2/imagemgr.hxx> @@ -49,21 +49,21 @@ #include <svx/svdundo.hxx> #include <svl/brdcst.hxx> #include <vcl/msgbox.hxx> -#include <svx/adjitem.hxx> -#include <svx/tstpitem.hxx> -#include <svx/lspcitem.hxx> -#include <svx/numitem.hxx> -#include <svx/outlobj.hxx> -#include <svx/numitem.hxx> -#include <svx/editeng.hxx> +#include <editeng/adjitem.hxx> +#include <editeng/tstpitem.hxx> +#include <editeng/lspcitem.hxx> +#include <editeng/numitem.hxx> +#include <editeng/outlobj.hxx> +#include <editeng/numitem.hxx> +#include <editeng/editeng.hxx> // #97766# -#include <svx/editobj.hxx> -#include <svx/editund2.hxx> +#include <editeng/editobj.hxx> +#include <editeng/editund2.hxx> -#include <svx/editview.hxx> -#include <svx/svxfont.hxx> -#include <svx/fhgtitem.hxx> +#include <editeng/editview.hxx> +#include <editeng/svxfont.hxx> +#include <editeng/fhgtitem.hxx> #include "DrawDocShell.hxx" #include "drawdoc.hxx" diff --git a/sd/source/ui/view/sdview.cxx b/sd/source/ui/view/sdview.cxx index 8118955f4248..94bf70287ccd 100644 --- a/sd/source/ui/view/sdview.cxx +++ b/sd/source/ui/view/sdview.cxx @@ -31,11 +31,11 @@ #include <com/sun/star/linguistic2/XSpellChecker1.hpp> #include "View.hxx" -#include <svx/unolingu.hxx> +#include <editeng/unolingu.hxx> #include <sfx2/request.hxx> #include <svx/obj3d.hxx> #include <svx/fmview.hxx> -#include <svx/outliner.hxx> +#include <editeng/outliner.hxx> #ifndef _SVX_SVXIDS_HRC #include <svx/svxids.hrc> #endif @@ -51,7 +51,7 @@ #include <svx/sdr/contact/displayinfo.hxx> #include <svx/svdetc.hxx> -#include <svx/editstat.hxx> +#include <editeng/editstat.hxx> #include <svx/dialogs.hrc> #include <sfx2/viewfrm.hxx> diff --git a/sd/source/ui/view/sdview2.cxx b/sd/source/ui/view/sdview2.cxx index 3c820b1de867..ea4d120b1219 100644 --- a/sd/source/ui/view/sdview2.cxx +++ b/sd/source/ui/view/sdview2.cxx @@ -51,11 +51,11 @@ #include <svx/svdpagv.hxx> #include <svl/urlbmk.hxx> #include <svl/urlbmk.hxx> -#include <svx/outliner.hxx> +#include <editeng/outliner.hxx> #include <svx/xflclit.hxx> #include <svx/dbexch.hrc> #include <sot/formats.hxx> -#include <svx/editeng.hxx> +#include <editeng/editeng.hxx> #include <svx/svditer.hxx> #include <svx/obj3d.hxx> #include <svx/scene3d.hxx> diff --git a/sd/source/ui/view/sdview3.cxx b/sd/source/ui/view/sdview3.cxx index 6617e2e5320e..53c0d3636d82 100644 --- a/sd/source/ui/view/sdview3.cxx +++ b/sd/source/ui/view/sdview3.cxx @@ -34,16 +34,14 @@ #include <com/sun/star/lang/XComponent.hpp> #include <sot/filelist.hxx> #include <unotools/pathoptions.hxx> -#ifndef _EDITDATA_HXX -#include <svx/editdata.hxx> -#endif +#include <editeng/editdata.hxx> #include <svl/urlbmk.hxx> #include <svx/xexch.hxx> #include <svx/xflclit.hxx> #include <svx/xlnclit.hxx> #include <svx/svdpagv.hxx> -#include <svx/eeitem.hxx> -#include <svx/colritem.hxx> +#include <editeng/eeitem.hxx> +#include <editeng/colritem.hxx> #include <sfx2/docfile.hxx> #include <svx/svditer.hxx> #include <svx/svdogrp.hxx> @@ -54,21 +52,17 @@ #include <sfx2/app.hxx> #include <svl/itempool.hxx> #include <sot/clsids.hxx> -#ifndef _FM_FMMODEL_HXX #include <svx/fmmodel.hxx> -#endif #include <sot/formats.hxx> -#include <svx/outliner.hxx> -#ifndef _EDITENG_HXX //autogen -#include <svx/editeng.hxx> -#endif +#include <editeng/outliner.hxx> +#include <editeng/editeng.hxx> #include <svx/obj3d.hxx> #include <svx/e3dundo.hxx> #include <svx/dbexch.hrc> #include <svx/unomodel.hxx> #include <unotools/streamwrap.hxx> #include <vcl/metaact.hxx> - +#include <svx/svxids.hrc> #include <toolkit/helper/vclunohelper.hxx> #include "DrawDocShell.hxx" diff --git a/sd/source/ui/view/sdview4.cxx b/sd/source/ui/view/sdview4.cxx index 1fa4905d1df5..44e5127bfb25 100644 --- a/sd/source/ui/view/sdview4.cxx +++ b/sd/source/ui/view/sdview4.cxx @@ -43,15 +43,12 @@ #include <svx/svdograf.hxx> #include <svx/svdomedia.hxx> #include <svx/svdoole2.hxx> -#ifndef _IMPGRF_HXX -#include <svx/impgrf.hxx> -#endif #include <sot/storage.hxx> #include <sfx2/app.hxx> #include <avmedia/mediawindow.hxx> #include <svtools/ehdl.hxx> #include <svtools/sfxecode.hxx> - +#include <svtools/filter.hxx> #include "app.hrc" #include "Window.hxx" #include "DrawDocShell.hxx" @@ -364,7 +361,7 @@ IMPL_LINK( View, DropInsertFileHdl, Timer*, EMPTYARG ) aURL = INetURLObject( aURLStr ); } - GraphicFilter* pGraphicFilter = GetGrfFilter(); + GraphicFilter* pGraphicFilter = GraphicFilter::GetGraphicFilter(); Graphic aGraphic; aCurrentDropFile = aURL.GetMainURL( INetURLObject::NO_DECODE ); diff --git a/sd/source/ui/view/sdwindow.cxx b/sd/source/ui/view/sdwindow.cxx index ca0c60b78dcb..7cae5d452a1b 100644 --- a/sd/source/ui/view/sdwindow.cxx +++ b/sd/source/ui/view/sdwindow.cxx @@ -33,10 +33,11 @@ #include <sfx2/request.hxx> #include <sfx2/viewfrm.hxx> +#include <svx/svxids.hrc> -#include <svx/outliner.hxx> +#include <editeng/outliner.hxx> -#include <svx/editview.hxx> +#include <editeng/editview.hxx> #include "app.hrc" #include "helpids.h" @@ -46,12 +47,8 @@ #include "FrameView.hxx" #include "OutlineViewShell.hxx" #include "drawdoc.hxx" -#ifndef SD_ACCESSIBILITY_ACCESSIBLE_DRAW_DOCUMENT_VIEW_HXX #include "AccessibleDrawDocumentView.hxx" -#endif -#ifndef SD_WINDOW_UPDATER_HXX #include "WindowUpdater.hxx" -#endif namespace sd { diff --git a/sd/source/ui/view/viewshe2.cxx b/sd/source/ui/view/viewshe2.cxx index fd7994bd305a..5a3426a42533 100644 --- a/sd/source/ui/view/viewshe2.cxx +++ b/sd/source/ui/view/viewshe2.cxx @@ -49,7 +49,7 @@ #include <sfx2/dispatch.hxx> #include <sfx2/app.hxx> #include <svx/ruler.hxx> -#include <svx/outliner.hxx> +#include <editeng/outliner.hxx> #include <svtools/ehdl.hxx> #include <svx/svdoole2.hxx> #include <svtools/sfxecode.hxx> diff --git a/sd/source/ui/view/viewshe3.cxx b/sd/source/ui/view/viewshe3.cxx index a78141cd820d..4ec163d813ca 100644 --- a/sd/source/ui/view/viewshe3.cxx +++ b/sd/source/ui/view/viewshe3.cxx @@ -55,8 +55,8 @@ #include <sfx2/bindings.hxx> #include <svx/svdpagv.hxx> #include <svx/svdetc.hxx> -#include <svx/outliner.hxx> -#include <svx/editstat.hxx> +#include <editeng/outliner.hxx> +#include <editeng/editstat.hxx> #include <tools/multisel.hxx> #include <svl/intitem.hxx> #include <svl/style.hxx> diff --git a/sd/util/makefile.mk b/sd/util/makefile.mk index 0186f13bf225..9b04aa7438ae 100644 --- a/sd/util/makefile.mk +++ b/sd/util/makefile.mk @@ -63,6 +63,7 @@ SHL1IMPLIB= sdi # dynamic libraries SHL1STDLIBS+= \ + $(EDITENGLIB) \ $(SVXCORELIB) \ $(SVXLIB) \ $(SFXLIB) \ @@ -70,7 +71,6 @@ SHL1STDLIBS+= \ $(CPPCANVASLIB) \ $(BASEGFXLIB) \ $(DRAWINGLAYERLIB) \ - $(GOODIESLIB) \ $(BASEGFXLIB) \ $(SVTOOLLIB) \ $(TKLIB) \ @@ -195,6 +195,7 @@ LIB4FILES= \ SHL4STDLIBS= \ $(ISDLIB) \ + $(EDITENGLIB) \ $(SVXCORELIB) \ $(SVXLIB) \ $(SFXLIB) \ @@ -246,12 +247,12 @@ SHL5LIBS = $(SLB)$/ppt.lib $(SLB)$/eppt.lib DEF5NAME=$(SHL5TARGET) SHL5STDLIBS = $(ISDLIB) \ + $(EDITENGLIB) \ $(SVXCORELIB) \ $(MSFILTERLIB) \ $(SFX2LIB) \ $(SVTOOLLIB) \ $(SOTLIB) \ - $(GOODIESLIB) \ $(VCLLIB) \ $(SVLLIB) \ $(SOTLIB) \ diff --git a/slideshow/prj/build.lst b/slideshow/prj/build.lst index ec0cf8c739de..14de0c1793e2 100644 --- a/slideshow/prj/build.lst +++ b/slideshow/prj/build.lst @@ -1,4 +1,4 @@ -pe slideshow : tools sal cppu vcl comphelper cppuhelper offuh cppcanvas basegfx goodies unotools toolkit animations avmedia NULL +pe slideshow : tools sal cppu vcl comphelper cppuhelper offuh cppcanvas basegfx svtools unotools toolkit animations avmedia NULL pe slideshow usr1 - all pe_mkout NULL pe slideshow\inc nmake - all pe_inc NULL pe slideshow\source\engine nmake - all pe_engine pe_inc NULL diff --git a/slideshow/source/engine/shapes/shapeimporter.cxx b/slideshow/source/engine/shapes/shapeimporter.cxx index ed5ce0aec150..f793dfed7e7e 100644 --- a/slideshow/source/engine/shapes/shapeimporter.cxx +++ b/slideshow/source/engine/shapes/shapeimporter.cxx @@ -33,7 +33,7 @@ #include <vcl/cvtgrf.hxx> #include <tools/urlobj.hxx> #include <tools/stream.hxx> -#include <goodies/grfmgr.hxx> +#include <svtools/grfmgr.hxx> #include <unotools/ucbstreamhelper.hxx> #include <unotools/streamwrap.hxx> #include <basegfx/point/b2dpoint.hxx> diff --git a/slideshow/util/makefile.mk b/slideshow/util/makefile.mk index 1f60dec840d5..cdd4508ff289 100644 --- a/slideshow/util/makefile.mk +++ b/slideshow/util/makefile.mk @@ -63,7 +63,7 @@ SHL1STDLIBS= $(TOOLSLIB) \ $(CANVASTOOLSLIB) \ $(CPPCANVASLIB) \ $(UNOTOOLSLIB) \ - $(GOODIESLIB) \ + $(SVTOOLLIB) \ $(AVMEDIALIB) SHL1IMPLIB=i$(TARGET) |