TypedWhichId for RES_CHRATR constants

Change-Id: Id6c45c237e9c8c55597d97b647b443eab9d1880a
Reviewed-on: https://gerrit.libreoffice.org/45147
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

2 files changed, 82 insertions, 84 deletions

diff --git a/sw/inc/charatr.hxx b/sw/inc/charatr.hxx
index ebc3f7de8892..3516772c2d82 100644
--- a/sw/inc/charatr.hxx
+++ b/sw/inc/charatr.hxx
@@ -52,73 +52,73 @@
 // implementation of the character attribute methods of SwAttrSet
 
 inline const SvxPostureItem      &SwAttrSet::GetPosture(bool bInP) const
-    {   return static_cast<const SvxPostureItem&>(Get( RES_CHRATR_POSTURE,bInP)); }
+    {   return Get( RES_CHRATR_POSTURE,bInP); }
 inline const SvxPostureItem      &SwAttrSet::GetCJKPosture(bool bInP) const
-    {   return static_cast<const SvxPostureItem&>(Get( RES_CHRATR_CJK_POSTURE,bInP)); }
+    {   return Get( RES_CHRATR_CJK_POSTURE,bInP); }
 inline const SvxPostureItem      &SwAttrSet::GetCTLPosture(bool bInP) const
-    {   return static_cast<const SvxPostureItem&>(Get( RES_CHRATR_CTL_POSTURE,bInP)); }
+    {   return Get( RES_CHRATR_CTL_POSTURE,bInP); }
 inline const SvxWeightItem       &SwAttrSet::GetWeight(bool bInP) const
-    {   return static_cast<const SvxWeightItem&>(Get( RES_CHRATR_WEIGHT,bInP)); }
+    {   return Get( RES_CHRATR_WEIGHT,bInP); }
 inline const SvxWeightItem       &SwAttrSet::GetCJKWeight(bool bInP) const
-    {   return static_cast<const SvxWeightItem&>(Get( RES_CHRATR_CJK_WEIGHT,bInP)); }
+    {   return Get( RES_CHRATR_CJK_WEIGHT,bInP); }
 inline const SvxWeightItem       &SwAttrSet::GetCTLWeight(bool bInP) const
-    {   return static_cast<const SvxWeightItem&>(Get( RES_CHRATR_CTL_WEIGHT,bInP)); }
+    {   return Get( RES_CHRATR_CTL_WEIGHT,bInP); }
 inline const SvxShadowedItem     &SwAttrSet::GetShadowed(bool bInP) const
-    {   return static_cast<const SvxShadowedItem&>(Get( RES_CHRATR_SHADOWED,bInP)); }
+    {   return Get( RES_CHRATR_SHADOWED,bInP); }
 inline const SvxAutoKernItem     &SwAttrSet::GetAutoKern(bool bInP) const
-    {   return static_cast<const SvxAutoKernItem&>(Get( RES_CHRATR_AUTOKERN,bInP)); }
+    {   return Get( RES_CHRATR_AUTOKERN,bInP); }
 inline const SvxWordLineModeItem &SwAttrSet::GetWordLineMode(bool bInP) const
-    {   return static_cast<const SvxWordLineModeItem&>(Get( RES_CHRATR_WORDLINEMODE,bInP)); }
+    {   return Get( RES_CHRATR_WORDLINEMODE,bInP); }
 inline const SvxContourItem      &SwAttrSet::GetContour(bool bInP) const
-    {   return static_cast<const SvxContourItem&>(Get( RES_CHRATR_CONTOUR,bInP)); }
+    {   return Get( RES_CHRATR_CONTOUR,bInP); }
 inline const SvxKerningItem      &SwAttrSet::GetKerning(bool bInP) const
-    {   return static_cast<const SvxKerningItem&>(Get( RES_CHRATR_KERNING,bInP)); }
+    {   return Get( RES_CHRATR_KERNING,bInP); }
 inline const SvxUnderlineItem    &SwAttrSet::GetUnderline(bool bInP) const
-    {   return static_cast<const SvxUnderlineItem&>(Get( RES_CHRATR_UNDERLINE,bInP)); }
+    {   return Get( RES_CHRATR_UNDERLINE,bInP); }
 inline const SvxOverlineItem     &SwAttrSet::GetOverline(bool bInP) const
-    {   return static_cast<const SvxOverlineItem&>(Get( RES_CHRATR_OVERLINE,bInP)); }
+    {   return Get( RES_CHRATR_OVERLINE,bInP); }
 inline const SvxCrossedOutItem   &SwAttrSet::GetCrossedOut(bool bInP) const
-    {   return static_cast<const SvxCrossedOutItem&>(Get( RES_CHRATR_CROSSEDOUT,bInP)); }
+    {   return Get( RES_CHRATR_CROSSEDOUT,bInP); }
 inline const SvxFontHeightItem   &SwAttrSet::GetSize(bool bInP) const
-    {   return static_cast<const SvxFontHeightItem&>(Get( RES_CHRATR_FONTSIZE,bInP)); }
+    {   return Get( RES_CHRATR_FONTSIZE,bInP); }
 inline const SvxFontHeightItem   &SwAttrSet::GetCJKSize(bool bInP) const
-    {   return static_cast<const SvxFontHeightItem&>(Get( RES_CHRATR_CJK_FONTSIZE,bInP)); }
+    {   return Get( RES_CHRATR_CJK_FONTSIZE,bInP); }
 inline const SvxFontHeightItem   &SwAttrSet::GetCTLSize(bool bInP) const
-    {   return static_cast<const SvxFontHeightItem&>(Get( RES_CHRATR_CTL_FONTSIZE,bInP)); }
+    {   return Get( RES_CHRATR_CTL_FONTSIZE,bInP); }
 inline const SvxFontItem         &SwAttrSet::GetFont(bool bInP) const
-    {   return static_cast<const SvxFontItem&>(Get( RES_CHRATR_FONT,bInP)); }
+    {   return Get( RES_CHRATR_FONT,bInP); }
 inline const SvxFontItem         &SwAttrSet::GetCJKFont(bool bInP) const
-    {   return static_cast<const SvxFontItem&>(Get( RES_CHRATR_CJK_FONT,bInP)); }
+    {   return Get( RES_CHRATR_CJK_FONT,bInP); }
 inline const SvxFontItem         &SwAttrSet::GetCTLFont(bool bInP) const
-    {   return static_cast<const SvxFontItem&>(Get( RES_CHRATR_CTL_FONT,bInP)); }
+    {   return Get( RES_CHRATR_CTL_FONT,bInP); }
 inline const SvxColorItem        &SwAttrSet::GetColor(bool bInP) const
-    {   return static_cast<const SvxColorItem&>(Get( RES_CHRATR_COLOR,bInP)); }
+    {   return Get( RES_CHRATR_COLOR,bInP); }
 inline const SvxLanguageItem     &SwAttrSet::GetLanguage(bool bInP) const
-    {   return static_cast<const SvxLanguageItem&>(Get( RES_CHRATR_LANGUAGE,bInP)); }
+    {   return Get( RES_CHRATR_LANGUAGE,bInP); }
 inline const SvxLanguageItem     &SwAttrSet::GetCJKLanguage(bool bInP) const
-    {   return static_cast<const SvxLanguageItem&>(Get( RES_CHRATR_CJK_LANGUAGE,bInP)); }
+    {   return Get( RES_CHRATR_CJK_LANGUAGE,bInP); }
 inline const SvxLanguageItem     &SwAttrSet::GetCTLLanguage(bool bInP) const
-    {   return static_cast<const SvxLanguageItem&>(Get( RES_CHRATR_CTL_LANGUAGE,bInP)); }
+    {   return Get( RES_CHRATR_CTL_LANGUAGE,bInP); }
 inline const SvxEscapementItem   &SwAttrSet::GetEscapement(bool bInP) const
-    {   return static_cast<const SvxEscapementItem&>(Get( RES_CHRATR_ESCAPEMENT,bInP)); }
+    {   return Get( RES_CHRATR_ESCAPEMENT,bInP); }
 inline const SvxCaseMapItem      &SwAttrSet::GetCaseMap(bool bInP) const
-    {   return static_cast<const SvxCaseMapItem&>(Get( RES_CHRATR_CASEMAP,bInP)); }
+    {   return Get( RES_CHRATR_CASEMAP,bInP); }
 inline const SvxNoHyphenItem     &SwAttrSet::GetNoHyphenHere(bool bInP) const
-    {   return static_cast<const SvxNoHyphenItem&>(Get( RES_CHRATR_NOHYPHEN,bInP)); }
+    {   return Get( RES_CHRATR_NOHYPHEN,bInP); }
 inline const SvxBlinkItem        &SwAttrSet::GetBlink(bool bInP) const
-    {   return static_cast<const SvxBlinkItem&>(Get( RES_CHRATR_BLINK,bInP)); }
+    {   return Get( RES_CHRATR_BLINK,bInP); }
 inline const SvxEmphasisMarkItem &SwAttrSet::GetEmphasisMark( bool bInP ) const
-    {   return static_cast<const SvxEmphasisMarkItem&>(Get( RES_CHRATR_EMPHASIS_MARK, bInP )); }
+    {   return Get( RES_CHRATR_EMPHASIS_MARK, bInP ); }
 inline const SvxTwoLinesItem     &SwAttrSet::Get2Lines( bool bInP ) const
-    {   return static_cast<const SvxTwoLinesItem&>(Get( RES_CHRATR_TWO_LINES, bInP )); }
+    {   return Get( RES_CHRATR_TWO_LINES, bInP ); }
 inline const SvxCharScaleWidthItem  &SwAttrSet::GetCharScaleW( bool bInP ) const
-    {   return static_cast<const SvxCharScaleWidthItem&>(Get( RES_CHRATR_SCALEW, bInP )); }
+    {   return Get( RES_CHRATR_SCALEW, bInP ); }
 inline const SvxCharRotateItem   &SwAttrSet::GetCharRotate( bool bInP ) const
-    {   return static_cast<const SvxCharRotateItem&>(Get( RES_CHRATR_ROTATE, bInP )); }
+    {   return Get( RES_CHRATR_ROTATE, bInP ); }
 inline const SvxCharReliefItem   &SwAttrSet::GetCharRelief( bool bInP ) const
-    {   return static_cast<const SvxCharReliefItem&>(Get( RES_CHRATR_RELIEF, bInP )); }
+    {   return Get( RES_CHRATR_RELIEF, bInP ); }
 inline const SvxCharHiddenItem   &SwAttrSet::GetCharHidden( bool bInP ) const
-    {   return static_cast<const SvxCharHiddenItem&>(Get( RES_CHRATR_HIDDEN, bInP )); }
+    {   return Get( RES_CHRATR_HIDDEN, bInP ); }
 
 // implementation of the character attribute methods of SwFormat
 
diff --git a/sw/inc/hintids.hxx b/sw/inc/hintids.hxx
index 6334a6007857..9d6111abcbe3 100644
--- a/sw/inc/hintids.hxx
+++ b/sw/inc/hintids.hxx
@@ -23,6 +23,7 @@
 #include <sal/types.h>
 #include <svx/xdef.hxx>
 #include "swdllapi.h"
+#include <svl/typedwhich.hxx>
 #include <vector>
 
 // For SwTextHints without end index the following char is added:
@@ -52,56 +53,53 @@
 
 // Ranges for the IDs of the format-attributes.
 // Which-values for character-format attributes.
-enum RES_CHRATR
-{
-RES_CHRATR_BEGIN = HINT_BEGIN,
-    RES_CHRATR_CASEMAP = RES_CHRATR_BEGIN,  //  1
-    RES_CHRATR_CHARSETCOLOR,                //  2
-    RES_CHRATR_COLOR,                       //  3
-    RES_CHRATR_CONTOUR,                     //  4
-    RES_CHRATR_CROSSEDOUT,                  //  5
-    RES_CHRATR_ESCAPEMENT,                  //  6
-    RES_CHRATR_FONT,                        //  7
-    RES_CHRATR_FONTSIZE,                    //  8
-    RES_CHRATR_KERNING,                     //  9
-    RES_CHRATR_LANGUAGE,                    // 10
-    RES_CHRATR_POSTURE,                     // 11
-    RES_CHRATR_PROPORTIONALFONTSIZE,        // 12
-    RES_CHRATR_SHADOWED,                    // 13
-    RES_CHRATR_UNDERLINE,                   // 14
-    RES_CHRATR_WEIGHT,                      // 15
-    RES_CHRATR_WORDLINEMODE,                // 16
-    RES_CHRATR_AUTOKERN,                    // 17
-    RES_CHRATR_BLINK,                       // 18
-    RES_CHRATR_NOHYPHEN,                    // 19
-    RES_CHRATR_NOLINEBREAK,                 // 20
-    RES_CHRATR_BACKGROUND,                  // 21
-    RES_CHRATR_CJK_FONT,                    // 22
-    RES_CHRATR_CJK_FONTSIZE,                // 23
-    RES_CHRATR_CJK_LANGUAGE,                // 24
-    RES_CHRATR_CJK_POSTURE,                 // 25
-    RES_CHRATR_CJK_WEIGHT,                  // 26
-    RES_CHRATR_CTL_FONT,                    // 27
-    RES_CHRATR_CTL_FONTSIZE,                // 28
-    RES_CHRATR_CTL_LANGUAGE,                // 29
-    RES_CHRATR_CTL_POSTURE,                 // 30
-    RES_CHRATR_CTL_WEIGHT,                  // 31
-    RES_CHRATR_ROTATE,                      // 32
-    RES_CHRATR_EMPHASIS_MARK,               // 33
-    RES_CHRATR_TWO_LINES,                   // 34
-    RES_CHRATR_SCALEW,                      // 35
-    RES_CHRATR_RELIEF,                      // 36
-    RES_CHRATR_HIDDEN,                      // 37
-    RES_CHRATR_OVERLINE,                    // 38
-    RES_CHRATR_RSID,                        // 39
-    RES_CHRATR_BOX,                         // 40
-    RES_CHRATR_SHADOW,                      // 41
-    RES_CHRATR_HIGHLIGHT,                   // 42
-    RES_CHRATR_GRABBAG,                     // 43
-    RES_CHRATR_BIDIRTL,                     // 44
-    RES_CHRATR_IDCTHINT,                    // 45
-RES_CHRATR_END
-};
+#define RES_CHRATR_BEGIN  HINT_BEGIN
+#define     RES_CHRATR_CASEMAP                     TypedWhichId<SvxCaseMapItem>(RES_CHRATR_BEGIN)  //  1
+#define     RES_CHRATR_CHARSETCOLOR                TypedWhichId<SvxCharSetColorItem>(2)
+#define     RES_CHRATR_COLOR                       TypedWhichId<SvxColorItem>(3)
+#define     RES_CHRATR_CONTOUR                     TypedWhichId<SvxContourItem>(4)
+#define     RES_CHRATR_CROSSEDOUT                  TypedWhichId<SvxCrossedOutItem>(5)
+#define     RES_CHRATR_ESCAPEMENT                  TypedWhichId<SvxEscapementItem>(6)
+#define     RES_CHRATR_FONT                        TypedWhichId<SvxFontItem>(7)
+#define     RES_CHRATR_FONTSIZE                    TypedWhichId<SvxFontHeightItem>(8)
+#define     RES_CHRATR_KERNING                     TypedWhichId<SvxKerningItem>(9)
+#define     RES_CHRATR_LANGUAGE                    TypedWhichId<SvxLanguageItem>(10)
+#define     RES_CHRATR_POSTURE                     TypedWhichId<SvxPostureItem>(11)
+#define     RES_CHRATR_PROPORTIONALFONTSIZE        TypedWhichId<SvxPropSizeItem>(12)
+#define     RES_CHRATR_SHADOWED                    TypedWhichId<SvxShadowedItem>(13)
+#define     RES_CHRATR_UNDERLINE                   TypedWhichId<SvxUnderlineItem>(14)
+#define     RES_CHRATR_WEIGHT                      TypedWhichId<SvxWeightItem>(15)
+#define     RES_CHRATR_WORDLINEMODE                TypedWhichId<SvxWordLineModeItem>(16)
+#define     RES_CHRATR_AUTOKERN                    TypedWhichId<SvxAutoKernItem>(17)
+#define     RES_CHRATR_BLINK                       TypedWhichId<SvxBlinkItem>(18)
+#define     RES_CHRATR_NOHYPHEN                    TypedWhichId<SvxNoHyphenItem>(19)
+#define     RES_CHRATR_NOLINEBREAK                 TypedWhichId<SvxNoLinebreakItem>(20)
+#define     RES_CHRATR_BACKGROUND                  TypedWhichId<SvxBrushItem>(21)
+#define     RES_CHRATR_CJK_FONT                    TypedWhichId<SvxFontItem>(22)
+#define     RES_CHRATR_CJK_FONTSIZE                TypedWhichId<SvxFontHeightItem>(23)
+#define     RES_CHRATR_CJK_LANGUAGE                TypedWhichId<SvxLanguageItem>(24)
+#define     RES_CHRATR_CJK_POSTURE                 TypedWhichId<SvxPostureItem>(25)
+#define     RES_CHRATR_CJK_WEIGHT                  TypedWhichId<SvxWeightItem>(26)
+#define     RES_CHRATR_CTL_FONT                    TypedWhichId<SvxFontItem>(27)
+#define     RES_CHRATR_CTL_FONTSIZE                TypedWhichId<SvxFontHeightItem>(28)
+#define     RES_CHRATR_CTL_LANGUAGE                TypedWhichId<SvxLanguageItem>(29)
+#define     RES_CHRATR_CTL_POSTURE                 TypedWhichId<SvxPostureItem>(30)
+#define     RES_CHRATR_CTL_WEIGHT                  TypedWhichId<SvxWeightItem>(31)
+#define     RES_CHRATR_ROTATE                      TypedWhichId<SvxCharRotateItem>(32)
+#define     RES_CHRATR_EMPHASIS_MARK               TypedWhichId<SvxEmphasisMarkItem>(33)
+#define     RES_CHRATR_TWO_LINES                   TypedWhichId<SvxTwoLinesItem>(34)
+#define     RES_CHRATR_SCALEW                      TypedWhichId<SvxCharScaleWidthItem>(35)
+#define     RES_CHRATR_RELIEF                      TypedWhichId<SvxCharReliefItem>(36)
+#define     RES_CHRATR_HIDDEN                      TypedWhichId<SvxCharHiddenItem>(37)
+#define     RES_CHRATR_OVERLINE                    TypedWhichId<SvxOverlineItem>(38)
+#define     RES_CHRATR_RSID                        TypedWhichId<SvxRsidItem>(39)
+#define     RES_CHRATR_BOX                         TypedWhichId<SvxBoxItem>(40)
+#define     RES_CHRATR_SHADOW                      TypedWhichId<SvxShadowedItem>(41)
+#define     RES_CHRATR_HIGHLIGHT                   TypedWhichId<SvxBrushItem>(42)
+#define     RES_CHRATR_GRABBAG                     TypedWhichId<SfxGrabBagItem>(43)
+#define     RES_CHRATR_BIDIRTL                     TypedWhichId<SfxInt16Item>(44)
+#define     RES_CHRATR_IDCTHINT                    TypedWhichId<SfxInt16Item>(45)
+#define RES_CHRATR_END  (46)
 
 // this Attribute used only in a TextNodes SwpAttr-Array
 enum RES_TXTATR