diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-04-07 16:05:14 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-04-10 13:39:37 +0200 |
| commit | 748fea983f88752541767affa232b7bcb85f28dd (patch) | |
| tree | 525b0c9f64616d10dbc97b07c62052c4de3b025d /filter | |
| parent | fb4620f14eb4bd3f763d2ab29c3f26ee40a20b49 (diff) | |
loplugin:inlinefields in SvxMSDffManager
Change-Id: I30a7f593c1d2f751adcdde1a381fb616c2dfed74
Reviewed-on: https://gerrit.libreoffice.org/36347
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'filter')
| -rw-r--r-- | filter/source/msfilter/msdffimp.cxx | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx index e13d0c317294..df8167f6e047 100644 --- a/filter/source/msfilter/msdffimp.cxx +++ b/filter/source/msfilter/msdffimp.cxx @@ -5524,10 +5524,10 @@ void SvxMSDffManager::StoreShapeOrder(sal_uLong nId, SdrObject* pObject, SwFlyFrameFormat* pFly) const { - sal_uInt16 nShpCnt = m_pShapeOrders->size(); + sal_uInt16 nShpCnt = m_aShapeOrders.size(); for (sal_uInt16 nShapeNum=0; nShapeNum < nShpCnt; nShapeNum++) { - SvxMSDffShapeOrder& rOrder = *(*m_pShapeOrders)[ nShapeNum ]; + SvxMSDffShapeOrder& rOrder = *m_aShapeOrders[ nShapeNum ]; if( rOrder.nShapeId == nId ) { @@ -5543,10 +5543,10 @@ void SvxMSDffManager::ExchangeInShapeOrder( SdrObject* pOldObject, sal_uLong nTxBx, SdrObject* pObject) const { - sal_uInt16 nShpCnt = m_pShapeOrders->size(); + sal_uInt16 nShpCnt = m_aShapeOrders.size(); for (sal_uInt16 nShapeNum=0; nShapeNum < nShpCnt; nShapeNum++) { - SvxMSDffShapeOrder& rOrder = *(*m_pShapeOrders)[ nShapeNum ]; + SvxMSDffShapeOrder& rOrder = *m_aShapeOrders[ nShapeNum ]; if( rOrder.pObj == pOldObject ) { @@ -5560,10 +5560,10 @@ void SvxMSDffManager::ExchangeInShapeOrder( SdrObject* pOldObject, void SvxMSDffManager::RemoveFromShapeOrder( SdrObject* pObject ) const { - sal_uInt16 nShpCnt = m_pShapeOrders->size(); + sal_uInt16 nShpCnt = m_aShapeOrders.size(); for (sal_uInt16 nShapeNum=0; nShapeNum < nShpCnt; nShapeNum++) { - SvxMSDffShapeOrder& rOrder = *(*m_pShapeOrders)[ nShapeNum ]; + SvxMSDffShapeOrder& rOrder = *m_aShapeOrders[ nShapeNum ]; if( rOrder.pObj == pObject ) { @@ -5589,7 +5589,6 @@ SvxMSDffManager::SvxMSDffManager(SvStream& rStCtrl_, :DffPropertyReader( *this ), m_pBLIPInfos( new SvxMSDffBLIPInfos ), m_xShapeInfosByTxBxComp( new SvxMSDffShapeInfos_ByTxBxComp ), - m_pShapeOrders( new SvxMSDffShapeOrders ), nOffsDgg( nOffsDgg_ ), nBLIPCount( USHRT_MAX ), // initialize with error, since we fist check if the nGroupShapeFlags(0), // ensure initialization here, as some corrupted @@ -5636,7 +5635,6 @@ SvxMSDffManager::SvxMSDffManager( SvStream& rStCtrl_, const OUString& rBaseURL ) :DffPropertyReader( *this ), m_pBLIPInfos( new SvxMSDffBLIPInfos ), m_xShapeInfosByTxBxComp( new SvxMSDffShapeInfos_ByTxBxComp ), - m_pShapeOrders( new SvxMSDffShapeOrders ), nOffsDgg( 0 ), nBLIPCount( USHRT_MAX ), // initialize with error, since we first have to check nGroupShapeFlags(0), @@ -5660,7 +5658,6 @@ SvxMSDffManager::~SvxMSDffManager() { delete pSecPropSet; delete m_pBLIPInfos; - delete m_pShapeOrders; } void SvxMSDffManager::InitSvxMSDffManager( sal_uInt32 nOffsDgg_, SvStream* pStData_, sal_uInt32 nOleConvFlags ) @@ -6188,7 +6185,7 @@ bool SvxMSDffManager::GetShapeContainerData( SvStream& rSt, } m_xShapeInfosByTxBxComp->insert(std::make_shared<SvxMSDffShapeInfo>( aInfo)); - m_pShapeOrders->push_back(o3tl::make_unique<SvxMSDffShapeOrder>( + m_aShapeOrders.push_back(o3tl::make_unique<SvxMSDffShapeOrder>( aInfo.nShapeId )); } |