diff options
| author | Jochen Nitschke <j.nitschke+logerrit@ok.de> | 2016-09-22 13:58:14 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-09-22 19:06:34 +0000 |
| commit | d141d5b3bd11ba6154b5d064fb69900405724b13 (patch) | |
| tree | f9f5fc1462c0b84552b5a6bda9730da4f17696e0 | |
| parent | a49748caf2bc3d236862eef5d26383212d35e648 (diff) | |
remove SfxPoolItemArrayBase_Impl typedef
Change-Id: Id4d3f80b3906395838afaffb2b0d00437d17f6dd
Reviewed-on: https://gerrit.libreoffice.org/29182
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
| -rw-r--r-- | svl/source/inc/poolio.hxx | 4 | ||||
| -rw-r--r-- | svl/source/items/itempool.cxx | 4 |
2 files changed, 3 insertions, 5 deletions
diff --git a/svl/source/inc/poolio.hxx b/svl/source/inc/poolio.hxx index 627fd6ba62ab..ec3ec8349c78 100644 --- a/svl/source/inc/poolio.hxx +++ b/svl/source/inc/poolio.hxx @@ -58,8 +58,6 @@ struct SfxPoolVersion_Impl {} }; -typedef std::vector<SfxPoolItem*> SfxPoolItemArrayBase_Impl; - typedef std::shared_ptr< SfxPoolVersion_Impl > SfxPoolVersion_ImplPtr; /** @@ -112,7 +110,7 @@ struct SfxItemPool_Impl bool mbPersistentRefCounts; SfxItemPool_Impl( SfxItemPool* pMaster, const OUString& rName, sal_uInt16 nStart, sal_uInt16 nEnd ) - : maPoolItems(nEnd - nStart + 1, static_cast<SfxPoolItemArray_Impl*>(nullptr)) + : maPoolItems(nEnd - nStart + 1) , aName(rName) , maPoolDefaults(nEnd - nStart + 1) , ppStaticDefaults(nullptr) diff --git a/svl/source/items/itempool.cxx b/svl/source/items/itempool.cxx index 6f4a6f210ad7..7a38d451acf7 100644 --- a/svl/source/items/itempool.cxx +++ b/svl/source/items/itempool.cxx @@ -646,7 +646,7 @@ const SfxPoolItem& SfxItemPool::Put( const SfxPoolItem& rItem, sal_uInt16 nWhich pItemArr = pImpl->maPoolItems[nIndex]; } - SfxPoolItemArrayBase_Impl::iterator ppFree; + std::vector<SfxPoolItem*>::iterator ppFree; bool ppFreeIsSet = false; // Is this a 'poolable' item - ie. should we re-use and return @@ -693,7 +693,7 @@ const SfxPoolItem& SfxItemPool::Put( const SfxPoolItem& rItem, sal_uInt16 nWhich // Unconditionally insert; check for a recently freed place if (pItemArr->maFree.size() > 0) { - SfxPoolItemArrayBase_Impl::iterator itr = pItemArr->begin(); + auto itr = pItemArr->begin(); sal_uInt32 nIdx = pItemArr->maFree.back(); pItemArr->maFree.pop_back(); |