diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/editeng/editids.hrc | 2 | ||||
| -rw-r--r-- | include/editeng/pmdlitem.hxx | 8 | ||||
| -rw-r--r-- | include/sfx2/sfxsids.hrc | 87 | ||||
| -rw-r--r-- | include/svl/typedwhich.hxx | 8 | ||||
| -rw-r--r-- | include/svx/svxids.hrc | 16 |
5 files changed, 66 insertions, 55 deletions
diff --git a/include/editeng/editids.hrc b/include/editeng/editids.hrc index 624c78b78a3a..bf6b33afb4d7 100644 --- a/include/editeng/editids.hrc +++ b/include/editeng/editids.hrc @@ -75,7 +75,7 @@ class SvxWordLineModeItem; #define SID_ATTR_TABSTOP_DEFAULTS TypedWhichId<SfxUInt16Item>( SID_SVX_START + 3 ) #define SID_ATTR_TABSTOP_POS TypedWhichId<SfxUInt16Item>( SID_SVX_START + 4 ) #define SID_ATTR_TABSTOP_OFFSET TypedWhichId<SfxInt32Item>( SID_SVX_START + 5 ) -#define SID_ATTR_CHAR ( SID_SVX_START + 6 ) +#define SID_ATTR_CHAR TypedWhichId<SfxStringItem>( SID_SVX_START + 6 ) #define SID_ATTR_CHAR_FONT TypedWhichId<SvxFontItem>( SID_SVX_START + 7 ) #define SID_ATTR_CHAR_POSTURE TypedWhichId<SvxPostureItem>( SID_SVX_START + 8 ) #define SID_ATTR_CHAR_WEIGHT TypedWhichId<SvxWeightItem>( SID_SVX_START + 9 ) diff --git a/include/editeng/pmdlitem.hxx b/include/editeng/pmdlitem.hxx index f4bfa53c47fa..45ca6ac6f4d3 100644 --- a/include/editeng/pmdlitem.hxx +++ b/include/editeng/pmdlitem.hxx @@ -37,9 +37,9 @@ private: public: static SfxPoolItem* CreateDefault(); - explicit inline SvxPageModelItem( sal_uInt16 nWh ); + explicit inline SvxPageModelItem( TypedWhichId<SvxPageModelItem> nWh ); inline SvxPageModelItem( const OUString& rModel, bool bA /*= false*/, - sal_uInt16 nWh ); + TypedWhichId<SvxPageModelItem> nWh ); virtual SvxPageModelItem* Clone( SfxItemPool *pPool = nullptr ) const override; @@ -53,14 +53,14 @@ public: virtual bool operator==( const SfxPoolItem& ) const override; }; -inline SvxPageModelItem::SvxPageModelItem( sal_uInt16 nWh ) +inline SvxPageModelItem::SvxPageModelItem( TypedWhichId<SvxPageModelItem> nWh ) : bAuto( false ) { SetWhich( nWh ); } inline SvxPageModelItem::SvxPageModelItem( const OUString& rModel, bool bA, - sal_uInt16 nWh ) : + TypedWhichId<SvxPageModelItem> nWh ) : SfxStringItem( nWh, rModel ), bAuto( bA ) {} diff --git a/include/sfx2/sfxsids.hrc b/include/sfx2/sfxsids.hrc index 3265f84131bc..3be1d86c3844 100644 --- a/include/sfx2/sfxsids.hrc +++ b/include/sfx2/sfxsids.hrc @@ -69,14 +69,14 @@ class SvxZoomItem; #define SID_DEVELOPMENT_TOOLS_DOCKING_WINDOW (SID_SFX_START + 306) #define SID_INSPECT_SELECTED_OBJECT (SID_SFX_START + 307) -#define SID_CONTEXT (SID_SFX_START + 310) +#define SID_CONTEXT TypedWhichId<SfxStringItem>(SID_SFX_START + 310) #define SID_PASTE_SPECIAL (SID_SFX_START + 311) #define SID_CLIPBOARD_FORMAT_ITEMS TypedWhichId<SvxClipboardFormatItem>(SID_SFX_START + 312) #define SID_PASTE_UNFORMATTED (SID_SFX_START + 314) #define SID_PRINTER_NOTFOUND_WARN TypedWhichId<SfxBoolItem>(SID_SFX_START + 320) -#define SID_PRINTER_NAME (SID_SFX_START + 322) +#define SID_PRINTER_NAME TypedWhichId<SfxStringItem>(SID_SFX_START + 322) #define SID_PRINTER_CHANGESTODOC TypedWhichId<SfxFlagItem>(SID_SFX_START + 324) #define SID_PRINTPREVIEW (SID_SFX_START + 325) @@ -126,31 +126,32 @@ class SvxZoomItem; #define SID_OPENDOC (SID_SFX_START + 501) #define SID_OPENREMOTE (SID_SFX_START + 517) #define SID_OPENURL (SID_SFX_START + 596) -#define SID_JUMPTOMARK (SID_SFX_START + 598) +#define SID_JUMPTOMARK TypedWhichId<SfxStringItem>(SID_SFX_START + 598) #define SID_OPENTEMPLATE (SID_SFX_START + 594) -#define SID_SAVEASDOC (SID_SFX_START + 502) +#define SID_SAVEASDOC TypedWhichId<SfxStringItem>(SID_SFX_START + 502) #define SID_SAVEASREMOTE (SID_SFX_START + 516) #define SID_SAVESIMPLE (SID_SFX_START + 518) #define SID_SIGNPDF TypedWhichId<SfxBoolItem>(SID_SFX_START + 519) -#define SID_SAVEACOPY TypedWhichId<SfxBoolItem>(SID_SFX_START + 999) +// this is either SfxBoolItem or SfxStringItem +#define SID_SAVEACOPY (SID_SFX_START + 999) #define SID_SAVEACOPYITEM TypedWhichId<SfxBoolItem>(SID_SFX_START + 998) #define SID_CONVERT_IMAGES TypedWhichId<SfxStringItem>(SID_SFX_START + 997) #define SID_CLOSING TypedWhichId<SfxBoolItem>(SID_SFX_START +1539) -#define SID_CLOSEDOC (SID_SFX_START + 503) +#define SID_CLOSEDOC TypedWhichId<SfxStringItem>(SID_SFX_START + 503) #define SID_CLOSEDOCS (SID_SFX_START + 595) #define SID_CLOSEDOC_SAVE (SID_SFX_START + 1) #define SID_CLOSEDOC_FILENAME (SID_SFX_START + 2) #define SID_PRINTDOC (SID_SFX_START + 504) #define SID_PRINT_COPIES (SID_SFX_START + 3) -#define SID_PRINT_PAGES (SID_SFX_START +1589) +#define SID_PRINT_PAGES TypedWhichId<SfxStringItem>(SID_SFX_START +1589) #define SID_PRINT_COLLATE (SID_SFX_START +1590) #define SID_PRINT_SORT (SID_SFX_START +1591) -#define SID_SAVEDOC (SID_SFX_START + 505) +#define SID_SAVEDOC TypedWhichId<SfxStringItem>(SID_SFX_START + 505) #define SID_FILE_NAME TypedWhichId<SfxStringItem>(SID_SFX_START + 507) #define SID_DOCINFO_TITLE TypedWhichId<SfxStringItem>(SID_SFX_START + 557) #define SID_FILE_FILTEROPTIONS TypedWhichId<SfxStringItem>(SID_SFX_START + 527) #define SID_RELOAD (SID_SFX_START + 508) -#define SID_PRINTDOCDIRECT (SID_SFX_START + 509) +#define SID_PRINTDOCDIRECT TypedWhichId<SfxStringItem>(SID_SFX_START + 509) #define SID_DOC_REPAIR TypedWhichId<SfxBoolItem>(SID_SFX_START + 510) #define SID_DOC_SERVICE TypedWhichId<SfxStringItem>(SID_SFX_START + 511) #define SID_PLUGIN_MODE TypedWhichId<SfxUInt16Item>(SID_SFX_START + 827) @@ -197,7 +198,7 @@ class SvxZoomItem; #define SID_AUTOLOAD TypedWhichId<SfxBoolItem>(SID_SFX_START + 1509) #define SID_FILLFRAME TypedWhichId<SfxUnoFrameItem>(SID_SFX_START + 1516) -#define SID_BASEURL (SID_SFX_START + 1518) +#define SID_BASEURL TypedWhichId<SfxStringItem>(SID_SFX_START + 1518) #define SID_TEMPLATE TypedWhichId<SfxBoolItem>(SID_SFX_START + 1519) #define SID_CONTENTTYPE TypedWhichId<SfxStringItem>(SID_SFX_START + 1541) @@ -210,7 +211,7 @@ class SvxZoomItem; #define SID_DOCUMENT_MERGE (SID_SFX_START + 1587) #define SID_OFFICE_CHECK_PLZ (SID_SFX_START + 1610) -#define SID_CURRENT_URL (SID_SFX_START + 1613) +#define SID_CURRENT_URL TypedWhichId<SfxStringItem>(SID_SFX_START + 1613) #define SID_CHARSET TypedWhichId<SfxStringItem>(SID_SFX_START + 1633) #define SID_OVERWRITE (SID_SFX_START + 1634) @@ -243,7 +244,7 @@ class SvxZoomItem; #define SID_RUNMACRO (SID_SFX_START + 1692) #define SID_AVMEDIA_TOOLBOX TypedWhichId<::avmedia::MediaItem>(SID_SFX_START + 1693) #define SID_AVMEDIA_PLAYER (SID_SFX_START + 1694) -#define SID_INSERT_AVMEDIA (SID_SFX_START + 1696) +#define SID_INSERT_AVMEDIA TypedWhichId<SfxStringItem>(SID_SFX_START + 1696) #define SID_RECENTFILELIST (SID_SFX_START + 1697) #define SID_AVAILABLE_TOOLBARS (SID_SFX_START + 1698) #define SID_STREAM TypedWhichId<SfxUnoAnyItem>(SID_SFX_START + 1699) @@ -260,10 +261,10 @@ class SvxZoomItem; #define SID_NO_ACCEPT_DIALOG TypedWhichId<SfxBoolItem>(SID_SFX_START + 1710) #define SID_NOAUTOSAVE TypedWhichId<SfxBoolItem>(SID_SFX_START + 1711) #define SID_PRINT_SELECTEDSHEET TypedWhichId<SfxBoolItem>(SID_SFX_START + 1712) -#define SID_OPTIONS_PAGEURL (SID_SFX_START + 1713) +#define SID_OPTIONS_PAGEURL TypedWhichId<SfxStringItem>(SID_SFX_START + 1713) #define SID_MORE_DICTIONARIES (SID_SFX_START + 1714) #define SID_ACTIVATE_STYLE_APPLY (SID_SFX_START + 1715) -#define SID_FONT_NAME (SID_SFX_START + 1716) +#define SID_FONT_NAME TypedWhichId<SfxStringItem>(SID_SFX_START + 1716) #define SID_DEFAULTFILENAME (SID_SFX_START + 1717) #define SID_MODIFYPASSWORDINFO TypedWhichId<SfxUnoAnyItem>(SID_SFX_START + 1718) #define SID_RECOMMENDREADONLY TypedWhichId<SfxBoolItem>(SID_SFX_START + 1719) @@ -317,7 +318,7 @@ class SvxZoomItem; #define SID_FILTER_NAME TypedWhichId<SfxStringItem>(SID_SFX_START + 530) #define SID_DOC_SALVAGE TypedWhichId<SfxStringItem>(SID_SFX_START + 531) -#define SID_INSERTDOC (SID_SFX_START + 532) +#define SID_INSERTDOC TypedWhichId<SfxStringItem>(SID_SFX_START + 532) #define SID_TYPE_NAME TypedWhichId<SfxStringItem>(SID_SFX_START + 533) #define SID_DOC_READONLY TypedWhichId<SfxBoolItem>(SID_SFX_START + 590) @@ -326,16 +327,16 @@ class SvxZoomItem; #define SID_IMG_LOADING TypedWhichId<SfxBoolItem>(SID_SFX_START + 586) #define SID_DOC_SAVED TypedWhichId<SfxBoolItem>(SID_SFX_START + 599) #define SID_DOCINFO TypedWhichId<SfxDocumentInfoItem>(SID_SFX_START + 535) -#define SID_DOCINFO_KEYWORDS (SID_SFX_START + 591) -#define SID_DOCINFO_COMMENTS (SID_SFX_START + 592) -#define SID_DOCINFO_AUTHOR (SID_SFX_START + 593) +#define SID_DOCINFO_KEYWORDS TypedWhichId<SfxStringItem>(SID_SFX_START + 591) +#define SID_DOCINFO_COMMENTS TypedWhichId<SfxStringItem>(SID_SFX_START + 592) +#define SID_DOCINFO_AUTHOR TypedWhichId<SfxStringItem>(SID_SFX_START + 593) #define SID_DOCINFO_MAJOR (SID_SFX_START + 594) -#define SID_NEWDOCDIRECT (SID_SFX_START + 537) +#define SID_NEWDOCDIRECT TypedWhichId<SfxStringItem>(SID_SFX_START + 537) #define SID_DOCFRAME (SID_SFX_START + 598) #define SID_TARGETNAME TypedWhichId<SfxStringItem>(SID_SFX_START + 560) #define SID_POSTDATA TypedWhichId<SfxUnoAnyItem>(SID_SFX_START + 1536) #define SID_DONELINK (SID_SFX_START + 646) -#define SID_REFERER (SID_SFX_START + 654) +#define SID_REFERER TypedWhichId<SfxStringItem>(SID_SFX_START + 654) #define SID_PAGE_NUMBER (SID_SFX_START + 655) #define SID_MODIFIER TypedWhichId<SfxUInt16Item>(SID_SFX_START + 669) #define SID_SETOPTIONS (SID_SFX_START + 670) @@ -349,7 +350,7 @@ class SvxZoomItem; // Floating Window Template #define SID_STYLE_DESIGNER TypedWhichId<SfxBoolItem>(SID_SFX_START + 539) -#define SID_SIDEBAR_DECK (SID_SFX_START + 850) +#define SID_SIDEBAR_DECK TypedWhichId<SfxStringItem>(SID_SFX_START + 850) #define SID_SIDEBAR_DECK_TOGGLE TypedWhichId<SfxBoolItem>(SID_SFX_START + 851) #define SID_TEMPLATE_ADDRESSBOOKSOURCE (SID_SFX_START + 1655) @@ -365,21 +366,21 @@ class SvxZoomItem; #define SID_STYLE_FAMILY5 (SID_STYLE_FAMILY_START + 4) #define SID_STYLE_FAMILY6 (SID_STYLE_FAMILY_START + 5) -#define SID_STYLE_NEW (SID_SFX_START + 549) -#define SID_STYLE_EDIT (SID_SFX_START + 550) -#define SID_STYLE_DELETE (SID_SFX_START + 551) -#define SID_STYLE_APPLY (SID_SFX_START + 552) +#define SID_STYLE_NEW TypedWhichId<SfxStringItem>(SID_SFX_START + 549) +#define SID_STYLE_EDIT TypedWhichId<SfxStringItem>(SID_SFX_START + 550) +#define SID_STYLE_DELETE TypedWhichId<SfxStringItem>(SID_SFX_START + 551) +#define SID_STYLE_APPLY TypedWhichId<SfxStringItem>(SID_SFX_START + 552) #define SID_STYLE_FAMILY TypedWhichId<SfxUInt16Item>(SID_SFX_START + 553) #define SID_STYLE_FAMILYNAME TypedWhichId<SfxStringItem>(SID_SFX_START + 566) #define SID_STYLE_WATERCAN TypedWhichId<SfxBoolItem>(SID_SFX_START + 554) -#define SID_STYLE_NEW_BY_EXAMPLE (SID_SFX_START + 555) -#define SID_STYLE_UPDATE_BY_EXAMPLE (SID_SFX_START + 556) +#define SID_STYLE_NEW_BY_EXAMPLE TypedWhichId<SfxStringItem>(SID_SFX_START + 555) +#define SID_STYLE_UPDATE_BY_EXAMPLE TypedWhichId<SfxStringItem>(SID_SFX_START + 556) #define SID_STYLE_DRAGHIERARCHIE (SID_SFX_START + 565) #define SID_STYLE_MASK (SID_SFX_START + 562) #define SID_STYLE_PREVIEW (SID_SFX_START + 567) #define SID_STYLE_END_PREVIEW (SID_SFX_START + 568) -#define SID_STYLE_HIDE (SID_SFX_START + 1603) -#define SID_STYLE_SHOW (SID_SFX_START + 1604) +#define SID_STYLE_HIDE TypedWhichId<SfxStringItem>(SID_SFX_START + 1603) +#define SID_STYLE_SHOW TypedWhichId<SfxStringItem>(SID_SFX_START + 1604) #define SID_STYLE_UPD_BY_EX_NAME TypedWhichId<SfxStringItem>(SID_SFX_START + 1585) #define SID_STYLE_REFERENCE TypedWhichId<SfxStringItem>(SID_SFX_START + 1602) @@ -402,7 +403,7 @@ class SvxZoomItem; #define SID_OBJECT (SID_SFX_START + 575) // Doc-Properties -#define SID_DOCFULLNAME (SID_SFX_START + 581) +#define SID_DOCFULLNAME TypedWhichId<SfxStringItem>(SID_SFX_START + 581) #define SID_DOCPATH (SID_SFX_START + 582) #define SID_DOCTITLE TypedWhichId<SfxStringItem>(SID_SFX_START + 583) @@ -423,18 +424,20 @@ class SvxZoomItem; #define SID_VIEWSHELL4 (SID_SFX_START + 634) // id for thesaurus entry in context menu -#define SID_THES (SID_SFX_START + 698) +#define SID_THES TypedWhichId<SfxStringItem>(SID_SFX_START + 698) #define FN_PARAM_THES_WORD_REPLACE TypedWhichId<SfxStringItem>(SID_SFX_START + 699) // default-ids for editing, cursor travelling and selection +// this is sometimes SfxStringItem and sometimes SfxUInt16Item #define SID_REDO (SID_SFX_START + 700) +// this is sometimes SfxStringItem and sometimes SfxUInt16Item #define SID_UNDO (SID_SFX_START + 701) -#define SID_REPEAT (SID_SFX_START + 702) +#define SID_REPEAT TypedWhichId<SfxStringItem>(SID_SFX_START + 702) #define SID_CLEARHISTORY (SID_SFX_START + 703) #define SID_CUT (SID_SFX_START + 710) #define SID_COPY (SID_SFX_START + 711) #define SID_PASTE (SID_SFX_START + 712) -#define SID_DELETE (SID_SFX_START + 713) +#define SID_DELETE TypedWhichId<SfxStringItem>(SID_SFX_START + 713) #define SID_BACKSPACE (SID_SFX_START + 714) #define SID_FORMATPAINTBRUSH TypedWhichId<SfxBoolItem>(SID_SFX_START + 715) @@ -474,7 +477,7 @@ class SvxZoomItem; #define SID_THEME_DIALOG (SID_SFX_START + 815) // default-ids for configuration -#define SID_CONFIG (SID_SFX_START + 904) +#define SID_CONFIG TypedWhichId<SfxStringItem>(SID_SFX_START + 904) #define SID_TOOLBOXOPTIONS (SID_SFX_START + 907) #define SID_TOGGLEFUNCTIONBAR (SID_SFX_START + 910) #define SID_MACROINFO TypedWhichId<SfxMacroInfoItem>(SID_SFX_START + 919) @@ -490,7 +493,7 @@ class SvxZoomItem; // FIXME this has two different associated pool item types, SvxMacroItem and SfxBoolItem #define SID_ATTR_MACROITEM TypedWhichId<SvxMacroItem>(SID_SFX_START + 934) -#define SID_OPTIONS (SID_SFX_START + 940) +#define SID_OPTIONS TypedWhichId<SfxStringItem>(SID_SFX_START + 940) #define SID_BASICLOAD (SID_SFX_START + 951) #define SID_BASICSAVEAS (SID_SFX_START + 953) #define SID_BASICCOMPILE (SID_SFX_START + 954) @@ -588,7 +591,7 @@ class SvxZoomItem; #define SID_SEARCH_OPTIONS (SID_SVX_START + 281) #define SID_SEARCH_ITEM TypedWhichId<SvxSearchItem>(SID_SVX_START + 291) #define SID_SIDEBAR TypedWhichId<SfxBoolItem>(SID_SVX_START + 336) -#define SID_NOTEBOOKBAR (SID_SVX_START + 338) +#define SID_NOTEBOOKBAR TypedWhichId<SfxStringItem>(SID_SVX_START + 338) #define SID_MENUBAR TypedWhichId<SfxBoolItem>(SID_SVX_START + 339) #define SID_HYPERLINK_GETLINK TypedWhichId<SvxHyperlinkItem>(SID_SVX_START + 361) #define SID_HYPERLINK_SETLINK TypedWhichId<SvxHyperlinkItem>(SID_SVX_START + 362) @@ -635,7 +638,7 @@ class SvxZoomItem; #define SID_BASICIDE_STOREALLMODULESOURCES ( SID_BASICIDE_START + 16 ) #define SID_BASICIDE_UPDATEALLMODULESOURCES ( SID_BASICIDE_START + 17 ) #define SID_BASICIDE_LIBSELECTED ( SID_BASICIDE_START + 18 ) -#define SID_BASICIDE_LIBSELECTOR ( SID_BASICIDE_START + 19 ) +#define SID_BASICIDE_LIBSELECTOR TypedWhichId<SfxStringItem>( SID_BASICIDE_START + 19 ) #define SID_BASICIDE_NEWDIALOG ( SID_BASICIDE_START + 20 ) #define SID_BASICIDE_NEWMODULE ( SID_BASICIDE_START + 21 ) #define SID_BASICIDE_DELETECURRENT ( SID_BASICIDE_START + 22 ) @@ -651,9 +654,9 @@ class SvxZoomItem; #define SID_BASICIDE_ARG_LIBNAME TypedWhichId<SfxStringItem>( SID_BASICIDE_START + 34 ) #define SID_BASICIDE_ARG_MODULENAME TypedWhichId<SfxStringItem>( SID_BASICIDE_START + 35 ) #define SID_BASICIDE_BRKPNTSCHANGED ( SID_BASICIDE_START + 36 ) -#define SID_BASICIDE_STAT_POS ( SID_BASICIDE_START + 38 ) -#define SID_BASICIDE_STAT_DATE ( SID_BASICIDE_START + 39 ) -#define SID_BASICIDE_STAT_TITLE ( SID_BASICIDE_START + 40 ) +#define SID_BASICIDE_STAT_POS TypedWhichId<SfxStringItem>( SID_BASICIDE_START + 38 ) +#define SID_BASICIDE_STAT_DATE TypedWhichId<SfxStringItem>( SID_BASICIDE_START + 39 ) +#define SID_BASICIDE_STAT_TITLE TypedWhichId<SfxStringItem>( SID_BASICIDE_START + 40 ) #define SID_BASICIDE_MANAGEBRKPNTS ( SID_BASICIDE_START + 42 ) #define SID_BASICIDE_TOGGLEBRKPNTENABLED ( SID_BASICIDE_START + 43 ) #define SID_BASICIDE_SHOWWINDOW ( SID_BASICIDE_START + 44 ) @@ -665,8 +668,8 @@ class SvxZoomItem; #define SID_BASICIDE_ARG_COLUMN2 ( SID_BASICIDE_START + 50 ) #define SID_BASICIDE_ARG_DOCUMENT_MODEL TypedWhichId<SfxUnoAnyItem>( SID_BASICIDE_START + 51 ) #define SID_BASICIDE_MANAGE_LANG ( SID_BASICIDE_START + 52 ) -#define SID_BASICIDE_CURRENT_LANG ( SID_BASICIDE_START + 53 ) -#define SID_BASICIDE_CURRENT_ZOOM ( SID_BASICIDE_START + 54 ) +#define SID_BASICIDE_CURRENT_LANG TypedWhichId<SfxStringItem>( SID_BASICIDE_START + 53 ) +#define SID_BASICIDE_CURRENT_ZOOM TypedWhichId<SfxStringItem>( SID_BASICIDE_START + 54 ) #define SID_BASICIDE_WATCH TypedWhichId<SfxBoolItem>( SID_BASICIDE_START + 55 ) #define SID_BASICIDE_STACK TypedWhichId<SfxBoolItem>( SID_BASICIDE_START + 56 ) #define SID_OPTIONS_TREEDIALOG ( SID_BASICIDE_START + 862) diff --git a/include/svl/typedwhich.hxx b/include/svl/typedwhich.hxx index cb9efabd59fc..8cfd4f01a314 100644 --- a/include/svl/typedwhich.hxx +++ b/include/svl/typedwhich.hxx @@ -40,6 +40,14 @@ private: sal_uInt16 mnWhich; }; +template <class T> constexpr bool operator==(TypedWhichId<T> const& lhs, TypedWhichId<T> rhs) +{ + return lhs == rhs; +} +template <class T> constexpr bool operator!=(TypedWhichId<T> const& lhs, TypedWhichId<T> rhs) +{ + return lhs != rhs; +} template <class T> constexpr bool operator==(sal_uInt16 lhs, TypedWhichId<T> const& rhs) { return lhs == sal_uInt16(rhs); diff --git a/include/svx/svxids.hrc b/include/svx/svxids.hrc index 584f10ec6670..c096a0a701ca 100644 --- a/include/svx/svxids.hrc +++ b/include/svx/svxids.hrc @@ -185,7 +185,7 @@ class XFillGradientItem; #define FN_OUTLINE_RULE_INDEX (FN_EDIT + 122) #define FN_INSERT (SID_SW_START + 300) // 20300 -#define FN_DELETE_BOOKMARK (FN_INSERT + 1) +#define FN_DELETE_BOOKMARK TypedWhichId<SfxStringItem>(FN_INSERT + 1) #define FN_INSERT_BREAK (FN_INSERT + 3) #define FN_INSERT_SOFT_HYPHEN (FN_INSERT + 43) /* optional hyphen */ #define FN_INSERT_HARD_SPACE (FN_INSERT + 44) /* hard space */ @@ -411,7 +411,7 @@ class XFillGradientItem; #define SID_SET_SUPER_SCRIPT ( SID_SVX_START + 294 ) #define SID_SET_SUB_SCRIPT ( SID_SVX_START + 295 ) #define SID_CHAR_DLG ( SID_SVX_START + 296 ) -#define SID_PARA_DLG ( SID_SVX_START + 297 ) +#define SID_PARA_DLG TypedWhichId<SfxStringItem>( SID_SVX_START + 297 ) #define SID_ATTR_GRID_OPTIONS TypedWhichId<SvxGridItem>( SID_SVX_START + 298 ) #define SID_ATTR_FILL_SHADOW ( SID_SVX_START + 299 ) @@ -608,7 +608,7 @@ class XFillGradientItem; #define SID_FM_ADD_FIELD ( SID_SVX_START + 623 ) #define SID_FM_RECORD_TEXT ( SID_SVX_START + 624 ) #define SID_FM_RECORD_FROM_TEXT ( SID_SVX_START + 625 ) -#define SID_FM_RECORD_TOTAL ( SID_SVX_START + 626 ) +#define SID_FM_RECORD_TOTAL TypedWhichId<SfxStringItem>( SID_SVX_START + 626 ) #define SID_FM_RECORD_SAVE ( SID_SVX_START + 627 ) #define SID_FM_CREATE_CONTROL ( SID_SVX_START + 628 ) #define SID_FM_DESIGN_MODE TypedWhichId<SfxBoolItem>( SID_SVX_START + 629 ) @@ -810,7 +810,7 @@ class XFillGradientItem; #define SID_EXTRUSION_DEPTH_DIALOG ( SID_SVX_START + 976 ) #define SID_FONTWORK_GALLERY_FLOATER ( SID_SVX_START + 977 ) #define SID_EDIT_HYPERLINK ( SID_SVX_START + 978 ) -#define SID_FONTWORK_SHAPE_TYPE ( SID_SVX_START + 979 ) +#define SID_FONTWORK_SHAPE_TYPE TypedWhichId<SfxStringItem>( SID_SVX_START + 979 ) #define SID_FONTWORK_SAME_LETTER_HEIGHTS ( SID_SVX_START + 980 ) #define SID_FONTWORK_ALIGNMENT_FLOATER ( SID_SVX_START + 981 ) #define SID_FONTWORK_CHARACTER_SPACING_FLOATER ( SID_SVX_START + 982 ) @@ -856,8 +856,8 @@ class XFillGradientItem; #define SID_ATTR_SET ( SID_SVX_START + 1022 ) #define SID_CHAR_FMT_LIST_BOX ( SID_SVX_START + 1023 ) #define SID_METRIC_ITEM TypedWhichId<SfxUInt16Item>( SID_SVX_START + 1024 ) -#define SID_NUM_CHAR_FMT ( SID_SVX_START + 1025 ) -#define SID_BULLET_CHAR_FMT ( SID_SVX_START + 1026 ) +#define SID_NUM_CHAR_FMT TypedWhichId<SfxStringItem>( SID_SVX_START + 1025 ) +#define SID_BULLET_CHAR_FMT TypedWhichId<SfxStringItem>( SID_SVX_START + 1026 ) #define SID_DISABLE_SVXEXTPARAGRAPHTABPAGE_PAGEBREAK ( SID_SVX_START + 1027 ) #define SID_SVXPARAALIGNTABPAGE_ENABLEJUSTIFYEXT ( SID_SVX_START + 1028 ) #define SID_SVXSTDPARAGRAPHTABPAGE_PAGEWIDTH ( SID_SVX_START + 1029 ) @@ -915,7 +915,7 @@ class XFillGradientItem; #define SID_TABLE_AUTOSUM ( SID_SVX_START + 1085 ) #define SID_TABLE_DISTRIBUTE_COLUMNS ( SID_SVX_START + 1086 ) #define SID_TABLE_DISTRIBUTE_ROWS ( SID_SVX_START + 1087 ) -#define SID_TABLE_STYLE ( SID_SVX_START + 1088 ) +#define SID_TABLE_STYLE TypedWhichId<SfxStringItem>( SID_SVX_START + 1088 ) #define SID_TABLE_STYLE_SETTINGS ( SID_SVX_START + 1089 ) #define SID_CHAR_DLG_PREVIEW_STRING ( SID_SVX_START + 1090 ) #define SID_RECHECK_DOCUMENT ( SID_SVX_START + 1091 ) @@ -928,7 +928,7 @@ class XFillGradientItem; #define SID_DELETEALL_POSTIT ( SID_SVX_START + 1097 ) #define SID_TOGGLE_NOTES ( SID_SVX_START + 1098 ) #define SID_REPLYTO_POSTIT ( SID_SVX_START + 1099 ) -#define SID_DELETEALLBYAUTHOR_POSTIT ( SID_SVX_START + 1100 ) +#define SID_DELETEALLBYAUTHOR_POSTIT TypedWhichId<SfxStringItem>( SID_SVX_START + 1100 ) #define SID_INSERT_POSTIT ( SID_SVX_START + 1101 ) #define SID_TRANSLITERATE_SENTENCE_CASE ( SID_SVX_START + 1102 ) |