summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatteo Casalin <matteo.casalin@yahoo.com>2017-11-26 17:02:32 +0100
committerMatteo Casalin <matteo.casalin@yahoo.com>2017-12-08 16:17:54 +0100
commitd67eaa235db15853b3b454f2ef45c9a72529a3dc (patch)
treed15f86929da1cb332da1704d29834df00d73b8c7
parent985f95215785a7eecd37e2b8eeb7fd232de850df (diff)
Remove unneeded data member
Change-Id: I9d007f67e5f6024b1eaea10669a915ffd33d7c29
-rw-r--r--include/svx/svdmrkv.hxx1
-rw-r--r--svx/source/svdraw/svddrgv.cxx16
-rw-r--r--svx/source/svdraw/svdmrkv.cxx1
3 files changed, 6 insertions, 12 deletions
diff --git a/include/svx/svdmrkv.hxx b/include/svx/svdmrkv.hxx
index acea4c514145..21b6df1583ab 100644
--- a/include/svx/svdmrkv.hxx
+++ b/include/svx/svdmrkv.hxx
@@ -114,7 +114,6 @@ protected:
tools::Rectangle maMarkedGluePointsRect;
sal_uInt16 mnFrameHandlesLimit;
- sal_uIntPtr mnInsPointNum; // Number of the InsPoint
SdrDragMode meDragMode; // Persistent
SdrViewEditMode meEditMode; // Persistent
diff --git a/svx/source/svdraw/svddrgv.cxx b/svx/source/svdraw/svddrgv.cxx
index 2716bf42ea49..252dfd456b9b 100644
--- a/svx/source/svdraw/svddrgv.cxx
+++ b/svx/source/svdraw/svddrgv.cxx
@@ -642,14 +642,10 @@ bool SdrDragView::ImpBegInsObjPoint(bool bIdxZwang, const Point& rPnt, bool bNew
bool bClosed0 = pMarkedPath->IsClosedObj();
- if(bIdxZwang)
- {
- mnInsPointNum = pMarkedPath->NbcInsPoint(aPt, bNewObj);
- }
- else
- {
- mnInsPointNum = pMarkedPath->NbcInsPointOld(aPt, bNewObj);
- }
+ const sal_uInt32 nInsPointNum { bIdxZwang
+ ? pMarkedPath->NbcInsPoint(aPt, bNewObj)
+ : pMarkedPath->NbcInsPointOld(aPt, bNewObj)
+ };
if(bClosed0 != pMarkedPath->IsClosedObj())
{
@@ -659,13 +655,13 @@ bool SdrDragView::ImpBegInsObjPoint(bool bIdxZwang, const Point& rPnt, bool bNew
pMarkedPath->BroadcastObjectChange();
}
- if(0xffffffff != mnInsPointNum)
+ if (nInsPointNum != SAL_MAX_UINT32)
{
mbInsPolyPoint = true;
UnmarkAllPoints();
AdjustMarkHdl();
- bRet = BegDragObj(rPnt, pOut, maHdlList.GetHdl(mnInsPointNum), 0);
+ bRet = BegDragObj(rPnt, pOut, maHdlList.GetHdl(nInsPointNum), 0);
if (bRet)
{
diff --git a/svx/source/svdraw/svdmrkv.cxx b/svx/source/svdraw/svdmrkv.cxx
index 23e5cfdf8822..9fc9f3a0bf0c 100644
--- a/svx/source/svdraw/svdmrkv.cxx
+++ b/svx/source/svdraw/svdmrkv.cxx
@@ -133,7 +133,6 @@ void SdrMarkView::ImpClearVars()
mbPlusHdlAlways=false;
mnFrameHandlesLimit=50;
mbInsPolyPoint=false;
- mnInsPointNum = 0;
mbMarkedObjRectDirty=false;
mbMarkedPointsRectsDirty=false;
mbMarkHandlesHidden = false;