summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2017-08-03 15:39:01 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2017-08-04 08:48:46 +0200
commit2213bd610f6522b8fea7ae2af7e973e29dbe25b6 (patch)
tree44941af30c27b43679e97b9dbadb218e453a991a
parentrename Anz->Cnt in sc (diff)
downloadcore-2213bd610f6522b8fea7ae2af7e973e29dbe25b6.tar.gz
core-2213bd610f6522b8fea7ae2af7e973e29dbe25b6.zip
rename Anz->Cnt in sd
Change-Id: If03e1e2e896ca7cd5783263b487eb313d80140c0 Reviewed-on: https://gerrit.libreoffice.org/40743 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
-rw-r--r--sd/source/core/sdiocmpt.cxx4
-rw-r--r--sd/source/filter/ppt/pptin.cxx10
-rw-r--r--sd/source/ui/animations/motionpathtag.cxx4
-rw-r--r--sd/source/ui/func/futext.cxx4
-rw-r--r--sd/source/ui/view/drviews2.cxx6
-rw-r--r--sd/source/ui/view/sdview2.cxx6
6 files changed, 17 insertions, 17 deletions
diff --git a/sd/source/core/sdiocmpt.cxx b/sd/source/core/sdiocmpt.cxx
index 68b3fa8df94e..d1103f5d7485 100644
--- a/sd/source/core/sdiocmpt.cxx
+++ b/sd/source/core/sdiocmpt.cxx
@@ -70,8 +70,8 @@ void old_SdrDownCompat::CloseSubRecord()
if(nMode == StreamMode::READ)
{
- sal_uInt32 nReadAnz(nAktPos - nSubRecPos);
- if(nReadAnz != nSubRecSiz)
+ sal_uInt32 nReadCnt(nAktPos - nSubRecPos);
+ if(nReadCnt != nSubRecSiz)
{
rStream.Seek(nSubRecPos + nSubRecSiz);
}
diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx
index d2b0d7ceb0d5..7bec40a94c6c 100644
--- a/sd/source/filter/ppt/pptin.cxx
+++ b/sd/source/filter/ppt/pptin.cxx
@@ -573,9 +573,9 @@ bool ImplSdPPTImport::Import()
sal_uInt32 nImportedPages = 0;
{
- sal_uInt16 nMasterAnz = GetPageCount( PPT_MASTERPAGE );
+ sal_uInt16 nMasterCnt = GetPageCount( PPT_MASTERPAGE );
- for ( sal_uInt16 nMasterNum = 0; nMasterNum < nMasterAnz; nMasterNum++ )
+ for ( sal_uInt16 nMasterNum = 0; nMasterNum < nMasterCnt; nMasterNum++ )
{
SetPageNum( nMasterNum, PPT_MASTERPAGE );
SdPage* pPage = static_cast<SdPage*>(MakeBlancPage( true ));
@@ -911,10 +911,10 @@ bool ImplSdPPTImport::Import()
pHandoutPage->SetPageKind( PageKind::Handout );
pSdrModel->InsertPage( pHandoutPage );
- sal_uInt16 nPageAnz = GetPageCount();
- if ( nPageAnz )
+ sal_uInt16 nPageCnt = GetPageCount();
+ if ( nPageCnt )
{
- for ( sal_uInt16 nPage = 0; nPage < nPageAnz; nPage++ )
+ for ( sal_uInt16 nPage = 0; nPage < nPageCnt; nPage++ )
{
mePresChange = PRESCHANGE_SEMIAUTO;
SetPageNum( nPage );
diff --git a/sd/source/ui/animations/motionpathtag.cxx b/sd/source/ui/animations/motionpathtag.cxx
index 90301c946242..7468dd549a22 100644
--- a/sd/source/ui/animations/motionpathtag.cxx
+++ b/sd/source/ui/animations/motionpathtag.cxx
@@ -920,8 +920,8 @@ void MotionPathTag::addCustomHandles( SdrHdlList& rHandlerList )
if( mrView.IsPlusHandlesAlwaysVisible() || bSelected )
{
- sal_uInt32 nPlusAnz=mpPathObj->GetPlusHdlCount(*pSmartHdl);
- for (sal_uInt32 nPlusNum=0; nPlusNum<nPlusAnz; nPlusNum++)
+ sal_uInt32 nPlusHdlCnt=mpPathObj->GetPlusHdlCount(*pSmartHdl);
+ for (sal_uInt32 nPlusNum=0; nPlusNum<nPlusHdlCnt; nPlusNum++)
{
SdrHdl* pPlusHdl = mpPathObj->GetPlusHdl(*pSmartHdl,nPlusNum);
if (pPlusHdl!=nullptr)
diff --git a/sd/source/ui/func/futext.cxx b/sd/source/ui/func/futext.cxx
index 5e2d82e1331e..1d65dd5d8fca 100644
--- a/sd/source/ui/func/futext.cxx
+++ b/sd/source/ui/func/futext.cxx
@@ -1017,10 +1017,10 @@ void FuText::SetInEditMode(const MouseEvent& rMEvt, bool bQuickDrag)
if (!GetTextObj()->GetOutlinerParaObject() && mpView->GetTextEditOutliner())
{
::Outliner* pOutl = mpView->GetTextEditOutliner();
- sal_Int32 nParaAnz = pOutl->GetParagraphCount();
+ sal_Int32 nParagraphCnt = pOutl->GetParagraphCount();
Paragraph* p1stPara = pOutl->GetParagraph( 0 );
- if (nParaAnz==1 && p1stPara)
+ if (nParagraphCnt==1 && p1stPara)
{
// with only one paragraph
if (pOutl->GetText(p1stPara).isEmpty())
diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx
index 0cb862c35122..21a5253bd4e2 100644
--- a/sd/source/ui/view/drviews2.cxx
+++ b/sd/source/ui/view/drviews2.cxx
@@ -2356,11 +2356,11 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
{
WaitObject aWait( GetActiveWindow() );
const SdrMarkList& rMarkList = mpDrawView->GetMarkedObjectList();
- const size_t nAnz=rMarkList.GetMarkCount();
+ const size_t nCnt=rMarkList.GetMarkCount();
// determine the sum of meta objects of all selected meta files
sal_uLong nCount = 0;
- for(size_t nm=0; nm<nAnz; ++nm)
+ for(size_t nm=0; nm<nCnt; ++nm)
{
SdrMark* pM=rMarkList.GetMark(nm);
SdrObject* pObj=pM->GetMarkedSdrObj();
@@ -2396,7 +2396,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
SdAbstractDialogFactory* pFact = SdAbstractDialogFactory::Create();
if( pFact )
{
- ScopedVclPtr<VclAbstractDialog> pDlg(pFact->CreateBreakDlg(GetActiveWindow(), mpDrawView, GetDocSh(), nCount, static_cast<sal_uLong>(nAnz) ));
+ ScopedVclPtr<VclAbstractDialog> pDlg(pFact->CreateBreakDlg(GetActiveWindow(), mpDrawView, GetDocSh(), nCount, static_cast<sal_uLong>(nCnt) ));
if( pDlg )
{
pDlg->Execute();
diff --git a/sd/source/ui/view/sdview2.cxx b/sd/source/ui/view/sdview2.cxx
index 81ddb27a7a36..ad13321ba146 100644
--- a/sd/source/ui/view/sdview2.cxx
+++ b/sd/source/ui/view/sdview2.cxx
@@ -392,9 +392,9 @@ void View::DragFinished( sal_Int8 nDropAction )
if( bUndo )
BegUndo();
- const size_t nAnz = mpDragSrcMarkList->GetMarkCount();
+ const size_t nCnt = mpDragSrcMarkList->GetMarkCount();
- for( size_t nm = nAnz; nm>0; )
+ for( size_t nm = nCnt; nm>0; )
{
--nm;
SdrMark* pM=mpDragSrcMarkList->GetMark(nm);
@@ -404,7 +404,7 @@ void View::DragFinished( sal_Int8 nDropAction )
mpDragSrcMarkList->GetMark(0)->GetMarkedSdrObj()->GetOrdNum();
- for (size_t nm = nAnz; nm>0;)
+ for (size_t nm = nCnt; nm>0;)
{
--nm;
SdrMark* pM=mpDragSrcMarkList->GetMark(nm);