diff options
Diffstat (limited to 'sd/source/ui/view/sdview3.cxx')
| -rw-r--r-- | sd/source/ui/view/sdview3.cxx | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/sd/source/ui/view/sdview3.cxx b/sd/source/ui/view/sdview3.cxx index 04cebfbdd577..184949f4e683 100644 --- a/sd/source/ui/view/sdview3.cxx +++ b/sd/source/ui/view/sdview3.cxx @@ -94,6 +94,7 @@ #include <comphelper/processfactory.hxx> #include <tools/stream.hxx> #include <vcl/cvtgrf.hxx> +#include <svx/sdrhittesthelper.hxx> // -------------- // - Namespaces - @@ -327,7 +328,7 @@ BOOL View::InsertData( const TransferableDataHelper& rDataHelper, if( bDrag ) { SdrPageView* pPV = NULL; - PickObj( rPos, pPickObj, pPV ); + PickObj( rPos, getHitTolLog(), pPickObj, pPV ); } if( nPage != SDRPAGE_NOTFOUND ) @@ -721,7 +722,7 @@ BOOL View::InsertData( const TransferableDataHelper& rDataHelper, SdrObject* pObj = pModel->GetSdPage( 0, PK_STANDARD )->GetObj( 0 ); SdrObject* pPickObj2 = NULL; SdrPageView* pPV = NULL; - PickObj( rPos, pPickObj2, pPV ); + PickObj( rPos, getHitTolLog(), pPickObj2, pPV ); if( ( mnAction & DND_ACTION_MOVE ) && pPickObj2 && pObj ) { @@ -1311,11 +1312,11 @@ BOOL View::InsertData( const TransferableDataHelper& rDataHelper, aHitPosT.Y() += n2HitLog; aHitPosB.Y() -= n2HitLog; - if( bClosed && - pPickObj->IsHit( aHitPosR, nHitLog, pVisiLayer ) && - pPickObj->IsHit( aHitPosL, nHitLog, pVisiLayer ) && - pPickObj->IsHit( aHitPosT, nHitLog, pVisiLayer ) && - pPickObj->IsHit( aHitPosB, nHitLog, pVisiLayer ) ) + if( bClosed && + SdrObjectPrimitiveHit(*pPickObj, aHitPosR, nHitLog, *GetSdrPageView(), pVisiLayer, false) && + SdrObjectPrimitiveHit(*pPickObj, aHitPosL, nHitLog, *GetSdrPageView(), pVisiLayer, false) && + SdrObjectPrimitiveHit(*pPickObj, aHitPosT, nHitLog, *GetSdrPageView(), pVisiLayer, false) && + SdrObjectPrimitiveHit(*pPickObj, aHitPosB, nHitLog, *GetSdrPageView(), pVisiLayer, false) ) { // area fill if(eFill == XFILL_SOLID ) |