use more TypedWhichId

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

3 files changed, 16 insertions, 16 deletions

diff --git a/include/sfx2/sfxsids.hrc b/include/sfx2/sfxsids.hrc
index 59b98b15244e..ea60a8507716 100644
--- a/include/sfx2/sfxsids.hrc
+++ b/include/sfx2/sfxsids.hrc
@@ -338,7 +338,7 @@ class SvxZoomItem;
 #define SID_POSTDATA                        TypedWhichId<SfxUnoAnyItem>(SID_SFX_START + 1536)
 #define SID_DONELINK                        (SID_SFX_START + 646)
 #define SID_REFERER                         TypedWhichId<SfxStringItem>(SID_SFX_START + 654)
-#define SID_PAGE_NUMBER                     (SID_SFX_START + 655)
+#define SID_PAGE_NUMBER                     TypedWhichId<SfxInt32Item>(SID_SFX_START + 655)
 #define SID_MODIFIER                        TypedWhichId<SfxUInt16Item>(SID_SFX_START + 669)
 #define SID_SETOPTIONS                      (SID_SFX_START + 670)
 #define SID_SOURCEVIEW                      (SID_SFX_START + 675)
@@ -387,7 +387,7 @@ class SvxZoomItem;
 
 #define SID_TEMPLATE_NAME                   TypedWhichId<SfxStringItem>(SID_SFX_START + 660)
 #define SID_TEMPLATE_REGIONNAME             TypedWhichId<SfxStringItem>(SID_SFX_START + 662)
-#define SID_TEMPLATE_LOAD                   (SID_SFX_START + 663)
+#define SID_TEMPLATE_LOAD                   TypedWhichId<SfxInt32Item>(SID_SFX_START + 663)
 
 #define SID_INSERT_OBJECT                   (SID_SFX_START + 561)
 #define SID_INSERT_FLOATINGFRAME            (SID_SFX_START + 563)
diff --git a/include/svl/typedwhich.hxx b/include/svl/typedwhich.hxx
index 8cfd4f01a314..e96ad8228d5c 100644
--- a/include/svl/typedwhich.hxx
+++ b/include/svl/typedwhich.hxx
@@ -42,11 +42,11 @@ private:
 
 template <class T> constexpr bool operator==(TypedWhichId<T> const& lhs, TypedWhichId<T> rhs)
 {
-    return lhs == rhs;
+    return sal_uInt16(lhs) == sal_uInt16(rhs);
 }
 template <class T> constexpr bool operator!=(TypedWhichId<T> const& lhs, TypedWhichId<T> rhs)
 {
-    return lhs != rhs;
+    return sal_uInt16(lhs) != sal_uInt16(rhs);
 }
 template <class T> constexpr bool operator==(sal_uInt16 lhs, TypedWhichId<T> const& rhs)
 {
diff --git a/include/svx/svxids.hrc b/include/svx/svxids.hrc
index e7c9b250d718..8625cd425672 100644
--- a/include/svx/svxids.hrc
+++ b/include/svx/svxids.hrc
@@ -421,11 +421,11 @@ class XFillGradientItem;
 
 #define SID_ATTR_LINEEND_STYLE                          ( SID_SVX_START + 301 )
 #define SID_ATTR_TRANSFORM_SHEAR                        TypedWhichId<SdrAngleItem>( SID_SVX_START + 304 )
-#define SID_ATTR_TRANSFORM_SHEAR_X                      ( SID_SVX_START + 305 )
-#define SID_ATTR_TRANSFORM_SHEAR_Y                      ( SID_SVX_START + 306 )
+#define SID_ATTR_TRANSFORM_SHEAR_X                      TypedWhichId<SfxInt32Item>( SID_SVX_START + 305 )
+#define SID_ATTR_TRANSFORM_SHEAR_Y                      TypedWhichId<SfxInt32Item>( SID_SVX_START + 306 )
 #define SID_ATTR_TRANSFORM_SHEAR_VERTICAL               TypedWhichId<SfxBoolItem>( SID_SVX_START + 307 )
-#define SID_ATTR_TRANSFORM_RESIZE_REF_X                 ( SID_SVX_START + 308 )
-#define SID_ATTR_TRANSFORM_RESIZE_REF_Y                 ( SID_SVX_START + 309 )
+#define SID_ATTR_TRANSFORM_RESIZE_REF_X                 TypedWhichId<SfxInt32Item>( SID_SVX_START + 308 )
+#define SID_ATTR_TRANSFORM_RESIZE_REF_Y                 TypedWhichId<SfxInt32Item>( SID_SVX_START + 309 )
 #define SID_ATTR_TRANSFORM_AUTOWIDTH                    TypedWhichId<SfxBoolItem>( SID_SVX_START + 310 )
 #define SID_ATTR_TRANSFORM_AUTOHEIGHT                   TypedWhichId<SfxBoolItem>( SID_SVX_START + 311 )
 #define SID_ATTR_TRANSFORM_HORI_RELATION                TypedWhichId<SfxInt16Item>( SID_SVX_START + 312 )
@@ -606,7 +606,7 @@ class XFillGradientItem;
 #define SID_FM_RECORD_LAST                              ( SID_SVX_START + 619 )
 #define SID_FM_RECORD_NEW                               ( SID_SVX_START + 620 )
 #define SID_FM_RECORD_DELETE                            ( SID_SVX_START + 621 )
-#define SID_FM_RECORD_ABSOLUTE                          ( SID_SVX_START + 622 )
+#define SID_FM_RECORD_ABSOLUTE                          TypedWhichId<SfxInt32Item>( SID_SVX_START + 622 )
 #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 )
@@ -804,11 +804,11 @@ class XFillGradientItem;
 #define SID_EXTRUSION_SURFACE_FLOATER                   ( SID_SVX_START + 968 )
 #define SID_EXTRUSION_3D_COLOR                          ( SID_SVX_START + 969 )
 #define SID_EXTRUSION_DEPTH                             TypedWhichId<SvxDoubleItem>( SID_SVX_START + 970 )
-#define SID_EXTRUSION_DIRECTION                         ( SID_SVX_START + 971 )
-#define SID_EXTRUSION_PROJECTION                        ( SID_SVX_START + 972 )
-#define SID_EXTRUSION_LIGHTING_DIRECTION                ( SID_SVX_START + 973 )
-#define SID_EXTRUSION_LIGHTING_INTENSITY                ( SID_SVX_START + 974 )
-#define SID_EXTRUSION_SURFACE                           ( SID_SVX_START + 975 )
+#define SID_EXTRUSION_DIRECTION                         TypedWhichId<SfxInt32Item>( SID_SVX_START + 971 )
+#define SID_EXTRUSION_PROJECTION                        TypedWhichId<SfxInt32Item>( SID_SVX_START + 972 )
+#define SID_EXTRUSION_LIGHTING_DIRECTION                TypedWhichId<SfxInt32Item>( SID_SVX_START + 973 )
+#define SID_EXTRUSION_LIGHTING_INTENSITY                TypedWhichId<SfxInt32Item>( SID_SVX_START + 974 )
+#define SID_EXTRUSION_SURFACE                           TypedWhichId<SfxInt32Item>( SID_SVX_START + 975 )
 #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 )
@@ -817,8 +817,8 @@ class XFillGradientItem;
 #define SID_FONTWORK_ALIGNMENT_FLOATER                  ( SID_SVX_START + 981 )
 #define SID_FONTWORK_CHARACTER_SPACING_FLOATER          ( SID_SVX_START + 982 )
 #define SID_FONTWORK_SHAPE                              ( SID_SVX_START + 983 )
-#define SID_FONTWORK_ALIGNMENT                          ( SID_SVX_START + 984 )
-#define SID_FONTWORK_CHARACTER_SPACING                  ( SID_SVX_START + 985 )
+#define SID_FONTWORK_ALIGNMENT                          TypedWhichId<SfxInt32Item>( SID_SVX_START + 984 )
+#define SID_FONTWORK_CHARACTER_SPACING                  TypedWhichId<SfxInt32Item>( SID_SVX_START + 985 )
 #define SID_FONTWORK_KERN_CHARACTER_PAIRS               TypedWhichId<SfxBoolItem>( SID_SVX_START + 986 )
 #define SID_DRAW_FONTWORK                               ( SID_SVX_START + 987 )
 #define SID_DRAW_FONTWORK_VERTICAL                      ( SID_SVX_START + 988 )