use more TypedWhichId

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

3 files changed, 15 insertions, 11 deletions

diff --git a/include/editeng/editids.hrc b/include/editeng/editids.hrc
index bf6b33afb4d7..f33972743aa0 100644
--- a/include/editeng/editids.hrc
+++ b/include/editeng/editids.hrc
@@ -50,6 +50,7 @@ class SvxKerningItem;
 class SvxLanguageItem;
 class SvxLineSpacingItem;
 class SvxLRSpaceItem;
+class SvxOrphansItem;
 class SvxOverlineItem;
 class SvxPageModelItem;
 class SvxParaVertAlignItem;
@@ -62,6 +63,7 @@ class SvxTwoLinesItem;
 class SvxUnderlineItem;
 class SvxULSpaceItem;
 class SvxWeightItem;
+class SvxWidowsItem;
 class SvxWordLineModeItem;
 
 /*
@@ -107,8 +109,8 @@ class SvxWordLineModeItem;
 #define SID_ATTR_PARA_PAGEBREAK                         ( SID_SVX_START + 37 )
 #define SID_ATTR_PARA_HYPHENZONE                        TypedWhichId<SvxHyphenZoneItem>( SID_SVX_START + 38 )
 #define SID_ATTR_PARA_SPLIT                             TypedWhichId<SvxFormatSplitItem>( SID_SVX_START + 39 )
-#define SID_ATTR_PARA_ORPHANS                           ( SID_SVX_START + 40 )
-#define SID_ATTR_PARA_WIDOWS                            ( SID_SVX_START + 41 )
+#define SID_ATTR_PARA_ORPHANS                           TypedWhichId<SvxOrphansItem>( SID_SVX_START + 40 )
+#define SID_ATTR_PARA_WIDOWS                            TypedWhichId<SvxWidowsItem>( SID_SVX_START + 41 )
 #define SID_ATTR_PARA_ULSPACE                           ( SID_SVX_START + 42 )
 #define SID_ATTR_PARA_LRSPACE                           ( SID_SVX_START + 43 )
 #define SID_ATTR_PARA_LEFTSPACE                         ( SID_SVX_START + 44 )
diff --git a/include/sfx2/sfxsids.hrc b/include/sfx2/sfxsids.hrc
index 3be1d86c3844..847dc6dac174 100644
--- a/include/sfx2/sfxsids.hrc
+++ b/include/sfx2/sfxsids.hrc
@@ -28,9 +28,10 @@ class SfxBoolItem;
 class SfxDocumentInfoItem;
 class SfxEventNamesItem;
 class SfxFlagItem;
+class SfxHyphenRegionItem;
+class SfxImageItem;
 class SfxInt16Item;
 class SfxInt32Item;
-class SfxHyphenRegionItem;
 class SfxMacroInfoItem;
 class SfxScriptOrganizerItem;
 class SfxStringItem;
@@ -142,7 +143,7 @@ class SvxZoomItem;
 #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_COPIES                    TypedWhichId<SfxInt16Item>(SID_SFX_START +   3)
 #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)
@@ -228,7 +229,7 @@ class SvxZoomItem;
 #define SID_ATTR_TARGETLANG_STR             (SID_SFX_START + 1664)
     // FREE
 #define SID_OUTPUTSTREAM                    TypedWhichId<SfxUnoAnyItem>(SID_SFX_START + 1666)
-#define SID_IMAGE_ORIENTATION               (SID_SFX_START + 1667)
+#define SID_IMAGE_ORIENTATION               TypedWhichId<SfxImageItem>(SID_SFX_START + 1667)
 
 #define SID_STOP_RECORDING                  (SID_SFX_START + 1671)
 #define SID_INTERACTIONHANDLER              TypedWhichId<SfxUnoAnyItem>(SID_SFX_START + 1675)
@@ -400,7 +401,7 @@ class SvxZoomItem;
 #define SID_HYPERLINK_DIALOG                TypedWhichId<SfxBoolItem>(SID_SFX_START + 678)
 
 #define SID_DEFAULTFILEPATH                 (SID_SFX_START + 571)
-#define SID_OBJECT                          (SID_SFX_START + 575)
+#define SID_OBJECT                          TypedWhichId<SfxInt16Item>(SID_SFX_START + 575)
 
 // Doc-Properties
 #define SID_DOCFULLNAME                     TypedWhichId<SfxStringItem>(SID_SFX_START + 581)
diff --git a/include/svx/svxids.hrc b/include/svx/svxids.hrc
index c096a0a701ca..a07a6f133120 100644
--- a/include/svx/svxids.hrc
+++ b/include/svx/svxids.hrc
@@ -28,6 +28,7 @@ class OfaPtrItem;
 class OfaXColorListItem;
 class SdrAngleItem;
 class SfxBoolItem;
+class SfxInt16Item;
 class SfxInt32Item;
 class SfxInt64Item;
 class SfxIntegerListItem;
@@ -710,11 +711,11 @@ class XFillGradientItem;
 #define SID_PARAM_NUM_PRESET                            TypedWhichId<SfxBoolItem>( SID_SVX_START + 856 )
 #define SID_PARAM_CUR_NUM_LEVEL                         TypedWhichId<SfxUInt16Item>( SID_SVX_START + 859 )
 #define SID_CREATE_SW_DRAWVIEW                          ( SID_SVX_START + 860 )
-#define SID_ATTR_GRAF_LUMINANCE                         ( SID_SVX_START + 863 )
-#define SID_ATTR_GRAF_CONTRAST                          ( SID_SVX_START + 864 )
-#define SID_ATTR_GRAF_RED                               ( SID_SVX_START + 865 )
-#define SID_ATTR_GRAF_GREEN                             ( SID_SVX_START + 866 )
-#define SID_ATTR_GRAF_BLUE                              ( SID_SVX_START + 867 )
+#define SID_ATTR_GRAF_LUMINANCE                         TypedWhichId<SfxInt16Item>( SID_SVX_START + 863 )
+#define SID_ATTR_GRAF_CONTRAST                          TypedWhichId<SfxInt16Item>( SID_SVX_START + 864 )
+#define SID_ATTR_GRAF_RED                               TypedWhichId<SfxInt16Item>( SID_SVX_START + 865 )
+#define SID_ATTR_GRAF_GREEN                             TypedWhichId<SfxInt16Item>( SID_SVX_START + 866 )
+#define SID_ATTR_GRAF_BLUE                              TypedWhichId<SfxInt16Item>( SID_SVX_START + 867 )
 #define SID_ATTR_GRAF_GAMMA                             ( SID_SVX_START + 868 )
 #define SID_ATTR_GRAF_TRANSPARENCE                      TypedWhichId<SfxUInt16Item>( SID_SVX_START + 869 )
 #define SID_ATTR_GRAF_INVERT                            ( SID_SVX_START + 870 )