[Libreoffice-commits] core.git: svx/source

[Libreoffice Gerrit user]

 svx/source/svdraw/svdmrkv.cxx |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 94ff79285a019b40027ec415b416ca217703728c
Author:     Mark Dobo <mrkropen18 at gmail.com>
AuthorDate: Sat Oct 20 16:37:14 2018 +0200
Commit:     Tamás Zolnai <tamas.zolnai at collabora.com>
CommitDate: Sun Oct 21 13:02:39 2018 +0200

    cppcheck: variableScope
    
    Change-Id: I6826f1352cff7632dc93cc0067dfe4315dc43823
    Reviewed-on: https://gerrit.libreoffice.org/62078
    Tested-by: Jenkins
    Reviewed-by: Tamás Zolnai <tamas.zolnai at collabora.com>

diff --git a/svx/source/svdraw/svdmrkv.cxx b/svx/source/svdraw/svdmrkv.cxx
index affec3af91e0..9e596cda77a8 100644
--- a/svx/source/svdraw/svdmrkv.cxx
+++ b/svx/source/svdraw/svdmrkv.cxx
@@ -1820,7 +1820,6 @@ SdrObject* SdrMarkView::PickObj(const Point& rPnt, short nTol, SdrPageView*& rpP
     if (pbHitPassDirect!=nullptr) *pbHitPassDirect=true;
     SdrObject* pRet = nullptr;
     rpPV=nullptr;
-    bool bWholePage(nOptions & SdrSearchOptions::WHOLEPAGE);
     bool bMarked(nOptions & SdrSearchOptions::MARKED);
     bool bMasters=!bMarked && bool(nOptions & SdrSearchOptions::ALSOONMASTER);
     bool bBack(nOptions & SdrSearchOptions::BACKWARD);
@@ -1861,7 +1860,7 @@ SdrObject* SdrMarkView::PickObj(const Point& rPnt, short nTol, SdrPageView*& rpP
             {
                 nPgCount++;
             }
-
+            bool bWholePage(nOptions & SdrSearchOptions::WHOLEPAGE);
             bool bExtraPassForWholePage=bWholePage && pPage!=pPV->GetObjList();
             if (bExtraPassForWholePage) nPgCount++; // First search in AktObjList, then on the entire page
             sal_uInt16 nPgNum=bBack ? 0 : nPgCount;