[Libreoffice-commits] core.git: svl/source

[Noel Grandin (via logerrit)]

 svl/source/items/itempool.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a6b1d12447628016241efd643d074ce66b025c47
Author:     Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Thu May 2 15:31:08 2019 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Thu May 2 18:19:57 2019 +0200

    fix assert in SfxItemPool::PutImpl
    
    Change-Id: I6e9abe241c7a001b503a9e3006d08c0dfc52fcda
    Reviewed-on: https://gerrit.libreoffice.org/71676
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/svl/source/items/itempool.cxx b/svl/source/items/itempool.cxx
index 406b4a3db785..11be19bc62e0 100644
--- a/svl/source/items/itempool.cxx
+++ b/svl/source/items/itempool.cxx
@@ -651,7 +651,7 @@ const SfxPoolItem& SfxItemPool::PutImpl( const SfxPoolItem& rItem, sal_uInt16 nW
                 if (**itr == rItem)
                 {
                     AddRef(**itr);
-                    assert(!bPassingOwnership && "can't be passing ownership and have the item already in the pool");
+                    assert((!bPassingOwnership || (&rItem != *itr)) && "can't be passing ownership and have the item already in the pool");
                     return **itr;
                 }
             }