commit 70c7e82003a539ed7f7ccbe596bde5ac9031d15c
author Jochen Nitschke <j.nitschke+logerrit@ok.de> Thu Sep 22 13:53:57 2016 +0200
committer Noel Grandin <noel.grandin@collabora.co.uk> Fri Sep 23 06:54:20 2016 +0000
tree 6db600f8472c2b9cc04352c98387e0291d5b0d8c
parent 792da744f3a360b2336fde3c9796e8e22db61308

move SfxPoolItemArray_Impl::ReHash to poolio.cxx ...

... it's declared in poolio.hxx

Change-Id: I8cc4a7152f66cf89fb01cd7a718974d76825ec04
Reviewed-on: https://gerrit.libreoffice.org/29181
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>

svl/source/items/itempool.cxx

diff --git a/svl/source/items/itempool.cxx b/svl/source/items/itempool.cxx
index eb78949..dca583c 100644
--- a/svl/source/items/itempool.cxx
+++ b/svl/source/items/itempool.cxx
@@ -730,25 +730,6 @@ const SfxPoolItem& SfxItemPool::Put( const SfxPoolItem& rItem, sal_uInt16 nWhich
    return *pNewItem;
}

/// Re-build our free list and pointer hash.
void SfxPoolItemArray_Impl::ReHash()
{
    maFree.clear();
    maPtrToIndex.clear();

    for (size_t nIdx = 0; nIdx < size(); ++nIdx)
    {
        SfxPoolItem *pItem = (*this)[nIdx];
        if (!pItem)
            maFree.push_back(nIdx);
        else
        {
            maPtrToIndex.insert(std::make_pair(pItem,nIdx));
            assert(maPtrToIndex.find(pItem) != maPtrToIndex.end());
        }
    }
}

void SfxItemPool::Remove( const SfxPoolItem& rItem )
{
    assert(!IsPoolDefaultItem(&rItem) && "cannot remove Pool Default");

svl/source/items/poolio.cxx

diff --git a/svl/source/items/poolio.cxx b/svl/source/items/poolio.cxx
index 0068fcd..30056e3 100644
--- a/svl/source/items/poolio.cxx
+++ b/svl/source/items/poolio.cxx
@@ -40,6 +40,25 @@ void SfxPoolItemArray_Impl::clear()
    maPtrToIndex.clear();
}

/// Re-build our free list and pointer hash.
void SfxPoolItemArray_Impl::ReHash()
{
    maFree.clear();
    maPtrToIndex.clear();

    for (size_t nIdx = 0; nIdx < size(); ++nIdx)
    {
        SfxPoolItem *pItem = (*this)[nIdx];
        if (!pItem)
            maFree.push_back(nIdx);
        else
        {
            maPtrToIndex.insert(std::make_pair(pItem,nIdx));
            assert(maPtrToIndex.find(pItem) != maPtrToIndex.end());
        }
    }
}

/**
 * Returns the <SfxItemPool> that is being saved.
 * This should only be used in very exceptional cases e.g.