diff --git a/sd/inc/pch/precompiled_sd.hxx b/sd/inc/pch/precompiled_sd.hxx index 2085c31b4acf..d17089a9e818 100644 --- a/sd/inc/pch/precompiled_sd.hxx +++ b/sd/inc/pch/precompiled_sd.hxx @@ -635,7 +635,7 @@ #include "svx/lathe3d.hxx" #include "svx/lboxctrl.hxx" #include "svx/linectrl.hxx" -#include "svx/linkmgr.hxx" +#include "sfx2/linkmgr.hxx" #include "editeng/lrspitem.hxx" #include "editeng/lspcitem.hxx" #include "svx/modctrl.hxx" @@ -646,7 +646,7 @@ #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 "editeng/outliner.hxx" #include "editeng/outlobj.hxx" diff --git a/sd/source/core/drawdoc.cxx b/sd/source/core/drawdoc.cxx index be016c06b864..91a41a6db1e3 100644 --- a/sd/source/core/drawdoc.cxx +++ b/sd/source/core/drawdoc.cxx @@ -47,7 +47,7 @@ #include #include #include -#include +#include #include #include "Outliner.hxx" #include "app.hxx" @@ -284,7 +284,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 9642a5609b8e..b4d91b5b2acb 100644 --- a/sd/source/core/drawdoc2.cxx +++ b/sd/source/core/drawdoc2.cxx @@ -53,7 +53,7 @@ #include #include -#include +#include #include #include #include // SVX_RESSTR @@ -923,7 +923,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 9c44f9edc485..9ac6a9527b58 100644 --- a/sd/source/core/drawdoc3.cxx +++ b/sd/source/core/drawdoc3.cxx @@ -51,7 +51,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/sd/source/core/pglink.cxx b/sd/source/core/pglink.cxx index 8ca3eb69f227..80129a491fe6 100644 --- a/sd/source/core/pglink.cxx +++ b/sd/source/core/pglink.cxx @@ -32,7 +32,7 @@ #include "precompiled_sd.hxx" #ifndef _SVXLINK_HXX -#include +#include #endif #include "pglink.hxx" @@ -77,7 +77,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/sdpage2.cxx b/sd/source/core/sdpage2.cxx index 3dfa84d8121e..8dcffe6dd473 100644 --- a/sd/source/core/sdpage2.cxx +++ b/sd/source/core/sdpage2.cxx @@ -34,7 +34,7 @@ #include #include #ifndef _SVXLINK_HXX -#include +#include #endif #include #include @@ -326,13 +326,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() && @@ -359,13 +359,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/ui/func/fuinsert.cxx b/sd/source/ui/func/fuinsert.cxx index b98acd7c24e8..71170ca54822 100644 --- a/sd/source/ui/func/fuinsert.cxx +++ b/sd/source/ui/func/fuinsert.cxx @@ -53,7 +53,7 @@ #include #include #include -#include +#include #include #include #ifndef _UNOTOOLS_UCBSTREAMHELPER_HXX @@ -77,7 +77,7 @@ #ifndef _MSGBOX_HXX //autogen #include #endif -#include +#include #include diff --git a/sd/source/ui/func/fulink.cxx b/sd/source/ui/func/fulink.cxx index 4c0bbeca5a34..78736be1de24 100644 --- a/sd/source/ui/func/fulink.cxx +++ b/sd/source/ui/func/fulink.cxx @@ -34,7 +34,7 @@ #include "fulink.hxx" -#include +#include #include #include @@ -79,7 +79,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/fupage.cxx b/sd/source/ui/func/fupage.cxx index 10c8d69552dd..51cd3cd39bb1 100644 --- a/sd/source/ui/func/fupage.cxx +++ b/sd/source/ui/func/fupage.cxx @@ -71,7 +71,7 @@ #include #include #include -#include +#include #include "strings.hrc" #include "sdpage.hxx"