summaryrefslogtreecommitdiff
path: root/svl/source/items
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2016-09-23 08:57:22 +0200
committerNoel Grandin <noel@peralex.com>2016-09-23 10:13:24 +0200
commite85d92a874524f677493dda5785be11ca6e99f17 (patch)
treea8762055324d46f4329180672fb527ead201065d /svl/source/items
parent373b44a2fcbe78e8a3ff14cd410826af151a6adf (diff)
Revert "Revert "remove SfxPoolItemArrayBase_Impl typedef""
This reverts commit b0eecd2d3ba4a1a424a2d52cccf64fe6fc09c34b. Now that the necessary parent commits are in, we can re-apply this.
Diffstat (limited to 'svl/source/items')
-rw-r--r--svl/source/items/itempool.cxx4
1 files changed, 2 insertions, 2 deletions
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();