use more TypedWhichId

which flushed out an inconsistency in how SID_NUMBER_TYPE_FORMAT was being used

Change-Id: Ib59ae4c4950136703d18d7485db432a39e3dc39c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152300
Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

1 files changed, 17 insertions, 16 deletions

diff --git a/include/svx/svxids.hrc b/include/svx/svxids.hrc
index a07a6f133120..e7c9b250d718 100644
--- a/include/svx/svxids.hrc
+++ b/include/svx/svxids.hrc
@@ -35,6 +35,7 @@ class SfxIntegerListItem;
 class SfxPointItem;
 class SfxRectangleItem;
 class SfxStringItem;
+class SfxUInt16Item;
 class SfxUInt32Item;
 class SvxBitmapListItem;
 class SvxBoxInfoItem;
@@ -136,7 +137,7 @@ class XFillGradientItem;
 #define SID_BEZIER_ELIMINATE_POINTS         (SID_SD_START+30)
 #define SID_BEZIER_EDGE                     (SID_SD_START+66)
 #define SID_BEZIER_SYMMTR                   (SID_SD_START+67)
-#define SID_TEXTEDIT                        (SID_SD_START+76)
+#define SID_TEXTEDIT                        TypedWhichId<SfxUInt16Item>(SID_SD_START+76)
 #define SID_ENTER_GROUP                     (SID_SD_START+96)
 #define SID_LEAVE_GROUP                     (SID_SD_START+97)
 #define SID_SIZE_PAGE_WIDTH                 (SID_SD_START+98)
@@ -181,9 +182,9 @@ class XFillGradientItem;
 #define FN_NUM_BULLET_OFF       (FN_EDIT + 37)  // numbering off
 #define FN_NUM_BULLET_ON        (FN_EDIT + 38)  // numbering with bullets on
 #define FN_NUM_NUMBERING_ON     (FN_EDIT + 44)  // numbering on
-#define FN_BUL_NUM_RULE_INDEX   (FN_EDIT + 120) // achieving num rule index
-#define FN_NUM_NUM_RULE_INDEX   (FN_EDIT + 121)
-#define FN_OUTLINE_RULE_INDEX   (FN_EDIT + 122)
+#define FN_BUL_NUM_RULE_INDEX   TypedWhichId<SfxUInt16Item>(FN_EDIT + 120) // achieving num rule index
+#define FN_NUM_NUM_RULE_INDEX   TypedWhichId<SfxUInt16Item>(FN_EDIT + 121)
+#define FN_OUTLINE_RULE_INDEX   TypedWhichId<SfxUInt16Item>(FN_EDIT + 122)
 
 #define FN_INSERT               (SID_SW_START +  300) // 20300
 #define FN_DELETE_BOOKMARK      TypedWhichId<SfxStringItem>(FN_INSERT + 1)
@@ -518,7 +519,7 @@ class XFillGradientItem;
 
 #define SID_TABLEDESIGN                                 ( SID_SVX_START + 429 )
 #define SID_GENERAL_OPTIONS                             ( SID_SVX_START + 432 )
-#define SID_SW_EDITOPTIONS                              ( SID_SVX_START + 433 )
+#define SID_SW_EDITOPTIONS                              TypedWhichId<SfxUInt16Item>( SID_SVX_START + 433 )
 #define SID_SD_EDITOPTIONS                              ( SID_SVX_START + 434 )
 #define SID_SC_EDITOPTIONS                              ( SID_SVX_START + 435 )
 #define SID_SM_EDITOPTIONS                              ( SID_SVX_START + 436 )
@@ -559,7 +560,7 @@ class XFillGradientItem;
 #define SID_GRFFILTER_POPART                            ( SID_SVX_START + 478 )
 #define SID_GRFFILTER_SEPIA                             ( SID_SVX_START + 479 )
 #define SID_GRFFILTER_SOLARIZE                          ( SID_SVX_START + 480 )
-#define SID_FIELD_GRABFOCUS                             ( SID_SVX_START + 567 )
+#define SID_FIELD_GRABFOCUS                             TypedWhichId<SfxUInt16Item>( SID_SVX_START + 567 )
 #define SID_ATTR_ALIGN_DEGREES                          ( SID_SVX_START + 577 )
 #define SID_ATTR_ALIGN_LOCKPOS                          ( SID_SVX_START + 578 )
 #define SID_ATTR_NUMBERFORMAT_ONE_AREA                  TypedWhichId<SfxBoolItem>( SID_SVX_START + 580 )
@@ -614,7 +615,7 @@ class XFillGradientItem;
 #define SID_FM_CREATE_CONTROL                           ( SID_SVX_START + 628 )
 #define SID_FM_DESIGN_MODE                              TypedWhichId<SfxBoolItem>( SID_SVX_START + 629 )
 #define SID_FM_RECORD_UNDO                              ( SID_SVX_START + 630 )
-#define SID_FM_CONTROL_IDENTIFIER                       ( SID_SVX_START + 631 )
+#define SID_FM_CONTROL_IDENTIFIER                       TypedWhichId<SfxUInt16Item>( SID_SVX_START + 631 )
 #define SID_FM_CONTROL_INVENTOR                         ( SID_SVX_START + 632 )
 #define SID_FM_SHOW_FMEXPLORER                          ( SID_SVX_START + 633 )
 #define SID_FM_FIELDS_CONTROL                           ( SID_SVX_START + 634 )
@@ -849,9 +850,9 @@ class XFillGradientItem;
 #define SID_ATTR_BORDER_DIAG_BLTR                       ( SID_SVX_START + 1014 )
 #define SID_ATTR_ALIGN_SHRINKTOFIT                      ( SID_SVX_START + 1015 )
 #define SID_CHINESE_CONVERSION                          ( SID_SVX_START + 1016 )
-#define SID_PAGE_TYPE                                   ( SID_SVX_START + 1017 )
-#define SID_DLG_TYPE                                    ( SID_SVX_START + 1018 )
-#define SID_TABPAGE_POS                                 ( SID_SVX_START + 1019 )
+#define SID_PAGE_TYPE                                   TypedWhichId<SfxUInt16Item>( SID_SVX_START + 1017 )
+#define SID_DLG_TYPE                                    TypedWhichId<SfxUInt16Item>( SID_SVX_START + 1018 )
+#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 )
@@ -861,14 +862,14 @@ class XFillGradientItem;
 #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 )
+#define SID_SVXSTDPARAGRAPHTABPAGE_PAGEWIDTH            TypedWhichId<SfxUInt16Item>( SID_SVX_START + 1029 )
 #define SID_SVXSTDPARAGRAPHTABPAGE_FLAGSET              ( SID_SVX_START + 1030 )
 #define SID_SVXSTDPARAGRAPHTABPAGE_ABSLINEDIST          ( SID_SVX_START + 1031 )
-#define SID_SVXTABULATORTABPAGE_DISABLEFLAGS            ( SID_SVX_START + 1032 )
+#define SID_SVXTABULATORTABPAGE_DISABLEFLAGS            TypedWhichId<SfxUInt16Item>( SID_SVX_START + 1032 )
 #define SID_SVXTEXTATTRPAGE_OBJKIND                     ( SID_SVX_START + 1033 )
 #define SID_FLAG_TYPE                                   ( SID_SVX_START + 1034 )
-#define SID_SWMODE_TYPE                                 ( SID_SVX_START + 1035 )
-#define SID_DISABLE_CTL                                 ( SID_SVX_START + 1036 )
+#define SID_SWMODE_TYPE                                 TypedWhichId<SfxUInt16Item>( SID_SVX_START + 1035 )
+#define SID_DISABLE_CTL                                 TypedWhichId<SfxUInt16Item>( SID_SVX_START + 1036 )
 #define SID_INSERT_HYPERLINKCONTROL                     ( SID_SVX_START + 1037 )
 #define SID_ENUM_PAGE_MODE                              TypedWhichId<SfxUInt16Item>( SID_SVX_START + 1038 )
 #define SID_PAPER_START                                 TypedWhichId<SfxUInt16Item>( SID_SVX_START + 1039 )
@@ -970,8 +971,8 @@ class XFillGradientItem;
 #define SID_CHAR_DLG_EFFECT                             ( SID_SVX_START + 1133 )
 #define SID_CHAR_DLG_POSITION                           ( SID_SVX_START + 1134 )
 #define SID_ATTR_FILL_USE_SLIDE_BACKGROUND              ( SID_SVX_START + 1135 )
-#define FN_SVX_SET_NUMBER                               ( SID_SVX_START + 1136 )
-#define FN_SVX_SET_BULLET                               ( SID_SVX_START + 1137 )
+#define FN_SVX_SET_NUMBER                               TypedWhichId<SfxUInt16Item>( SID_SVX_START + 1136 )
+#define FN_SVX_SET_BULLET                               TypedWhichId<SfxUInt16Item>( SID_SVX_START + 1137 )
 #define FN_SVX_SET_OUTLINE                              ( SID_SVX_START + 1138 )
 
 #define SID_ATTR_BORDER_STYLES                          TypedWhichId<SfxIntegerListItem>( SID_SVX_START + 1140 )