diff options
| author | Noel Grandin <noel@peralex.com> | 2012-06-12 08:42:28 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-06-12 23:25:09 +0200 |
| commit | e19a2e50b723e0871d10cb51198d82c3dc8e57fa (patch) | |
| tree | 4293005023e070d931422fb3c04aa40a7ecb3030 /sw | |
| parent | 9536a28ede89e8c29940e8ba225215a45667062c (diff) | |
Convert SV_DECL_PTRARR_DEL(SvxMSDffShapeOrders) to std::vector
I could not use boost::ptr_vector because some of the code copies
the pointers into other data-structures temporarily, which
ptr_vector does not like.
Change-Id: Ie9c8aeb4e741bfd138694929ccda451a1c0984bb
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/filter/ww8/ww8graf2.cxx | 6 | ||||
| -rw-r--r-- | sw/source/filter/ww8/ww8par.cxx | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/sw/source/filter/ww8/ww8graf2.cxx b/sw/source/filter/ww8/ww8graf2.cxx index 93ef5e7a1198..a11c00e276bd 100644 --- a/sw/source/filter/ww8/ww8graf2.cxx +++ b/sw/source/filter/ww8/ww8graf2.cxx @@ -103,12 +103,12 @@ wwZOrderer::myeiter wwZOrderer::MapEscherIdxToIter(sal_uLong nIdx) sal_uInt16 wwZOrderer::GetEscherObjectIdx(sal_uLong nSpId) { sal_uInt16 nFound=0; - sal_uInt16 nShapeCount = mpShapeOrders ? mpShapeOrders->Count() : 0; + sal_uInt16 nShapeCount = mpShapeOrders ? mpShapeOrders->size() : 0; // First, find out what position this shape is in in the Escher order. for (sal_uInt16 nShapePos=0; nShapePos < nShapeCount; nShapePos++) { - const SvxMSDffShapeOrder *pOrder = mpShapeOrders->GetObject(nShapePos); - if (pOrder->nShapeId == nSpId) + const SvxMSDffShapeOrder& rOrder = *(*mpShapeOrders)[nShapePos]; + if (rOrder.nShapeId == nSpId) { nFound = nShapePos; break; diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx index b07404e47d96..82f4312c605d 100644 --- a/sw/source/filter/ww8/ww8par.cxx +++ b/sw/source/filter/ww8/ww8par.cxx @@ -4637,12 +4637,12 @@ sal_uLong SwWW8ImplReader::CoreLoad(WW8Glossary *pGloss, const SwPosition &rPos) SvxMSDffShapeTxBxSort aTxBxSort; // korrekte Z-Order der eingelesen Escher-Objekte sicherstellen - sal_uInt16 nShapeCount = pMSDffManager->GetShapeOrders()->Count(); + sal_uInt16 nShapeCount = pMSDffManager->GetShapeOrders()->size(); for (sal_uInt16 nShapeNum=0; nShapeNum < nShapeCount; nShapeNum++) { - SvxMSDffShapeOrder *pOrder = - pMSDffManager->GetShapeOrders()->GetObject(nShapeNum); + const SvxMSDffShapeOrder *pOrder = + (*pMSDffManager->GetShapeOrders())[nShapeNum]; // Pointer in neues Sort-Array einfuegen if (pOrder->nTxBxComp && pOrder->pFly) aTxBxSort.Insert(pOrder); |