From c8a93253e43e81e5dbc89937f2a21ca75e0582bc Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Wed, 9 Mar 2016 09:47:35 +0200 Subject: remove unused NOT_POOLABLE enum value and simplify the resulting SfxItemInfo field down to a single bool Change-Id: I73e24e83d39afc7660ac85872ba96bc790713cb2 Reviewed-on: https://gerrit.libreoffice.org/23058 Reviewed-by: Noel Grandin Tested-by: Noel Grandin --- svl/qa/unit/items/test_itempool.cxx | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) (limited to 'svl/qa') diff --git a/svl/qa/unit/items/test_itempool.cxx b/svl/qa/unit/items/test_itempool.cxx index 0c817ec804be..cc43694493e4 100644 --- a/svl/qa/unit/items/test_itempool.cxx +++ b/svl/qa/unit/items/test_itempool.cxx @@ -35,10 +35,10 @@ class PoolItemTest : public CppUnit::TestFixture void PoolItemTest::testPool() { SfxItemInfo aItems[] = - { { 0, SfxItemPoolFlags::POOLABLE }, - { 1, SfxItemPoolFlags::NONE /* not poolable */ }, - { 2, SfxItemPoolFlags::NOT_POOLABLE }, - { 3, SfxItemPoolFlags::NONE /* not poolable */} + { { 0, true }, + { 1, false /* not poolable */ }, + { 2, false }, + { 3, false /* not poolable */} }; SfxItemPool *pPool = new SfxItemPool("testpool", 0, 3, aItems); @@ -80,17 +80,6 @@ void PoolItemTest::testPool() CPPUNIT_ASSERT(&rVal2 != &rVal); } - // not-poolable - SfxVoidItem aItemTwo( 2 ); - SfxVoidItem aNotherTwo( 2 ); - { - CPPUNIT_ASSERT(pImpl->maPoolItems[2] == nullptr); - const SfxPoolItem &rVal = pPool->Put(aItemTwo); - // those guys just don't go in ... - CPPUNIT_ASSERT(pImpl->maPoolItems[2] == nullptr); - CPPUNIT_ASSERT(rVal == aItemOne); - } - // Test rehash for (size_t i = 0; i < pImpl->maPoolItems.size(); ++i) { -- cgit