diff options
| author | Takeshi Abe <tabe@fixedpoint.jp> | 2014-10-07 18:46:56 +0900 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-10-08 15:18:32 +0000 |
| commit | ad8c2f7090ea2e77bb9afe77b2764f1b4560ad76 (patch) | |
| tree | 41e7d92633f00c30dbde46e039857bfbfc276dcf /sw | |
| parent | 79141e2ce2cac45634d48d13cf07f5d3fad171a6 (diff) | |
fdo#75757: remove inheritance to std::vector
from SvxMSDffShapeOrders.
Change-Id: Idf551f1fbde907759d6a296141e2837264dbbb10
Reviewed-on: https://gerrit.libreoffice.org/11840
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
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 0e3a4910dc42..6be482ca6f8a 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 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 7c1331e1fd94..df76c200920d 100644 --- a/sw/source/filter/ww8/ww8par.cxx +++ b/sw/source/filter/ww8/ww8par.cxx @@ -5203,7 +5203,7 @@ sal_uLong SwWW8ImplReader::CoreLoad(WW8Glossary *pGloss, const SwPosition &rPos) for (sal_uInt16 nShapeNum=0; nShapeNum < nShapeCount; nShapeNum++) { SvxMSDffShapeOrder *pOrder = - (*pMSDffManager->GetShapeOrders())[nShapeNum]; + &(*pMSDffManager->GetShapeOrders())[nShapeNum]; // Insert Pointer into new Sort array if (pOrder->nTxBxComp && pOrder->pFly) aTxBxSort.insert(pOrder); |