strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

#i107450#: move more code out of svx

Browse source
This commit is contained in:
Mathias Bauer 2010-01-13 22:25:07 +01:00
parent 3c764e3f30
commit beef7ed3c1
9 changed files with 19 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
sd/inc/pch/precompiled_sd.hxx
View file

@ -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"

4
sd/source/core/drawdoc.cxx
View file

@ -47,7 +47,7 @@
#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"
@ -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();

4
sd/source/core/drawdoc2.cxx
View file

@ -53,7 +53,7 @@
#include <svx/svdpool.hxx>
#include <editeng/flditem.hxx>
#include <svx/linkmgr.hxx>
#include <sfx2/linkmgr.hxx>
#include <editeng/editdata.hxx>
#include <svx/dialogs.hrc>
#include <svx/dialmgr.hxx> // SVX_RESSTR
@ -923,7 +923,7 @@ BOOL SdDrawDocument::MovePages(USHORT nTargetPage)
/*************************************************************************
|*
|* Anzahl der Links im LinkManager zurueckgeben
|* Anzahl der Links im sfx2::LinkManager zurueckgeben
|*
\************************************************************************/

2
sd/source/core/drawdoc3.cxx
View file

@ -51,7 +51,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>

4
sd/source/core/pglink.cxx
View file

@ -32,7 +32,7 @@
#include "precompiled_sd.hxx"
#ifndef _SVXLINK_HXX
#include <svx/linkmgr.hxx>
#include <sfx2/linkmgr.hxx>
#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)
{

10
sd/source/core/sdpage2.cxx
View file

@ -34,7 +34,7 @@
#include <vcl/svapp.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>
@ -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)
{

4
sd/source/ui/func/fuinsert.cxx
View file

@ -53,7 +53,7 @@
#include <unotools/pathoptions.hxx>
#include <svx/pfiledlg.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
@ -77,7 +77,7 @@
#ifndef _MSGBOX_HXX //autogen
#include <vcl/msgbox.hxx>
#endif
#include <svx/opengrf.hxx>
#include <sfx2/opengrf.hxx>
#include <sfx2/viewfrm.hxx>

4
sd/source/ui/func/fulink.cxx
View file

@ -34,7 +34,7 @@
#include "fulink.hxx"
#include <svx/linkmgr.hxx>
#include <sfx2/linkmgr.hxx>
#include <sfx2/bindings.hxx>
#include <sfx2/viewfrm.hxx>
@ -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 );

2
sd/source/ui/func/fupage.cxx
View file

@ -71,7 +71,7 @@
#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"