[Libreoffice-commits] core.git: svx/source
Noel Grandin
noel.grandin at collabora.co.uk
Fri Aug 4 06:48:31 UTC 2017
svx/source/svdraw/svdedtv.cxx | 8 ++---
svx/source/svdraw/svdedxv.cxx | 14 ++++-----
svx/source/svdraw/svdmark.cxx | 22 +++++++-------
svx/source/svdraw/svdmodel.cxx | 54 +++++++++++++++++------------------
svx/source/svdraw/svdmrkv.cxx | 10 +++---
svx/source/svdraw/svdmrkv1.cxx | 12 +++----
svx/source/svdraw/svdocapt.cxx | 6 +--
svx/source/svdraw/svdoedge.cxx | 42 +++++++++++++--------------
svx/source/svdraw/svdomeas.cxx | 14 ++++-----
svx/source/svdraw/svdorect.cxx | 14 ++++-----
svx/source/svdraw/svdotxat.cxx | 4 +-
svx/source/svdraw/svdpagv.cxx | 6 +--
svx/source/svdraw/svdtrans.cxx | 24 +++++++--------
svx/source/svdraw/svdundo.cxx | 4 +-
svx/source/svdraw/svdviter.cxx | 4 +-
svx/source/table/svdotable.cxx | 4 +-
svx/source/table/tablecontroller.cxx | 4 +-
17 files changed, 123 insertions(+), 123 deletions(-)
New commits:
commit b258ecd76171bab37139cfa0f56d079cda4fbb39
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Thu Aug 3 14:52:39 2017 +0200
rename Anz->Cnt in svx
Change-Id: Idbe6849d36727c382ffd11d6bf04e78d6a66a878
Reviewed-on: https://gerrit.libreoffice.org/40740
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/svx/source/svdraw/svdedtv.cxx b/svx/source/svdraw/svdedtv.cxx
index 7e41af8cf798..e7cd29de92f7 100644
--- a/svx/source/svdraw/svdedtv.cxx
+++ b/svx/source/svdraw/svdedtv.cxx
@@ -333,9 +333,9 @@ void SdrEditView::ImpBroadcastEdgesOfMarkedNodes()
}
}
- const size_t nMarkedEdgeAnz = GetMarkedEdgesOfMarkedNodes().GetMarkCount();
+ const size_t nMarkedEdgeCnt = GetMarkedEdgesOfMarkedNodes().GetMarkCount();
- for (size_t i=0; i<nMarkedEdgeAnz; ++i) {
+ for (size_t i=0; i<nMarkedEdgeCnt; ++i) {
SdrMark* pEM = GetMarkedEdgesOfMarkedNodes().GetMark(i);
SdrObject* pEdgeTmp=pEM->GetMarkedSdrObj();
SdrEdgeObj* pEdge=dynamic_cast<SdrEdgeObj*>( pEdgeTmp );
@@ -879,8 +879,8 @@ void SdrEditView::CopyMarkedObj()
SdrMarkList aSourceObjectsForCopy(GetMarkedObjectList());
// The following loop is used instead of MarkList::Merge(), to be
// able to flag the MarkEntries.
- const size_t nEdgeAnz = GetEdgesOfMarkedNodes().GetMarkCount();
- for (size_t nEdgeNum=0; nEdgeNum<nEdgeAnz; ++nEdgeNum) {
+ const size_t nEdgeCnt = GetEdgesOfMarkedNodes().GetMarkCount();
+ for (size_t nEdgeNum=0; nEdgeNum<nEdgeCnt; ++nEdgeNum) {
SdrMark aM(*GetEdgesOfMarkedNodes().GetMark(nEdgeNum));
aM.SetUser(1);
aSourceObjectsForCopy.InsertEntry(aM);
diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx
index ee854da6eb6d..65dede8abcb1 100644
--- a/svx/source/svdraw/svdedxv.cxx
+++ b/svx/source/svdraw/svdedxv.cxx
@@ -238,7 +238,7 @@ void SdrObjEditView::ModelHasChanged()
if (IsTextEdit()) {
SdrTextObj* pTextObj=dynamic_cast<SdrTextObj*>( mxTextEditObj.get() );
if (pTextObj!=nullptr) {
- sal_uIntPtr nOutlViewAnz=pTextEditOutliner->GetViewCount();
+ sal_uIntPtr nOutlViewCnt=pTextEditOutliner->GetViewCount();
bool bAreaChg=false;
bool bAnchorChg=false;
bool bColorChg=false;
@@ -286,7 +286,7 @@ void SdrObjEditView::ModelHasChanged()
pTextObj->TakeTextAnchorRect(aAnchorRect);
pTextObj->ImpSetContourPolygon(*pTextEditOutliner,aAnchorRect, true);
}
- for (sal_uIntPtr nOV=0; nOV<nOutlViewAnz; nOV++) {
+ for (sal_uIntPtr nOV=0; nOV<nOutlViewCnt; nOV++) {
OutlinerView* pOLV=pTextEditOutliner->GetView(nOV);
EVControlBits nStat0=pOLV->GetControlWord();
EVControlBits nStat=nStat0;
@@ -324,7 +324,7 @@ void SdrObjEditView::ModelHasChanged()
// again on ModelHasChanged().
if (bContourFrame || bAreaChg || bAnchorChg || bColorChg)
{
- for (sal_uIntPtr nOV=0; nOV<nOutlViewAnz; nOV++)
+ for (sal_uIntPtr nOV=0; nOV<nOutlViewCnt; nOV++)
{
OutlinerView* pOLV=pTextEditOutliner->GetView(nOV);
{ // invalidate old OutlinerView area
@@ -1581,17 +1581,17 @@ bool SdrObjEditView::ImpIsTextEditAllSelected() const
{
if(SdrTextObj::HasTextImpl( pTextEditOutliner ) )
{
- const sal_Int32 nParaAnz=pTextEditOutliner->GetParagraphCount();
- Paragraph* pLastPara=pTextEditOutliner->GetParagraph( nParaAnz > 1 ? nParaAnz - 1 : 0 );
+ const sal_Int32 nParaCnt=pTextEditOutliner->GetParagraphCount();
+ Paragraph* pLastPara=pTextEditOutliner->GetParagraph( nParaCnt > 1 ? nParaCnt - 1 : 0 );
ESelection aESel(pTextEditOutlinerView->GetSelection());
- if (aESel.nStartPara==0 && aESel.nStartPos==0 && aESel.nEndPara==(nParaAnz-1))
+ if (aESel.nStartPara==0 && aESel.nStartPos==0 && aESel.nEndPara==(nParaCnt-1))
{
if( pTextEditOutliner->GetText(pLastPara).getLength() == aESel.nEndPos )
bRet = true;
}
// in case the selection was done backwards
- if (!bRet && aESel.nEndPara==0 && aESel.nEndPos==0 && aESel.nStartPara==(nParaAnz-1))
+ if (!bRet && aESel.nEndPara==0 && aESel.nEndPos==0 && aESel.nStartPara==(nParaCnt-1))
{
if(pTextEditOutliner->GetText(pLastPara).getLength() == aESel.nStartPos)
bRet = true;
diff --git a/svx/source/svdraw/svdmark.cxx b/svx/source/svdraw/svdmark.cxx
index df617e4c5946..661ef14d4694 100644
--- a/svx/source/svdraw/svdmark.cxx
+++ b/svx/source/svdraw/svdmark.cxx
@@ -498,8 +498,8 @@ const OUString& SdrMarkList::GetPointMarkDescription(bool bGlue) const
bool& rNameOk = const_cast<bool&>(bGlue ? mbGluePointNameOk : mbPointNameOk);
OUString& rName = const_cast<OUString&>(bGlue ? maGluePointName : maPointName);
const size_t nMarkCount(GetMarkCount());
- size_t nMarkPtAnz(0);
- size_t nMarkPtObjAnz(0);
+ size_t nMarkPtCnt(0);
+ size_t nMarkPtObjCnt(0);
size_t n1stMarkNum(SAL_MAX_SIZE);
for(size_t nMarkNum = 0; nMarkNum < nMarkCount; ++nMarkNum)
@@ -514,18 +514,18 @@ const OUString& SdrMarkList::GetPointMarkDescription(bool bGlue) const
n1stMarkNum = nMarkNum;
}
- nMarkPtAnz += rPts.size();
- nMarkPtObjAnz++;
+ nMarkPtCnt += rPts.size();
+ nMarkPtObjCnt++;
}
- if(nMarkPtObjAnz > 1 && rNameOk)
+ if(nMarkPtObjCnt > 1 && rNameOk)
{
// preliminary decision
return rName;
}
}
- if(rNameOk && 1 == nMarkPtObjAnz)
+ if(rNameOk && 1 == nMarkPtObjCnt)
{
// if it's a single selection, cache only text frame
const SdrObject* pObj = GetMark(0)->GetMarkedSdrObj();
@@ -537,7 +537,7 @@ const OUString& SdrMarkList::GetPointMarkDescription(bool bGlue) const
}
}
- if(!nMarkPtObjAnz)
+ if(!nMarkPtObjCnt)
{
rName.clear();
rNameOk = true;
@@ -547,7 +547,7 @@ const OUString& SdrMarkList::GetPointMarkDescription(bool bGlue) const
const SdrMark* pMark = GetMark(n1stMarkNum);
OUString aNam;
- if(1L == nMarkPtObjAnz)
+ if(1L == nMarkPtObjCnt)
{
if(pMark->GetMarkedSdrObj())
{
@@ -580,19 +580,19 @@ const OUString& SdrMarkList::GetPointMarkDescription(bool bGlue) const
aNam = ImpGetResStr(STR_ObjNamePlural);
}
- aNam = OUString::number( nMarkPtObjAnz ) + " " + aNam;
+ aNam = OUString::number( nMarkPtObjCnt ) + " " + aNam;
}
OUString aStr1;
- if(1L == nMarkPtAnz)
+ if(1L == nMarkPtCnt)
{
aStr1 = (ImpGetResStr(bGlue ? STR_ViewMarkedGluePoint : STR_ViewMarkedPoint));
}
else
{
aStr1 = (ImpGetResStr(bGlue ? STR_ViewMarkedGluePoints : STR_ViewMarkedPoints));
- aStr1 = aStr1.replaceFirst("%2", OUString::number( nMarkPtAnz ));
+ aStr1 = aStr1.replaceFirst("%2", OUString::number( nMarkPtCnt ));
}
aStr1 = aStr1.replaceFirst("%1", aNam);
diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx
index ba495561f835..0029b9f4db10 100644
--- a/svx/source/svdraw/svdmodel.cxx
+++ b/svx/source/svdraw/svdmodel.cxx
@@ -1453,9 +1453,9 @@ SdrPage* SdrModel::RemoveMasterPage(sal_uInt16 nPgNum)
if(pRetPg)
{
// Now delete the links from the normal drawing pages to the deleted master page.
- sal_uInt16 nPageAnz(GetPageCount());
+ sal_uInt16 nPageCnt(GetPageCount());
- for(sal_uInt16 np(0); np < nPageAnz; np++)
+ for(sal_uInt16 np(0); np < nPageCnt; np++)
{
GetPage(np)->TRG_ImpMasterPageRemoved(*pRetPg);
}
@@ -1497,8 +1497,8 @@ void SdrModel::CopyPages(sal_uInt16 nFirstPageNum, sal_uInt16 nLastPageNum,
if( bUndo )
BegUndo(ImpGetResStr(STR_UndoMergeModel));
- sal_uInt16 nPageAnz=GetPageCount();
- sal_uInt16 nMaxPage=nPageAnz;
+ sal_uInt16 nPageCnt=GetPageCount();
+ sal_uInt16 nMaxPage=nPageCnt;
if (nMaxPage!=0)
nMaxPage--;
@@ -1507,15 +1507,15 @@ void SdrModel::CopyPages(sal_uInt16 nFirstPageNum, sal_uInt16 nLastPageNum,
if (nLastPageNum>nMaxPage)
nLastPageNum =nMaxPage;
bool bReverse=nLastPageNum<nFirstPageNum;
- if (nDestPos>nPageAnz)
- nDestPos=nPageAnz;
+ if (nDestPos>nPageCnt)
+ nDestPos=nPageCnt;
// at first, save the pointers of the affected pages in an array
sal_uInt16 nPageNum=nFirstPageNum;
- sal_uInt16 nCopyAnz=((!bReverse)?(nLastPageNum-nFirstPageNum):(nFirstPageNum-nLastPageNum))+1;
- std::unique_ptr<SdrPage*[]> pPagePtrs(new SdrPage*[nCopyAnz]);
+ sal_uInt16 nCopyCnt=((!bReverse)?(nLastPageNum-nFirstPageNum):(nFirstPageNum-nLastPageNum))+1;
+ std::unique_ptr<SdrPage*[]> pPagePtrs(new SdrPage*[nCopyCnt]);
sal_uInt16 nCopyNum;
- for(nCopyNum=0; nCopyNum<nCopyAnz; nCopyNum++)
+ for(nCopyNum=0; nCopyNum<nCopyCnt; nCopyNum++)
{
pPagePtrs[nCopyNum]=GetPage(nPageNum);
if (bReverse)
@@ -1526,7 +1526,7 @@ void SdrModel::CopyPages(sal_uInt16 nFirstPageNum, sal_uInt16 nLastPageNum,
// now copy the pages
sal_uInt16 nDestNum=nDestPos;
- for (nCopyNum=0; nCopyNum<nCopyAnz; nCopyNum++)
+ for (nCopyNum=0; nCopyNum<nCopyCnt; nCopyNum++)
{
SdrPage* pPg=pPagePtrs[nCopyNum];
sal_uInt16 nPageNum2=pPg->GetPageNum();
@@ -1582,11 +1582,11 @@ void SdrModel::Merge(SdrModel& rSourceModel,
if (bUndo)
BegUndo(ImpGetResStr(STR_UndoMergeModel));
- sal_uInt16 nSrcPageAnz=rSourceModel.GetPageCount();
- sal_uInt16 nSrcMasterPageAnz=rSourceModel.GetMasterPageCount();
- sal_uInt16 nDstMasterPageAnz=GetMasterPageCount();
- bool bInsPages=(nFirstPageNum<nSrcPageAnz || nLastPageNum<nSrcPageAnz);
- sal_uInt16 nMaxSrcPage=nSrcPageAnz; if (nMaxSrcPage!=0) nMaxSrcPage--;
+ sal_uInt16 nSrcPageCnt=rSourceModel.GetPageCount();
+ sal_uInt16 nSrcMasterPageCnt=rSourceModel.GetMasterPageCount();
+ sal_uInt16 nDstMasterPageCnt=GetMasterPageCount();
+ bool bInsPages=(nFirstPageNum<nSrcPageCnt || nLastPageNum<nSrcPageCnt);
+ sal_uInt16 nMaxSrcPage=nSrcPageCnt; if (nMaxSrcPage!=0) nMaxSrcPage--;
if (nFirstPageNum>nMaxSrcPage) nFirstPageNum=nMaxSrcPage;
if (nLastPageNum>nMaxSrcPage) nLastPageNum =nMaxSrcPage;
bool bReverse=nLastPageNum<nFirstPageNum;
@@ -1594,15 +1594,15 @@ void SdrModel::Merge(SdrModel& rSourceModel,
std::unique_ptr<sal_uInt16[]> pMasterMap;
std::unique_ptr<bool[]> pMasterNeed;
sal_uInt16 nMasterNeed=0;
- if (bMergeMasterPages && nSrcMasterPageAnz!=0) {
+ if (bMergeMasterPages && nSrcMasterPageCnt!=0) {
// determine which MasterPages from rSrcModel we need
- pMasterMap.reset(new sal_uInt16[nSrcMasterPageAnz]);
- pMasterNeed.reset(new bool[nSrcMasterPageAnz]);
- memset(pMasterMap.get(),0xFF,nSrcMasterPageAnz*sizeof(sal_uInt16));
+ pMasterMap.reset(new sal_uInt16[nSrcMasterPageCnt]);
+ pMasterNeed.reset(new bool[nSrcMasterPageCnt]);
+ memset(pMasterMap.get(),0xFF,nSrcMasterPageCnt*sizeof(sal_uInt16));
if (bAllMasterPages) {
- memset(pMasterNeed.get(), true, nSrcMasterPageAnz * sizeof(bool));
+ memset(pMasterNeed.get(), true, nSrcMasterPageCnt * sizeof(bool));
} else {
- memset(pMasterNeed.get(), false, nSrcMasterPageAnz * sizeof(bool));
+ memset(pMasterNeed.get(), false, nSrcMasterPageCnt * sizeof(bool));
sal_uInt16 nAnf= bReverse ? nLastPageNum : nFirstPageNum;
sal_uInt16 nEnd= bReverse ? nFirstPageNum : nLastPageNum;
for (sal_uInt16 i=nAnf; i<=nEnd; i++) {
@@ -1612,7 +1612,7 @@ void SdrModel::Merge(SdrModel& rSourceModel,
SdrPage& rMasterPage = pPg->TRG_GetMasterPage();
sal_uInt16 nMPgNum(rMasterPage.GetPageNum());
- if(nMPgNum < nSrcMasterPageAnz)
+ if(nMPgNum < nSrcMasterPageCnt)
{
pMasterNeed[nMPgNum] = true;
}
@@ -1620,8 +1620,8 @@ void SdrModel::Merge(SdrModel& rSourceModel,
}
}
// now determine the Mapping of the MasterPages
- sal_uInt16 nAktMaPagNum=nDstMasterPageAnz;
- for (sal_uInt16 i=0; i<nSrcMasterPageAnz; i++) {
+ sal_uInt16 nAktMaPagNum=nDstMasterPageCnt;
+ for (sal_uInt16 i=0; i<nSrcMasterPageCnt; i++) {
if (pMasterNeed[i]) {
pMasterMap[i]=nAktMaPagNum;
nAktMaPagNum++;
@@ -1632,7 +1632,7 @@ void SdrModel::Merge(SdrModel& rSourceModel,
// get the MasterPages
if (pMasterMap && pMasterNeed && nMasterNeed!=0) {
- for (sal_uInt16 i=nSrcMasterPageAnz; i>0;) {
+ for (sal_uInt16 i=nSrcMasterPageCnt; i>0;) {
i--;
if (pMasterNeed[i]) {
SdrPage* pPg=nullptr;
@@ -1646,7 +1646,7 @@ void SdrModel::Merge(SdrModel& rSourceModel,
// Now append all of them to the end of the DstModel.
// Don't use InsertMasterPage(), because everything is
// inconsistent until all are in.
- maMaPag.insert(maMaPag.begin()+nDstMasterPageAnz, pPg);
+ maMaPag.insert(maMaPag.begin()+nDstMasterPageCnt, pPg);
MasterPageListChanged();
pPg->SetInserted();
pPg->SetModel(this);
@@ -1709,7 +1709,7 @@ void SdrModel::Merge(SdrModel& rSourceModel,
}
DBG_ASSERT(nNewNum!=0xFFFF,"SdrModel::Merge(): Something is crooked with the mapping of the MasterPages.");
} else {
- if (nMaPgNum>=nDstMasterPageAnz) {
+ if (nMaPgNum>=nDstMasterPageCnt) {
// This is outside of the original area of the MasterPage of the DstModel.
pPg->TRG_ClearMasterPage();
}
diff --git a/svx/source/svdraw/svdmrkv.cxx b/svx/source/svdraw/svdmrkv.cxx
index 5f47639ba74d..e972dd7c7ceb 100644
--- a/svx/source/svdraw/svdmrkv.cxx
+++ b/svx/source/svdraw/svdmrkv.cxx
@@ -896,8 +896,8 @@ void SdrMarkView::SetMarkHandles(SfxViewShell* pOtherShell)
pHdl->SetSelected(bSelected);
if (mbPlusHdlAlways || bSelected)
{
- sal_uInt32 nPlusAnz=pObj->GetPlusHdlCount(*pHdl);
- for (sal_uInt32 nPlusNum=0; nPlusNum<nPlusAnz; nPlusNum++)
+ sal_uInt32 nPlusHdlCnt=pObj->GetPlusHdlCount(*pHdl);
+ for (sal_uInt32 nPlusNum=0; nPlusNum<nPlusHdlCnt; nPlusNum++)
{
SdrHdl* pPlusHdl=pObj->GetPlusHdl(*pHdl,nPlusNum);
if (pPlusHdl!=nullptr)
@@ -1798,9 +1798,9 @@ SdrObject* SdrMarkView::PickObj(const Point& rPnt, short nTol, SdrPageView*& rpP
pPV=static_cast<const SdrObjEditView*>(this)->GetTextEditPageView();
}
if (bMarked) {
- const size_t nMrkAnz=GetMarkedObjectCount();
- size_t nMrkNum=bBack ? 0 : nMrkAnz;
- while (pHitObj==nullptr && (bBack ? nMrkNum<nMrkAnz : nMrkNum>0)) {
+ const size_t nMrkCnt=GetMarkedObjectCount();
+ size_t nMrkNum=bBack ? 0 : nMrkCnt;
+ while (pHitObj==nullptr && (bBack ? nMrkNum<nMrkCnt : nMrkNum>0)) {
if (!bBack) nMrkNum--;
SdrMark* pM=GetSdrMarkByIndex(nMrkNum);
pObj=pM->GetMarkedSdrObj();
diff --git a/svx/source/svdraw/svdmrkv1.cxx b/svx/source/svdraw/svdmrkv1.cxx
index 59d4196a1ed1..5957c18331e6 100644
--- a/svx/source/svdraw/svdmrkv1.cxx
+++ b/svx/source/svdraw/svdmrkv1.cxx
@@ -215,8 +215,8 @@ bool SdrMarkView::MarkPoints(const tools::Rectangle* pRect, bool bUnmark)
const SdrPageView* pPV0=nullptr;
SdrMark* pM=nullptr;
maHdlList.Sort();
- const size_t nHdlAnz=maHdlList.GetHdlCount();
- for (size_t nHdlNum=nHdlAnz; nHdlNum>0;) {
+ const size_t nHdlCnt=maHdlList.GetHdlCount();
+ for (size_t nHdlNum=nHdlCnt; nHdlNum>0;) {
--nHdlNum;
SdrHdl* pHdl=maHdlList.GetHdl(nHdlNum);
if (IsPointMarkable(*pHdl) && pHdl->IsSelected()==bUnmark) {
@@ -282,8 +282,8 @@ void SdrMarkView::ImpSetPointsRects() const
{
tools::Rectangle aPnts;
tools::Rectangle aGlue;
- const size_t nHdlAnz=maHdlList.GetHdlCount();
- for (size_t nHdlNum=0; nHdlNum<nHdlAnz; ++nHdlNum) {
+ const size_t nHdlCnt=maHdlList.GetHdlCount();
+ for (size_t nHdlNum=0; nHdlNum<nHdlCnt; ++nHdlNum) {
const SdrHdl* pHdl=maHdlList.GetHdl(nHdlNum);
SdrHdlKind eKind=pHdl->GetKind();
if ((eKind==SdrHdlKind::Poly && pHdl->IsSelected()) || eKind==SdrHdlKind::Glue) {
@@ -544,8 +544,8 @@ bool SdrMarkView::IsGluePointMarked(const SdrObject* pObj, sal_uInt16 nId) const
SdrHdl* SdrMarkView::GetGluePointHdl(const SdrObject* pObj, sal_uInt16 nId) const
{
ForceUndirtyMrkPnt();
- const size_t nHdlAnz=maHdlList.GetHdlCount();
- for (size_t nHdlNum=0; nHdlNum<nHdlAnz; ++nHdlNum) {
+ const size_t nHdlCnt=maHdlList.GetHdlCount();
+ for (size_t nHdlNum=0; nHdlNum<nHdlCnt; ++nHdlNum) {
SdrHdl* pHdl=maHdlList.GetHdl(nHdlNum);
if (pHdl->GetObj()==pObj &&
pHdl->GetKind()==SdrHdlKind::Glue &&
diff --git a/svx/source/svdraw/svdocapt.cxx b/svx/source/svdraw/svdocapt.cxx
index 7f2957006a7b..71ce32a660f3 100644
--- a/svx/source/svdraw/svdocapt.cxx
+++ b/svx/source/svdraw/svdocapt.cxx
@@ -275,16 +275,16 @@ sal_uInt32 SdrCaptionObj::GetHdlCount() const
SdrHdl* SdrCaptionObj::GetHdl(sal_uInt32 nHdlNum) const
{
- const sal_uInt32 nRectHdlAnz(SdrRectObj::GetHdlCount());
+ const sal_uInt32 nRectHdlCnt(SdrRectObj::GetHdlCount());
- if(nHdlNum < nRectHdlAnz)
+ if(nHdlNum < nRectHdlCnt)
{
return SdrRectObj::GetHdl(nHdlNum);
}
else
{
sal_uInt32 nPntNum(nHdlNum);
- nPntNum -= nRectHdlAnz;
+ nPntNum -= nRectHdlCnt;
if(nPntNum < aTailPoly.GetSize())
{
diff --git a/svx/source/svdraw/svdoedge.cxx b/svx/source/svdraw/svdoedge.cxx
index 658e476e6e5f..1b4cd734e72c 100644
--- a/svx/source/svdraw/svdoedge.cxx
+++ b/svx/source/svdraw/svdoedge.cxx
@@ -1210,21 +1210,21 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const too
XPolygon aXP1(ImpCalcObjToCenter(aPt1,nAngle1,aBewareRect1,aMeeting));
XPolygon aXP2(ImpCalcObjToCenter(aPt2,nAngle2,aBewareRect2,aMeeting));
- sal_uInt16 nXP1Anz=aXP1.GetPointCount();
- sal_uInt16 nXP2Anz=aXP2.GetPointCount();
+ sal_uInt16 nXP1Cnt=aXP1.GetPointCount();
+ sal_uInt16 nXP2Cnt=aXP2.GetPointCount();
if (bInfo) {
- pInfo->nObj1Lines=nXP1Anz; if (nXP1Anz>1) pInfo->nObj1Lines--;
- pInfo->nObj2Lines=nXP2Anz; if (nXP2Anz>1) pInfo->nObj2Lines--;
+ pInfo->nObj1Lines=nXP1Cnt; if (nXP1Cnt>1) pInfo->nObj1Lines--;
+ pInfo->nObj2Lines=nXP2Cnt; if (nXP2Cnt>1) pInfo->nObj2Lines--;
}
- Point aEP1(aXP1[nXP1Anz-1]);
- Point aEP2(aXP2[nXP2Anz-1]);
+ Point aEP1(aXP1[nXP1Cnt-1]);
+ Point aEP2(aXP2[nXP2Cnt-1]);
bool bInsMeetingPoint=aEP1.X()!=aEP2.X() && aEP1.Y()!=aEP2.Y();
- bool bHorzE1=aEP1.Y()==aXP1[nXP1Anz-2].Y(); // is last line of XP1 horizontal?
- bool bHorzE2=aEP2.Y()==aXP2[nXP2Anz-2].Y(); // is last line of XP2 horizontal?
+ bool bHorzE1=aEP1.Y()==aXP1[nXP1Cnt-2].Y(); // is last line of XP1 horizontal?
+ bool bHorzE2=aEP2.Y()==aXP2[nXP2Cnt-2].Y(); // is last line of XP2 horizontal?
if (aEP1==aEP2 && ((bHorzE1 && bHorzE2 && aEP1.Y()==aEP2.Y()) || (!bHorzE1 && !bHorzE2 && aEP1.X()==aEP2.X()))) {
// special casing 'I' connectors
- nXP1Anz--; aXP1.Remove(nXP1Anz,1);
- nXP2Anz--; aXP2.Remove(nXP2Anz,1);
+ nXP1Cnt--; aXP1.Remove(nXP1Cnt,1);
+ nXP2Cnt--; aXP2.Remove(nXP2Cnt,1);
}
if (bInsMeetingPoint) {
aXP1.Insert(XPOLY_APPEND,aMeeting,PolyFlags::Normal);
@@ -1237,19 +1237,19 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const too
} else {
if (pInfo->nObj1Lines>pInfo->nObj2Lines) {
pInfo->nObj2Lines++;
- pInfo->nMiddleLine=nXP1Anz-1;
+ pInfo->nMiddleLine=nXP1Cnt-1;
} else {
pInfo->nObj1Lines++;
- pInfo->nMiddleLine=nXP1Anz;
+ pInfo->nMiddleLine=nXP1Cnt;
}
}
}
- } else if (bInfo && aEP1!=aEP2 && nXP1Anz+nXP2Anz>=4) {
+ } else if (bInfo && aEP1!=aEP2 && nXP1Cnt+nXP2Cnt>=4) {
// By connecting both ends, another line is added, this becomes the center line.
- pInfo->nMiddleLine=nXP1Anz-1;
+ pInfo->nMiddleLine=nXP1Cnt-1;
}
sal_uInt16 nNum=aXP2.GetPointCount();
- if (aXP1[nXP1Anz-1]==aXP2[nXP2Anz-1] && nXP1Anz>1 && nXP2Anz>1) nNum--;
+ if (aXP1[nXP1Cnt-1]==aXP2[nXP2Cnt-1] && nXP1Cnt>1 && nXP2Cnt>1) nNum--;
while (nNum>0) {
nNum--;
aXP1.Insert(XPOLY_APPEND,aXP2[nNum],PolyFlags::Normal);
@@ -1709,31 +1709,31 @@ basegfx::B2DPolyPolygon SdrEdgeObj::GetEdgeTrackPath() const
sal_uInt32 SdrEdgeObj::GetHdlCount() const
{
SdrEdgeKind eKind=static_cast<const SdrEdgeKindItem&>(GetObjectItem(SDRATTR_EDGEKIND)).GetValue();
- sal_uInt32 nHdlAnz(0);
+ sal_uInt32 nHdlCnt(0);
sal_uInt32 nPointCount(pEdgeTrack->GetPointCount());
if(nPointCount)
{
- nHdlAnz = 2;
+ nHdlCnt = 2;
if ((eKind==SdrEdgeKind::OrthoLines || eKind==SdrEdgeKind::Bezier) && nPointCount >= 4)
{
sal_uInt32 nO1(aEdgeInfo.nObj1Lines > 0 ? aEdgeInfo.nObj1Lines - 1 : 0);
sal_uInt32 nO2(aEdgeInfo.nObj2Lines > 0 ? aEdgeInfo.nObj2Lines - 1 : 0);
sal_uInt32 nM(aEdgeInfo.nMiddleLine != 0xFFFF ? 1 : 0);
- nHdlAnz += nO1 + nO2 + nM;
+ nHdlCnt += nO1 + nO2 + nM;
}
else if (eKind==SdrEdgeKind::ThreeLines && nPointCount == 4)
{
if(GetConnectedNode(true))
- nHdlAnz++;
+ nHdlCnt++;
if(GetConnectedNode(false))
- nHdlAnz++;
+ nHdlCnt++;
}
}
- return nHdlAnz;
+ return nHdlCnt;
}
SdrHdl* SdrEdgeObj::GetHdl(sal_uInt32 nHdlNum) const
diff --git a/svx/source/svdraw/svdomeas.cxx b/svx/source/svdraw/svdomeas.cxx
index dbc0e2b8ab33..dcf8345e2cf7 100644
--- a/svx/source/svdraw/svdomeas.cxx
+++ b/svx/source/svdraw/svdomeas.cxx
@@ -295,7 +295,7 @@ struct ImpMeasurePoly
long nHlpAngle;
double nLineSin;
double nLineCos;
- sal_uInt16 nMainlineAnz;
+ sal_uInt16 nMainlineCnt;
css::drawing::MeasureTextHorzPos eUsedTextHPos;
css::drawing::MeasureTextVertPos eUsedTextVPos;
long nLineWdt2; // half the line width
@@ -483,11 +483,11 @@ void SdrMeasureObj::ImpCalcGeometrics(const ImpMeasureRec& rRec, ImpMeasurePoly&
rPol.aMainline1.aP2=aMainlinePt2;
rPol.aMainline2=rPol.aMainline1;
rPol.aMainline3=rPol.aMainline1;
- rPol.nMainlineAnz=1;
+ rPol.nMainlineCnt=1;
if (bBrkLine) {
long nNeedSiz=!rRec.bTextRota90 ? rPol.aTextSize.Width() : rPol.aTextSize.Height();
long nHalfLen=(rPol.nLineLen-nNeedSiz-nArrow1Wdt/4-nArrow2Wdt/4) /2;
- rPol.nMainlineAnz=2;
+ rPol.nMainlineCnt=2;
rPol.aMainline1.aP2=aMainlinePt1;
rPol.aMainline1.aP2.X()+=nHalfLen;
RotatePoint(rPol.aMainline1.aP2,rPol.aMainline1.aP1,nLineSin,nLineCos);
@@ -509,8 +509,8 @@ void SdrMeasureObj::ImpCalcGeometrics(const ImpMeasureRec& rRec, ImpMeasurePoly&
rPol.aMainline2.aP2=aMainlinePt2;
rPol.aMainline3.aP1=aMainlinePt1;
rPol.aMainline3.aP2=aMainlinePt2;
- rPol.nMainlineAnz=3;
- if (bBrkLine && rPol.eUsedTextHPos==css::drawing::MeasureTextHorzPos_INSIDE) rPol.nMainlineAnz=2;
+ rPol.nMainlineCnt=3;
+ if (bBrkLine && rPol.eUsedTextHPos==css::drawing::MeasureTextHorzPos_INSIDE) rPol.nMainlineCnt=2;
}
}
@@ -522,7 +522,7 @@ basegfx::B2DPolyPolygon SdrMeasureObj::ImpCalcXPoly(const ImpMeasurePoly& rPol)
aPartPolyA.append(basegfx::B2DPoint(rPol.aMainline1.aP2.X(), rPol.aMainline1.aP2.Y()));
aRetval.append(aPartPolyA);
- if(rPol.nMainlineAnz > 1)
+ if(rPol.nMainlineCnt > 1)
{
aPartPolyA.clear();
aPartPolyA.append(basegfx::B2DPoint(rPol.aMainline2.aP1.X(), rPol.aMainline2.aP1.Y()));
@@ -530,7 +530,7 @@ basegfx::B2DPolyPolygon SdrMeasureObj::ImpCalcXPoly(const ImpMeasurePoly& rPol)
aRetval.append(aPartPolyA);
}
- if(rPol.nMainlineAnz > 2)
+ if(rPol.nMainlineCnt > 2)
{
aPartPolyA.clear();
aPartPolyA.append(basegfx::B2DPoint(rPol.aMainline3.aP1.X(), rPol.aMainline3.aP1.Y()));
diff --git a/svx/source/svdraw/svdorect.cxx b/svx/source/svdraw/svdorect.cxx
index 5cd19c1e0168..e0e48dc5a720 100644
--- a/svx/source/svdraw/svdorect.cxx
+++ b/svx/source/svdraw/svdorect.cxx
@@ -122,19 +122,19 @@ void SdrRectObj::SetXPolyDirty()
XPolygon SdrRectObj::ImpCalcXPoly(const tools::Rectangle& rRect1, long nRad1) const
{
XPolygon aXPoly(rRect1,nRad1,nRad1);
- const sal_uInt16 nPointAnz(aXPoly.GetPointCount());
- XPolygon aNeuPoly(nPointAnz+1);
- sal_uInt16 nShift=nPointAnz-2;
- if (nRad1!=0) nShift=nPointAnz-5;
+ const sal_uInt16 nPointCnt(aXPoly.GetPointCount());
+ XPolygon aNeuPoly(nPointCnt+1);
+ sal_uInt16 nShift=nPointCnt-2;
+ if (nRad1!=0) nShift=nPointCnt-5;
sal_uInt16 j=nShift;
- for (sal_uInt16 i=1; i<nPointAnz; i++) {
+ for (sal_uInt16 i=1; i<nPointCnt; i++) {
aNeuPoly[i]=aXPoly[j];
aNeuPoly.SetFlags(i,aXPoly.GetFlags(j));
j++;
- if (j>=nPointAnz) j=1;
+ if (j>=nPointCnt) j=1;
}
aNeuPoly[0]=rRect1.BottomCenter();
- aNeuPoly[nPointAnz]=aNeuPoly[0];
+ aNeuPoly[nPointCnt]=aNeuPoly[0];
aXPoly=aNeuPoly;
// these angles always relate to the top left corner of aRect
diff --git a/svx/source/svdraw/svdotxat.cxx b/svx/source/svdraw/svdotxat.cxx
index cf29c117594b..20325165a172 100644
--- a/svx/source/svdraw/svdotxat.cxx
+++ b/svx/source/svdraw/svdotxat.cxx
@@ -309,10 +309,10 @@ void SdrTextObj::ImpSetTextStyleSheetListeners()
const EditTextObject& rTextObj=pOutlinerParaObject->GetTextObject();
OUString aStyleName;
SfxStyleFamily eStyleFam;
- sal_Int32 nParaAnz=rTextObj.GetParagraphCount();
+ sal_Int32 nParaCnt=rTextObj.GetParagraphCount();
- for(sal_Int32 nParaNum(0); nParaNum < nParaAnz; nParaNum++)
+ for(sal_Int32 nParaNum(0); nParaNum < nParaCnt; nParaNum++)
{
rTextObj.GetStyleSheet(nParaNum, aStyleName, eStyleFam);
diff --git a/svx/source/svdraw/svdpagv.cxx b/svx/source/svdraw/svdpagv.cxx
index e7ced1227be6..d23f8f43f380 100644
--- a/svx/source/svdraw/svdpagv.cxx
+++ b/svx/source/svdraw/svdpagv.cxx
@@ -499,9 +499,9 @@ void SdrPageView::DrawPageViewGrid(OutputDevice& rOut, const tools::Rectangle& r
long y2=GetPage()->GetHgt()-GetPage()->GetLwrBorder()-1+nWrY;
const SdrPageGridFrameList* pFrames=GetPage()->GetGridFrameList(this,nullptr);
- sal_uInt16 nGridPaintAnz=1;
- if (pFrames!=nullptr) nGridPaintAnz=pFrames->GetCount();
- for (sal_uInt16 nGridPaintNum=0; nGridPaintNum<nGridPaintAnz; nGridPaintNum++) {
+ sal_uInt16 nGridPaintCnt=1;
+ if (pFrames!=nullptr) nGridPaintCnt=pFrames->GetCount();
+ for (sal_uInt16 nGridPaintNum=0; nGridPaintNum<nGridPaintCnt; nGridPaintNum++) {
if (pFrames!=nullptr) {
const SdrPageGridFrame& rGF=(*pFrames)[nGridPaintNum];
nWrX=rGF.GetPaperRect().Left();
diff --git a/svx/source/svdraw/svdtrans.cxx b/svx/source/svdraw/svdtrans.cxx
index 55e7d4784e49..1c6eff45a09e 100644
--- a/svx/source/svdraw/svdtrans.cxx
+++ b/svx/source/svdraw/svdtrans.cxx
@@ -287,19 +287,19 @@ double CrookStretchXPoint(Point& rPnt, Point* pC1, Point* pC2, const Point& rCen
void CrookRotatePoly(XPolygon& rPoly, const Point& rCenter, const Point& rRad, bool bVert)
{
double nSin,nCos;
- sal_uInt16 nPointAnz=rPoly.GetPointCount();
+ sal_uInt16 nPointCnt=rPoly.GetPointCount();
sal_uInt16 i=0;
- while (i<nPointAnz) {
+ while (i<nPointCnt) {
Point* pPnt=&rPoly[i];
Point* pC1=nullptr;
Point* pC2=nullptr;
- if (i+1<nPointAnz && rPoly.IsControl(i)) { // control point to the left
+ if (i+1<nPointCnt && rPoly.IsControl(i)) { // control point to the left
pC1=pPnt;
i++;
pPnt=&rPoly[i];
}
i++;
- if (i<nPointAnz && rPoly.IsControl(i)) { // control point to the right
+ if (i<nPointCnt && rPoly.IsControl(i)) { // control point to the right
pC2=&rPoly[i];
i++;
}
@@ -310,19 +310,19 @@ void CrookRotatePoly(XPolygon& rPoly, const Point& rCenter, const Point& rRad, b
void CrookSlantPoly(XPolygon& rPoly, const Point& rCenter, const Point& rRad, bool bVert)
{
double nSin,nCos;
- sal_uInt16 nPointAnz=rPoly.GetPointCount();
+ sal_uInt16 nPointCnt=rPoly.GetPointCount();
sal_uInt16 i=0;
- while (i<nPointAnz) {
+ while (i<nPointCnt) {
Point* pPnt=&rPoly[i];
Point* pC1=nullptr;
Point* pC2=nullptr;
- if (i+1<nPointAnz && rPoly.IsControl(i)) { // control point to the left
+ if (i+1<nPointCnt && rPoly.IsControl(i)) { // control point to the left
pC1=pPnt;
i++;
pPnt=&rPoly[i];
}
i++;
- if (i<nPointAnz && rPoly.IsControl(i)) { // control point to the right
+ if (i<nPointCnt && rPoly.IsControl(i)) { // control point to the right
pC2=&rPoly[i];
i++;
}
@@ -333,19 +333,19 @@ void CrookSlantPoly(XPolygon& rPoly, const Point& rCenter, const Point& rRad, bo
void CrookStretchPoly(XPolygon& rPoly, const Point& rCenter, const Point& rRad, bool bVert, const tools::Rectangle& rRefRect)
{
double nSin,nCos;
- sal_uInt16 nPointAnz=rPoly.GetPointCount();
+ sal_uInt16 nPointCnt=rPoly.GetPointCount();
sal_uInt16 i=0;
- while (i<nPointAnz) {
+ while (i<nPointCnt) {
Point* pPnt=&rPoly[i];
Point* pC1=nullptr;
Point* pC2=nullptr;
- if (i+1<nPointAnz && rPoly.IsControl(i)) { // control point to the left
+ if (i+1<nPointCnt && rPoly.IsControl(i)) { // control point to the left
pC1=pPnt;
i++;
pPnt=&rPoly[i];
}
i++;
- if (i<nPointAnz && rPoly.IsControl(i)) { // control point to the right
+ if (i<nPointCnt && rPoly.IsControl(i)) { // control point to the right
pC2=&rPoly[i];
i++;
}
diff --git a/svx/source/svdraw/svdundo.cxx b/svx/source/svdraw/svdundo.cxx
index 133c604953d9..c7a27c9140ef 100644
--- a/svx/source/svdraw/svdundo.cxx
+++ b/svx/source/svdraw/svdundo.cxx
@@ -1449,9 +1449,9 @@ SdrUndoDelPage::SdrUndoDelPage(SdrPage& rNewPg)
// now remember the master page relationships
if(mrPage.IsMasterPage())
{
- sal_uInt16 nPageAnz(rMod.GetPageCount());
+ sal_uInt16 nPageCnt(rMod.GetPageCount());
- for(sal_uInt16 nPageNum2(0); nPageNum2 < nPageAnz; nPageNum2++)
+ for(sal_uInt16 nPageNum2(0); nPageNum2 < nPageCnt; nPageNum2++)
{
SdrPage* pDrawPage = rMod.GetPage(nPageNum2);
diff --git a/svx/source/svdraw/svdviter.cxx b/svx/source/svdraw/svdviter.cxx
index f58f958efa41..e87d8b69b6fe 100644
--- a/svx/source/svdraw/svdviter.cxx
+++ b/svx/source/svdraw/svdviter.cxx
@@ -125,9 +125,9 @@ SdrView* SdrViewIter::ImpFindView()
{
if(mpModel)
{
- const size_t nLsAnz(mpModel->GetSizeOfVector());
+ const size_t nLsCnt(mpModel->GetSizeOfVector());
- while(mnListenerNum < nLsAnz)
+ while(mnListenerNum < nLsCnt)
{
SfxListener* pLs = mpModel->GetListener(mnListenerNum);
mpAktView = dynamic_cast<SdrView*>( pLs );
diff --git a/svx/source/table/svdotable.cxx b/svx/source/table/svdotable.cxx
index 1c8a7437f4a0..a265d8baa5c2 100644
--- a/svx/source/table/svdotable.cxx
+++ b/svx/source/table/svdotable.cxx
@@ -1772,7 +1772,7 @@ void SdrTableObj::EndTextEdit(SdrOutliner& rOutl)
{
OutlinerParaObject* pNewText = nullptr;
Paragraph* p1stPara = rOutl.GetParagraph( 0 );
- sal_Int32 nParaAnz = rOutl.GetParagraphCount();
+ sal_Int32 nParaCnt = rOutl.GetParagraphCount();
if(p1stPara)
{
@@ -1780,7 +1780,7 @@ void SdrTableObj::EndTextEdit(SdrOutliner& rOutl)
rOutl.UpdateFields();
// create new text object
- pNewText = rOutl.CreateParaObject( 0, nParaAnz );
+ pNewText = rOutl.CreateParaObject( 0, nParaCnt );
}
SetOutlinerParaObject(pNewText);
}
diff --git a/svx/source/table/tablecontroller.cxx b/svx/source/table/tablecontroller.cxx
index 514cd49d593e..98ef5bd8ffaf 100644
--- a/svx/source/table/tablecontroller.cxx
+++ b/svx/source/table/tablecontroller.cxx
@@ -1865,10 +1865,10 @@ void SvxTableController::EditCell(const CellPos& rPos, vcl::Window* pWindow, Tbl
if(!pTableObj->GetOutlinerParaObject() && mpView->GetTextEditOutliner())
{
::Outliner* pOutl = mpView->GetTextEditOutliner();
- sal_Int32 nParaAnz = pOutl->GetParagraphCount();
+ sal_Int32 nParaCnt = pOutl->GetParagraphCount();
Paragraph* p1stPara = pOutl->GetParagraph( 0 );
- if(nParaAnz==1 && p1stPara)
+ if(nParaCnt==1 && p1stPara)
{
// with only one paragraph
if (pOutl->GetText(p1stPara).isEmpty())
More information about the Libreoffice-commits
mailing list