diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2015-10-12 21:44:46 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2015-10-13 06:22:33 +0000 |
| commit | ed7361ef0bdb6bee4f47a8421221eb7824f02e38 (patch) | |
| tree | b745a27d916bb923f01857148e16485ac319f288 /svx | |
| parent | 239c75ed63fb31cfef9cee13d8d58c4fe9e7a906 (diff) | |
cppcheck:variableScope
Change-Id: I7cbd5a9e9bb5417f754d4e2445df309140fd40af
Reviewed-on: https://gerrit.libreoffice.org/19329
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/svdraw/svdmrkv.cxx | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/svx/source/svdraw/svdmrkv.cxx b/svx/source/svdraw/svdmrkv.cxx index 529315ca6a47..5d4f77bc271e 100644 --- a/svx/source/svdraw/svdmrkv.cxx +++ b/svx/source/svdraw/svdmrkv.cxx @@ -1694,12 +1694,11 @@ SdrObject* SdrMarkView::CheckSingleSdrObjectHit(const Point& rPnt, sal_uInt16 nT } SdrObject* SdrMarkView::CheckSingleSdrObjectHit(const Point& rPnt, sal_uInt16 nTol, SdrObjList* pOL, SdrPageView* pPV, SdrSearchOptions nOptions, const SetOfByte* pMVisLay, SdrObject*& rpRootObj,const SdrMarkList * pMarkList) const { - bool bBack(nOptions & SdrSearchOptions::BACKWARD); - bool bBefMrk(nOptions & SdrSearchOptions::BEFOREMARK); SdrObject* pRet=NULL; rpRootObj=NULL; if (pOL!=NULL) { + bool bBack(nOptions & SdrSearchOptions::BACKWARD); bool bRemap(pOL->GetOwnerObj() && dynamic_cast< const E3dScene* >(pOL->GetOwnerObj()) != nullptr); E3dScene* pRemapScene = (bRemap ? static_cast<E3dScene*>(pOL->GetOwnerObj()) : 0L); @@ -1717,7 +1716,7 @@ SdrObject* SdrMarkView::CheckSingleSdrObjectHit(const Point& rPnt, sal_uInt16 nT { pObj = pOL->GetObj(nObjNum); } - if (bBefMrk) + if (nOptions & SdrSearchOptions::BEFOREMARK) { if ((pMarkList)!=NULL) { |