diff options
Diffstat (limited to 'sd/source/ui/func/fudraw.cxx')
| -rw-r--r-- | sd/source/ui/func/fudraw.cxx | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/sd/source/ui/func/fudraw.cxx b/sd/source/ui/func/fudraw.cxx index 87fd5f415e12..1655822dee2b 100644 --- a/sd/source/ui/func/fudraw.cxx +++ b/sd/source/ui/func/fudraw.cxx @@ -557,7 +557,7 @@ void FuDraw::ForcePointer(const MouseEvent* pMEvt) // wouldn't be possible per default. const SdrMarkList& rMarkList = mpView->GetMarkedObjectList(); SdrObject* pObject = rMarkList.GetMark(0)->GetMarkedSdrObj(); - if ((pObject->ISA(E3dObject)) && (rMarkList.GetMarkCount() == 1)) + if ((dynamic_cast<const E3dObject* >(pObject) != nullptr) && (rMarkList.GetMarkCount() == 1)) { mpWindow->SetPointer(Pointer(PointerStyle::Rotate)); bDefPointer = false; // Otherwise it'll be calles Joes routine and the mousepointer will reconfigurate again @@ -573,7 +573,7 @@ void FuDraw::ForcePointer(const MouseEvent* pMEvt) { pObj = aVEvt.pObj; } - else if (eHit == SDRHIT_TEXTEDITOBJ && this->ISA(FuSelection)) + else if (eHit == SDRHIT_TEXTEDITOBJ && dynamic_cast< const FuSelection *>( this ) != nullptr) { sal_uInt16 nSdrObjKind = aVEvt.pObj->GetObjIdentifier(); @@ -588,12 +588,12 @@ void FuDraw::ForcePointer(const MouseEvent* pMEvt) } } - if (pObj && pMEvt && !pMEvt->IsMod2() && this->ISA(FuSelection)) + if (pObj && pMEvt && !pMEvt->IsMod2() && dynamic_cast< const FuSelection *>( this ) != nullptr) { // test for animation or ImageMap bDefPointer = !SetPointer(pObj, aPnt); - if (bDefPointer && (pObj->ISA(SdrObjGroup) || pObj->ISA(E3dPolyScene))) + if (bDefPointer && (dynamic_cast< const SdrObjGroup *>( pObj ) != nullptr || dynamic_cast< const E3dPolyScene* >(pObj) != nullptr)) { // take a glance into the group if (mpView->PickObj(aPnt, mpView->getHitTolLog(), pObj, pPV, SdrSearchOptions::ALSOONMASTER | SdrSearchOptions::DEEP)) @@ -617,7 +617,7 @@ bool FuDraw::SetPointer(SdrObject* pObj, const Point& rPos) { bool bSet = false; - bool bAnimationInfo = !mpDocSh->ISA(GraphicDocShell) && + bool bAnimationInfo = dynamic_cast< const GraphicDocShell *>( mpDocSh ) == nullptr && mpDoc->GetAnimationInfo(pObj); bool bImageMapInfo = false; @@ -657,7 +657,7 @@ bool FuDraw::SetPointer(SdrObject* pObj, const Point& rPos) ******************************************************/ SdAnimationInfo* pInfo = mpDoc->GetAnimationInfo(pObj); - if ((mpView->ISA(DrawView) && + if(( dynamic_cast< const DrawView *>( mpView ) != nullptr && (pInfo->meClickAction == presentation::ClickAction_BOOKMARK || pInfo->meClickAction == presentation::ClickAction_DOCUMENT || pInfo->meClickAction == presentation::ClickAction_PREVPAGE || @@ -669,7 +669,7 @@ bool FuDraw::SetPointer(SdrObject* pObj, const Point& rPos) pInfo->meClickAction == presentation::ClickAction_MACRO || pInfo->meClickAction == presentation::ClickAction_SOUND)) || - (mpView->ISA(DrawView) && + ( dynamic_cast< const DrawView *>( mpView ) != nullptr && SlideShow::IsRunning( mpViewShell->GetViewShellBase() ) && (pInfo->meClickAction == presentation::ClickAction_VANISH || pInfo->meClickAction == presentation::ClickAction_INVISIBLE || @@ -735,7 +735,7 @@ void FuDraw::DoubleClick(const MouseEvent& rMEvt) GetDispatcher()->Execute( SID_INSERT_GRAPHIC, SfxCallMode::ASYNCHRON | SfxCallMode::RECORD ); } - else if ( ( pObj->ISA(SdrTextObj) || pObj->ISA(SdrObjGroup) ) && + else if ( ( dynamic_cast< const SdrTextObj *>( pObj ) != nullptr || dynamic_cast< const SdrObjGroup *>( pObj ) != nullptr ) && !SD_MOD()->GetWaterCan() && mpViewShell->GetFrameView()->IsDoubleClickTextEdit() && !mpDocSh->IsReadOnly()) @@ -777,7 +777,7 @@ bool FuDraw::RequestHelp(const HelpEvent& rHEvt) bReturn = SetHelpText(pObj, aPosPixel, aVEvt); - if (!bReturn && (pObj->ISA(SdrObjGroup) || pObj->ISA(E3dPolyScene))) + if (!bReturn && (dynamic_cast< const SdrObjGroup *>( pObj ) != nullptr || dynamic_cast< const E3dPolyScene* >(pObj) != nullptr)) { // take a glance into the group SdrPageView* pPV = NULL; @@ -821,7 +821,7 @@ bool FuDraw::SetHelpText(SdrObject* pObj, const Point& rPosPixel, const SdrViewE } } } - else if (!mpDocSh->ISA(GraphicDocShell) && mpDoc->GetAnimationInfo(pObj)) + else if (dynamic_cast< GraphicDocShell *>( mpDocSh ) == nullptr && mpDoc->GetAnimationInfo(pObj)) { SdAnimationInfo* pInfo = mpDoc->GetAnimationInfo(pObj); |