From cff185e438f2db564d0309f1c790cd79be908351 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Fri, 7 Oct 2016 12:03:56 +0200 Subject: loplugin:staticmethods: sd Change-Id: I150a2f4011981be28a0a8fc09c29d3f152bd8b78 --- sd/source/ui/annotations/annotationmanager.cxx | 2 +- sd/source/ui/annotations/annotationwindow.cxx | 2 +- sd/source/ui/app/sdxfer.cxx | 4 ++-- sd/source/ui/dlg/animobjs.cxx | 2 +- sd/source/ui/func/fudraw.cxx | 16 ++++++++-------- sd/source/ui/func/fuoaprms.cxx | 10 +++++----- sd/source/ui/func/fusel.cxx | 12 ++++++------ sd/source/ui/func/unoaprms.cxx | 2 +- sd/source/ui/unoidl/unoobj.cxx | 4 ++-- sd/source/ui/view/drviewsc.cxx | 2 +- sd/source/ui/view/drviewsg.cxx | 2 +- sd/source/ui/view/sdview2.cxx | 2 +- 12 files changed, 30 insertions(+), 30 deletions(-) (limited to 'sd/source/ui') diff --git a/sd/source/ui/annotations/annotationmanager.cxx b/sd/source/ui/annotations/annotationmanager.cxx index 748402b40fe9..b76825ad78dc 100644 --- a/sd/source/ui/annotations/annotationmanager.cxx +++ b/sd/source/ui/annotations/annotationmanager.cxx @@ -430,7 +430,7 @@ void AnnotationManagerImpl::ExecuteReplyToAnnotation( SfxRequest& rReq ) { std::unique_ptr< ::Outliner > pOutliner( new ::Outliner(GetAnnotationPool(),OutlinerMode::TextObject) ); - mpDoc->SetCalcFieldValueHdl( pOutliner.get() ); + SdDrawDocument::SetCalcFieldValueHdl( pOutliner.get() ); pOutliner->SetUpdateMode( true ); OUString aStr(SD_RESSTR(STR_ANNOTATION_REPLY)); diff --git a/sd/source/ui/annotations/annotationwindow.cxx b/sd/source/ui/annotations/annotationwindow.cxx index 21cf13b5499c..5666ff46af84 100644 --- a/sd/source/ui/annotations/annotationwindow.cxx +++ b/sd/source/ui/annotations/annotationwindow.cxx @@ -317,7 +317,7 @@ void AnnotationWindow::InitControls() mpMeta->SetSettings(aSettings); mpOutliner = new ::Outliner(GetAnnotationPool(),OutlinerMode::TextObject); - Doc()->SetCalcFieldValueHdl( mpOutliner ); + SdDrawDocument::SetCalcFieldValueHdl( mpOutliner ); mpOutliner->SetUpdateMode( true ); Rescale(); diff --git a/sd/source/ui/app/sdxfer.cxx b/sd/source/ui/app/sdxfer.cxx index 27b8aab55a38..c699a563fcd7 100644 --- a/sd/source/ui/app/sdxfer.cxx +++ b/sd/source/ui/app/sdxfer.cxx @@ -181,7 +181,7 @@ void SdTransferable::CreateObjectReplacement( SdrObject* pObj ) catch( uno::Exception& ) {} } - else if( dynamic_cast< const SdrGrafObj *>( pObj ) != nullptr && (mpSourceDoc && !mpSourceDoc->GetAnimationInfo( pObj )) ) + else if( dynamic_cast< const SdrGrafObj *>( pObj ) != nullptr && (mpSourceDoc && !SdDrawDocument::GetAnimationInfo( pObj )) ) { mpGraphic = new Graphic( static_cast< SdrGrafObj* >( pObj )->GetTransformedGraphic() ); } @@ -246,7 +246,7 @@ void SdTransferable::CreateObjectReplacement( SdrObject* pObj ) } } - SdIMapInfo* pInfo = static_cast< SdDrawDocument* >( pObj->GetModel() )->GetIMapInfo( pObj ); + SdIMapInfo* pInfo = SdDrawDocument::GetIMapInfo( pObj ); if( pInfo ) mpImageMap = new ImageMap( pInfo->GetImageMap() ); diff --git a/sd/source/ui/dlg/animobjs.cxx b/sd/source/ui/dlg/animobjs.cxx index 1bf21f267c91..84ad06b0d307 100644 --- a/sd/source/ui/dlg/animobjs.cxx +++ b/sd/source/ui/dlg/animobjs.cxx @@ -720,7 +720,7 @@ void AnimationWindow::AddObj (::sd::View& rView ) { SdrMark* pMark = rMarkList.GetMark(0); SdrObject* pObject = pMark->GetMarkedSdrObj(); - SdAnimationInfo* pAnimInfo = rView.GetDoc().GetAnimationInfo( pObject ); + SdAnimationInfo* pAnimInfo = SdDrawDocument::GetAnimationInfo( pObject ); sal_uInt32 nInv = pObject->GetObjInventor(); sal_uInt16 nId = pObject->GetObjIdentifier(); 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(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(pObject->GetModel()); if( pDoc ) { - SdAnimationInfo* pInfo = pDoc->GetAnimationInfo( pObject ); + SdAnimationInfo* pInfo = SdDrawDocument::GetAnimationInfo( pObject ); pInfo->mbActive = bOldActive; pInfo->meEffect = eOldEffect; diff --git a/sd/source/ui/unoidl/unoobj.cxx b/sd/source/ui/unoidl/unoobj.cxx index d49a4a4560b4..b360cdd9c806 100644 --- a/sd/source/ui/unoidl/unoobj.cxx +++ b/sd/source/ui/unoidl/unoobj.cxx @@ -646,7 +646,7 @@ void SAL_CALL SdXShape::setPropertyValue( const OUString& aPropertyName, const c if( !xImageMap.is() || !SvUnoImageMap_fillImageMap( xImageMap, aImageMap ) ) throw lang::IllegalArgumentException(); - SdIMapInfo* pIMapInfo = pDoc->GetIMapInfo(pObj); + SdIMapInfo* pIMapInfo = SdDrawDocument::GetIMapInfo(pObj); if( pIMapInfo ) { // replace existing image map @@ -805,7 +805,7 @@ css::uno::Any SAL_CALL SdXShape::getPropertyValue( const OUString& PropertyName if( pDoc ) { - SdIMapInfo* pIMapInfo = pDoc->GetIMapInfo(mpShape->GetSdrObject()); + SdIMapInfo* pIMapInfo = SdDrawDocument::GetIMapInfo(mpShape->GetSdrObject()); if( pIMapInfo ) { const ImageMap& rIMap = pIMapInfo->GetImageMap(); diff --git a/sd/source/ui/view/drviewsc.cxx b/sd/source/ui/view/drviewsc.cxx index 3bbb3a7ef9ce..9f245cc9aa52 100644 --- a/sd/source/ui/view/drviewsc.cxx +++ b/sd/source/ui/view/drviewsc.cxx @@ -59,7 +59,7 @@ void DrawViewShell::UpdateIMapDlg( SdrObject* pObj ) Graphic aGraphic; ImageMap* pIMap = nullptr; TargetList* pTargetList = nullptr; - SdIMapInfo* pIMapInfo = GetDoc()->GetIMapInfo( pObj ); + SdIMapInfo* pIMapInfo = SdDrawDocument::GetIMapInfo( pObj ); // get graphic from shape SdrGrafObj* pGrafObj = dynamic_cast< SdrGrafObj* >( pObj ); diff --git a/sd/source/ui/view/drviewsg.cxx b/sd/source/ui/view/drviewsg.cxx index 81fe3a7aba62..4123cc44ccae 100644 --- a/sd/source/ui/view/drviewsg.cxx +++ b/sd/source/ui/view/drviewsg.cxx @@ -59,7 +59,7 @@ void DrawViewShell::ExecIMap( SfxRequest& rReq ) if ( pDlg->GetEditingObject() == static_cast(pSdrObj) ) { const ImageMap& rImageMap = pDlg->GetImageMap(); - SdIMapInfo* pIMapInfo = GetDoc()->GetIMapInfo( pSdrObj ); + SdIMapInfo* pIMapInfo = SdDrawDocument::GetIMapInfo( pSdrObj ); if ( !pIMapInfo ) pSdrObj->AppendUserData( new SdIMapInfo( rImageMap ) ); diff --git a/sd/source/ui/view/sdview2.cxx b/sd/source/ui/view/sdview2.cxx index 574e456a12ef..ddae5e886756 100644 --- a/sd/source/ui/view/sdview2.cxx +++ b/sd/source/ui/view/sdview2.cxx @@ -726,7 +726,7 @@ sal_Int8 View::ExecuteDrop( const ExecuteDropEvent& rEvt, { // insert as clip action => jump OUString aBookmark( aINetBookmark.GetURL() ); - SdAnimationInfo* pInfo = mrDoc.GetAnimationInfo( pPickObj ); + SdAnimationInfo* pInfo = SdDrawDocument::GetAnimationInfo( pPickObj ); if( !aBookmark.isEmpty() ) { -- cgit