[Libreoffice-commits] core.git: chart2/source dbaccess/source editeng/source extensions/source include/svl reportdesign/source sc/source sfx2/source svl/qa svl/README svl/source svx/source sw/source

Noel Grandin noel at peralex.com
Wed Mar 9 09:47:16 UTC 2016


 chart2/source/view/main/ChartItemPool.cxx          |    2 
 dbaccess/source/ui/dlg/dbadmin.cxx                 |  122 +++----
 dbaccess/source/ui/misc/UITools.cxx                |   10 
 editeng/source/editeng/editdoc.cxx                 |  110 +++----
 extensions/source/propctrlr/fontdialog.cxx         |   40 +-
 include/svl/itempool.hxx                           |   22 -
 reportdesign/source/ui/misc/UITools.cxx            |   74 ++--
 reportdesign/source/ui/report/ReportController.cxx |   60 +--
 sc/source/core/data/docpool.cxx                    |  186 ++++++------
 sc/source/ui/app/msgpool.cxx                       |   20 -
 sfx2/source/explorer/nochaos.cxx                   |    8 
 svl/README                                         |    2 
 svl/qa/unit/items/test_itempool.cxx                |   19 -
 svl/source/items/itempool.cxx                      |   25 -
 svl/source/items/itemset.cxx                       |    8 
 svl/source/items/poolio.cxx                        |    6 
 svl/source/items/stylepool.cxx                     |    4 
 svx/source/svdraw/svdattr.cxx                      |    2 
 svx/source/xoutdev/xpool.cxx                       |    2 
 sw/source/core/bastyp/init.cxx                     |  324 ++++++++++-----------
 20 files changed, 511 insertions(+), 535 deletions(-)

New commits:
commit c8a93253e43e81e5dbc89937f2a21ca75e0582bc
Author: Noel Grandin <noel at peralex.com>
Date:   Wed Mar 9 09:47:35 2016 +0200

    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 <noelgrandin at gmail.com>
    Tested-by: Noel Grandin <noelgrandin at gmail.com>

diff --git a/chart2/source/view/main/ChartItemPool.cxx b/chart2/source/view/main/ChartItemPool.cxx
index 59f114c..b6864ca 100644
--- a/chart2/source/view/main/ChartItemPool.cxx
+++ b/chart2/source/view/main/ChartItemPool.cxx
@@ -168,7 +168,7 @@ ChartItemPool::ChartItemPool():
     for( sal_uInt16 i = 0; i < nMax; i++ )
     {
         pItemInfos[i]._nSID = 0;
-        pItemInfos[i]._nFlags = SfxItemPoolFlags::POOLABLE;
+        pItemInfos[i]._bPoolable = true;
     }
 
     // slot ids differing from which ids
diff --git a/dbaccess/source/ui/dlg/dbadmin.cxx b/dbaccess/source/ui/dlg/dbadmin.cxx
index ecf86d5..ac87241 100644
--- a/dbaccess/source/ui/dlg/dbadmin.cxx
+++ b/dbaccess/source/ui/dlg/dbadmin.cxx
@@ -371,67 +371,67 @@ SfxItemSet* ODbAdminDialog::createItemSet(SfxItemSet*& _rpSet, SfxItemPool*& _rp
     // create the pool
     static SfxItemInfo const aItemInfos[DSID_LAST_ITEM_ID - DSID_FIRST_ITEM_ID + 1] =
     {
-        {0,SfxItemPoolFlags::NONE},
-        {0,SfxItemPoolFlags::NONE},
-        {0,SfxItemPoolFlags::NONE},
-        {0,SfxItemPoolFlags::NONE},
-        {0,SfxItemPoolFlags::NONE},
-        {0,SfxItemPoolFlags::NONE},
-        {0,SfxItemPoolFlags::NONE},
-        {0,SfxItemPoolFlags::NONE},
-        {0,SfxItemPoolFlags::NONE},
-        {0,SfxItemPoolFlags::NONE},
-        {0,SfxItemPoolFlags::NONE},
-        {0,SfxItemPoolFlags::NONE},
-        {0,SfxItemPoolFlags::NONE},
-        {0,SfxItemPoolFlags::NONE},
-        {0,SfxItemPoolFlags::NONE},
-        {0,SfxItemPoolFlags::NONE},
-        {0,SfxItemPoolFlags::NONE},
-        {0,SfxItemPoolFlags::NONE},
-        {0,SfxItemPoolFlags::NONE},
-        {0,SfxItemPoolFlags::NONE},
-        {0,SfxItemPoolFlags::NONE},
-        {0,SfxItemPoolFlags::NONE},
-        {0,SfxItemPoolFlags::NONE},
-        {0,SfxItemPoolFlags::NONE},
-        {0,SfxItemPoolFlags::NONE},
-        {0,SfxItemPoolFlags::NONE},
-        {0,SfxItemPoolFlags::NONE},
-        {0,SfxItemPoolFlags::NONE},
-        {0,SfxItemPoolFlags::NONE},
-        {0,SfxItemPoolFlags::NONE},
-        {0,SfxItemPoolFlags::NONE},
-        {0,SfxItemPoolFlags::NONE},
-        {0,SfxItemPoolFlags::NONE},
-        {0,SfxItemPoolFlags::NONE},
-        {0,SfxItemPoolFlags::NONE},
-        {0,SfxItemPoolFlags::NONE},
-        {0,SfxItemPoolFlags::NONE},
-        {0,SfxItemPoolFlags::NONE},
-        {0,SfxItemPoolFlags::NONE},
-        {0,SfxItemPoolFlags::NONE},
-        {0,SfxItemPoolFlags::NONE},
-        {0,SfxItemPoolFlags::NONE},
-        {0,SfxItemPoolFlags::NONE},
-        {0,SfxItemPoolFlags::NONE},
-        {0,SfxItemPoolFlags::NONE},
-        {0,SfxItemPoolFlags::NONE},
-        {0,SfxItemPoolFlags::NONE},
-        {0,SfxItemPoolFlags::NONE},
-        {0,SfxItemPoolFlags::NONE},
-        {0,SfxItemPoolFlags::NONE},
-        {0,SfxItemPoolFlags::NONE},
-        {0,SfxItemPoolFlags::NONE},
-        {0,SfxItemPoolFlags::NONE},
-        {0,SfxItemPoolFlags::NONE},
-        {0,SfxItemPoolFlags::NONE},
-        {0,SfxItemPoolFlags::NONE},
-        {0,SfxItemPoolFlags::NONE},
-        {0,SfxItemPoolFlags::NONE},
-        {0,SfxItemPoolFlags::NONE},
-        {0,SfxItemPoolFlags::NONE},
-        {0,SfxItemPoolFlags::NONE}
+        {0,false},
+        {0,false},
+        {0,false},
+        {0,false},
+        {0,false},
+        {0,false},
+        {0,false},
+        {0,false},
+        {0,false},
+        {0,false},
+        {0,false},
+        {0,false},
+        {0,false},
+        {0,false},
+        {0,false},
+        {0,false},
+        {0,false},
+        {0,false},
+        {0,false},
+        {0,false},
+        {0,false},
+        {0,false},
+        {0,false},
+        {0,false},
+        {0,false},
+        {0,false},
+        {0,false},
+        {0,false},
+        {0,false},
+        {0,false},
+        {0,false},
+        {0,false},
+        {0,false},
+        {0,false},
+        {0,false},
+        {0,false},
+        {0,false},
+        {0,false},
+        {0,false},
+        {0,false},
+        {0,false},
+        {0,false},
+        {0,false},
+        {0,false},
+        {0,false},
+        {0,false},
+        {0,false},
+        {0,false},
+        {0,false},
+        {0,false},
+        {0,false},
+        {0,false},
+        {0,false},
+        {0,false},
+        {0,false},
+        {0,false},
+        {0,false},
+        {0,false},
+        {0,false},
+        {0,false},
+        {0,false}
     };
 
     OSL_ENSURE(sizeof(aItemInfos)/sizeof(aItemInfos[0]) == DSID_LAST_ITEM_ID,"Invalid Ids!");
diff --git a/dbaccess/source/ui/misc/UITools.cxx b/dbaccess/source/ui/misc/UITools.cxx
index ebfd43a..42353aa 100644
--- a/dbaccess/source/ui/misc/UITools.cxx
+++ b/dbaccess/source/ui/misc/UITools.cxx
@@ -799,11 +799,11 @@ bool callColumnFormatDialog(vcl::Window* _pParent,
     // UNO->ItemSet
     static SfxItemInfo aItemInfos[] =
     {
-        { 0, SfxItemPoolFlags::NONE },
-        { SID_ATTR_NUMBERFORMAT_VALUE,      SfxItemPoolFlags::POOLABLE },
-        { SID_ATTR_ALIGN_HOR_JUSTIFY,       SfxItemPoolFlags::POOLABLE },
-        { SID_ATTR_NUMBERFORMAT_ONE_AREA,   SfxItemPoolFlags::POOLABLE },
-        { SID_ATTR_NUMBERFORMAT_INFO,       SfxItemPoolFlags::POOLABLE }
+        { 0, false },
+        { SID_ATTR_NUMBERFORMAT_VALUE,      true },
+        { SID_ATTR_ALIGN_HOR_JUSTIFY,       true },
+        { SID_ATTR_NUMBERFORMAT_ONE_AREA,   true },
+        { SID_ATTR_NUMBERFORMAT_INFO,       true }
     };
     static const sal_uInt16 aAttrMap[] =
     {
diff --git a/editeng/source/editeng/editdoc.cxx b/editeng/source/editeng/editdoc.cxx
index 5db6b76..0cd46fa 100644
--- a/editeng/source/editeng/editdoc.cxx
+++ b/editeng/source/editeng/editdoc.cxx
@@ -158,61 +158,61 @@ bool IsScriptItemValid( sal_uInt16 nItemId, short nScriptType )
 }
 
 const SfxItemInfo aItemInfos[EDITITEMCOUNT] = {
-        { SID_ATTR_FRAMEDIRECTION, SfxItemPoolFlags::POOLABLE },         // EE_PARA_WRITINGDIR
-        { 0, SfxItemPoolFlags::POOLABLE },                               // EE_PARA_XMLATTRIBS
-        { SID_ATTR_PARA_HANGPUNCTUATION, SfxItemPoolFlags::POOLABLE },   // EE_PARA_HANGINGPUNCTUATION
-        { SID_ATTR_PARA_FORBIDDEN_RULES, SfxItemPoolFlags::POOLABLE },
-        { SID_ATTR_PARA_SCRIPTSPACE, SfxItemPoolFlags::POOLABLE },       // EE_PARA_ASIANCJKSPACING
-        { SID_ATTR_NUMBERING_RULE, SfxItemPoolFlags::POOLABLE },         // EE_PARA_NUMBULL
-        { 0, SfxItemPoolFlags::POOLABLE },                               // EE_PARA_HYPHENATE
-        { 0, SfxItemPoolFlags::POOLABLE },                               // EE_PARA_BULLETSTATE
-        { 0, SfxItemPoolFlags::POOLABLE },                               // EE_PARA_OUTLLRSPACE
-        { SID_ATTR_PARA_OUTLLEVEL, SfxItemPoolFlags::POOLABLE },         // EE_PARA_OUTLLEVEL
-        { SID_ATTR_PARA_BULLET, SfxItemPoolFlags::POOLABLE },            // EE_PARA_BULLET
-        { SID_ATTR_LRSPACE, SfxItemPoolFlags::POOLABLE },                // EE_PARA_LRSPACE
-        { SID_ATTR_ULSPACE, SfxItemPoolFlags::POOLABLE },                // EE_PARA_ULSPACE
-        { SID_ATTR_PARA_LINESPACE, SfxItemPoolFlags::POOLABLE },         // EE_PARA_SBL
-        { SID_ATTR_PARA_ADJUST, SfxItemPoolFlags::POOLABLE },            // EE_PARA_JUST
-        { SID_ATTR_TABSTOP, SfxItemPoolFlags::POOLABLE },                // EE_PARA_TABS
-        { SID_ATTR_ALIGN_HOR_JUSTIFY_METHOD, SfxItemPoolFlags::POOLABLE }, // EE_PARA_JUST_METHOD
-        { SID_ATTR_ALIGN_VER_JUSTIFY, SfxItemPoolFlags::POOLABLE },      // EE_PARA_VER_JUST
-        { SID_ATTR_CHAR_COLOR, SfxItemPoolFlags::POOLABLE },
-        { SID_ATTR_CHAR_FONT, SfxItemPoolFlags::POOLABLE },
-        { SID_ATTR_CHAR_FONTHEIGHT, SfxItemPoolFlags::POOLABLE },
-        { SID_ATTR_CHAR_SCALEWIDTH, SfxItemPoolFlags::POOLABLE },
-        { SID_ATTR_CHAR_WEIGHT, SfxItemPoolFlags::POOLABLE },
-        { SID_ATTR_CHAR_UNDERLINE, SfxItemPoolFlags::POOLABLE },
-        { SID_ATTR_CHAR_STRIKEOUT, SfxItemPoolFlags::POOLABLE },
-        { SID_ATTR_CHAR_POSTURE, SfxItemPoolFlags::POOLABLE },
-        { SID_ATTR_CHAR_CONTOUR, SfxItemPoolFlags::POOLABLE },
-        { SID_ATTR_CHAR_SHADOWED, SfxItemPoolFlags::POOLABLE },
-        { SID_ATTR_CHAR_ESCAPEMENT, SfxItemPoolFlags::POOLABLE },
-        { SID_ATTR_CHAR_AUTOKERN, SfxItemPoolFlags::POOLABLE },
-        { SID_ATTR_CHAR_KERNING, SfxItemPoolFlags::POOLABLE },
-        { SID_ATTR_CHAR_WORDLINEMODE, SfxItemPoolFlags::POOLABLE },
-        { SID_ATTR_CHAR_LANGUAGE, SfxItemPoolFlags::POOLABLE },
-        { SID_ATTR_CHAR_CJK_LANGUAGE, SfxItemPoolFlags::POOLABLE },
-        { SID_ATTR_CHAR_CTL_LANGUAGE, SfxItemPoolFlags::POOLABLE },
-        { SID_ATTR_CHAR_CJK_FONT, SfxItemPoolFlags::POOLABLE },
-        { SID_ATTR_CHAR_CTL_FONT, SfxItemPoolFlags::POOLABLE },
-        { SID_ATTR_CHAR_CJK_FONTHEIGHT, SfxItemPoolFlags::POOLABLE },
-        { SID_ATTR_CHAR_CTL_FONTHEIGHT, SfxItemPoolFlags::POOLABLE },
-        { SID_ATTR_CHAR_CJK_WEIGHT, SfxItemPoolFlags::POOLABLE },
-        { SID_ATTR_CHAR_CTL_WEIGHT, SfxItemPoolFlags::POOLABLE },
-        { SID_ATTR_CHAR_CJK_POSTURE, SfxItemPoolFlags::POOLABLE },
-        { SID_ATTR_CHAR_CTL_POSTURE, SfxItemPoolFlags::POOLABLE },
-        { SID_ATTR_CHAR_EMPHASISMARK, SfxItemPoolFlags::POOLABLE },
-        { SID_ATTR_CHAR_RELIEF, SfxItemPoolFlags::POOLABLE },
-        { 0, SfxItemPoolFlags::POOLABLE },                           // EE_CHAR_RUBI_DUMMY
-        { 0, SfxItemPoolFlags::POOLABLE },                           // EE_CHAR_XMLATTRIBS
-        { SID_ATTR_CHAR_OVERLINE, SfxItemPoolFlags::POOLABLE },
-        { SID_ATTR_CHAR_CASEMAP, SfxItemPoolFlags::POOLABLE },       // EE_CHAR_CASEMAP
-        { SID_ATTR_CHAR_GRABBAG, SfxItemPoolFlags::POOLABLE },       // EE_CHAR_GRABBAG
-        { SID_ATTR_CHAR_BACK_COLOR, SfxItemPoolFlags::POOLABLE },    // EE_CHAR_BKGCOLOR
-        { 0, SfxItemPoolFlags::POOLABLE },                           // EE_FEATURE_TAB
-        { 0, SfxItemPoolFlags::POOLABLE },                           // EE_FEATURE_LINEBR
-        { SID_ATTR_CHAR_CHARSETCOLOR, SfxItemPoolFlags::POOLABLE },  // EE_FEATURE_NOTCONV
-        { SID_FIELD, SfxItemPoolFlags::POOLABLE }
+        { SID_ATTR_FRAMEDIRECTION, true },         // EE_PARA_WRITINGDIR
+        { 0, true },                               // EE_PARA_XMLATTRIBS
+        { SID_ATTR_PARA_HANGPUNCTUATION, true },   // EE_PARA_HANGINGPUNCTUATION
+        { SID_ATTR_PARA_FORBIDDEN_RULES, true },
+        { SID_ATTR_PARA_SCRIPTSPACE, true },       // EE_PARA_ASIANCJKSPACING
+        { SID_ATTR_NUMBERING_RULE, true },         // EE_PARA_NUMBULL
+        { 0, true },                               // EE_PARA_HYPHENATE
+        { 0, true },                               // EE_PARA_BULLETSTATE
+        { 0, true },                               // EE_PARA_OUTLLRSPACE
+        { SID_ATTR_PARA_OUTLLEVEL, true },         // EE_PARA_OUTLLEVEL
+        { SID_ATTR_PARA_BULLET, true },            // EE_PARA_BULLET
+        { SID_ATTR_LRSPACE, true },                // EE_PARA_LRSPACE
+        { SID_ATTR_ULSPACE, true },                // EE_PARA_ULSPACE
+        { SID_ATTR_PARA_LINESPACE, true },         // EE_PARA_SBL
+        { SID_ATTR_PARA_ADJUST, true },            // EE_PARA_JUST
+        { SID_ATTR_TABSTOP, true },                // EE_PARA_TABS
+        { SID_ATTR_ALIGN_HOR_JUSTIFY_METHOD, true }, // EE_PARA_JUST_METHOD
+        { SID_ATTR_ALIGN_VER_JUSTIFY, true },      // EE_PARA_VER_JUST
+        { SID_ATTR_CHAR_COLOR, true },
+        { SID_ATTR_CHAR_FONT, true },
+        { SID_ATTR_CHAR_FONTHEIGHT, true },
+        { SID_ATTR_CHAR_SCALEWIDTH, true },
+        { SID_ATTR_CHAR_WEIGHT, true },
+        { SID_ATTR_CHAR_UNDERLINE, true },
+        { SID_ATTR_CHAR_STRIKEOUT, true },
+        { SID_ATTR_CHAR_POSTURE, true },
+        { SID_ATTR_CHAR_CONTOUR, true },
+        { SID_ATTR_CHAR_SHADOWED, true },
+        { SID_ATTR_CHAR_ESCAPEMENT, true },
+        { SID_ATTR_CHAR_AUTOKERN, true },
+        { SID_ATTR_CHAR_KERNING, true },
+        { SID_ATTR_CHAR_WORDLINEMODE, true },
+        { SID_ATTR_CHAR_LANGUAGE, true },
+        { SID_ATTR_CHAR_CJK_LANGUAGE, true },
+        { SID_ATTR_CHAR_CTL_LANGUAGE, true },
+        { SID_ATTR_CHAR_CJK_FONT, true },
+        { SID_ATTR_CHAR_CTL_FONT, true },
+        { SID_ATTR_CHAR_CJK_FONTHEIGHT, true },
+        { SID_ATTR_CHAR_CTL_FONTHEIGHT, true },
+        { SID_ATTR_CHAR_CJK_WEIGHT, true },
+        { SID_ATTR_CHAR_CTL_WEIGHT, true },
+        { SID_ATTR_CHAR_CJK_POSTURE, true },
+        { SID_ATTR_CHAR_CTL_POSTURE, true },
+        { SID_ATTR_CHAR_EMPHASISMARK, true },
+        { SID_ATTR_CHAR_RELIEF, true },
+        { 0, true },                           // EE_CHAR_RUBI_DUMMY
+        { 0, true },                           // EE_CHAR_XMLATTRIBS
+        { SID_ATTR_CHAR_OVERLINE, true },
+        { SID_ATTR_CHAR_CASEMAP, true },       // EE_CHAR_CASEMAP
+        { SID_ATTR_CHAR_GRABBAG, true },       // EE_CHAR_GRABBAG
+        { SID_ATTR_CHAR_BACK_COLOR, true },    // EE_CHAR_BKGCOLOR
+        { 0, true },                           // EE_FEATURE_TAB
+        { 0, true },                           // EE_FEATURE_LINEBR
+        { SID_ATTR_CHAR_CHARSETCOLOR, true },  // EE_FEATURE_NOTCONV
+        { SID_FIELD, true }
 };
 
 const sal_uInt16 aV1Map[] = {
diff --git a/extensions/source/propctrlr/fontdialog.cxx b/extensions/source/propctrlr/fontdialog.cxx
index 4d73a20..4aa9f88 100644
--- a/extensions/source/propctrlr/fontdialog.cxx
+++ b/extensions/source/propctrlr/fontdialog.cxx
@@ -518,26 +518,26 @@ namespace pcr
         // create the pool
         static SfxItemInfo const aItemInfos[CFID_LAST_ITEM_ID - CFID_FIRST_ITEM_ID + 1] =
         {
-            { SID_ATTR_CHAR_FONT,               SfxItemPoolFlags::NONE },
-            { SID_ATTR_CHAR_FONTHEIGHT,         SfxItemPoolFlags::NONE },
-            { SID_ATTR_CHAR_WEIGHT,             SfxItemPoolFlags::NONE },
-            { SID_ATTR_CHAR_POSTURE,            SfxItemPoolFlags::NONE },
-            { SID_ATTR_CHAR_LANGUAGE,           SfxItemPoolFlags::NONE },
-            { SID_ATTR_CHAR_UNDERLINE,          SfxItemPoolFlags::NONE },
-            { SID_ATTR_CHAR_STRIKEOUT,          SfxItemPoolFlags::NONE },
-            { SID_ATTR_CHAR_WORDLINEMODE,       SfxItemPoolFlags::NONE },
-            { SID_ATTR_CHAR_COLOR,              SfxItemPoolFlags::NONE },
-            { SID_ATTR_CHAR_RELIEF,             SfxItemPoolFlags::NONE },
-            { SID_ATTR_CHAR_EMPHASISMARK,       SfxItemPoolFlags::NONE },
-            { 0,                                SfxItemPoolFlags::NONE },
-            { 0,                                SfxItemPoolFlags::NONE },
-            { 0,                                SfxItemPoolFlags::NONE },
-            { 0,                                SfxItemPoolFlags::NONE },
-            { 0,                                SfxItemPoolFlags::NONE },
-            { 0,                                SfxItemPoolFlags::NONE },
-            { 0,                                SfxItemPoolFlags::NONE },
-            { 0,                                SfxItemPoolFlags::NONE },
-            { SID_ATTR_CHAR_FONTLIST,           SfxItemPoolFlags::NONE }
+            { SID_ATTR_CHAR_FONT,               false },
+            { SID_ATTR_CHAR_FONTHEIGHT,         false },
+            { SID_ATTR_CHAR_WEIGHT,             false },
+            { SID_ATTR_CHAR_POSTURE,            false },
+            { SID_ATTR_CHAR_LANGUAGE,           false },
+            { SID_ATTR_CHAR_UNDERLINE,          false },
+            { SID_ATTR_CHAR_STRIKEOUT,          false },
+            { SID_ATTR_CHAR_WORDLINEMODE,       false },
+            { SID_ATTR_CHAR_COLOR,              false },
+            { SID_ATTR_CHAR_RELIEF,             false },
+            { SID_ATTR_CHAR_EMPHASISMARK,       false },
+            { 0,                                false },
+            { 0,                                false },
+            { 0,                                false },
+            { 0,                                false },
+            { 0,                                false },
+            { 0,                                false },
+            { 0,                                false },
+            { 0,                                false },
+            { SID_ATTR_CHAR_FONTLIST,           false }
         };
 
         _rpPool = new SfxItemPool(OUString("PCRControlFontItemPool"), CFID_FIRST_ITEM_ID, CFID_LAST_ITEM_ID,
diff --git a/include/svl/itempool.hxx b/include/svl/itempool.hxx
index e9f216b..2ca544d 100644
--- a/include/svl/itempool.hxx
+++ b/include/svl/itempool.hxx
@@ -24,7 +24,6 @@
 #include <svl/poolitem.hxx>
 #include <svl/svldllapi.h>
 #include <tools/solar.h>
-#include <o3tl/typed_flags_set.hxx>
 
 class SvStream;
 class SfxBroadcaster;
@@ -32,21 +31,10 @@ struct SfxItemPool_Impl;
 
 #define SFX_WHICH_MAX 4999
 
-enum class SfxItemPoolFlags
-{
-    NONE               = 0x00,
-    POOLABLE           = 0x01,
-    NOT_POOLABLE       = 0x02,
-};
-namespace o3tl
-{
-    template<> struct typed_flags<SfxItemPoolFlags> : is_typed_flags<SfxItemPoolFlags, 0x03> {};
-}
-
 struct SfxItemInfo
 {
     sal_uInt16       _nSID;
-    SfxItemPoolFlags _nFlags;
+    bool            _bPoolable;
 };
 
 class SfxStyleSheetIterator;
@@ -84,7 +72,7 @@ private:
     sal_uInt16                      GetIndex_Impl(sal_uInt16 nWhich) const;
     sal_uInt16                      GetSize_Impl() const;
 
-    SVL_DLLPRIVATE bool             IsItemFlag_Impl( sal_uInt16 nWhich, SfxItemPoolFlags nFlag ) const;
+    SVL_DLLPRIVATE bool             IsItemPoolable_Impl( sal_uInt16 nWhich ) const;
 
 public:
     // for default SfxItemSet::CTOR, set default WhichRanges
@@ -197,9 +185,9 @@ public:
 
     void                            Delete();
 
-    bool                            IsItemFlag( sal_uInt16 nWhich, SfxItemPoolFlags nFlag ) const;
-    bool                            IsItemFlag( const SfxPoolItem &rItem, SfxItemPoolFlags nFlag ) const
-                                    { return IsItemFlag( rItem.Which(), nFlag ); }
+    bool                            IsItemPoolable( sal_uInt16 nWhich ) const;
+    bool                            IsItemPoolable( const SfxPoolItem &rItem ) const
+                                    { return IsItemPoolable( rItem.Which() ); }
     void                            SetItemInfos( const SfxItemInfo *pInfos );
     sal_uInt16                      GetWhich( sal_uInt16 nSlot, bool bDeep = true ) const;
     sal_uInt16                      GetSlotId( sal_uInt16 nWhich, bool bDeep = true ) const;
diff --git a/reportdesign/source/ui/misc/UITools.cxx b/reportdesign/source/ui/misc/UITools.cxx
index 0feab73..a070c7e 100644
--- a/reportdesign/source/ui/misc/UITools.cxx
+++ b/reportdesign/source/ui/misc/UITools.cxx
@@ -603,46 +603,46 @@ bool openCharDialog( const uno::Reference<report::XReportControlFormat >& _rxRep
     // UNO->ItemSet
     static SfxItemInfo aItemInfos[] =
     {
-        { SID_ATTR_CHAR_FONT, SfxItemPoolFlags::POOLABLE },
-        { SID_ATTR_CHAR_FONTHEIGHT, SfxItemPoolFlags::POOLABLE },
-        { SID_ATTR_CHAR_LANGUAGE, SfxItemPoolFlags::POOLABLE },
-        { SID_ATTR_CHAR_POSTURE, SfxItemPoolFlags::POOLABLE },
-        { SID_ATTR_CHAR_WEIGHT, SfxItemPoolFlags::POOLABLE },
-        { SID_ATTR_CHAR_SHADOWED, SfxItemPoolFlags::POOLABLE },
-        { SID_ATTR_CHAR_WORDLINEMODE, SfxItemPoolFlags::POOLABLE },
-        { SID_ATTR_CHAR_CONTOUR, SfxItemPoolFlags::POOLABLE },
-        { SID_ATTR_CHAR_STRIKEOUT, SfxItemPoolFlags::POOLABLE },
-        { SID_ATTR_CHAR_UNDERLINE, SfxItemPoolFlags::POOLABLE },
-        { SID_ATTR_CHAR_COLOR, SfxItemPoolFlags::POOLABLE },
-        { SID_ATTR_CHAR_KERNING, SfxItemPoolFlags::POOLABLE },
-        { SID_ATTR_CHAR_CASEMAP, SfxItemPoolFlags::POOLABLE },
-        { SID_ATTR_CHAR_ESCAPEMENT, SfxItemPoolFlags::POOLABLE },
-        { SID_ATTR_CHAR_FONTLIST, SfxItemPoolFlags::POOLABLE },
-        { SID_ATTR_CHAR_AUTOKERN, SfxItemPoolFlags::POOLABLE },
-        { SID_COLOR_TABLE, SfxItemPoolFlags::POOLABLE },
-        { SID_ATTR_FLASH, SfxItemPoolFlags::POOLABLE },
-        { SID_ATTR_CHAR_EMPHASISMARK, SfxItemPoolFlags::POOLABLE },
-        { SID_ATTR_CHAR_TWO_LINES, SfxItemPoolFlags::POOLABLE },
-        { SID_ATTR_CHAR_ROTATED, SfxItemPoolFlags::POOLABLE },
-        { SID_ATTR_CHAR_SCALEWIDTH, SfxItemPoolFlags::POOLABLE },
-        { SID_ATTR_CHAR_RELIEF, SfxItemPoolFlags::POOLABLE },
-        { SID_ATTR_CHAR_HIDDEN, SfxItemPoolFlags::POOLABLE },
-        { SID_ATTR_BRUSH, SfxItemPoolFlags::POOLABLE },
-        { SID_ATTR_ALIGN_HOR_JUSTIFY, SfxItemPoolFlags::POOLABLE },
-        { SID_ATTR_ALIGN_VER_JUSTIFY, SfxItemPoolFlags::POOLABLE },
+        { SID_ATTR_CHAR_FONT, true },
+        { SID_ATTR_CHAR_FONTHEIGHT, true },
+        { SID_ATTR_CHAR_LANGUAGE, true },
+        { SID_ATTR_CHAR_POSTURE, true },
+        { SID_ATTR_CHAR_WEIGHT, true },
+        { SID_ATTR_CHAR_SHADOWED, true },
+        { SID_ATTR_CHAR_WORDLINEMODE, true },
+        { SID_ATTR_CHAR_CONTOUR, true },
+        { SID_ATTR_CHAR_STRIKEOUT, true },
+        { SID_ATTR_CHAR_UNDERLINE, true },
+        { SID_ATTR_CHAR_COLOR, true },
+        { SID_ATTR_CHAR_KERNING, true },
+        { SID_ATTR_CHAR_CASEMAP, true },
+        { SID_ATTR_CHAR_ESCAPEMENT, true },
+        { SID_ATTR_CHAR_FONTLIST, true },
+        { SID_ATTR_CHAR_AUTOKERN, true },
+        { SID_COLOR_TABLE, true },
+        { SID_ATTR_FLASH, true },
+        { SID_ATTR_CHAR_EMPHASISMARK, true },
+        { SID_ATTR_CHAR_TWO_LINES, true },
+        { SID_ATTR_CHAR_ROTATED, true },
+        { SID_ATTR_CHAR_SCALEWIDTH, true },
+        { SID_ATTR_CHAR_RELIEF, true },
+        { SID_ATTR_CHAR_HIDDEN, true },
+        { SID_ATTR_BRUSH, true },
+        { SID_ATTR_ALIGN_HOR_JUSTIFY, true },
+        { SID_ATTR_ALIGN_VER_JUSTIFY, true },
 
         // Asian
-        { SID_ATTR_CHAR_CJK_FONT, SfxItemPoolFlags::POOLABLE },
-        { SID_ATTR_CHAR_CJK_FONTHEIGHT, SfxItemPoolFlags::POOLABLE },
-        { SID_ATTR_CHAR_CJK_LANGUAGE, SfxItemPoolFlags::POOLABLE },
-        { SID_ATTR_CHAR_CJK_POSTURE, SfxItemPoolFlags::POOLABLE },
-        { SID_ATTR_CHAR_CJK_WEIGHT, SfxItemPoolFlags::POOLABLE },
+        { SID_ATTR_CHAR_CJK_FONT, true },
+        { SID_ATTR_CHAR_CJK_FONTHEIGHT, true },
+        { SID_ATTR_CHAR_CJK_LANGUAGE, true },
+        { SID_ATTR_CHAR_CJK_POSTURE, true },
+        { SID_ATTR_CHAR_CJK_WEIGHT, true },
         // Complex
-        { SID_ATTR_CHAR_CTL_FONT, SfxItemPoolFlags::POOLABLE },
-        { SID_ATTR_CHAR_CTL_FONTHEIGHT, SfxItemPoolFlags::POOLABLE },
-        { SID_ATTR_CHAR_CTL_LANGUAGE, SfxItemPoolFlags::POOLABLE },
-        { SID_ATTR_CHAR_CTL_POSTURE, SfxItemPoolFlags::POOLABLE },
-        { SID_ATTR_CHAR_CTL_WEIGHT, SfxItemPoolFlags::POOLABLE }
+        { SID_ATTR_CHAR_CTL_FONT, true },
+        { SID_ATTR_CHAR_CTL_FONTHEIGHT, true },
+        { SID_ATTR_CHAR_CTL_LANGUAGE, true },
+        { SID_ATTR_CHAR_CTL_POSTURE, true },
+        { SID_ATTR_CHAR_CTL_WEIGHT, true }
     };
     vcl::Window* pParent = VCLUnoHelper::GetWindow( _rxParentWindow );
     ::std::unique_ptr<FontList> pFontList(new FontList( pParent ));
diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx
index 5498e53..ca02bc5 100644
--- a/reportdesign/source/ui/report/ReportController.cxx
+++ b/reportdesign/source/ui/report/ReportController.cxx
@@ -2352,35 +2352,35 @@ void OReportController::openPageDialog(const uno::Reference<report::XSection>& _
     // UNO->ItemSet
     static SfxItemInfo aItemInfos[] =
     {
-        { SID_ATTR_LRSPACE,     SfxItemPoolFlags::POOLABLE },
-        { SID_ATTR_ULSPACE,     SfxItemPoolFlags::POOLABLE },
-        { SID_ATTR_PAGE,        SfxItemPoolFlags::POOLABLE },
-        { SID_ATTR_PAGE_SIZE,   SfxItemPoolFlags::POOLABLE },
-        { SID_ENUM_PAGE_MODE,   SfxItemPoolFlags::POOLABLE },
-        { SID_PAPER_START,      SfxItemPoolFlags::POOLABLE },
-        { SID_PAPER_END,        SfxItemPoolFlags::POOLABLE },
-        { SID_ATTR_BRUSH,       SfxItemPoolFlags::POOLABLE },
-        { XATTR_FILLSTYLE,      SfxItemPoolFlags::POOLABLE },
-        { XATTR_FILLCOLOR,      SfxItemPoolFlags::POOLABLE },
-        { XATTR_FILLGRADIENT,       SfxItemPoolFlags::POOLABLE },
-        { XATTR_FILLHATCH,      SfxItemPoolFlags::POOLABLE },
-        { XATTR_FILLBITMAP,     SfxItemPoolFlags::POOLABLE },
-        { XATTR_FILLTRANSPARENCE,       SfxItemPoolFlags::POOLABLE },
-        { XATTR_GRADIENTSTEPCOUNT,      SfxItemPoolFlags::POOLABLE },
-        { XATTR_FILLBMP_TILE,       SfxItemPoolFlags::POOLABLE },
-        { XATTR_FILLBMP_POS,        SfxItemPoolFlags::POOLABLE },
-        { XATTR_FILLBMP_SIZEX,      SfxItemPoolFlags::POOLABLE },
-        { XATTR_FILLBMP_SIZEY,      SfxItemPoolFlags::POOLABLE },
-        { XATTR_FILLBMP_SIZELOG,        SfxItemPoolFlags::POOLABLE },
-        { XATTR_FILLBMP_TILEOFFSETX,    SfxItemPoolFlags::POOLABLE },
-        { XATTR_FILLBMP_TILEOFFSETY,    SfxItemPoolFlags::POOLABLE },
-        { XATTR_FILLBMP_STRETCH,        SfxItemPoolFlags::POOLABLE },
-        { XATTR_FILLBMP_POSOFFSETX,     SfxItemPoolFlags::POOLABLE },
-        { XATTR_FILLBMP_POSOFFSETY,     SfxItemPoolFlags::POOLABLE },
-        { XATTR_FILLFLOATTRANSPARENCE,  SfxItemPoolFlags::POOLABLE },
-        { XATTR_SECONDARYFILLCOLOR,     SfxItemPoolFlags::POOLABLE },
-        { XATTR_FILLBACKGROUND,     SfxItemPoolFlags::POOLABLE },
-        { SID_ATTR_METRIC,      SfxItemPoolFlags::POOLABLE }
+        { SID_ATTR_LRSPACE,     true },
+        { SID_ATTR_ULSPACE,     true },
+        { SID_ATTR_PAGE,        true },
+        { SID_ATTR_PAGE_SIZE,   true },
+        { SID_ENUM_PAGE_MODE,   true },
+        { SID_PAPER_START,      true },
+        { SID_PAPER_END,        true },
+        { SID_ATTR_BRUSH,       true },
+        { XATTR_FILLSTYLE,      true },
+        { XATTR_FILLCOLOR,      true },
+        { XATTR_FILLGRADIENT,       true },
+        { XATTR_FILLHATCH,      true },
+        { XATTR_FILLBITMAP,     true },
+        { XATTR_FILLTRANSPARENCE,       true },
+        { XATTR_GRADIENTSTEPCOUNT,      true },
+        { XATTR_FILLBMP_TILE,       true },
+        { XATTR_FILLBMP_POS,        true },
+        { XATTR_FILLBMP_SIZEX,      true },
+        { XATTR_FILLBMP_SIZEY,      true },
+        { XATTR_FILLBMP_SIZELOG,        true },
+        { XATTR_FILLBMP_TILEOFFSETX,    true },
+        { XATTR_FILLBMP_TILEOFFSETY,    true },
+        { XATTR_FILLBMP_STRETCH,        true },
+        { XATTR_FILLBMP_POSOFFSETX,     true },
+        { XATTR_FILLBMP_POSOFFSETY,     true },
+        { XATTR_FILLFLOATTRANSPARENCE,  true },
+        { XATTR_SECONDARYFILLCOLOR,     true },
+        { XATTR_FILLBACKGROUND,     true },
+        { SID_ATTR_METRIC,      true }
     };
 
     MeasurementSystem eSystem = SvtSysLocale().GetLocaleData().getMeasurementSystemEnum();
@@ -4221,7 +4221,7 @@ void OReportController::openZoomDialog()
     {
         static SfxItemInfo aItemInfos[] =
         {
-            { SID_ATTR_ZOOM, SfxItemPoolFlags::POOLABLE }
+            { SID_ATTR_ZOOM, true }
         };
         SfxPoolItem* pDefaults[] =
         {
diff --git a/sc/source/core/data/docpool.cxx b/sc/source/core/data/docpool.cxx
index be88800..71f7cf1 100644
--- a/sc/source/core/data/docpool.cxx
+++ b/sc/source/core/data/docpool.cxx
@@ -89,99 +89,99 @@ sal_uInt16* ScDocumentPool::pVersionMap12 = nullptr;
 
 static SfxItemInfo const  aItemInfos[] =
 {
-    { SID_ATTR_CHAR_FONT,           SfxItemPoolFlags::POOLABLE },    // ATTR_FONT
-    { SID_ATTR_CHAR_FONTHEIGHT,     SfxItemPoolFlags::POOLABLE },    // ATTR_FONT_HEIGHT
-    { SID_ATTR_CHAR_WEIGHT,         SfxItemPoolFlags::POOLABLE },    // ATTR_FONT_WEIGHT
-    { SID_ATTR_CHAR_POSTURE,        SfxItemPoolFlags::POOLABLE },    // ATTR_FONT_POSTURE
-    { SID_ATTR_CHAR_UNDERLINE,      SfxItemPoolFlags::POOLABLE },    // ATTR_FONT_UNDERLINE
-    { SID_ATTR_CHAR_OVERLINE,       SfxItemPoolFlags::POOLABLE },    // ATTR_FONT_OVERLINE
-    { SID_ATTR_CHAR_STRIKEOUT,      SfxItemPoolFlags::POOLABLE },    // ATTR_FONT_CROSSEDOUT
-    { SID_ATTR_CHAR_CONTOUR,        SfxItemPoolFlags::POOLABLE },    // ATTR_FONT_CONTOUR
-    { SID_ATTR_CHAR_SHADOWED,       SfxItemPoolFlags::POOLABLE },    // ATTR_FONT_SHADOWED
-    { SID_ATTR_CHAR_COLOR,          SfxItemPoolFlags::POOLABLE },    // ATTR_FONT_COLOR
-    { SID_ATTR_CHAR_LANGUAGE,       SfxItemPoolFlags::POOLABLE },    // ATTR_FONT_LANGUAGE
-    { SID_ATTR_CHAR_CJK_FONT,       SfxItemPoolFlags::POOLABLE },    // ATTR_CJK_FONT            from 614
-    { SID_ATTR_CHAR_CJK_FONTHEIGHT, SfxItemPoolFlags::POOLABLE },    // ATTR_CJK_FONT_HEIGHT     from 614
-    { SID_ATTR_CHAR_CJK_WEIGHT,     SfxItemPoolFlags::POOLABLE },    // ATTR_CJK_FONT_WEIGHT     from 614
-    { SID_ATTR_CHAR_CJK_POSTURE,    SfxItemPoolFlags::POOLABLE },    // ATTR_CJK_FONT_POSTURE    from 614
-    { SID_ATTR_CHAR_CJK_LANGUAGE,   SfxItemPoolFlags::POOLABLE },    // ATTR_CJK_FONT_LANGUAGE   from 614
-    { SID_ATTR_CHAR_CTL_FONT,       SfxItemPoolFlags::POOLABLE },    // ATTR_CTL_FONT            from 614
-    { SID_ATTR_CHAR_CTL_FONTHEIGHT, SfxItemPoolFlags::POOLABLE },    // ATTR_CTL_FONT_HEIGHT     from 614
-    { SID_ATTR_CHAR_CTL_WEIGHT,     SfxItemPoolFlags::POOLABLE },    // ATTR_CTL_FONT_WEIGHT     from 614
-    { SID_ATTR_CHAR_CTL_POSTURE,    SfxItemPoolFlags::POOLABLE },    // ATTR_CTL_FONT_POSTURE    from 614
-    { SID_ATTR_CHAR_CTL_LANGUAGE,   SfxItemPoolFlags::POOLABLE },    // ATTR_CTL_FONT_LANGUAGE   from 614
-    { SID_ATTR_CHAR_EMPHASISMARK,   SfxItemPoolFlags::POOLABLE },    // ATTR_FONT_EMPHASISMARK   from 614
-    { 0,                            SfxItemPoolFlags::POOLABLE },    // ATTR_USERDEF             from 614 / 641c
-    { SID_ATTR_CHAR_WORDLINEMODE,   SfxItemPoolFlags::POOLABLE },    // ATTR_FONT_WORDLINE       from 632b
-    { SID_ATTR_CHAR_RELIEF,         SfxItemPoolFlags::POOLABLE },    // ATTR_FONT_RELIEF         from 632b
-    { SID_ATTR_ALIGN_HYPHENATION,   SfxItemPoolFlags::POOLABLE },    // ATTR_HYPHENATE           from 632b
-    { 0,                            SfxItemPoolFlags::POOLABLE },    // ATTR_SCRIPTSPACE         from 614d
-    { 0,                            SfxItemPoolFlags::POOLABLE },    // ATTR_HANGPUNCTUATION     from 614d
-    { SID_ATTR_PARA_FORBIDDEN_RULES,SfxItemPoolFlags::POOLABLE },    // ATTR_FORBIDDEN_RULES     from 614d
-    { SID_ATTR_ALIGN_HOR_JUSTIFY,   SfxItemPoolFlags::POOLABLE },    // ATTR_HOR_JUSTIFY
-    { SID_ATTR_ALIGN_HOR_JUSTIFY_METHOD, SfxItemPoolFlags::POOLABLE }, // ATTR_HOR_JUSTIFY_METHOD
-    { SID_ATTR_ALIGN_INDENT,        SfxItemPoolFlags::POOLABLE },    // ATTR_INDENT          from 350
-    { SID_ATTR_ALIGN_VER_JUSTIFY,   SfxItemPoolFlags::POOLABLE },    // ATTR_VER_JUSTIFY
-    { SID_ATTR_ALIGN_VER_JUSTIFY_METHOD, SfxItemPoolFlags::POOLABLE }, // ATTR_VER_JUSTIFY_METHOD
-    { SID_ATTR_ALIGN_STACKED,       SfxItemPoolFlags::POOLABLE },    // ATTR_STACKED         from 680/dr14 (replaces ATTR_ORIENTATION)
-    { SID_ATTR_ALIGN_DEGREES,       SfxItemPoolFlags::POOLABLE },    // ATTR_ROTATE_VALUE    from 367
-    { SID_ATTR_ALIGN_LOCKPOS,       SfxItemPoolFlags::POOLABLE },    // ATTR_ROTATE_MODE     from 367
-    { SID_ATTR_ALIGN_ASIANVERTICAL, SfxItemPoolFlags::POOLABLE },    // ATTR_VERTICAL_ASIAN  from 642
-    { SID_ATTR_FRAMEDIRECTION,      SfxItemPoolFlags::POOLABLE },    // ATTR_WRITINGDIR      from 643
-    { SID_ATTR_ALIGN_LINEBREAK,     SfxItemPoolFlags::POOLABLE },    // ATTR_LINEBREAK
-    { SID_ATTR_ALIGN_SHRINKTOFIT,   SfxItemPoolFlags::POOLABLE },    // ATTR_SHRINKTOFIT     from 680/dr14
-    { SID_ATTR_BORDER_DIAG_TLBR,    SfxItemPoolFlags::POOLABLE },    // ATTR_BORDER_TLBR     from 680/dr14
-    { SID_ATTR_BORDER_DIAG_BLTR,    SfxItemPoolFlags::POOLABLE },    // ATTR_BORDER_BLTR     from 680/dr14
-    { SID_ATTR_ALIGN_MARGIN,        SfxItemPoolFlags::POOLABLE },    // ATTR_MARGIN
-    { 0,                            SfxItemPoolFlags::POOLABLE },    // ATTR_MERGE
-    { 0,                            SfxItemPoolFlags::POOLABLE },    // ATTR_MERGE_FLAG
-    { SID_ATTR_NUMBERFORMAT_VALUE,  SfxItemPoolFlags::POOLABLE },    // ATTR_VALUE_FORMAT
-    { ATTR_LANGUAGE_FORMAT,         SfxItemPoolFlags::POOLABLE },    // ATTR_LANGUAGE_FORMAT from 329, is combined with SID_ATTR_NUMBERFORMAT_VALUE in the dialog
-    { SID_ATTR_BRUSH,               SfxItemPoolFlags::POOLABLE },    // ATTR_BACKGROUND
-    { SID_SCATTR_PROTECTION,        SfxItemPoolFlags::POOLABLE },    // ATTR_PROTECTION
-    { SID_ATTR_BORDER_OUTER,        SfxItemPoolFlags::POOLABLE },    // ATTR_BORDER
-    { SID_ATTR_BORDER_INNER,        SfxItemPoolFlags::POOLABLE },    // ATTR_BORDER_INNER
-    { SID_ATTR_BORDER_SHADOW,       SfxItemPoolFlags::POOLABLE },    // ATTR_SHADOW
-    { 0,                            SfxItemPoolFlags::POOLABLE },    // ATTR_VALIDDATA
-    { 0,                            SfxItemPoolFlags::POOLABLE },    // ATTR_CONDITIONAL
-    { 0,                            SfxItemPoolFlags::POOLABLE },    // ATTR_HYPERLINK
-    { 0,                            SfxItemPoolFlags::POOLABLE },    // ATTR_PATTERN
-    { SID_ATTR_LRSPACE,             SfxItemPoolFlags::POOLABLE },    // ATTR_LRSPACE
-    { SID_ATTR_ULSPACE,             SfxItemPoolFlags::POOLABLE },    // ATTR_ULSPACE
-    { SID_ATTR_PAGE,                SfxItemPoolFlags::POOLABLE },    // ATTR_PAGE
-    { 0,                            SfxItemPoolFlags::POOLABLE },    // ATTR_PAGE_PAPERTRAY, since 303 just a dummy
-    { SID_ATTR_PAGE_PAPERBIN,       SfxItemPoolFlags::POOLABLE },    // ATTR_PAGE_PAPERBIN
-    { SID_ATTR_PAGE_SIZE,           SfxItemPoolFlags::POOLABLE },    // ATTR_PAGE_SIZE
-    { SID_ATTR_PAGE_MAXSIZE,        SfxItemPoolFlags::POOLABLE },    // ATTR_PAGE_MAXSIZE
-    { SID_ATTR_PAGE_EXT1,           SfxItemPoolFlags::POOLABLE },    // ATTR_PAGE_HORCENTER
-    { SID_ATTR_PAGE_EXT2,           SfxItemPoolFlags::POOLABLE },    // ATTR_PAGE_VERCENTER
-    { SID_ATTR_PAGE_ON,             SfxItemPoolFlags::POOLABLE },    // ATTR_PAGE_ON
-    { SID_ATTR_PAGE_DYNAMIC,        SfxItemPoolFlags::POOLABLE },    // ATTR_PAGE_DYNAMIC
-    { SID_ATTR_PAGE_SHARED,         SfxItemPoolFlags::POOLABLE },    // ATTR_PAGE_SHARED
-    { SID_SCATTR_PAGE_NOTES,        SfxItemPoolFlags::POOLABLE },    // ATTR_PAGE_NOTES
-    { SID_SCATTR_PAGE_GRID,         SfxItemPoolFlags::POOLABLE },    // ATTR_PAGE_GRID
-    { SID_SCATTR_PAGE_HEADERS,      SfxItemPoolFlags::POOLABLE },    // ATTR_PAGE_HEADERS
-    { SID_SCATTR_PAGE_CHARTS,       SfxItemPoolFlags::POOLABLE },    // ATTR_PAGE_CHARTS
-    { SID_SCATTR_PAGE_OBJECTS,      SfxItemPoolFlags::POOLABLE },    // ATTR_PAGE_OBJECTS
-    { SID_SCATTR_PAGE_DRAWINGS,     SfxItemPoolFlags::POOLABLE },    // ATTR_PAGE_DRAWINGS
-    { SID_SCATTR_PAGE_TOPDOWN,      SfxItemPoolFlags::POOLABLE },    // ATTR_PAGE_TOPDOWN
-    { SID_SCATTR_PAGE_SCALE,        SfxItemPoolFlags::POOLABLE },    // ATTR_PAGE_SCALE
-    { SID_SCATTR_PAGE_SCALETOPAGES, SfxItemPoolFlags::POOLABLE },    // ATTR_PAGE_SCALETOPAGES
-    { SID_SCATTR_PAGE_FIRSTPAGENO,  SfxItemPoolFlags::POOLABLE },    // ATTR_PAGE_FIRSTPAGENO
-    { SID_SCATTR_PAGE_PRINTAREA,    SfxItemPoolFlags::POOLABLE },    // ATTR_PAGE_PRINTAREA
-    { SID_SCATTR_PAGE_REPEATROW,    SfxItemPoolFlags::POOLABLE },    // ATTR_PAGE_REPEATROW
-    { SID_SCATTR_PAGE_REPEATCOL,    SfxItemPoolFlags::POOLABLE },    // ATTR_PAGE_REPEATCOL
-    { SID_SCATTR_PAGE_PRINTTABLES,  SfxItemPoolFlags::POOLABLE },    // ATTR_PAGE_PRINTTABLES
-    { SID_SCATTR_PAGE_HEADERLEFT,   SfxItemPoolFlags::POOLABLE },    // ATTR_PAGE_HEADERLEFT
-    { SID_SCATTR_PAGE_FOOTERLEFT,   SfxItemPoolFlags::POOLABLE },    // ATTR_PAGE_FOOTERLEFT
-    { SID_SCATTR_PAGE_HEADERRIGHT,  SfxItemPoolFlags::POOLABLE },    // ATTR_PAGE_HEADERRIGHT
-    { SID_SCATTR_PAGE_FOOTERRIGHT,  SfxItemPoolFlags::POOLABLE },    // ATTR_PAGE_FOOTERRIGHT
-    { SID_ATTR_PAGE_HEADERSET,      SfxItemPoolFlags::POOLABLE },    // ATTR_PAGE_HEADERSET
-    { SID_ATTR_PAGE_FOOTERSET,      SfxItemPoolFlags::POOLABLE },    // ATTR_PAGE_FOOTERSET
-    { SID_SCATTR_PAGE_FORMULAS,     SfxItemPoolFlags::POOLABLE },    // ATTR_PAGE_FORMULAS
-    { SID_SCATTR_PAGE_NULLVALS,     SfxItemPoolFlags::POOLABLE },    // ATTR_PAGE_NULLVALS
-    { SID_SCATTR_PAGE_SCALETO,      SfxItemPoolFlags::POOLABLE },    // ATTR_PAGE_SCALETO
-    { 0,                            SfxItemPoolFlags::POOLABLE }     // ATTR_HIDDEN
+    { SID_ATTR_CHAR_FONT,           true },    // ATTR_FONT
+    { SID_ATTR_CHAR_FONTHEIGHT,     true },    // ATTR_FONT_HEIGHT
+    { SID_ATTR_CHAR_WEIGHT,         true },    // ATTR_FONT_WEIGHT
+    { SID_ATTR_CHAR_POSTURE,        true },    // ATTR_FONT_POSTURE
+    { SID_ATTR_CHAR_UNDERLINE,      true },    // ATTR_FONT_UNDERLINE
+    { SID_ATTR_CHAR_OVERLINE,       true },    // ATTR_FONT_OVERLINE
+    { SID_ATTR_CHAR_STRIKEOUT,      true },    // ATTR_FONT_CROSSEDOUT
+    { SID_ATTR_CHAR_CONTOUR,        true },    // ATTR_FONT_CONTOUR
+    { SID_ATTR_CHAR_SHADOWED,       true },    // ATTR_FONT_SHADOWED
+    { SID_ATTR_CHAR_COLOR,          true },    // ATTR_FONT_COLOR
+    { SID_ATTR_CHAR_LANGUAGE,       true },    // ATTR_FONT_LANGUAGE
+    { SID_ATTR_CHAR_CJK_FONT,       true },    // ATTR_CJK_FONT            from 614
+    { SID_ATTR_CHAR_CJK_FONTHEIGHT, true },    // ATTR_CJK_FONT_HEIGHT     from 614
+    { SID_ATTR_CHAR_CJK_WEIGHT,     true },    // ATTR_CJK_FONT_WEIGHT     from 614
+    { SID_ATTR_CHAR_CJK_POSTURE,    true },    // ATTR_CJK_FONT_POSTURE    from 614
+    { SID_ATTR_CHAR_CJK_LANGUAGE,   true },    // ATTR_CJK_FONT_LANGUAGE   from 614
+    { SID_ATTR_CHAR_CTL_FONT,       true },    // ATTR_CTL_FONT            from 614
+    { SID_ATTR_CHAR_CTL_FONTHEIGHT, true },    // ATTR_CTL_FONT_HEIGHT     from 614
+    { SID_ATTR_CHAR_CTL_WEIGHT,     true },    // ATTR_CTL_FONT_WEIGHT     from 614
+    { SID_ATTR_CHAR_CTL_POSTURE,    true },    // ATTR_CTL_FONT_POSTURE    from 614
+    { SID_ATTR_CHAR_CTL_LANGUAGE,   true },    // ATTR_CTL_FONT_LANGUAGE   from 614
+    { SID_ATTR_CHAR_EMPHASISMARK,   true },    // ATTR_FONT_EMPHASISMARK   from 614
+    { 0,                            true },    // ATTR_USERDEF             from 614 / 641c
+    { SID_ATTR_CHAR_WORDLINEMODE,   true },    // ATTR_FONT_WORDLINE       from 632b
+    { SID_ATTR_CHAR_RELIEF,         true },    // ATTR_FONT_RELIEF         from 632b
+    { SID_ATTR_ALIGN_HYPHENATION,   true },    // ATTR_HYPHENATE           from 632b
+    { 0,                            true },    // ATTR_SCRIPTSPACE         from 614d
+    { 0,                            true },    // ATTR_HANGPUNCTUATION     from 614d
+    { SID_ATTR_PARA_FORBIDDEN_RULES,true },    // ATTR_FORBIDDEN_RULES     from 614d
+    { SID_ATTR_ALIGN_HOR_JUSTIFY,   true },    // ATTR_HOR_JUSTIFY
+    { SID_ATTR_ALIGN_HOR_JUSTIFY_METHOD, true }, // ATTR_HOR_JUSTIFY_METHOD
+    { SID_ATTR_ALIGN_INDENT,        true },    // ATTR_INDENT          from 350
+    { SID_ATTR_ALIGN_VER_JUSTIFY,   true },    // ATTR_VER_JUSTIFY
+    { SID_ATTR_ALIGN_VER_JUSTIFY_METHOD, true }, // ATTR_VER_JUSTIFY_METHOD
+    { SID_ATTR_ALIGN_STACKED,       true },    // ATTR_STACKED         from 680/dr14 (replaces ATTR_ORIENTATION)
+    { SID_ATTR_ALIGN_DEGREES,       true },    // ATTR_ROTATE_VALUE    from 367
+    { SID_ATTR_ALIGN_LOCKPOS,       true },    // ATTR_ROTATE_MODE     from 367
+    { SID_ATTR_ALIGN_ASIANVERTICAL, true },    // ATTR_VERTICAL_ASIAN  from 642
+    { SID_ATTR_FRAMEDIRECTION,      true },    // ATTR_WRITINGDIR      from 643
+    { SID_ATTR_ALIGN_LINEBREAK,     true },    // ATTR_LINEBREAK
+    { SID_ATTR_ALIGN_SHRINKTOFIT,   true },    // ATTR_SHRINKTOFIT     from 680/dr14
+    { SID_ATTR_BORDER_DIAG_TLBR,    true },    // ATTR_BORDER_TLBR     from 680/dr14
+    { SID_ATTR_BORDER_DIAG_BLTR,    true },    // ATTR_BORDER_BLTR     from 680/dr14
+    { SID_ATTR_ALIGN_MARGIN,        true },    // ATTR_MARGIN
+    { 0,                            true },    // ATTR_MERGE
+    { 0,                            true },    // ATTR_MERGE_FLAG
+    { SID_ATTR_NUMBERFORMAT_VALUE,  true },    // ATTR_VALUE_FORMAT
+    { ATTR_LANGUAGE_FORMAT,         true },    // ATTR_LANGUAGE_FORMAT from 329, is combined with SID_ATTR_NUMBERFORMAT_VALUE in the dialog
+    { SID_ATTR_BRUSH,               true },    // ATTR_BACKGROUND
+    { SID_SCATTR_PROTECTION,        true },    // ATTR_PROTECTION
+    { SID_ATTR_BORDER_OUTER,        true },    // ATTR_BORDER
+    { SID_ATTR_BORDER_INNER,        true },    // ATTR_BORDER_INNER
+    { SID_ATTR_BORDER_SHADOW,       true },    // ATTR_SHADOW
+    { 0,                            true },    // ATTR_VALIDDATA
+    { 0,                            true },    // ATTR_CONDITIONAL
+    { 0,                            true },    // ATTR_HYPERLINK
+    { 0,                            true },    // ATTR_PATTERN
+    { SID_ATTR_LRSPACE,             true },    // ATTR_LRSPACE
+    { SID_ATTR_ULSPACE,             true },    // ATTR_ULSPACE
+    { SID_ATTR_PAGE,                true },    // ATTR_PAGE
+    { 0,                            true },    // ATTR_PAGE_PAPERTRAY, since 303 just a dummy
+    { SID_ATTR_PAGE_PAPERBIN,       true },    // ATTR_PAGE_PAPERBIN
+    { SID_ATTR_PAGE_SIZE,           true },    // ATTR_PAGE_SIZE
+    { SID_ATTR_PAGE_MAXSIZE,        true },    // ATTR_PAGE_MAXSIZE
+    { SID_ATTR_PAGE_EXT1,           true },    // ATTR_PAGE_HORCENTER
+    { SID_ATTR_PAGE_EXT2,           true },    // ATTR_PAGE_VERCENTER
+    { SID_ATTR_PAGE_ON,             true },    // ATTR_PAGE_ON
+    { SID_ATTR_PAGE_DYNAMIC,        true },    // ATTR_PAGE_DYNAMIC
+    { SID_ATTR_PAGE_SHARED,         true },    // ATTR_PAGE_SHARED
+    { SID_SCATTR_PAGE_NOTES,        true },    // ATTR_PAGE_NOTES
+    { SID_SCATTR_PAGE_GRID,         true },    // ATTR_PAGE_GRID
+    { SID_SCATTR_PAGE_HEADERS,      true },    // ATTR_PAGE_HEADERS
+    { SID_SCATTR_PAGE_CHARTS,       true },    // ATTR_PAGE_CHARTS
+    { SID_SCATTR_PAGE_OBJECTS,      true },    // ATTR_PAGE_OBJECTS
+    { SID_SCATTR_PAGE_DRAWINGS,     true },    // ATTR_PAGE_DRAWINGS
+    { SID_SCATTR_PAGE_TOPDOWN,      true },    // ATTR_PAGE_TOPDOWN
+    { SID_SCATTR_PAGE_SCALE,        true },    // ATTR_PAGE_SCALE
+    { SID_SCATTR_PAGE_SCALETOPAGES, true },    // ATTR_PAGE_SCALETOPAGES
+    { SID_SCATTR_PAGE_FIRSTPAGENO,  true },    // ATTR_PAGE_FIRSTPAGENO
+    { SID_SCATTR_PAGE_PRINTAREA,    true },    // ATTR_PAGE_PRINTAREA
+    { SID_SCATTR_PAGE_REPEATROW,    true },    // ATTR_PAGE_REPEATROW
+    { SID_SCATTR_PAGE_REPEATCOL,    true },    // ATTR_PAGE_REPEATCOL
+    { SID_SCATTR_PAGE_PRINTTABLES,  true },    // ATTR_PAGE_PRINTTABLES
+    { SID_SCATTR_PAGE_HEADERLEFT,   true },    // ATTR_PAGE_HEADERLEFT
+    { SID_SCATTR_PAGE_FOOTERLEFT,   true },    // ATTR_PAGE_FOOTERLEFT
+    { SID_SCATTR_PAGE_HEADERRIGHT,  true },    // ATTR_PAGE_HEADERRIGHT
+    { SID_SCATTR_PAGE_FOOTERRIGHT,  true },    // ATTR_PAGE_FOOTERRIGHT
+    { SID_ATTR_PAGE_HEADERSET,      true },    // ATTR_PAGE_HEADERSET
+    { SID_ATTR_PAGE_FOOTERSET,      true },    // ATTR_PAGE_FOOTERSET
+    { SID_SCATTR_PAGE_FORMULAS,     true },    // ATTR_PAGE_FORMULAS
+    { SID_SCATTR_PAGE_NULLVALS,     true },    // ATTR_PAGE_NULLVALS
+    { SID_SCATTR_PAGE_SCALETO,      true },    // ATTR_PAGE_SCALETO
+    { 0,                            true }     // ATTR_HIDDEN
 };
 static_assert(
     SAL_N_ELEMENTS(aItemInfos) == ATTR_ENDINDEX - ATTR_STARTINDEX + 1, "these must match");
diff --git a/sc/source/ui/app/msgpool.cxx b/sc/source/ui/app/msgpool.cxx
index f39fd78..caa8aaa 100644
--- a/sc/source/ui/app/msgpool.cxx
+++ b/sc/source/ui/app/msgpool.cxx
@@ -26,16 +26,16 @@
 
 static SfxItemInfo const aMsgItemInfos[] =
 {
-    { 0,                         SfxItemPoolFlags::POOLABLE },   // SCITEM_STRING
-    { 0,                         SfxItemPoolFlags::POOLABLE },   // SCITEM_SEARCHDATA - stop using this!
-    { SID_SORT,                  SfxItemPoolFlags::POOLABLE },   // SCITEM_SORTDATA
-    { SID_QUERY,                 SfxItemPoolFlags::POOLABLE },   // SCITEM_QUERYDATA
-    { SID_SUBTOTALS,             SfxItemPoolFlags::POOLABLE },   // SCITEM_SUBTDATA
-    { SID_CONSOLIDATE,           SfxItemPoolFlags::POOLABLE },   // SCITEM_CONSOLIDATEDATA
-    { SID_PIVOT_TABLE,           SfxItemPoolFlags::POOLABLE },   // SCITEM_PIVOTDATA
-    { SID_SOLVE,                 SfxItemPoolFlags::POOLABLE },   // SCITEM_SOLVEDATA
-    { SID_SCUSERLISTS,           SfxItemPoolFlags::POOLABLE },   // SCITEM_USERLIST
-    { SID_PRINTER_NOTFOUND_WARN, SfxItemPoolFlags::POOLABLE }    // SCITEM_PRINTWARN
+    { 0,                         true },   // SCITEM_STRING
+    { 0,                         true },   // SCITEM_SEARCHDATA - stop using this!
+    { SID_SORT,                  true },   // SCITEM_SORTDATA
+    { SID_QUERY,                 true },   // SCITEM_QUERYDATA
+    { SID_SUBTOTALS,             true },   // SCITEM_SUBTDATA
+    { SID_CONSOLIDATE,           true },   // SCITEM_CONSOLIDATEDATA
+    { SID_PIVOT_TABLE,           true },   // SCITEM_PIVOTDATA
+    { SID_SOLVE,                 true },   // SCITEM_SOLVEDATA
+    { SID_SCUSERLISTS,           true },   // SCITEM_USERLIST
+    { SID_PRINTER_NOTFOUND_WARN, true }    // SCITEM_PRINTWARN
 };
 
 ScMessagePool::ScMessagePool()
diff --git a/sfx2/source/explorer/nochaos.cxx b/sfx2/source/explorer/nochaos.cxx
index b9716e8..4f174a8 100644
--- a/sfx2/source/explorer/nochaos.cxx
+++ b/sfx2/source/explorer/nochaos.cxx
@@ -41,7 +41,7 @@ class CntStaticPoolDefaults_Impl: private boost::noncopyable
     SfxItemInfo*  m_pItemInfos;
 
 private:
-    inline void Insert( SfxPoolItem* pItem, sal_uInt16 nSID, SfxItemPoolFlags nFlags );
+    inline void Insert( SfxPoolItem* pItem, sal_uInt16 nSID, bool bPoolable );
 
 public:
     explicit CntStaticPoolDefaults_Impl( CntItemPool* pPool );
@@ -158,13 +158,13 @@ sal_uInt16 CntItemPool::Release()
 
 inline void CntStaticPoolDefaults_Impl::Insert(
          SfxPoolItem* pItem,        /* Static Pool Default Item */
-         sal_uInt16 nSID, SfxItemPoolFlags nFlags  /* Item Info */    )
+         sal_uInt16 nSID, bool bPoolable  /* Item Info */    )
 {
     sal_uInt16 nPos = pItem->Which() - WID_CHAOS_START;
 
     m_ppDefaults[ nPos ]         = pItem;
     m_pItemInfos[ nPos ]._nSID   = nSID;
-    m_pItemInfos[ nPos ]._nFlags = nFlags;
+    m_pItemInfos[ nPos ]._bPoolable = bPoolable;
 }
 
 
@@ -188,7 +188,7 @@ CntStaticPoolDefaults_Impl::CntStaticPoolDefaults_Impl( CntItemPool* /*pPool*/ )
     Insert(
         new SfxStringItem( WID_CHAOS_START, OUString() ),
         0,
-        SfxItemPoolFlags::POOLABLE );
+        true );
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svl/README b/svl/README
index 57cb60c..ce25774 100644
--- a/svl/README
+++ b/svl/README
@@ -19,7 +19,7 @@ A small reference counted piece of data.  Many subclasses, each with a
 unique integer to identify its type (WhichId).  Can be compared for equality
 (operator==), Clone()d, and converted to/from uno::Any (QueryValue/PutValue).
 
-A pool item may have value semantics (SfxItemPoolFlags::POOLABLE), meaning that
+A pool item may have value semantics ("poolable"), meaning that
 there will generally be only one instance that compares equal per item pool,
 or not, in which case the item will be Clone()d quite a bit.
 
diff --git a/svl/qa/unit/items/test_itempool.cxx b/svl/qa/unit/items/test_itempool.cxx
index 0c817ec..cc43694 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)
     {
diff --git a/svl/source/items/itempool.cxx b/svl/source/items/itempool.cxx
index 40fd54c..34153c7 100644
--- a/svl/source/items/itempool.cxx
+++ b/svl/source/items/itempool.cxx
@@ -115,18 +115,18 @@ const SfxPoolItem* SfxItemPool::GetPoolDefaultItem( sal_uInt16 nWhich ) const
 }
 
 
-bool SfxItemPool::IsItemFlag_Impl( sal_uInt16 nPos, SfxItemPoolFlags nFlag ) const
+bool SfxItemPool::IsItemPoolable_Impl( sal_uInt16 nPos ) const
 {
-    return bool(pItemInfos[nPos]._nFlags & nFlag);
+    return pItemInfos[nPos]._bPoolable;
 }
 
 
-bool SfxItemPool::IsItemFlag( sal_uInt16 nWhich, SfxItemPoolFlags nFlag ) const
+bool SfxItemPool::IsItemPoolable( sal_uInt16 nWhich ) const
 {
     for ( const SfxItemPool *pPool = this; pPool; pPool = pPool->pImp->mpSecondary )
     {
         if ( pPool->IsInRange(nWhich) )
-            return pPool->IsItemFlag_Impl( pPool->GetIndex_Impl(nWhich), nFlag);
+            return pPool->IsItemPoolable_Impl( pPool->GetIndex_Impl(nWhich));
     }
     DBG_ASSERT( !IsWhich(nWhich), "unknown which-id" );
     return false;
@@ -151,7 +151,7 @@ SfxBroadcaster& SfxItemPool::BC()
  * 'pItemInfos' is a USHORT array arranged in the same way, which holds
  *  SlotIds and Flags. These SlotIds can be 0, if the affected Items are
  *  exclusively used in the Core.
- *  The flags allow for e.g. enabling value sharing (SfxItemPoolFlags::POOLABLE).
+ *  The flags allow for e.g. enabling value sharing (poolable).
  *
  *  If the Pool is supposed to hold SfxSetItems, the ctor cannot yet contain
  *  static Defaults. This needs to be done afterwards, using
@@ -632,10 +632,9 @@ const SfxPoolItem& SfxItemPool::Put( const SfxPoolItem& rItem, sal_uInt16 nWhich
         OSL_FAIL( "unknown WhichId - cannot put item" );
     }
 
-    // SID or not poolable (new definition)?
+    // SID ?
     sal_uInt16 nIndex = bSID ? USHRT_MAX : GetIndex_Impl(nWhich);
-    if ( USHRT_MAX == nIndex ||
-         IsItemFlag_Impl( nIndex, SfxItemPoolFlags::NOT_POOLABLE ) )
+    if ( USHRT_MAX == nIndex )
     {
         assert((USHRT_MAX != nIndex || rItem.Which() != nWhich ||
             !IsDefaultItem(&rItem) || rItem.GetKind() == SFX_ITEMS_DELETEONIDLE)
@@ -661,7 +660,7 @@ const SfxPoolItem& SfxItemPool::Put( const SfxPoolItem& rItem, sal_uInt16 nWhich
 
     // Is this a 'poolable' item - ie. should we re-use and return
     // the same underlying item for equivalent (==) SfxPoolItems?
-    if ( IsItemFlag_Impl( nIndex, SfxItemPoolFlags::POOLABLE ) )
+    if ( IsItemPoolable_Impl( nIndex ) )
     {
         // if is already in a pool, then it is worth checking if it is in this one.
         if ( IsPooledItem(&rItem) )
@@ -721,9 +720,9 @@ const SfxPoolItem& SfxItemPool::Put( const SfxPoolItem& rItem, sal_uInt16 nWhich
     assert(typeid(rItem) == typeid(*pNewItem) && "SfxItemPool::Put(): unequal types, no Clone() override?");
     if (dynamic_cast<const SfxSetItem*>(&rItem) == nullptr)
     {
-        assert((!IsItemFlag(nWhich, SfxItemPoolFlags::POOLABLE) || rItem == *pNewItem)
+        assert((!IsItemPoolable(nWhich) || rItem == *pNewItem)
             && "SfxItemPool::Put(): unequal items: no operator== override?");
-        assert((!IsItemFlag(*pNewItem, SfxItemPoolFlags::POOLABLE) || *pNewItem == rItem)
+        assert((!IsItemPoolable(*pNewItem) || *pNewItem == rItem)
             && "SfxItemPool::Put(): unequal items: no operator== override?");
     }
     AddRef( *pNewItem, pImp->nInitRefCount );
@@ -782,9 +781,9 @@ void SfxItemPool::Remove( const SfxPoolItem& rItem )
         OSL_FAIL( "unknown WhichId - cannot remove item" );
     }
 
-    // SID or not poolable (new definition)?
+    // SID ?
     sal_uInt16 nIndex = bSID ? USHRT_MAX : GetIndex_Impl(nWhich);
-    if ( bSID || IsItemFlag_Impl( nIndex, SfxItemPoolFlags::NOT_POOLABLE ) )
+    if ( bSID )
     {
         assert((USHRT_MAX != nIndex || !IsDefaultItem(&rItem)) &&
                     "a non Pool Item is Default?!");
diff --git a/svl/source/items/itemset.cxx b/svl/source/items/itemset.cxx
index 6a28a9f..2772226 100644
--- a/svl/source/items/itemset.cxx
+++ b/svl/source/items/itemset.cxx
@@ -181,7 +181,7 @@ SfxItemSet::SfxItemSet( const SfxItemSet& rASet )
              IsStaticDefaultItem(*ppSrc) )  // Defaults that are not to be pooled?
             // Just copy the pointer
             *ppDst = *ppSrc;
-        else if (m_pPool->IsItemFlag( **ppSrc, SfxItemPoolFlags::POOLABLE ))
+        else if (m_pPool->IsItemPoolable( **ppSrc ))
         {
             // Just copy the pointer and increase RefCount
             *ppDst = *ppSrc;
@@ -475,7 +475,7 @@ const SfxPoolItem* SfxItemSet::Put( const SfxPoolItem& rItem, sal_uInt16 nWhich
                     }
                 }
             }
-            SFX_ASSERT( !m_pPool->IsItemFlag(nWhich, SfxItemPoolFlags::POOLABLE) ||
+            SFX_ASSERT( !m_pPool->IsItemPoolable(nWhich) ||
                         dynamic_cast<const SfxSetItem*>( &rItem ) !=  nullptr || **ppFnd == rItem,
                         nWhich, "putted Item unequal" );
             return *ppFnd;
@@ -1401,7 +1401,7 @@ bool SfxItemSet::operator==(const SfxItemSet &rCmp) const
                         rCmp.GetItemState( nWh, false, &pItem2 ) ||
                      ( pItem1 != pItem2 &&
                         ( !pItem1 || IsInvalidItem(pItem1) ||
-                          (m_pPool->IsItemFlag(*pItem1, SfxItemPoolFlags::POOLABLE) &&
+                          (m_pPool->IsItemPoolable(*pItem1) &&
                             *pItem1 != *pItem2 ) ) ) )
                     return false;
             }
@@ -1424,7 +1424,7 @@ bool SfxItemSet::operator==(const SfxItemSet &rCmp) const
         if ( *ppItem1 != *ppItem2 &&
              ( ( !*ppItem1 || !*ppItem2 ) ||
                ( IsInvalidItem(*ppItem1) || IsInvalidItem(*ppItem2) ) ||
-               (m_pPool->IsItemFlag(**ppItem1, SfxItemPoolFlags::POOLABLE)) ||
+               (m_pPool->IsItemPoolable(**ppItem1)) ||
                  **ppItem1 != **ppItem2 ) )
             return false;
 
diff --git a/svl/source/items/poolio.cxx b/svl/source/items/poolio.cxx
index e588a6a..9e1b969 100644
--- a/svl/source/items/poolio.cxx
+++ b/svl/source/items/poolio.cxx
@@ -196,7 +196,7 @@ SvStream &SfxItemPool::Store(SvStream &rStream) const
 
                 // ! Poolable is not even saved in the Pool
                 // And itemsets/plain-items depending on the round
-                if ( *itrArr && IsItemFlag(**ppDefItem, SfxItemPoolFlags::POOLABLE) &&
+                if ( *itrArr && IsItemPoolable(**ppDefItem) &&
                      pImp->bInSetItem == (dynamic_cast< const SfxSetItem* >(*ppDefItem) !=  nullptr) )
                 {
                     // Own signature, global WhichId and ItemVersion
@@ -737,7 +737,7 @@ sal_uInt16 SfxItemPool::GetSize_Impl() const
  * Loads surrogate from 'rStream' and returns the corresponding SfxPoolItem
  * from the rRefPool.
  * If the surrogate contained within the stream == SFX_ITEMS_DIRECT
- * (!SfxItemPoolFlags::POOLABLE), we return 0 and the Item is to be loaded directly
+ * (!poolable), we return 0 and the Item is to be loaded directly
  * from the stream.
  * We also return 0 for 0xfffffff0 (SFX_ITEMS_NULL) and rWhich is set to 0,
  * making the Items unavailable.
@@ -869,7 +869,7 @@ bool SfxItemPool::StoreSurrogate ( SvStream& rStream, const SfxPoolItem*  pItem)
 {
     if ( pItem )
     {
-        bool bRealSurrogate = IsItemFlag(*pItem, SfxItemPoolFlags::POOLABLE);
+        bool bRealSurrogate = IsItemPoolable(*pItem);
         rStream.WriteUInt32( bRealSurrogate
                         ? GetSurrogate( pItem )
                         : SFX_ITEMS_DIRECT  );
diff --git a/svl/source/items/stylepool.cxx b/svl/source/items/stylepool.cxx
index 9eaf86c..9734bd1 100644
--- a/svl/source/items/stylepool.cxx
+++ b/svl/source/items/stylepool.cxx
@@ -391,7 +391,7 @@ StylePool::SfxItemSet_Pointer_t StylePoolImpl::insertItemSet( const SfxItemSet&
     }
     while( pItem )
     {
-        if( !rSet.GetPool()->IsItemFlag(pItem->Which(), SfxItemPoolFlags::POOLABLE ) )
+        if( !rSet.GetPool()->IsItemPoolable(pItem->Which() ) )
             bNonPoolable = true;
         if ( !xFoundIgnorableItems.get() ||
              (xFoundIgnorableItems->Put( *pItem ) == nullptr ) )
@@ -407,7 +407,7 @@ StylePool::SfxItemSet_Pointer_t StylePoolImpl::insertItemSet( const SfxItemSet&
         pItem = aIgnorableItemsIter.GetCurItem();
         while( pItem )
         {
-            if( !rSet.GetPool()->IsItemFlag(pItem->Which(), SfxItemPoolFlags::POOLABLE ) )
+            if( !rSet.GetPool()->IsItemPoolable(pItem->Which() ) )
                 bNonPoolable = true;
             pCurNode = pCurNode->findChildNode( *pItem, true );
             pItem = aIgnorableItemsIter.NextItem();
diff --git a/svx/source/svdraw/svdattr.cxx b/svx/source/svdraw/svdattr.cxx
index 3b9d460..5a0570c 100644
--- a/svx/source/svdraw/svdattr.cxx
+++ b/svx/source/svdraw/svdattr.cxx
@@ -115,7 +115,7 @@ SdrItemPool::SdrItemPool(
     // init the non-persistent items
     for(sal_uInt16 i(SDRATTR_NOTPERSIST_FIRST); i <= SDRATTR_NOTPERSIST_LAST; i++)
     {
-        mpLocalItemInfos[i - SDRATTR_START]._nFlags = SfxItemPoolFlags::NONE;
+        mpLocalItemInfos[i - SDRATTR_START]._bPoolable = false;
     }
 
     // init own PoolDefaults
diff --git a/svx/source/xoutdev/xpool.cxx b/svx/source/xoutdev/xpool.cxx
index dc1085e..fc6a3ff 100644
--- a/svx/source/xoutdev/xpool.cxx
+++ b/svx/source/xoutdev/xpool.cxx
@@ -119,7 +119,7 @@ XOutdevItemPool::XOutdevItemPool(
     for(sal_uInt16 i(GetFirstWhich()); i <= GetLastWhich(); i++)
     {
         mpLocalItemInfos[i - XATTR_START]._nSID = 0;
-        mpLocalItemInfos[i - XATTR_START]._nFlags = SfxItemPoolFlags::POOLABLE;
+        mpLocalItemInfos[i - XATTR_START]._bPoolable = true;
     }
 
     mpLocalItemInfos[XATTR_LINESTYLE        -XATTR_START]._nSID = SID_ATTR_LINE_STYLE;
diff --git a/sw/source/core/bastyp/init.cxx b/sw/source/core/bastyp/init.cxx
index 20c4f3b..d3775b1 100644
--- a/sw/source/core/bastyp/init.cxx
+++ b/sw/source/core/bastyp/init.cxx
@@ -266,171 +266,171 @@ SwDfltAttrTab aAttrTab;
 
 SfxItemInfo aSlotTab[] =
 {
-    { SID_ATTR_CHAR_CASEMAP, SfxItemPoolFlags::POOLABLE },       // RES_CHRATR_CASEMAP
-    { SID_ATTR_CHAR_CHARSETCOLOR, SfxItemPoolFlags::POOLABLE },  // RES_CHRATR_CHARSETCOLOR
-    { SID_ATTR_CHAR_COLOR, SfxItemPoolFlags::POOLABLE },         // RES_CHRATR_COLOR
-    { SID_ATTR_CHAR_CONTOUR, SfxItemPoolFlags::POOLABLE },       // RES_CHRATR_CONTOUR
-    { SID_ATTR_CHAR_STRIKEOUT, SfxItemPoolFlags::POOLABLE },     // RES_CHRATR_CROSSEDOUT
-    { SID_ATTR_CHAR_ESCAPEMENT, SfxItemPoolFlags::POOLABLE },    // RES_CHRATR_ESCAPEMENT
-    { SID_ATTR_CHAR_FONT, SfxItemPoolFlags::POOLABLE },          // RES_CHRATR_FONT
-    { SID_ATTR_CHAR_FONTHEIGHT, SfxItemPoolFlags::POOLABLE },    // RES_CHRATR_FONTSIZE
-    { SID_ATTR_CHAR_KERNING, SfxItemPoolFlags::POOLABLE },       // RES_CHRATR_KERNING
-    { SID_ATTR_CHAR_LANGUAGE, SfxItemPoolFlags::POOLABLE },      // RES_CHRATR_LANGUAGE
-    { SID_ATTR_CHAR_POSTURE, SfxItemPoolFlags::POOLABLE },       // RES_CHRATR_POSTURE
-    { SID_ATTR_CHAR_PROPSIZE, SfxItemPoolFlags::POOLABLE },      // RES_CHRATR_PROPORTIONALFONTSIZE
-    { SID_ATTR_CHAR_SHADOWED, SfxItemPoolFlags::POOLABLE },      // RES_CHRATR_SHADOWED
-    { SID_ATTR_CHAR_UNDERLINE, SfxItemPoolFlags::POOLABLE },     // RES_CHRATR_UNDERLINE
-    { SID_ATTR_CHAR_WEIGHT, SfxItemPoolFlags::POOLABLE },        // RES_CHRATR_WEIGHT
-    { SID_ATTR_CHAR_WORDLINEMODE, SfxItemPoolFlags::POOLABLE },  // RES_CHRATR_WORDLINEMODE
-    { SID_ATTR_CHAR_AUTOKERN, SfxItemPoolFlags::POOLABLE },      // RES_CHRATR_AUTOKERN
-    { SID_ATTR_FLASH, SfxItemPoolFlags::POOLABLE },              // RES_CHRATR_BLINK
-    { 0, SfxItemPoolFlags::POOLABLE },                           // RES_CHRATR_NOLINEBREAK
-    { 0, SfxItemPoolFlags::POOLABLE },                           // RES_CHRATR_NOHYPHEN
-    { SID_ATTR_BRUSH_CHAR, SfxItemPoolFlags::POOLABLE },         // RES_CHRATR_BACKGROUND
-    { SID_ATTR_CHAR_CJK_FONT, SfxItemPoolFlags::POOLABLE },      // RES_CHRATR_CJK_FONT
-    { SID_ATTR_CHAR_CJK_FONTHEIGHT, SfxItemPoolFlags::POOLABLE },// RES_CHRATR_CJK_FONTSIZE
-    { SID_ATTR_CHAR_CJK_LANGUAGE, SfxItemPoolFlags::POOLABLE },  // RES_CHRATR_CJK_LANGUAGE
-    { SID_ATTR_CHAR_CJK_POSTURE, SfxItemPoolFlags::POOLABLE },   // RES_CHRATR_CJK_POSTURE
-    { SID_ATTR_CHAR_CJK_WEIGHT, SfxItemPoolFlags::POOLABLE },    // RES_CHRATR_CJK_WEIGHT
-    { SID_ATTR_CHAR_CTL_FONT, SfxItemPoolFlags::POOLABLE },      // RES_CHRATR_CTL_FONT
-    { SID_ATTR_CHAR_CTL_FONTHEIGHT, SfxItemPoolFlags::POOLABLE },// RES_CHRATR_CTL_FONTSIZE
-    { SID_ATTR_CHAR_CTL_LANGUAGE, SfxItemPoolFlags::POOLABLE },  // RES_CHRATR_CTL_LANGUAGE
-    { SID_ATTR_CHAR_CTL_POSTURE, SfxItemPoolFlags::POOLABLE },   // RES_CHRATR_CTL_POSTURE
-    { SID_ATTR_CHAR_CTL_WEIGHT, SfxItemPoolFlags::POOLABLE },    // RES_CHRATR_CTL_WEIGHT
-    { SID_ATTR_CHAR_ROTATED, SfxItemPoolFlags::POOLABLE },       // RES_CHRATR_ROTATE
-    { SID_ATTR_CHAR_EMPHASISMARK, SfxItemPoolFlags::POOLABLE },  // RES_CHRATR_EMPHASIS_MARK
-    { SID_ATTR_CHAR_TWO_LINES, SfxItemPoolFlags::POOLABLE },     // RES_CHRATR_TWO_LINES
-    { SID_ATTR_CHAR_SCALEWIDTH, SfxItemPoolFlags::POOLABLE },    // RES_CHRATR_SCALEW
-    { SID_ATTR_CHAR_RELIEF, SfxItemPoolFlags::POOLABLE },        // RES_CHRATR_RELIEF
-    { SID_ATTR_CHAR_HIDDEN, SfxItemPoolFlags::POOLABLE },        // RES_CHRATR_HIDDEN
-    { SID_ATTR_CHAR_OVERLINE, SfxItemPoolFlags::POOLABLE },      // RES_CHRATR_OVERLINE
-    { 0, SfxItemPoolFlags::POOLABLE },                           // RES_CHRATR_RSID
-    { 0, SfxItemPoolFlags::POOLABLE },                           // RES_CHRATR_BOX
-    { 0, SfxItemPoolFlags::POOLABLE },                           // RES_CHRATR_SHADOW
-    { 0, SfxItemPoolFlags::POOLABLE },                           // RES_CHRATR_HIGHLIGHT
-    { SID_ATTR_CHAR_GRABBAG, SfxItemPoolFlags::POOLABLE },       // RES_CHRATR_GRABBAG
-    { 0, SfxItemPoolFlags::POOLABLE },                           // RES_CHRATR_BIDIRTL
-    { 0, SfxItemPoolFlags::POOLABLE },                           // RES_CHRATR_IDCTHINT
-
-    { 0, SfxItemPoolFlags::NONE },                               // RES_TXTATR_REFMARK
-    { 0, SfxItemPoolFlags::NONE },                               // RES_TXTATR_TOXMARK
-    { 0, SfxItemPoolFlags::NONE },                               // RES_TXTATR_META
-    { 0, SfxItemPoolFlags::NONE },                               // RES_TXTATR_METAFIELD
-    { 0, SfxItemPoolFlags::POOLABLE },                           // RES_TXTATR_AUTOFMT
-    { FN_TXTATR_INET, SfxItemPoolFlags::NONE },                  // RES_TXTATR_INETFMT
-    { 0, SfxItemPoolFlags::NONE },                               // RES_TXTATR_CHARFMT
-    { SID_ATTR_CHAR_CJK_RUBY, SfxItemPoolFlags::NONE },          // RES_TXTATR_CJK_RUBY
-    { 0, SfxItemPoolFlags::POOLABLE },                           // RES_TXTATR_UNKNOWN_CONTAINER
-    { 0, SfxItemPoolFlags::NONE },                               // RES_TXTATR_INPUTFIELD
-
-    { 0, SfxItemPoolFlags::NONE },                               // RES_TXTATR_FIELD
-    { 0, SfxItemPoolFlags::NONE },                               // RES_TXTATR_FLYCNT
-    { 0, SfxItemPoolFlags::NONE },                               // RES_TXTATR_FTN
-    { 0, SfxItemPoolFlags::NONE },                               // RES_TXTATR_ANNOTATION
-    { 0, SfxItemPoolFlags::POOLABLE },                           // RES_TXTATR_DUMMY3
-    { 0, SfxItemPoolFlags::POOLABLE },                           // RES_TXTATR_DUMMY1
-    { 0, SfxItemPoolFlags::POOLABLE },                           // RES_TXTATR_DUMMY2
-
-    { SID_ATTR_PARA_LINESPACE, SfxItemPoolFlags::POOLABLE },     // RES_PARATR_LINESPACING
-    { SID_ATTR_PARA_ADJUST, SfxItemPoolFlags::POOLABLE },        // RES_PARATR_ADJUST
-    { SID_ATTR_PARA_SPLIT, SfxItemPoolFlags::POOLABLE },         // RES_PARATR_SPLIT
-    { SID_ATTR_PARA_ORPHANS, SfxItemPoolFlags::POOLABLE },       // RES_PARATR_ORPHANS
-    { SID_ATTR_PARA_WIDOWS, SfxItemPoolFlags::POOLABLE },        // RES_PARATR_WIDOWS
-    { SID_ATTR_TABSTOP, SfxItemPoolFlags::POOLABLE },            // RES_PARATR_TABSTOP
-    { SID_ATTR_PARA_HYPHENZONE, SfxItemPoolFlags::POOLABLE },    // RES_PARATR_HYPHENZONE
-    { FN_FORMAT_DROPCAPS, SfxItemPoolFlags::NONE },              // RES_PARATR_DROP
-    { SID_ATTR_PARA_REGISTER, SfxItemPoolFlags::POOLABLE },      // RES_PARATR_REGISTER
-    { SID_ATTR_PARA_NUMRULE, SfxItemPoolFlags::POOLABLE },       // RES_PARATR_NUMRULE
-    { SID_ATTR_PARA_SCRIPTSPACE, SfxItemPoolFlags::POOLABLE },   // RES_PARATR_SCRIPTSPACE
-    { SID_ATTR_PARA_HANGPUNCTUATION, SfxItemPoolFlags::POOLABLE },// RES_PARATR_HANGINGPUNCTUATION
-
-    { SID_ATTR_PARA_FORBIDDEN_RULES, SfxItemPoolFlags::POOLABLE },// RES_PARATR_FORBIDDEN_RULES
-    { SID_PARA_VERTALIGN, SfxItemPoolFlags::POOLABLE },          // RES_PARATR_VERTALIGN
-    { SID_ATTR_PARA_SNAPTOGRID, SfxItemPoolFlags::POOLABLE },    // RES_PARATR_SNAPTOGRID
-    { SID_ATTR_BORDER_CONNECT, SfxItemPoolFlags::POOLABLE },     // RES_PARATR_CONNECT_BORDER
-
-    { SID_ATTR_PARA_OUTLINE_LEVEL, SfxItemPoolFlags::POOLABLE }, // RES_PARATR_OUTLINELEVEL //#outline level
-    { 0, SfxItemPoolFlags::POOLABLE },                           // RES_PARATR_RSID
-    { 0, SfxItemPoolFlags::POOLABLE },                           // RES_PARATR_GRABBAG
-    { 0, SfxItemPoolFlags::POOLABLE },                           // RES_PARATR_LIST_ID
-    { 0, SfxItemPoolFlags::POOLABLE },                           // RES_PARATR_LIST_LEVEL
-    { 0, SfxItemPoolFlags::POOLABLE },                           // RES_PARATR_LIST_ISRESTART
-    { 0, SfxItemPoolFlags::POOLABLE },                           // RES_PARATR_LIST_RESTARTVALUE
-    { 0, SfxItemPoolFlags::POOLABLE },                           // RES_PARATR_LIST_ISCOUNTED
-
-    { 0, SfxItemPoolFlags::POOLABLE },                           // RES_FILL_ORDER
-    { 0, SfxItemPoolFlags::POOLABLE },                           // RES_FRM_SIZE
-    { SID_ATTR_PAGE_PAPERBIN, SfxItemPoolFlags::POOLABLE },      // RES_PAPER_BIN
-    { SID_ATTR_LRSPACE, SfxItemPoolFlags::POOLABLE },            // RES_LR_SPACE
-    { SID_ATTR_ULSPACE, SfxItemPoolFlags::POOLABLE },            // RES_UL_SPACE
-    { 0, SfxItemPoolFlags::NONE },                               // RES_PAGEDESC
-    { SID_ATTR_PARA_PAGEBREAK, SfxItemPoolFlags::POOLABLE },     // RES_BREAK
-    { 0, SfxItemPoolFlags::NONE },                               // RES_CNTNT
-    { 0, SfxItemPoolFlags::POOLABLE },                           // RES_HEADER
-    { 0, SfxItemPoolFlags::POOLABLE },                           // RES_FOOTER
-    { 0, SfxItemPoolFlags::POOLABLE },                           // RES_PRINT
-    { FN_OPAQUE, SfxItemPoolFlags::POOLABLE },                   // RES_OPAQUE
-    { FN_SET_PROTECT, SfxItemPoolFlags::POOLABLE },              // RES_PROTECT
-    { FN_SURROUND, SfxItemPoolFlags::POOLABLE },                 // RES_SURROUND
-    { FN_VERT_ORIENT, SfxItemPoolFlags::POOLABLE },              // RES_VERT_ORIENT
-    { FN_HORI_ORIENT, SfxItemPoolFlags::POOLABLE },              // RES_HORI_ORIENT
-    { 0, SfxItemPoolFlags::NONE },                               // RES_ANCHOR
-    { SID_ATTR_BRUSH, SfxItemPoolFlags::POOLABLE },              // RES_BACKGROUND
-    { SID_ATTR_BORDER_OUTER, SfxItemPoolFlags::POOLABLE },       // RES_BOX
-    { SID_ATTR_BORDER_SHADOW, SfxItemPoolFlags::POOLABLE },      // RES_SHADOW
-    { SID_ATTR_MACROITEM, SfxItemPoolFlags::POOLABLE },          // RES_FRMMACRO
-    { FN_ATTR_COLUMNS, SfxItemPoolFlags::POOLABLE },             // RES_COL
-    { SID_ATTR_PARA_KEEP, SfxItemPoolFlags::POOLABLE },          // RES_KEEP
-    { 0, SfxItemPoolFlags::POOLABLE },                           // RES_URL
-    { 0, SfxItemPoolFlags::POOLABLE },                           // RES_EDIT_IN_READONLY
-
-    { 0, SfxItemPoolFlags::POOLABLE },                           // RES_LAYOUT_SPLIT
-    { 0, SfxItemPoolFlags::NONE },                               // RES_CHAIN
-    { 0, SfxItemPoolFlags::POOLABLE },                           // RES_TEXTGRID
-    { FN_FORMAT_LINENUMBER, SfxItemPoolFlags::POOLABLE },        // RES_LINENUMBER
-    { 0, SfxItemPoolFlags::POOLABLE },                           // RES_FTN_AT_TXTEND
-    { 0, SfxItemPoolFlags::POOLABLE },                           // RES_END_AT_TXTEND
-    { 0, SfxItemPoolFlags::POOLABLE },                           // RES_COLUMNBALANCE
-
-    { SID_ATTR_FRAMEDIRECTION, SfxItemPoolFlags::POOLABLE },     // RES_FRAMEDIR
-
-    { SID_ATTR_HDFT_DYNAMIC_SPACING, SfxItemPoolFlags::POOLABLE },// RES_HEADER_FOOTER_EAT_SPACING
-    { FN_TABLE_ROW_SPLIT, SfxItemPoolFlags::POOLABLE },          // RES_ROW_SPLIT
+    { SID_ATTR_CHAR_CASEMAP, true },       // RES_CHRATR_CASEMAP
+    { SID_ATTR_CHAR_CHARSETCOLOR, true },  // RES_CHRATR_CHARSETCOLOR
+    { SID_ATTR_CHAR_COLOR, true },         // RES_CHRATR_COLOR
+    { SID_ATTR_CHAR_CONTOUR, true },       // RES_CHRATR_CONTOUR
+    { SID_ATTR_CHAR_STRIKEOUT, true },     // RES_CHRATR_CROSSEDOUT
+    { SID_ATTR_CHAR_ESCAPEMENT, true },    // RES_CHRATR_ESCAPEMENT
+    { SID_ATTR_CHAR_FONT, true },          // RES_CHRATR_FONT
+    { SID_ATTR_CHAR_FONTHEIGHT, true },    // RES_CHRATR_FONTSIZE
+    { SID_ATTR_CHAR_KERNING, true },       // RES_CHRATR_KERNING
+    { SID_ATTR_CHAR_LANGUAGE, true },      // RES_CHRATR_LANGUAGE
+    { SID_ATTR_CHAR_POSTURE, true },       // RES_CHRATR_POSTURE
+    { SID_ATTR_CHAR_PROPSIZE, true },      // RES_CHRATR_PROPORTIONALFONTSIZE
+    { SID_ATTR_CHAR_SHADOWED, true },      // RES_CHRATR_SHADOWED
+    { SID_ATTR_CHAR_UNDERLINE, true },     // RES_CHRATR_UNDERLINE
+    { SID_ATTR_CHAR_WEIGHT, true },        // RES_CHRATR_WEIGHT
+    { SID_ATTR_CHAR_WORDLINEMODE, true },  // RES_CHRATR_WORDLINEMODE
+    { SID_ATTR_CHAR_AUTOKERN, true },      // RES_CHRATR_AUTOKERN
+    { SID_ATTR_FLASH, true },              // RES_CHRATR_BLINK
+    { 0, true },                           // RES_CHRATR_NOLINEBREAK
+    { 0, true },                           // RES_CHRATR_NOHYPHEN
+    { SID_ATTR_BRUSH_CHAR, true },         // RES_CHRATR_BACKGROUND
+    { SID_ATTR_CHAR_CJK_FONT, true },      // RES_CHRATR_CJK_FONT
+    { SID_ATTR_CHAR_CJK_FONTHEIGHT, true },// RES_CHRATR_CJK_FONTSIZE
+    { SID_ATTR_CHAR_CJK_LANGUAGE, true },  // RES_CHRATR_CJK_LANGUAGE
+    { SID_ATTR_CHAR_CJK_POSTURE, true },   // RES_CHRATR_CJK_POSTURE
+    { SID_ATTR_CHAR_CJK_WEIGHT, true },    // RES_CHRATR_CJK_WEIGHT
+    { SID_ATTR_CHAR_CTL_FONT, true },      // RES_CHRATR_CTL_FONT
+    { SID_ATTR_CHAR_CTL_FONTHEIGHT, true },// RES_CHRATR_CTL_FONTSIZE
+    { SID_ATTR_CHAR_CTL_LANGUAGE, true },  // RES_CHRATR_CTL_LANGUAGE
+    { SID_ATTR_CHAR_CTL_POSTURE, true },   // RES_CHRATR_CTL_POSTURE
+    { SID_ATTR_CHAR_CTL_WEIGHT, true },    // RES_CHRATR_CTL_WEIGHT
+    { SID_ATTR_CHAR_ROTATED, true },       // RES_CHRATR_ROTATE
+    { SID_ATTR_CHAR_EMPHASISMARK, true },  // RES_CHRATR_EMPHASIS_MARK
+    { SID_ATTR_CHAR_TWO_LINES, true },     // RES_CHRATR_TWO_LINES
+    { SID_ATTR_CHAR_SCALEWIDTH, true },    // RES_CHRATR_SCALEW
+    { SID_ATTR_CHAR_RELIEF, true },        // RES_CHRATR_RELIEF
+    { SID_ATTR_CHAR_HIDDEN, true },        // RES_CHRATR_HIDDEN
+    { SID_ATTR_CHAR_OVERLINE, true },      // RES_CHRATR_OVERLINE
+    { 0, true },                           // RES_CHRATR_RSID
+    { 0, true },                           // RES_CHRATR_BOX
+    { 0, true },                           // RES_CHRATR_SHADOW
+    { 0, true },                           // RES_CHRATR_HIGHLIGHT
+    { SID_ATTR_CHAR_GRABBAG, true },       // RES_CHRATR_GRABBAG
+    { 0, true },                           // RES_CHRATR_BIDIRTL
+    { 0, true },                           // RES_CHRATR_IDCTHINT
+
+    { 0, false },                               // RES_TXTATR_REFMARK
+    { 0, false },                               // RES_TXTATR_TOXMARK
+    { 0, false },                               // RES_TXTATR_META
+    { 0, false },                               // RES_TXTATR_METAFIELD
+    { 0, true },                           // RES_TXTATR_AUTOFMT
+    { FN_TXTATR_INET, false },                  // RES_TXTATR_INETFMT
+    { 0, false },                               // RES_TXTATR_CHARFMT
+    { SID_ATTR_CHAR_CJK_RUBY, false },          // RES_TXTATR_CJK_RUBY
+    { 0, true },                           // RES_TXTATR_UNKNOWN_CONTAINER
+    { 0, false },                               // RES_TXTATR_INPUTFIELD
+
+    { 0, false },                               // RES_TXTATR_FIELD
+    { 0, false },                               // RES_TXTATR_FLYCNT
+    { 0, false },                               // RES_TXTATR_FTN
+    { 0, false },                               // RES_TXTATR_ANNOTATION
+    { 0, true },                           // RES_TXTATR_DUMMY3
+    { 0, true },                           // RES_TXTATR_DUMMY1
+    { 0, true },                           // RES_TXTATR_DUMMY2
+
+    { SID_ATTR_PARA_LINESPACE, true },     // RES_PARATR_LINESPACING
+    { SID_ATTR_PARA_ADJUST, true },        // RES_PARATR_ADJUST
+    { SID_ATTR_PARA_SPLIT, true },         // RES_PARATR_SPLIT
+    { SID_ATTR_PARA_ORPHANS, true },       // RES_PARATR_ORPHANS
+    { SID_ATTR_PARA_WIDOWS, true },        // RES_PARATR_WIDOWS
+    { SID_ATTR_TABSTOP, true },            // RES_PARATR_TABSTOP
+    { SID_ATTR_PARA_HYPHENZONE, true },    // RES_PARATR_HYPHENZONE
+    { FN_FORMAT_DROPCAPS, false },              // RES_PARATR_DROP
+    { SID_ATTR_PARA_REGISTER, true },      // RES_PARATR_REGISTER
+    { SID_ATTR_PARA_NUMRULE, true },       // RES_PARATR_NUMRULE
+    { SID_ATTR_PARA_SCRIPTSPACE, true },   // RES_PARATR_SCRIPTSPACE
+    { SID_ATTR_PARA_HANGPUNCTUATION, true },// RES_PARATR_HANGINGPUNCTUATION
+
+    { SID_ATTR_PARA_FORBIDDEN_RULES, true },// RES_PARATR_FORBIDDEN_RULES
+    { SID_PARA_VERTALIGN, true },          // RES_PARATR_VERTALIGN
+    { SID_ATTR_PARA_SNAPTOGRID, true },    // RES_PARATR_SNAPTOGRID
+    { SID_ATTR_BORDER_CONNECT, true },     // RES_PARATR_CONNECT_BORDER
+
+    { SID_ATTR_PARA_OUTLINE_LEVEL, true }, // RES_PARATR_OUTLINELEVEL //#outline level
+    { 0, true },                           // RES_PARATR_RSID
+    { 0, true },                           // RES_PARATR_GRABBAG
+    { 0, true },                           // RES_PARATR_LIST_ID
+    { 0, true },                           // RES_PARATR_LIST_LEVEL
+    { 0, true },                           // RES_PARATR_LIST_ISRESTART
+    { 0, true },                           // RES_PARATR_LIST_RESTARTVALUE
+    { 0, true },                           // RES_PARATR_LIST_ISCOUNTED
+
+    { 0, true },                           // RES_FILL_ORDER
+    { 0, true },                           // RES_FRM_SIZE
+    { SID_ATTR_PAGE_PAPERBIN, true },      // RES_PAPER_BIN
+    { SID_ATTR_LRSPACE, true },            // RES_LR_SPACE
+    { SID_ATTR_ULSPACE, true },            // RES_UL_SPACE
+    { 0, false },                               // RES_PAGEDESC
+    { SID_ATTR_PARA_PAGEBREAK, true },     // RES_BREAK
+    { 0, false },                               // RES_CNTNT
+    { 0, true },                           // RES_HEADER
+    { 0, true },                           // RES_FOOTER
+    { 0, true },                           // RES_PRINT
+    { FN_OPAQUE, true },                   // RES_OPAQUE
+    { FN_SET_PROTECT, true },              // RES_PROTECT
+    { FN_SURROUND, true },                 // RES_SURROUND
+    { FN_VERT_ORIENT, true },              // RES_VERT_ORIENT
+    { FN_HORI_ORIENT, true },              // RES_HORI_ORIENT
+    { 0, false },                               // RES_ANCHOR
+    { SID_ATTR_BRUSH, true },              // RES_BACKGROUND
+    { SID_ATTR_BORDER_OUTER, true },       // RES_BOX
+    { SID_ATTR_BORDER_SHADOW, true },      // RES_SHADOW
+    { SID_ATTR_MACROITEM, true },          // RES_FRMMACRO
+    { FN_ATTR_COLUMNS, true },             // RES_COL
+    { SID_ATTR_PARA_KEEP, true },          // RES_KEEP
+    { 0, true },                           // RES_URL
+    { 0, true },                           // RES_EDIT_IN_READONLY
+
+    { 0, true },                           // RES_LAYOUT_SPLIT
+    { 0, false },                               // RES_CHAIN
+    { 0, true },                           // RES_TEXTGRID
+    { FN_FORMAT_LINENUMBER, true },        // RES_LINENUMBER
+    { 0, true },                           // RES_FTN_AT_TXTEND
+    { 0, true },                           // RES_END_AT_TXTEND
+    { 0, true },                           // RES_COLUMNBALANCE
+
+    { SID_ATTR_FRAMEDIRECTION, true },     // RES_FRAMEDIR
+
+    { SID_ATTR_HDFT_DYNAMIC_SPACING, true },// RES_HEADER_FOOTER_EAT_SPACING
+    { FN_TABLE_ROW_SPLIT, true },          // RES_ROW_SPLIT
     // #i18732# - use slot-id define in svx
-    { SID_SW_FOLLOW_TEXT_FLOW, SfxItemPoolFlags::POOLABLE },     // RES_FOLLOW_TEXT_FLOW
+    { SID_SW_FOLLOW_TEXT_FLOW, true },     // RES_FOLLOW_TEXT_FLOW
     // #i29550#
-    { SID_SW_COLLAPSING_BORDERS, SfxItemPoolFlags::POOLABLE },   // RES_COLLAPSING_BORDERS
+    { SID_SW_COLLAPSING_BORDERS, true },   // RES_COLLAPSING_BORDERS
     // #i28701#
-    { SID_SW_WRAP_INFLUENCE_ON_OBJPOS, SfxItemPoolFlags::POOLABLE },// RES_WRAP_INFLUENCE_ON_OBJPOS
-    { 0, SfxItemPoolFlags::NONE },                               // RES_AUTO_STYLE
-    { 0, SfxItemPoolFlags::POOLABLE },                           // RES_FRMATR_STYLE_NAME
-    { 0, SfxItemPoolFlags::POOLABLE },                           // RES_FRMATR_CONDITIONAL_STYLE_NAME
-    { 0, SfxItemPoolFlags::POOLABLE },                           // RES_FRMATR_GRABBAG
-    { 0, SfxItemPoolFlags::POOLABLE },                           // RES_TEXT_VERT_ADJUST
-
-    { 0, SfxItemPoolFlags::POOLABLE },                           // RES_GRFATR_MIRRORGRF
-    { SID_ATTR_GRAF_CROP, SfxItemPoolFlags::POOLABLE },          // RES_GRFATR_CROPGRF
-    { 0, SfxItemPoolFlags::POOLABLE },                           // RES_GRFATR_ROTATION,
-    { 0, SfxItemPoolFlags::POOLABLE },                           // RES_GRFATR_LUMINANCE,
-    { 0, SfxItemPoolFlags::POOLABLE },                           // RES_GRFATR_CONTRAST,
-    { 0, SfxItemPoolFlags::POOLABLE },                           // RES_GRFATR_CHANNELR,
-    { 0, SfxItemPoolFlags::POOLABLE },                           // RES_GRFATR_CHANNELG,
-    { 0, SfxItemPoolFlags::POOLABLE },                           // RES_GRFATR_CHANNELB,
-    { 0, SfxItemPoolFlags::POOLABLE },                           // RES_GRFATR_GAMMA,
-    { 0, SfxItemPoolFlags::POOLABLE },                           // RES_GRFATR_INVERT,
-    { 0, SfxItemPoolFlags::POOLABLE },                           // RES_GRFATR_TRANSPARENCY,
-    { 0, SfxItemPoolFlags::POOLABLE },                           // RES_GRFATR_DUMMY1,
-    { 0, SfxItemPoolFlags::POOLABLE },                           // RES_GRFATR_DUMMY2,
-    { 0, SfxItemPoolFlags::POOLABLE },                           // RES_GRFATR_DUMMY3,
-    { 0, SfxItemPoolFlags::POOLABLE },                           // RES_GRFATR_DUMMY4,
-    { 0, SfxItemPoolFlags::POOLABLE },                           // RES_GRFATR_DUMMY5,
-    { 0, SfxItemPoolFlags::POOLABLE },                           // RES_GRFATR_DUMMY6,
-
-    { 0, SfxItemPoolFlags::POOLABLE },                           // RES_BOXATR_FORMAT
-    { 0, SfxItemPoolFlags::NONE },                               // RES_BOXATR_FORMULA,
-    { 0, SfxItemPoolFlags::POOLABLE },                           // RES_BOXATR_VALUE
-
-    { 0, SfxItemPoolFlags::POOLABLE }                            // RES_UNKNOWNATR_CONTAINER
+    { SID_SW_WRAP_INFLUENCE_ON_OBJPOS, true },// RES_WRAP_INFLUENCE_ON_OBJPOS
+    { 0, false },                               // RES_AUTO_STYLE
+    { 0, true },                           // RES_FRMATR_STYLE_NAME
+    { 0, true },                           // RES_FRMATR_CONDITIONAL_STYLE_NAME
+    { 0, true },                           // RES_FRMATR_GRABBAG
+    { 0, true },                           // RES_TEXT_VERT_ADJUST
+
+    { 0, true },                           // RES_GRFATR_MIRRORGRF
+    { SID_ATTR_GRAF_CROP, true },          // RES_GRFATR_CROPGRF
+    { 0, true },                           // RES_GRFATR_ROTATION,
+    { 0, true },                           // RES_GRFATR_LUMINANCE,
+    { 0, true },                           // RES_GRFATR_CONTRAST,
+    { 0, true },                           // RES_GRFATR_CHANNELR,
+    { 0, true },                           // RES_GRFATR_CHANNELG,
+    { 0, true },                           // RES_GRFATR_CHANNELB,
+    { 0, true },                           // RES_GRFATR_GAMMA,
+    { 0, true },                           // RES_GRFATR_INVERT,
+    { 0, true },                           // RES_GRFATR_TRANSPARENCY,
+    { 0, true },                           // RES_GRFATR_DUMMY1,
+    { 0, true },                           // RES_GRFATR_DUMMY2,
+    { 0, true },                           // RES_GRFATR_DUMMY3,
+    { 0, true },                           // RES_GRFATR_DUMMY4,
+    { 0, true },                           // RES_GRFATR_DUMMY5,
+    { 0, true },                           // RES_GRFATR_DUMMY6,
+
+    { 0, true },                           // RES_BOXATR_FORMAT
+    { 0, false },                               // RES_BOXATR_FORMULA,
+    { 0, true },                           // RES_BOXATR_VALUE
+
+    { 0, true }                            // RES_UNKNOWNATR_CONTAINER
 };
 
 sal_uInt16* SwAttrPool::pVersionMap1 = nullptr;


More information about the Libreoffice-commits mailing list