diff options
| author | Noel Grandin <noel@peralex.com> | 2016-03-09 09:47:35 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2016-03-09 09:46:53 +0000 |
| commit | c8a93253e43e81e5dbc89937f2a21ca75e0582bc (patch) | |
| tree | c5ebf27b0f2a5ece4846bf2e0cd0a09815f105e0 /include/svl | |
| parent | 9885a4f10f6b900a2a870e5fe691c4a465522b75 (diff) | |
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@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'include/svl')
| -rw-r--r-- | include/svl/itempool.hxx | 22 |
1 files changed, 5 insertions, 17 deletions
diff --git a/include/svl/itempool.hxx b/include/svl/itempool.hxx index e9f216bd4f4c..2ca544d45808 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; |