svl/source/inc/poolio.hxx | 4 +--- svl/source/items/itempool.cxx | 4 ++-- 2 files changed, 3 insertions(+), 5 deletions(-)
New commits: commit e85d92a874524f677493dda5785be11ca6e99f17 Author: Noel Grandin <n...@peralex.com> Date: Fri Sep 23 08:57:22 2016 +0200 Revert "Revert "remove SfxPoolItemArrayBase_Impl typedef"" This reverts commit b0eecd2d3ba4a1a424a2d52cccf64fe6fc09c34b. Now that the necessary parent commits are in, we can re-apply this. diff --git a/svl/source/inc/poolio.hxx b/svl/source/inc/poolio.hxx index 0dd561e..75ba733 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 dca583c..15333f2 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(); _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits