summaryrefslogtreecommitdiff
path: root/svx
diff options
context:
space:
mode:
authorMatteo Casalin <matteo.casalin@yahoo.com>2017-12-27 12:52:27 +0100
committerMatteo Casalin <matteo.casalin@yahoo.com>2017-12-27 16:34:14 +0100
commitb30499e288b923483c3d00edce6af72cb5eef5b9 (patch)
tree4250bfb5f40216c9849479ac6391a265adc16525 /svx
parent541f369f30527687af010db5bfa75008a7013dd7 (diff)
mnHitTolLog is already sal_uInt16
Change-Id: I4a0e55818ad8e2f61845484a71b6283e0a7c326a
Diffstat (limited to 'svx')
-rw-r--r--svx/source/svdraw/svdmrkv.cxx11
1 files changed, 5 insertions, 6 deletions
diff --git a/svx/source/svdraw/svdmrkv.cxx b/svx/source/svdraw/svdmrkv.cxx
index 14443e767d10..f0043d4aa824 100644
--- a/svx/source/svdraw/svdmrkv.cxx
+++ b/svx/source/svdraw/svdmrkv.cxx
@@ -1913,7 +1913,6 @@ bool SdrMarkView::PickMarkedObj(const Point& rPnt, SdrObject*& rpObj, SdrPageVie
bool bCheckNearestOn3rdPass(nOptions & SdrSearchOptions::PASS3NEAREST);
rpObj=nullptr;
rpPV=nullptr;
- sal_uInt16 nTol=(sal_uInt16)mnHitTolLog;
bool bFnd=false;
const size_t nMarkCount=GetMarkedObjectCount();
for (size_t nMarkNum=nMarkCount; nMarkNum>0 && !bFnd;) {
@@ -1921,7 +1920,7 @@ bool SdrMarkView::PickMarkedObj(const Point& rPnt, SdrObject*& rpObj, SdrPageVie
SdrMark* pM=GetSdrMarkByIndex(nMarkNum);
SdrPageView* pPV=pM->GetPageView();
SdrObject* pObj=pM->GetMarkedSdrObj();
- bFnd = nullptr != CheckSingleSdrObjectHit(rPnt,nTol,pObj,pPV,SdrSearchOptions::TESTMARKABLE,nullptr);
+ bFnd = nullptr != CheckSingleSdrObjectHit(rPnt,mnHitTolLog,pObj,pPV,SdrSearchOptions::TESTMARKABLE,nullptr);
if (bFnd) {
rpObj=pObj;
rpPV=pPV;
@@ -1937,10 +1936,10 @@ bool SdrMarkView::PickMarkedObj(const Point& rPnt, SdrObject*& rpObj, SdrPageVie
SdrPageView* pPV=pM->GetPageView();
SdrObject* pObj=pM->GetMarkedSdrObj();
tools::Rectangle aRect(pObj->GetCurrentBoundRect());
- aRect.Left ()-=nTol;
- aRect.Top ()-=nTol;
- aRect.Right ()+=nTol;
- aRect.Bottom()+=nTol;
+ aRect.Left ()-=mnHitTolLog;
+ aRect.Top ()-=mnHitTolLog;
+ aRect.Right ()+=mnHitTolLog;
+ aRect.Bottom()+=mnHitTolLog;
if (aRect.IsInside(rPnt)) {
bFnd=true;
rpObj=pObj;