[Libreoffice-commits] core.git: svx/source
Miklos Vajna
vmiklos at collabora.co.uk
Sat Mar 21 03:01:57 PDT 2015
svx/source/engine3d/view3d.cxx | 8 ++++----
svx/source/svdraw/svdxcgv.cxx | 4 ++--
2 files changed, 6 insertions(+), 6 deletions(-)
New commits:
commit 794ed9fdd0fb426647c1f9086512fe9c425fb17d
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Sat Mar 21 09:47:29 2015 +0100
svx: nObAnz -> nObjCount
Change-Id: I964d02b94f63ee5c3aea7375b0d833ea7ba99105
Reviewed-on: https://gerrit.libreoffice.org/14939
Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
Tested-by: Jenkins <ci at libreoffice.org>
diff --git a/svx/source/engine3d/view3d.cxx b/svx/source/engine3d/view3d.cxx
index 399bd23..16150b4 100644
--- a/svx/source/engine3d/view3d.cxx
+++ b/svx/source/engine3d/view3d.cxx
@@ -410,9 +410,9 @@ SdrModel* E3dView::GetMarkedObjModel() const
for(sal_uInt16 nPg(0); nPg < pNewModel->GetPageCount(); nPg++)
{
const SdrPage* pSrcPg=pNewModel->GetPage(nPg);
- const size_t nObAnz(pSrcPg->GetObjCount());
+ const size_t nObjCount(pSrcPg->GetObjCount());
- for(size_t nOb = 0; nOb < nObAnz; ++nOb)
+ for(size_t nOb = 0; nOb < nObjCount; ++nOb)
{
const SdrObject* pSrcOb=pSrcPg->GetObj(nOb);
@@ -465,14 +465,14 @@ bool E3dView::Paste(
for(sal_uInt16 nPg(0); nPg < rMod.GetPageCount(); nPg++)
{
const SdrPage* pSrcPg=rMod.GetPage(nPg);
- const size_t nObAnz(pSrcPg->GetObjCount());
+ const size_t nObjCount(pSrcPg->GetObjCount());
// calculate offset for paste
Rectangle aR = pSrcPg->GetAllObjBoundRect();
Point aDist(aPos - aR.Center());
// Insert sub-objects for scenes
- for(size_t nOb = 0; nOb < nObAnz; ++nOb)
+ for(size_t nOb = 0; nOb < nObjCount; ++nOb)
{
const SdrObject* pSrcOb = pSrcPg->GetObj(nOb);
if(pSrcOb->ISA(E3dScene))
diff --git a/svx/source/svdraw/svdxcgv.cxx b/svx/source/svdraw/svdxcgv.cxx
index fbc9b53..194231e 100644
--- a/svx/source/svdraw/svdxcgv.cxx
+++ b/svx/source/svdraw/svdxcgv.cxx
@@ -289,14 +289,14 @@ bool SdrExchangeView::Paste(
Point aDist(aPos-aR.Center());
Size aSiz(aDist.X(),aDist.Y());
size_t nCloneErrCnt = 0;
- const size_t nObAnz = pSrcPg->GetObjCount();
+ const size_t nObjCount = pSrcPg->GetObjCount();
bool bMark=pMarkPV!=NULL && !IsTextEdit() && (nOptions&SDRINSERT_DONTMARK)==0;
// #i13033#
// New mechanism to re-create the connections of cloned connectors
CloneList aCloneList;
- for (size_t nOb=0; nOb<nObAnz; ++nOb)
+ for (size_t nOb=0; nOb<nObjCount; ++nOb)
{
const SdrObject* pSrcOb=pSrcPg->GetObj(nOb);
More information about the Libreoffice-commits
mailing list