diff options
| author | Jochen Nitschke <j.nitschke+logerrit@ok.de> | 2017-02-23 16:53:38 +0000 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-02-24 06:05:52 +0000 |
| commit | b65f742d7a3d843570c75ffcab99d5029b01a772 (patch) | |
| tree | 727e9adf026976c55afaec57dfc5d83806962b9f /svl | |
| parent | 1dadd312e5cb3c95f1e3cd5a1776830b7056bc6b (diff) | |
fix inverted warning logic
warning says the item pool is not empty,
so test item pointers for not null.
ever since initial commit cf7e1f9cc99e7c260cfab823f2c47f56035bdbd0
and make warning more descriptive by adding pool names
Change-Id: I3a8a6ca69e319d01418eac527b15f61adfd0fb13
Reviewed-on: https://gerrit.libreoffice.org/34589
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'svl')
| -rw-r--r-- | svl/source/items/itempool.cxx | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/svl/source/items/itempool.cxx b/svl/source/items/itempool.cxx index 679a097adf2f..ef2a481befb5 100644 --- a/svl/source/items/itempool.cxx +++ b/svl/source/items/itempool.cxx @@ -413,10 +413,11 @@ void SfxItemPool::SetSecondaryPool( SfxItemPool *pPool ) break; if (rSecArrayPtr) { - for (auto const& rItemPtr : *rSecArrayPtr) - if (!rItemPtr) + for (const SfxPoolItem* pItem : *rSecArrayPtr) + if (pItem) { - OSL_FAIL( "old secondary pool must be empty" ); + SAL_WARN("svl.items", "old secondary pool: " << pImpl->mpSecondary->pImpl->aName + << " of pool: " << pImpl->aName << " must be empty."); bOK = false; break; } |