dbaccess/source/ui/inc/sbagrid.hrc | 4 ++--
include/sfx2/sfxsids.hrc | 12 +++++++-----
include/svx/svxids.hrc | 14 +++++++-------
sc/inc/sc.hrc | 2 +-
svx/source/dialog/srchdlg.cxx | 2 +-
sw/inc/cmdid.h | 2 +-
6 files changed, 19 insertions(+), 17 deletions(-)
New commits:
commit 583c3fcea50b69ca9d3cd866050c9e722a8f780b
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Sun May 28 15:49:53 2023 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Mon May 29 13:13:44 2023 +0200
use more TypedWhichId
Change-Id: If7b4320e199a01f2614e3bf582e5d96fade22aa2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152353
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/dbaccess/source/ui/inc/sbagrid.hrc
b/dbaccess/source/ui/inc/sbagrid.hrc
index c84dbccead66..921faa6a9bd2 100644
--- a/dbaccess/source/ui/inc/sbagrid.hrc
+++ b/dbaccess/source/ui/inc/sbagrid.hrc
@@ -26,8 +26,8 @@
// Columns
// Formatting
-#define SBA_DEF_RANGEFORMAT (SBA_WHICHID_START+143) // RangeItem
-#define SBA_DEF_FMTVALUE (SBA_WHICHID_START+144) // SfxULONG, Format
+#define SBA_DEF_RANGEFORMAT
TypedWhichId<SfxRangeItem>(SBA_WHICHID_START+143) // RangeItem
+#define SBA_DEF_FMTVALUE
TypedWhichId<SfxUInt32Item>(SBA_WHICHID_START+144) // SfxULONG, Format
// Justification
#define SBA_ATTR_ALIGN_HOR_JUSTIFY (SBA_WHICHID_START + 145) //
SvxHorJustifyItem
diff --git a/include/sfx2/sfxsids.hrc b/include/sfx2/sfxsids.hrc
index ea60a8507716..f21e1141bce7 100644
--- a/include/sfx2/sfxsids.hrc
+++ b/include/sfx2/sfxsids.hrc
@@ -28,6 +28,7 @@ class SfxBoolItem;
class SfxDocumentInfoItem;
class SfxEventNamesItem;
class SfxFlagItem;
+class SfxGlobalNameItem;
class SfxHyphenRegionItem;
class SfxImageItem;
class SfxInt16Item;
@@ -40,6 +41,7 @@ class SfxUInt16Item;
class SfxUnoAnyItem;
class SfxUnoFrameItem;
class SfxWatermarkItem;
+class SfxVisibilityItem;
class SvxClipboardFormatItem;
class SvxHyperlinkItem;
class SvxLanguageItem;
@@ -164,9 +166,9 @@ class SvxZoomItem;
#define SID_REDACTDOC (SID_SFX_START + 1732)
#define SID_AUTOREDACTDOC (SID_SFX_START + 1736)
#define SID_UPDATEDOCMODE
TypedWhichId<SfxUInt16Item>(SID_SFX_START + 1668)
-#define SID_CHECKOUT (SID_SFX_START + 512)
-#define SID_CANCELCHECKOUT (SID_SFX_START + 513)
-#define SID_CHECKIN (SID_SFX_START + 514)
+#define SID_CHECKOUT
TypedWhichId<SfxVisibilityItem>(SID_SFX_START + 512)
+#define SID_CANCELCHECKOUT
TypedWhichId<SfxVisibilityItem>(SID_SFX_START + 513)
+#define SID_CHECKIN
TypedWhichId<SfxVisibilityItem>(SID_SFX_START + 514)
#define SID_FILTER_PROVIDER
TypedWhichId<SfxStringItem>(SID_SFX_START + 515)
#define SID_FORCERELOAD
TypedWhichId<SfxBoolItem>(SID_SFX_START + 1502)
@@ -276,7 +278,7 @@ class SvxZoomItem;
#define SID_GOTOLINE (SID_SFX_START + 1724)
#define SID_SHOWLINES
TypedWhichId<SfxBoolItem>(SID_SFX_START + 1725)
#define SID_BLUETOOTH_SENDDOC (SID_SFX_START + 1726)
-#define SID_TEMPLATE_MANAGER (SID_SFX_START + 1727)
+#define SID_TEMPLATE_MANAGER
TypedWhichId<SfxVisibilityItem>(SID_SFX_START + 1727)
#define SID_TOOLBAR_MODE (SID_SFX_START + 1728)
#define SID_NO_FILE_SYNC (SID_SFX_START + 1729)
#define SID_NO_THUMBNAIL (SID_SFX_START + 1730)
@@ -389,7 +391,7 @@ class SvxZoomItem;
#define SID_TEMPLATE_REGIONNAME
TypedWhichId<SfxStringItem>(SID_SFX_START + 662)
#define SID_TEMPLATE_LOAD
TypedWhichId<SfxInt32Item>(SID_SFX_START + 663)
-#define SID_INSERT_OBJECT (SID_SFX_START + 561)
+#define SID_INSERT_OBJECT
TypedWhichId<SfxGlobalNameItem>(SID_SFX_START + 561)
#define SID_INSERT_FLOATINGFRAME (SID_SFX_START + 563)
#define SID_CLASSIFICATION_APPLY (SID_SFX_START + 672)
#define SID_WATERMARK
TypedWhichId<SfxWatermarkItem>(SID_SFX_START + 676)
diff --git a/include/svx/svxids.hrc b/include/svx/svxids.hrc
index 8625cd425672..b8269b0dcf13 100644
--- a/include/svx/svxids.hrc
+++ b/include/svx/svxids.hrc
@@ -348,8 +348,8 @@ class XFillGradientItem;
#define SID_FRAME_LINECOLOR
TypedWhichId<SvxColorItem>( SID_SVX_START + 202 )
#define SID_ATTR_LINE_WIDTH_ARG
TypedWhichId<SvxDoubleItem>( SID_SVX_START + 203 )
#define SID_FILL_GRADIENT_JSON
TypedWhichId<SfxStringItem>( SID_SVX_START + 204 )
-#define SID_SEARCHDLG_SEARCHSTRINGS ( SID_SVX_START + 215 )
-#define SID_SEARCHDLG_REPLACESTRINGS ( SID_SVX_START + 216 )
+#define SID_SEARCHDLG_SEARCHSTRINGS
TypedWhichId<SfxStringListItem>( SID_SVX_START + 215 )
+#define SID_SEARCHDLG_REPLACESTRINGS
TypedWhichId<SfxStringListItem>( SID_SVX_START + 216 )
#define SID_ATTR_TABLE ( SID_SVX_START + 217 )
#define SID_ATTR_TABLE_COLUMN
TypedWhichId<SfxUInt16Item>( SID_SVX_START + 218 )
#define SID_ATTR_TABLE_ROW
TypedWhichId<SfxUInt16Item>( SID_SVX_START + 219 )
@@ -751,8 +751,8 @@ class XFillGradientItem;
// CAUTION! Range <919 .. 920> used by EditEngine (!)
#define SID_LANGUAGE_OPTIONS ( SID_SVX_START + 921 )
-#define SID_GETUNDOSTRINGS ( SID_SVX_START + 923 )
-#define SID_GETREDOSTRINGS ( SID_SVX_START + 924 )
+#define SID_GETUNDOSTRINGS
TypedWhichId<SfxStringListItem>( SID_SVX_START + 923 )
+#define SID_GETREDOSTRINGS
TypedWhichId<SfxStringListItem>( SID_SVX_START + 924 )
// CAUTION! Range <925 .. 925> used by EditEngine (!)
@@ -855,8 +855,8 @@ class XFillGradientItem;
#define SID_TABPAGE_POS
TypedWhichId<SfxUInt16Item>( SID_SVX_START + 1019 )
#define SID_GRAPHIC ( SID_SVX_START + 1020
)
#define SID_OBJECT_LIST
TypedWhichId<OfaPtrItem>( SID_SVX_START + 1021 )
-#define SID_ATTR_SET ( SID_SVX_START + 1022
)
-#define SID_CHAR_FMT_LIST_BOX ( SID_SVX_START + 1023
)
+#define SID_ATTR_SET
TypedWhichId<SfxTabDialogItem>( SID_SVX_START + 1022 )
+#define SID_CHAR_FMT_LIST_BOX
TypedWhichId<SfxStringListItem>( SID_SVX_START + 1023 )
#define SID_METRIC_ITEM
TypedWhichId<SfxUInt16Item>( SID_SVX_START + 1024 )
#define SID_NUM_CHAR_FMT
TypedWhichId<SfxStringItem>( SID_SVX_START + 1025 )
#define SID_BULLET_CHAR_FMT
TypedWhichId<SfxStringItem>( SID_SVX_START + 1026 )
@@ -874,7 +874,7 @@ class XFillGradientItem;
#define SID_ENUM_PAGE_MODE
TypedWhichId<SfxUInt16Item>( SID_SVX_START + 1038 )
#define SID_PAPER_START
TypedWhichId<SfxUInt16Item>( SID_SVX_START + 1039 )
#define SID_PAPER_END
TypedWhichId<SfxUInt16Item>( SID_SVX_START + 1040 )
-#define SID_COLLECT_LIST ( SID_SVX_START + 1041
)
+#define SID_COLLECT_LIST
TypedWhichId<SfxStringListItem>( SID_SVX_START + 1041 )
#define SID_GROW_FONT_SIZE ( SID_SVX_START + 1042
)
#define SID_SHRINK_FONT_SIZE ( SID_SVX_START + 1043
)
// color subtoolbar on graphictoolbar
diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc
index 625206b74f8c..534ff7ab6795 100644
--- a/sc/inc/sc.hrc
+++ b/sc/inc/sc.hrc
@@ -145,7 +145,7 @@ class SvxZoomSliderItem;
#define SID_RENAME_OBJECT (SC_VIEW_START + 88)
#define SID_FOCUS_INPUTLINE (SC_VIEW_START + 89)
-#define SID_SELECT_TABLES (SC_VIEW_START + 90)
+#define SID_SELECT_TABLES
TypedWhichId<SfxIntegerListItem>(SC_VIEW_START + 90)
// new entry "Filter..." in DP popup menu
#define SID_DP_FILTER (SC_VIEW_START + 91)
diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx
index 4805bbd8159e..b1c5c8477955 100644
--- a/svx/source/dialog/srchdlg.cxx
+++ b/svx/source/dialog/srchdlg.cxx
@@ -168,7 +168,7 @@ static void ListToStrArr_Impl(sal_uInt16 nId,
std::vector<OUString>& rStrLst, we
}
}
-static void StrArrToList_Impl( sal_uInt16 nId, const std::vector<OUString>&
rStrLst )
+static void StrArrToList_Impl( TypedWhichId<SfxStringListItem> nId, const
std::vector<OUString>& rStrLst )
{
DBG_ASSERT( !rStrLst.empty(), "check in advance");
SfxGetpApp()->PutItem( SfxStringListItem( nId, &rStrLst ) );
diff --git a/sw/inc/cmdid.h b/sw/inc/cmdid.h
index 14d721ae427b..6d828cefbe94 100644
--- a/sw/inc/cmdid.h
+++ b/sw/inc/cmdid.h
@@ -864,7 +864,7 @@ class SwUINumRuleItem;
#define FN_BOOKMARK_CONDITION (FN_PARAM2+30) /* Condition Property
of bookmarks*/
// Status: not more than 19!
-#define FN_STAT_PAGE (FN_STAT + 1)
+#define FN_STAT_PAGE TypedWhichId<SfxStringListItem>(FN_STAT +
1)
#define FN_STAT_TEMPLATE TypedWhichId<SfxStringItem>(FN_STAT + 2)
#define FN_STAT_ZOOM (FN_STAT + 3)
#define FN_STAT_SELMODE TypedWhichId<SfxUInt16Item>(FN_STAT + 5)
