diff options
| author | Armin Le Grand (allotropia) <armin.le.grand.extern@allotropia.de> | 2024-01-12 18:40:24 +0100 |
|---|---|---|
| committer | Armin Le Grand <Armin.Le.Grand@me.com> | 2024-01-14 21:02:46 +0100 |
| commit | 845d92e1f30eef5745480604fb9f6e4c3e3b7284 (patch) | |
| tree | 7499b058845fbd7317469332e7c0b7414da9f1c6 /extensions/source | |
| parent | 04777d49b17834a5edf0063e89b968afae457191 (diff) | |
ITEM: Move Shareable ItemFlag to SfxPolItem
Currently a Pool-Attribute (in SfxItemInfo), but should
be a SfxPoolItem property. Originally 'moved' from old
'poolable' used as hint. I identified needs more general
and moved it to where it belongs.
Also reworked SfxItemInfo to no longer have/support
single bollean flags, but a FlagVariable and defined
SFX_ITEMINFOFLAG_* entries to access these, that will
make future changes easier without having to change
all palces where these get defined over and over again.
Added CheckItemInfoFlag for gereral access to that flag
and e.g. NeedsSurrogateSupport to directly check for
the SFX_ITEMINFOFLAG_SUPPORT_SURROGATE flag as syntactical
sugar, that makes the intention clear.
Change-Id: I09c238c7c5b7f721b657d7b0a44dbc8d14e02528
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161982
Tested-by: Jenkins
Reviewed-by: Armin Le Grand <Armin.Le.Grand@me.com>
Diffstat (limited to 'extensions/source')
| -rw-r--r-- | extensions/source/propctrlr/fontdialog.cxx | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/extensions/source/propctrlr/fontdialog.cxx b/extensions/source/propctrlr/fontdialog.cxx index 59757421a06e..5605560070e8 100644 --- a/extensions/source/propctrlr/fontdialog.cxx +++ b/extensions/source/propctrlr/fontdialog.cxx @@ -532,27 +532,27 @@ namespace pcr // create the pool static SfxItemInfo const aItemInfos[FontItemIds::CFID_LAST_ITEM_ID - FontItemIds::CFID_FIRST_ITEM_ID + 1] = { - // _nSID, _bNeedsPoolRegistration, _bShareable - { SID_ATTR_CHAR_FONT, false, false }, - { SID_ATTR_CHAR_FONTHEIGHT, false, false }, - { SID_ATTR_CHAR_WEIGHT, false, false }, - { SID_ATTR_CHAR_POSTURE, false, false }, - { SID_ATTR_CHAR_LANGUAGE, false, false }, - { SID_ATTR_CHAR_UNDERLINE, false, false }, - { SID_ATTR_CHAR_STRIKEOUT, false, false }, - { SID_ATTR_CHAR_WORDLINEMODE, false, false }, - { SID_ATTR_CHAR_COLOR, false, false }, - { SID_ATTR_CHAR_RELIEF, false, false }, - { SID_ATTR_CHAR_EMPHASISMARK, false, false }, - { 0, false, false }, - { 0, false, false }, - { 0, false, false }, - { 0, false, false }, - { 0, false, false }, - { 0, false, false }, - { 0, false, false }, - { 0, false, false }, - { SID_ATTR_CHAR_FONTLIST, false, false } + // _nItemInfoSlotID, _nItemInfoFlags + { SID_ATTR_CHAR_FONT, SFX_ITEMINFOFLAG_NONE }, // FontItemIds::CFID_FONT + { SID_ATTR_CHAR_FONTHEIGHT, SFX_ITEMINFOFLAG_NONE }, // FontItemIds::CFID_HEIGHT + { SID_ATTR_CHAR_WEIGHT, SFX_ITEMINFOFLAG_NONE }, // FontItemIds::CFID_WEIGHT + { SID_ATTR_CHAR_POSTURE, SFX_ITEMINFOFLAG_NONE }, // FontItemIds::CFID_POSTURE + { SID_ATTR_CHAR_LANGUAGE, SFX_ITEMINFOFLAG_NONE }, // FontItemIds::CFID_LANGUAGE + { SID_ATTR_CHAR_UNDERLINE, SFX_ITEMINFOFLAG_NONE }, // FontItemIds::CFID_UNDERLINE + { SID_ATTR_CHAR_STRIKEOUT, SFX_ITEMINFOFLAG_NONE }, // FontItemIds::CFID_STRIKEOUT + { SID_ATTR_CHAR_WORDLINEMODE, SFX_ITEMINFOFLAG_NONE }, // FontItemIds::CFID_WORDLINEMODE + { SID_ATTR_CHAR_COLOR, SFX_ITEMINFOFLAG_NONE }, // FontItemIds::CFID_CHARCOLOR + { SID_ATTR_CHAR_RELIEF, SFX_ITEMINFOFLAG_NONE }, // FontItemIds::CFID_RELIEF + { SID_ATTR_CHAR_EMPHASISMARK, SFX_ITEMINFOFLAG_NONE }, // FontItemIds::CFID_EMPHASIS + { 0, SFX_ITEMINFOFLAG_NONE }, // FontItemIds::CFID_CJK_FONT + { 0, SFX_ITEMINFOFLAG_NONE }, // FontItemIds::CFID_CJK_HEIGHT + { 0, SFX_ITEMINFOFLAG_NONE }, // FontItemIds::CFID_CJK_WEIGHT + { 0, SFX_ITEMINFOFLAG_NONE }, // FontItemIds::CFID_CJK_POSTURE + { 0, SFX_ITEMINFOFLAG_NONE }, // FontItemIds::CFID_CJK_LANGUAGE + { 0, SFX_ITEMINFOFLAG_NONE }, // FontItemIds::CFID_CASEMAP + { 0, SFX_ITEMINFOFLAG_NONE }, // FontItemIds::CFID_CONTOUR + { 0, SFX_ITEMINFOFLAG_NONE }, // FontItemIds::CFID_SHADOWED + { SID_ATTR_CHAR_FONTLIST, SFX_ITEMINFOFLAG_NONE } // FontItemIds::CFID_FONTLIST }; _rpPool = new SfxItemPool("PCRControlFontItemPool", FontItemIds::CFID_FIRST_ITEM_ID, FontItemIds::CFID_LAST_ITEM_ID, |