Kaydet (Commit) 794ed9fd authored tarafından Miklos Vajna's avatar Miklos Vajna

svx: nObAnz -> nObjCount

Change-Id: I964d02b94f63ee5c3aea7375b0d833ea7ba99105
Reviewed-on: https://gerrit.libreoffice.org/14939Reviewed-by: 's avatarMiklos Vajna <vmiklos@collabora.co.uk>
Tested-by: 's avatarJenkins <ci@libreoffice.org>
üst 45c949c5
...@@ -410,9 +410,9 @@ SdrModel* E3dView::GetMarkedObjModel() const ...@@ -410,9 +410,9 @@ SdrModel* E3dView::GetMarkedObjModel() const
for(sal_uInt16 nPg(0); nPg < pNewModel->GetPageCount(); nPg++) for(sal_uInt16 nPg(0); nPg < pNewModel->GetPageCount(); nPg++)
{ {
const SdrPage* pSrcPg=pNewModel->GetPage(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); const SdrObject* pSrcOb=pSrcPg->GetObj(nOb);
...@@ -465,14 +465,14 @@ bool E3dView::Paste( ...@@ -465,14 +465,14 @@ bool E3dView::Paste(
for(sal_uInt16 nPg(0); nPg < rMod.GetPageCount(); nPg++) for(sal_uInt16 nPg(0); nPg < rMod.GetPageCount(); nPg++)
{ {
const SdrPage* pSrcPg=rMod.GetPage(nPg); const SdrPage* pSrcPg=rMod.GetPage(nPg);
const size_t nObAnz(pSrcPg->GetObjCount()); const size_t nObjCount(pSrcPg->GetObjCount());
// calculate offset for paste // calculate offset for paste
Rectangle aR = pSrcPg->GetAllObjBoundRect(); Rectangle aR = pSrcPg->GetAllObjBoundRect();
Point aDist(aPos - aR.Center()); Point aDist(aPos - aR.Center());
// Insert sub-objects for scenes // 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); const SdrObject* pSrcOb = pSrcPg->GetObj(nOb);
if(pSrcOb->ISA(E3dScene)) if(pSrcOb->ISA(E3dScene))
......
...@@ -289,14 +289,14 @@ bool SdrExchangeView::Paste( ...@@ -289,14 +289,14 @@ bool SdrExchangeView::Paste(
Point aDist(aPos-aR.Center()); Point aDist(aPos-aR.Center());
Size aSiz(aDist.X(),aDist.Y()); Size aSiz(aDist.X(),aDist.Y());
size_t nCloneErrCnt = 0; 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; bool bMark=pMarkPV!=NULL && !IsTextEdit() && (nOptions&SDRINSERT_DONTMARK)==0;
// #i13033# // #i13033#
// New mechanism to re-create the connections of cloned connectors // New mechanism to re-create the connections of cloned connectors
CloneList aCloneList; CloneList aCloneList;
for (size_t nOb=0; nOb<nObAnz; ++nOb) for (size_t nOb=0; nOb<nObjCount; ++nOb)
{ {
const SdrObject* pSrcOb=pSrcPg->GetObj(nOb); const SdrObject* pSrcOb=pSrcPg->GetObj(nOb);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment