diff options
| author | Noel Grandin <noel@peralex.com> | 2016-02-29 13:37:14 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2016-03-01 08:30:27 +0200 |
| commit | 595f46344e18fd6275ff7b862269e4c131449591 (patch) | |
| tree | 0de2d2e300399b9aa9c0fea2dd6ca2155f8a231a /svx/source/svdraw/svdmrkv1.cxx | |
| parent | 44e700f70d750cf1c6aac89d0dd07a4f57879b1b (diff) | |
loplugin:unuseddefaultparam in svx (part1)
Change-Id: I0fc8d00447491e8474508952c21d07aa22b6f055
Diffstat (limited to 'svx/source/svdraw/svdmrkv1.cxx')
| -rw-r--r-- | svx/source/svdraw/svdmrkv1.cxx | 20 |
1 files changed, 5 insertions, 15 deletions
diff --git a/svx/source/svdraw/svdmrkv1.cxx b/svx/source/svdraw/svdmrkv1.cxx index 298a12a1295a..68201cc02e78 100644 --- a/svx/source/svdraw/svdmrkv1.cxx +++ b/svx/source/svdraw/svdmrkv1.cxx @@ -466,33 +466,25 @@ bool SdrMarkView::MarkGluePoints(const Rectangle* pRect, bool bUnmark) return bChgd; } -bool SdrMarkView::PickGluePoint(const Point& rPnt, SdrObject*& rpObj, sal_uInt16& rnId, SdrPageView*& rpPV, SdrSearchOptions nOptions) const +bool SdrMarkView::PickGluePoint(const Point& rPnt, SdrObject*& rpObj, sal_uInt16& rnId, SdrPageView*& rpPV) const { - SdrObject* pObj0=rpObj; sal_uInt16 nId0=rnId; rpObj=nullptr; rpPV=nullptr; rnId=0; if (!IsGluePointEditMode()) return false; - bool bBack(nOptions & SdrSearchOptions::BACKWARD); - bool bNext(nOptions & SdrSearchOptions::NEXT); OutputDevice* pOut=mpActualOutDev.get(); if (pOut==nullptr) pOut=GetFirstOutputDevice(); if (pOut==nullptr) return false; SortMarkedObjects(); const size_t nMarkCount=GetMarkedObjectCount(); - size_t nMarkNum=bBack ? 0 : nMarkCount; - if (bNext) { - nMarkNum=TryToFindMarkedObject(pObj0); - if (nMarkNum==SAL_MAX_SIZE) return false; - if (!bBack) nMarkNum++; - } - while (bBack ? nMarkNum<nMarkCount : nMarkNum>0) { - if (!bBack) nMarkNum--; + size_t nMarkNum=nMarkCount; + while (nMarkNum>0) { + nMarkNum--; const SdrMark* pM=GetSdrMarkByIndex(nMarkNum); SdrObject* pObj=pM->GetMarkedSdrObj(); SdrPageView* pPV=pM->GetPageView(); const SdrGluePointList* pGPL=pObj->GetGluePointList(); if (pGPL!=nullptr) { - sal_uInt16 nNum=pGPL->HitTest(rPnt,*pOut,pObj,bBack,bNext,nId0); + sal_uInt16 nNum=pGPL->HitTest(rPnt,*pOut,pObj,false/*bBack*/,false/*bNext*/,nId0); if (nNum!=SDRGLUEPOINT_NOTFOUND) { // #i38892# @@ -507,8 +499,6 @@ bool SdrMarkView::PickGluePoint(const Point& rPnt, SdrObject*& rpObj, sal_uInt16 } } } - bNext=false; // HitNextGluePoint only for the first Obj - if (bBack) nMarkNum++; } return false; } |