diff options
Diffstat (limited to 'sd/source/ui/func/fusel.cxx')
| -rw-r--r-- | sd/source/ui/func/fusel.cxx | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/sd/source/ui/func/fusel.cxx b/sd/source/ui/func/fusel.cxx index 9f534ede7006..3517892700ed 100644 --- a/sd/source/ui/func/fusel.cxx +++ b/sd/source/ui/func/fusel.cxx @@ -91,6 +91,8 @@ #include <svx/svdundo.hxx> #include <avmedia/mediawindow.hxx> +#include <svx/sdrhittesthelper.hxx> + using namespace ::com::sun::star; namespace sd { @@ -264,7 +266,7 @@ BOOL FuSelection::MouseButtonDown(const MouseEvent& rMEvt) } else { - if (!rMEvt.IsMod2() && mpView->PickObj(aMDPos, pObj, pPV, SDRSEARCH_PICKMACRO)) + if (!rMEvt.IsMod2() && mpView->PickObj(aMDPos, mpView->getHitTolLog(), pObj, pPV, SDRSEARCH_PICKMACRO)) { mpView->BegMacroObj(aMDPos, nHitLog, pObj, pPV, mpWindow); bReturn = TRUE; @@ -320,7 +322,7 @@ BOOL FuSelection::MouseButtonDown(const MouseEvent& rMEvt) && mpViewShell->ISA(DrawViewShell) ) { - if(mpView->PickObj(aMDPos, pObj, pPV, SDRSEARCH_ALSOONMASTER)) + if(mpView->PickObj(aMDPos, mpView->getHitTolLog(), pObj, pPV, SDRSEARCH_ALSOONMASTER)) { // Animate object when not just selecting. if ( ! bSelectionOnly) @@ -331,7 +333,7 @@ BOOL FuSelection::MouseButtonDown(const MouseEvent& rMEvt) if(rMEvt.GetClicks() == 1) { // In die Gruppe hineinschauen - if (mpView->PickObj(aMDPos, pObj, pPV, SDRSEARCH_ALSOONMASTER | SDRSEARCH_DEEP)) + if (mpView->PickObj(aMDPos, mpView->getHitTolLog(), pObj, pPV, SDRSEARCH_ALSOONMASTER | SDRSEARCH_DEEP)) bReturn = AnimateObj(pObj, aMDPos); } else if( !bReadOnly && rMEvt.GetClicks() == 2) @@ -1212,10 +1214,10 @@ BOOL FuSelection::AnimateObj(SdrObject* pObj, const Point& rPos) if ( !bClosed || !bFilled || - (pObj->IsHit( aHitPosR, nHitLog, pVisiLayer ) && - pObj->IsHit( aHitPosL, nHitLog, pVisiLayer ) && - pObj->IsHit( aHitPosT, nHitLog, pVisiLayer ) && - pObj->IsHit( aHitPosB, nHitLog, pVisiLayer ) ) ) + (SdrObjectPrimitiveHit(*pObj, aHitPosR, nHitLog, *mpView->GetSdrPageView(), pVisiLayer, false) && + SdrObjectPrimitiveHit(*pObj, aHitPosL, nHitLog, *mpView->GetSdrPageView(), pVisiLayer, false) && + SdrObjectPrimitiveHit(*pObj, aHitPosT, nHitLog, *mpView->GetSdrPageView(), pVisiLayer, false) && + SdrObjectPrimitiveHit(*pObj, aHitPosB, nHitLog, *mpView->GetSdrPageView(), pVisiLayer, false) ) ) { if ( mpDoc->GetIMapInfo( pObj ) ) { |