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 /filter/source/msfilter | |
| 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 'filter/source/msfilter')
| -rw-r--r-- | filter/source/msfilter/msdffimp.cxx | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx index f76de8cfab5f..1fe026ce0fed 100644 --- a/filter/source/msfilter/msdffimp.cxx +++ b/filter/source/msfilter/msdffimp.cxx @@ -5419,7 +5419,7 @@ void SvxMSDffManager::StoreShapeOrder(sal_uLong nId, sal_uInt16 nShpCnt = pShapeOrders->size(); for (sal_uInt16 nShapeNum=0; nShapeNum < nShpCnt; nShapeNum++) { - SvxMSDffShapeOrder& rOrder = *(*pShapeOrders)[ nShapeNum ]; + SvxMSDffShapeOrder& rOrder = (*pShapeOrders)[ nShapeNum ]; if( rOrder.nShapeId == nId ) { @@ -5440,7 +5440,7 @@ void SvxMSDffManager::ExchangeInShapeOrder( SdrObject* pOldObject, sal_uInt16 nShpCnt = pShapeOrders->size(); for (sal_uInt16 nShapeNum=0; nShapeNum < nShpCnt; nShapeNum++) { - SvxMSDffShapeOrder& rOrder = *(*pShapeOrders)[ nShapeNum ]; + SvxMSDffShapeOrder& rOrder = (*pShapeOrders)[ nShapeNum ]; if( rOrder.pObj == pOldObject ) { @@ -5457,7 +5457,7 @@ void SvxMSDffManager::RemoveFromShapeOrder( SdrObject* pObject ) const sal_uInt16 nShpCnt = pShapeOrders->size(); for (sal_uInt16 nShapeNum=0; nShapeNum < nShpCnt; nShapeNum++) { - SvxMSDffShapeOrder& rOrder = *(*pShapeOrders)[ nShapeNum ]; + SvxMSDffShapeOrder& rOrder = (*pShapeOrders)[ nShapeNum ]; if( rOrder.pObj == pObject ) { @@ -7345,10 +7345,4 @@ SdrObject* SvxMSDffManager::getShapeForId( sal_Int32 nShapeId ) return aIter != maShapeIdContainer.end() ? (*aIter).second : 0; } -SvxMSDffShapeOrders::~SvxMSDffShapeOrders() -{ - for( const_iterator it = begin(); it != end(); ++it ) - delete *it; -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |