summaryrefslogtreecommitdiff
path: root/sd/source/ui/func
diff options
context:
space:
mode:
Diffstat (limited to 'sd/source/ui/func')
-rw-r--r--sd/source/ui/func/fudraw.cxx16
-rw-r--r--sd/source/ui/func/fuoaprms.cxx10
-rw-r--r--sd/source/ui/func/fusel.cxx12
-rw-r--r--sd/source/ui/func/unoaprms.cxx2
4 files changed, 20 insertions, 20 deletions
diff --git a/sd/source/ui/func/fudraw.cxx b/sd/source/ui/func/fudraw.cxx
index f161acc49293..f3d7575a0a1d 100644
--- a/sd/source/ui/func/fudraw.cxx
+++ b/sd/source/ui/func/fudraw.cxx
@@ -593,12 +593,12 @@ bool FuDraw::SetPointer(SdrObject* pObj, const Point& rPos)
bool bSet = false;
bool bAnimationInfo = dynamic_cast< const GraphicDocShell *>( mpDocSh ) == nullptr &&
- mpDoc->GetAnimationInfo(pObj);
+ SdDrawDocument::GetAnimationInfo(pObj);
bool bImageMapInfo = false;
if (!bAnimationInfo)
- bImageMapInfo = mpDoc->GetIMapInfo(pObj) != nullptr;
+ bImageMapInfo = SdDrawDocument::GetIMapInfo(pObj) != nullptr;
if (bAnimationInfo || bImageMapInfo)
{
@@ -630,7 +630,7 @@ bool FuDraw::SetPointer(SdrObject* pObj, const Point& rPos)
/******************************************************
* Click-Action
******************************************************/
- SdAnimationInfo* pInfo = mpDoc->GetAnimationInfo(pObj);
+ SdAnimationInfo* pInfo = SdDrawDocument::GetAnimationInfo(pObj);
if(( dynamic_cast< const DrawView *>( mpView ) != nullptr &&
(pInfo->meClickAction == presentation::ClickAction_BOOKMARK ||
@@ -659,7 +659,7 @@ bool FuDraw::SetPointer(SdrObject* pObj, const Point& rPos)
}
}
else if (bImageMapInfo &&
- mpDoc->GetHitIMapObject(pObj, rPos, *mpWindow))
+ SdDrawDocument::GetHitIMapObject(pObj, rPos, *mpWindow))
{
/******************************************************
* ImageMap
@@ -781,9 +781,9 @@ bool FuDraw::SetHelpText(SdrObject* pObj, const Point& rPosPixel, const SdrViewE
Point aPos(mpWindow->PixelToLogic(mpWindow->ScreenToOutputPixel(rPosPixel)));
// URL for IMapObject underneath pointer is help text
- if ( mpDoc->GetIMapInfo(pObj) )
+ if ( SdDrawDocument::GetIMapInfo(pObj) )
{
- IMapObject* pIMapObj = mpDoc->GetHitIMapObject(pObj, aPos, *mpWindow );
+ IMapObject* pIMapObj = SdDrawDocument::GetHitIMapObject(pObj, aPos, *mpWindow );
if ( pIMapObj )
{
@@ -797,9 +797,9 @@ bool FuDraw::SetHelpText(SdrObject* pObj, const Point& rPosPixel, const SdrViewE
}
}
}
- else if (dynamic_cast< GraphicDocShell *>( mpDocSh ) == nullptr && mpDoc->GetAnimationInfo(pObj))
+ else if (dynamic_cast< GraphicDocShell *>( mpDocSh ) == nullptr && SdDrawDocument::GetAnimationInfo(pObj))
{
- SdAnimationInfo* pInfo = mpDoc->GetAnimationInfo(pObj);
+ SdAnimationInfo* pInfo = SdDrawDocument::GetAnimationInfo(pObj);
switch (pInfo->meClickAction)
{
diff --git a/sd/source/ui/func/fuoaprms.cxx b/sd/source/ui/func/fuoaprms.cxx
index e5ef8a46f744..89df12f6e268 100644
--- a/sd/source/ui/func/fuoaprms.cxx
+++ b/sd/source/ui/func/fuoaprms.cxx
@@ -123,7 +123,7 @@ void FuObjectAnimationParameters::DoExecute( SfxRequest& rReq )
// inspect first object
pMark = rMarkList.GetMark(0);
- pInfo = mpDoc->GetAnimationInfo(pMark->GetMarkedSdrObj());
+ pInfo = SdDrawDocument::GetAnimationInfo(pMark->GetMarkedSdrObj());
if( pInfo )
{
bActive = pInfo->mbActive;
@@ -180,7 +180,7 @@ void FuObjectAnimationParameters::DoExecute( SfxRequest& rReq )
{
pMark = rMarkList.GetMark( nObject );
SdrObject* pObject = pMark->GetMarkedSdrObj();
- pInfo = mpDoc->GetAnimationInfo(pObject);
+ pInfo = SdDrawDocument::GetAnimationInfo(pObject);
if( pInfo )
{
if( bActive != pInfo->mbActive )
@@ -291,8 +291,8 @@ void FuObjectAnimationParameters::DoExecute( SfxRequest& rReq )
SdrObject* pObject2 = rMarkList.GetMark(1)->GetMarkedSdrObj();
SdrObjKind eKind1 = (SdrObjKind)pObject1->GetObjIdentifier();
SdrObjKind eKind2 = (SdrObjKind)pObject2->GetObjIdentifier();
- SdAnimationInfo* pInfo1 = mpDoc->GetAnimationInfo(pObject1);
- SdAnimationInfo* pInfo2 = mpDoc->GetAnimationInfo(pObject2);
+ SdAnimationInfo* pInfo1 = SdDrawDocument::GetAnimationInfo(pObject1);
+ SdAnimationInfo* pInfo2 = SdDrawDocument::GetAnimationInfo(pObject2);
pInfo = nullptr;
if (pObject1->GetObjInventor() == SdrInventor &&
@@ -679,7 +679,7 @@ void FuObjectAnimationParameters::DoExecute( SfxRequest& rReq )
{
SdrObject* pObject = rMarkList.GetMark(nObject)->GetMarkedSdrObj();
- pInfo = mpDoc->GetAnimationInfo(pObject);
+ pInfo = SdDrawDocument::GetAnimationInfo(pObject);
bool bCreated = false;
if( !pInfo )
diff --git a/sd/source/ui/func/fusel.cxx b/sd/source/ui/func/fusel.cxx
index 57491f6f994f..e8f3b6e6b65b 100644
--- a/sd/source/ui/func/fusel.cxx
+++ b/sd/source/ui/func/fusel.cxx
@@ -1220,9 +1220,9 @@ bool FuSelection::AnimateObj(SdrObject* pObj, const Point& rPos)
SdrObjectPrimitiveHit(*pObj, aHitPosT, nHitLog, *mpView->GetSdrPageView(), pVisiLayer, false) &&
SdrObjectPrimitiveHit(*pObj, aHitPosB, nHitLog, *mpView->GetSdrPageView(), pVisiLayer, false) ) )
{
- if ( mpDoc->GetIMapInfo( pObj ) )
+ if ( SdDrawDocument::GetIMapInfo( pObj ) )
{
- const IMapObject* pIMapObj = mpDoc->GetHitIMapObject( pObj, rPos, *mpWindow );
+ const IMapObject* pIMapObj = SdDrawDocument::GetHitIMapObject( pObj, rPos, *mpWindow );
if ( pIMapObj && !pIMapObj->GetURL().isEmpty() )
{
@@ -1243,12 +1243,12 @@ bool FuSelection::AnimateObj(SdrObject* pObj, const Point& rPos)
}
else if( dynamic_cast< const GraphicDocShell *>( mpDocSh ) == nullptr &&
dynamic_cast< const DrawView *>( mpView ) != nullptr &&
- mpDoc->GetAnimationInfo(pObj))
+ SdDrawDocument::GetAnimationInfo(pObj))
{
/**********************************************************
* Animation-object hit in the middle -> interaction
**********************************************************/
- SdAnimationInfo* pInfo = mpDoc->GetAnimationInfo(pObj);
+ SdAnimationInfo* pInfo = SdDrawDocument::GetAnimationInfo(pObj);
DrawViewShell* pDrViewSh = static_cast<DrawViewShell*>(mpViewShell);
mpWindow->ReleaseMouse();
@@ -1438,12 +1438,12 @@ bool FuSelection::AnimateObj(SdrObject* pObj, const Point& rPos)
dynamic_cast< const DrawView *>( mpView ) != nullptr &&
dynamic_cast< const GraphicDocShell *>( mpDocSh ) == nullptr &&
SlideShow::IsRunning( mpViewShell->GetViewShellBase() ) &&
- mpDoc->GetAnimationInfo(pObj))
+ SdDrawDocument::GetAnimationInfo(pObj))
{
/**********************************************************
* Effect-Object hit in the middle -> Play effect
**********************************************************/
- SdAnimationInfo* pInfo = mpDoc->GetAnimationInfo(pObj);
+ SdAnimationInfo* pInfo = SdDrawDocument::GetAnimationInfo(pObj);
switch (pInfo->meClickAction)
{
diff --git a/sd/source/ui/func/unoaprms.cxx b/sd/source/ui/func/unoaprms.cxx
index 9ffa9761c3d4..e3f2c8807389 100644
--- a/sd/source/ui/func/unoaprms.cxx
+++ b/sd/source/ui/func/unoaprms.cxx
@@ -30,7 +30,7 @@ void SdAnimationPrmsUndoAction::Undo()
SdDrawDocument* pDoc = static_cast<SdDrawDocument*>(pObject->GetModel());
if( pDoc )
{
- SdAnimationInfo* pInfo = pDoc->GetAnimationInfo( pObject );
+ SdAnimationInfo* pInfo = SdDrawDocument::GetAnimationInfo( pObject );
pInfo->mbActive = bOldActive;
pInfo->meEffect = eOldEffect;