diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-08-03 14:42:37 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-08-04 08:47:43 +0200 |
| commit | 33b150bbd636ab23ebf50a5301034f3a551f3793 (patch) | |
| tree | da8b06bfbdfbcadffbf11d54049db2a3fb4463fc /svx/source | |
| parent | e0c64cbeaf458cabcf8f4ac7c8aac4cd1896273c (diff) | |
rename nPgAnz->nPgCount
Change-Id: I4cbc74ed4488c06feaa8b8ab62496fac77ab3aa6
Reviewed-on: https://gerrit.libreoffice.org/40739
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'svx/source')
| -rw-r--r-- | svx/source/svdraw/svdedtv.cxx | 4 | ||||
| -rw-r--r-- | svx/source/svdraw/svdmrkv.cxx | 14 | ||||
| -rw-r--r-- | svx/source/svdraw/svdxcgv.cxx | 4 |
3 files changed, 11 insertions, 11 deletions
diff --git a/svx/source/svdraw/svdedtv.cxx b/svx/source/svdraw/svdedtv.cxx index 55d7d31fa64f..7e41af8cf798 100644 --- a/svx/source/svdraw/svdedtv.cxx +++ b/svx/source/svdraw/svdedtv.cxx @@ -207,9 +207,9 @@ void SdrEditView::DeleteLayer(const OUString& rName) for(sal_uInt16 nPageKind(0); nPageKind < 2; nPageKind++) { // MasterPages and DrawPages - sal_uInt16 nPgAnz(bMaPg ? mpModel->GetMasterPageCount() : mpModel->GetPageCount()); + sal_uInt16 nPgCount(bMaPg ? mpModel->GetMasterPageCount() : mpModel->GetPageCount()); - for(sal_uInt16 nPgNum(0); nPgNum < nPgAnz; nPgNum++) + for(sal_uInt16 nPgNum(0); nPgNum < nPgCount; nPgNum++) { // over all pages SdrPage* pPage = (bMaPg) ? mpModel->GetMasterPage(nPgNum) : mpModel->GetPage(nPgNum); diff --git a/svx/source/svdraw/svdmrkv.cxx b/svx/source/svdraw/svdmrkv.cxx index 938ce9e60370..5f47639ba74d 100644 --- a/svx/source/svdraw/svdmrkv.cxx +++ b/svx/source/svdraw/svdmrkv.cxx @@ -1816,26 +1816,26 @@ SdrObject* SdrMarkView::PickObj(const Point& rPnt, short nTol, SdrPageView*& rpP if(pPV) { SdrPage* pPage=pPV->GetPage(); - sal_uInt16 nPgAnz=1; + sal_uInt16 nPgCount=1; if(bMasters && pPage->TRG_HasMasterPage()) { - nPgAnz++; + nPgCount++; } bool bExtraPassForWholePage=bWholePage && pPage!=pPV->GetObjList(); - if (bExtraPassForWholePage) nPgAnz++; // First search in AktObjList, then on the entire page - sal_uInt16 nPgNum=bBack ? 0 : nPgAnz; - while (pHitObj==nullptr && (bBack ? nPgNum<nPgAnz : nPgNum>0)) { + if (bExtraPassForWholePage) nPgCount++; // First search in AktObjList, then on the entire page + sal_uInt16 nPgNum=bBack ? 0 : nPgCount; + while (pHitObj==nullptr && (bBack ? nPgNum<nPgCount : nPgNum>0)) { SdrSearchOptions nTmpOptions=nOptions; if (!bBack) nPgNum--; const SdrLayerIDSet* pMVisLay=nullptr; SdrObjList* pObjList=nullptr; if (pbHitPassDirect!=nullptr) *pbHitPassDirect = true; - if (nPgNum>=nPgAnz-1 || (bExtraPassForWholePage && nPgNum>=nPgAnz-2)) + if (nPgNum>=nPgCount-1 || (bExtraPassForWholePage && nPgNum>=nPgCount-2)) { pObjList=pPV->GetObjList(); - if (bExtraPassForWholePage && nPgNum==nPgAnz-2) { + if (bExtraPassForWholePage && nPgNum==nPgCount-2) { pObjList=pPage; if (pbHitPassDirect!=nullptr) *pbHitPassDirect = false; } diff --git a/svx/source/svdraw/svdxcgv.cxx b/svx/source/svdraw/svdxcgv.cxx index f81933b05a95..0d954f6e799c 100644 --- a/svx/source/svdraw/svdxcgv.cxx +++ b/svx/source/svdraw/svdxcgv.cxx @@ -275,8 +275,8 @@ bool SdrExchangeView::Paste( aYResize=aResize.Y(); } SdrObjList* pDstLst=pLst; - sal_uInt16 nPg,nPgAnz=pSrcMod->GetPageCount(); - for (nPg=0; nPg<nPgAnz; nPg++) + sal_uInt16 nPg,nPgCount=pSrcMod->GetPageCount(); + for (nPg=0; nPg<nPgCount; nPg++) { const SdrPage* pSrcPg=pSrcMod->GetPage(nPg); |