diff options
| author | Michael Stahl <mstahl@redhat.com> | 2015-07-23 23:47:46 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2015-07-24 10:58:57 +0200 |
| commit | 22fd35f5987e3fed40d5b2ad0df35f7d89f842f8 (patch) | |
| tree | b8f0d3caa268cd03edc2dd132be5490708c38593 /sw | |
| parent | b772f022192d2150aa6b33b1ce086c4645277023 (diff) | |
filter: replace boost::ptr_vector with std::vector<std::unique_ptr>
Change-Id: I9aa0543edf3f0aef3a0a376aa0f82f51c6d93313
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/filter/ww8/ww8graf2.cxx | 2 | ||||
| -rw-r--r-- | sw/source/filter/ww8/ww8par.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sw/source/filter/ww8/ww8graf2.cxx b/sw/source/filter/ww8/ww8graf2.cxx index c2c0a65ae547..2c1182d115f5 100644 --- a/sw/source/filter/ww8/ww8graf2.cxx +++ b/sw/source/filter/ww8/ww8graf2.cxx @@ -99,7 +99,7 @@ sal_uInt16 wwZOrderer::GetEscherObjectIdx(sal_uLong nSpId) // First, find out what position this shape is in the Escher order. for (sal_uInt16 nShapePos=0; nShapePos < nShapeCount; nShapePos++) { - const SvxMSDffShapeOrder& rOrder = (*mpShapeOrders)[nShapePos]; + const SvxMSDffShapeOrder& rOrder = *(*mpShapeOrders)[nShapePos]; if (rOrder.nShapeId == nSpId) { nFound = nShapePos; diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx index 9ae8606fe228..8641ff07888e 100644 --- a/sw/source/filter/ww8/ww8par.cxx +++ b/sw/source/filter/ww8/ww8par.cxx @@ -5167,7 +5167,7 @@ sal_uLong SwWW8ImplReader::CoreLoad(WW8Glossary *pGloss, const SwPosition &rPos) for (sal_uInt16 nShapeNum=0; nShapeNum < nShapeCount; nShapeNum++) { SvxMSDffShapeOrder *pOrder = - &(*m_pMSDffManager->GetShapeOrders())[nShapeNum]; + (*m_pMSDffManager->GetShapeOrders())[nShapeNum].get(); // Insert Pointer into new Sort array if (pOrder->nTxBxComp && pOrder->pFly) aTxBxSort.insert(pOrder); |