diff options
| author | Noel Grandin <noel@peralex.com> | 2016-09-23 08:57:22 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2016-09-23 10:13:24 +0200 |
| commit | e85d92a874524f677493dda5785be11ca6e99f17 (patch) | |
| tree | a8762055324d46f4329180672fb527ead201065d | |
| parent | 373b44a2fcbe78e8a3ff14cd410826af151a6adf (diff) | |
Revert "Revert "remove SfxPoolItemArrayBase_Impl typedef""
This reverts commit b0eecd2d3ba4a1a424a2d52cccf64fe6fc09c34b.
Now that the necessary parent commits are in, we can re-apply this.
| -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 0dd561e30346..75ba7334079c 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; /** @@ -121,7 +119,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 dca583c1aa35..15333f2f1aff 100644 --- a/svl/source/items/itempool.cxx +++ b/svl/source/items/itempool.cxx @@ -641,7 +641,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 @@ -688,7 +688,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(); |