convert RES_FRM constants to TypedWhichId

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

24 files changed, 85 insertions, 88 deletions

diff --git a/sw/inc/fmtanchr.hxx b/sw/inc/fmtanchr.hxx
index 28361a7ac7cf..cfdc600562f7 100644
--- a/sw/inc/fmtanchr.hxx
+++ b/sw/inc/fmtanchr.hxx
@@ -76,7 +76,7 @@ public:
 };
 
 inline const SwFormatAnchor &SwAttrSet::GetAnchor(bool bInP) const
-    { return static_cast<const SwFormatAnchor&>(Get(RES_ANCHOR, bInP)); }
+    { return Get(RES_ANCHOR, bInP); }
 
  inline const SwFormatAnchor &SwFormat::GetAnchor(bool bInP) const
      { return m_aSet.GetAnchor(bInP); }
diff --git a/sw/inc/fmtclbl.hxx b/sw/inc/fmtclbl.hxx
index cf41b339f938..dcfdba05f7f1 100644
--- a/sw/inc/fmtclbl.hxx
+++ b/sw/inc/fmtclbl.hxx
@@ -37,7 +37,7 @@ public:
 };
 
 inline const SwFormatNoBalancedColumns &SwAttrSet::GetBalancedColumns(bool bInP) const
-    { return static_cast<const SwFormatNoBalancedColumns&>(Get( RES_COLUMNBALANCE, bInP )); }
+    { return Get( RES_COLUMNBALANCE, bInP ); }
 
 inline const SwFormatNoBalancedColumns &SwFormat::GetBalancedColumns(bool bInP) const
     { return m_aSet.GetBalancedColumns( bInP ); }
diff --git a/sw/inc/fmtclds.hxx b/sw/inc/fmtclds.hxx
index 9e94196729fb..6bb50990660f 100644
--- a/sw/inc/fmtclds.hxx
+++ b/sw/inc/fmtclds.hxx
@@ -162,7 +162,7 @@ public:
 };
 
 inline const SwFormatCol &SwAttrSet::GetCol(bool bInP) const
-    { return static_cast<const SwFormatCol&>(Get( RES_COL,bInP)); }
+    { return Get( RES_COL,bInP); }
 
 inline const SwFormatCol &SwFormat::GetCol(bool bInP) const
     { return m_aSet.GetCol(bInP); }
diff --git a/sw/inc/fmtcnct.hxx b/sw/inc/fmtcnct.hxx
index c95e87cc10e2..e85ac8db5b8b 100644
--- a/sw/inc/fmtcnct.hxx
+++ b/sw/inc/fmtcnct.hxx
@@ -65,7 +65,7 @@ SwFormatChain &SwFormatChain::operator=( const SwFormatChain &rCpy )
 }
 
 inline const SwFormatChain &SwAttrSet::GetChain(bool bInP) const
-    { return static_cast<const SwFormatChain&>(Get( RES_CHAIN,bInP)); }
+    { return Get( RES_CHAIN,bInP); }
 
 inline const SwFormatChain &SwFormat::GetChain(bool bInP) const
     { return m_aSet.GetChain(bInP); }
diff --git a/sw/inc/fmtcntnt.hxx b/sw/inc/fmtcntnt.hxx
index 8fcdae13542b..ad864a51fce7 100644
--- a/sw/inc/fmtcntnt.hxx
+++ b/sw/inc/fmtcntnt.hxx
@@ -50,7 +50,7 @@ public:
 };
 
 inline const SwFormatContent &SwAttrSet::GetContent(bool bInP) const
-    { return static_cast<const SwFormatContent&>(Get( RES_CNTNT,bInP)); }
+    { return Get( RES_CNTNT,bInP); }
 
 inline const SwFormatContent &SwFormat::GetContent(bool bInP) const
     { return m_aSet.GetContent(bInP); }
diff --git a/sw/inc/fmteiro.hxx b/sw/inc/fmteiro.hxx
index 8ea4e9964d7c..ab53d6d2bf93 100644
--- a/sw/inc/fmteiro.hxx
+++ b/sw/inc/fmteiro.hxx
@@ -43,7 +43,7 @@ public:
 };
 
 inline const SwFormatEditInReadonly &SwAttrSet::GetEditInReadonly(bool bInP) const
-    { return static_cast<const SwFormatEditInReadonly&>(Get( RES_EDIT_IN_READONLY,bInP)); }
+    { return Get( RES_EDIT_IN_READONLY,bInP); }
 
 inline const SwFormatEditInReadonly &SwFormat::GetEditInReadonly(bool bInP) const
     { return m_aSet.GetEditInReadonly(bInP); }
diff --git a/sw/inc/fmtfollowtextflow.hxx b/sw/inc/fmtfollowtextflow.hxx
index 7686edfeccd2..6cbc6dfe39e9 100644
--- a/sw/inc/fmtfollowtextflow.hxx
+++ b/sw/inc/fmtfollowtextflow.hxx
@@ -45,7 +45,7 @@ public:
 };
 
 inline const SwFormatFollowTextFlow &SwAttrSet::GetFollowTextFlow(bool bInP) const
-    { return static_cast<const SwFormatFollowTextFlow&>(Get( RES_FOLLOW_TEXT_FLOW, bInP )); }
+    { return Get( RES_FOLLOW_TEXT_FLOW, bInP ); }
 
 inline const SwFormatFollowTextFlow &SwFormat::GetFollowTextFlow(bool bInP) const
     { return m_aSet.GetFollowTextFlow( bInP ); }
diff --git a/sw/inc/fmtfordr.hxx b/sw/inc/fmtfordr.hxx
index 20b80d1d4b90..2518995dbe3a 100644
--- a/sw/inc/fmtfordr.hxx
+++ b/sw/inc/fmtfordr.hxx
@@ -51,7 +51,7 @@ inline SwFormatFillOrder &SwFormatFillOrder::operator=( const SwFormatFillOrder
 }
 
 inline const SwFormatFillOrder &SwAttrSet::GetFillOrder(bool bInP) const
-    { return static_cast<const SwFormatFillOrder&>(Get( RES_FILL_ORDER,bInP)); }
+    { return Get( RES_FILL_ORDER,bInP); }
 
 inline const SwFormatFillOrder &SwFormat::GetFillOrder(bool bInP) const
     { return m_aSet.GetFillOrder(bInP); }
diff --git a/sw/inc/fmtfsize.hxx b/sw/inc/fmtfsize.hxx
index 94edec0814ce..9cbfb2078198 100644
--- a/sw/inc/fmtfsize.hxx
+++ b/sw/inc/fmtfsize.hxx
@@ -105,7 +105,7 @@ public:
 };
 
 inline const SwFormatFrameSize &SwAttrSet::GetFrameSize(bool bInP) const
-    { return static_cast<const SwFormatFrameSize&>(Get( RES_FRM_SIZE,bInP)); }
+    { return Get( RES_FRM_SIZE,bInP); }
 
 inline const SwFormatFrameSize &SwFormat::GetFrameSize(bool bInP) const
     { return m_aSet.GetFrameSize(bInP); }
diff --git a/sw/inc/fmtftntx.hxx b/sw/inc/fmtftntx.hxx
index 5fc5832b224c..e8c747d7ad4b 100644
--- a/sw/inc/fmtftntx.hxx
+++ b/sw/inc/fmtftntx.hxx
@@ -102,9 +102,9 @@ public:
 };
 
 inline const SwFormatFootnoteAtTextEnd &SwAttrSet::GetFootnoteAtTextEnd(bool bInP) const
-    { return static_cast<const SwFormatFootnoteAtTextEnd&>(Get( RES_FTN_AT_TXTEND, bInP)); }
+    { return Get( RES_FTN_AT_TXTEND, bInP); }
 inline const SwFormatEndAtTextEnd &SwAttrSet::GetEndAtTextEnd(bool bInP) const
-    { return static_cast<const SwFormatEndAtTextEnd&>(Get( RES_END_AT_TXTEND, bInP)); }
+    { return Get( RES_END_AT_TXTEND, bInP); }
 
 inline const SwFormatFootnoteAtTextEnd &SwFormat::GetFootnoteAtTextEnd(bool bInP) const
     { return m_aSet.GetFootnoteAtTextEnd(bInP); }
diff --git a/sw/inc/fmthdft.hxx b/sw/inc/fmthdft.hxx
index 0c0804fa1d04..7fcb53ecf4d8 100644
--- a/sw/inc/fmthdft.hxx
+++ b/sw/inc/fmthdft.hxx
@@ -91,9 +91,9 @@ public:
 };
 
 inline const SwFormatHeader &SwAttrSet::GetHeader(bool bInP) const
-    { return static_cast<const SwFormatHeader&>(Get( RES_HEADER,bInP)); }
+    { return Get( RES_HEADER,bInP); }
 inline const SwFormatFooter &SwAttrSet::GetFooter(bool bInP) const
-    { return static_cast<const SwFormatFooter&>(Get( RES_FOOTER,bInP)); }
+    { return Get( RES_FOOTER,bInP); }
 
 inline const SwFormatHeader &SwFormat::GetHeader(bool bInP) const
     { return m_aSet.GetHeader(bInP); }
diff --git a/sw/inc/fmtline.hxx b/sw/inc/fmtline.hxx
index 523442f6c677..84e4d56e6e35 100644
--- a/sw/inc/fmtline.hxx
+++ b/sw/inc/fmtline.hxx
@@ -56,7 +56,7 @@ public:
 };
 
 inline const SwFormatLineNumber &SwAttrSet::GetLineNumber(bool bInP) const
-    { return static_cast<const SwFormatLineNumber&>(Get( RES_LINENUMBER,bInP)); }
+    { return Get( RES_LINENUMBER,bInP); }
 
 #endif
 
diff --git a/sw/inc/fmtlsplt.hxx b/sw/inc/fmtlsplt.hxx
index 85f10adadf00..89670136a5e9 100644
--- a/sw/inc/fmtlsplt.hxx
+++ b/sw/inc/fmtlsplt.hxx
@@ -41,7 +41,7 @@ public:
 };
 
 inline const SwFormatLayoutSplit &SwAttrSet::GetLayoutSplit(bool bInP) const
-    { return static_cast<const SwFormatLayoutSplit&>(Get( RES_LAYOUT_SPLIT,bInP)); }
+    { return Get( RES_LAYOUT_SPLIT,bInP); }
 
 inline const SwFormatLayoutSplit &SwFormat::GetLayoutSplit(bool bInP) const
     { return m_aSet.GetLayoutSplit(bInP); }
diff --git a/sw/inc/fmtornt.hxx b/sw/inc/fmtornt.hxx
index 8b8c3173afde..5de9f2ff6949 100644
--- a/sw/inc/fmtornt.hxx
+++ b/sw/inc/fmtornt.hxx
@@ -118,9 +118,9 @@ inline SwFormatHoriOrient &SwFormatHoriOrient::operator=( const SwFormatHoriOrie
 }
 
 inline const SwFormatVertOrient &SwAttrSet::GetVertOrient(bool bInP) const
-    { return static_cast<const SwFormatVertOrient&>(Get( RES_VERT_ORIENT,bInP)); }
+    { return Get( RES_VERT_ORIENT,bInP); }
 inline const SwFormatHoriOrient &SwAttrSet::GetHoriOrient(bool bInP) const
-    { return static_cast<const SwFormatHoriOrient&>(Get( RES_HORI_ORIENT,bInP)); }
+    { return Get( RES_HORI_ORIENT,bInP); }
 
 inline const SwFormatVertOrient &SwFormat::GetVertOrient(bool bInP) const
     { return m_aSet.GetVertOrient(bInP); }
diff --git a/sw/inc/fmtpdsc.hxx b/sw/inc/fmtpdsc.hxx
index 1d39f7b0343f..1b015cf2384f 100644
--- a/sw/inc/fmtpdsc.hxx
+++ b/sw/inc/fmtpdsc.hxx
@@ -78,7 +78,7 @@ public:
 };
 
 inline const SwFormatPageDesc &SwAttrSet::GetPageDesc(bool bInP) const
-    { return static_cast<const SwFormatPageDesc&>(Get( RES_PAGEDESC,bInP)); }
+    { return Get( RES_PAGEDESC,bInP); }
 
 inline const SwFormatPageDesc &SwFormat::GetPageDesc(bool bInP) const
     { return m_aSet.GetPageDesc(bInP); }
diff --git a/sw/inc/fmtrowsplt.hxx b/sw/inc/fmtrowsplt.hxx
index a17809b0c604..735625841dc4 100644
--- a/sw/inc/fmtrowsplt.hxx
+++ b/sw/inc/fmtrowsplt.hxx
@@ -41,7 +41,7 @@ public:
 };
 
 inline const SwFormatRowSplit &SwAttrSet::GetRowSplit(bool bInP) const
-    { return static_cast<const SwFormatRowSplit&>(Get( RES_ROW_SPLIT,bInP)); }
+    { return Get( RES_ROW_SPLIT,bInP); }
 
 inline const SwFormatRowSplit &SwFormat::GetRowSplit(bool bInP) const
     { return m_aSet.GetRowSplit(bInP); }
diff --git a/sw/inc/fmtsrnd.hxx b/sw/inc/fmtsrnd.hxx
index df4637842819..ae17719d32ff 100644
--- a/sw/inc/fmtsrnd.hxx
+++ b/sw/inc/fmtsrnd.hxx
@@ -71,7 +71,7 @@ inline SwFormatSurround &SwFormatSurround::operator=( const SwFormatSurround &rC
 }
 
 inline const SwFormatSurround &SwAttrSet::GetSurround(bool bInP) const
-    { return static_cast<const SwFormatSurround&>(Get( RES_SURROUND,bInP)); }
+    { return Get( RES_SURROUND,bInP); }
 
 inline const SwFormatSurround &SwFormat::GetSurround(bool bInP) const
     { return m_aSet.GetSurround(bInP); }
diff --git a/sw/inc/fmturl.hxx b/sw/inc/fmturl.hxx
index f7f472b558bb..de877239563e 100644
--- a/sw/inc/fmturl.hxx
+++ b/sw/inc/fmturl.hxx
@@ -73,7 +73,7 @@ public:
 };
 
 inline const SwFormatURL &SwAttrSet::GetURL(bool bInP) const
-    { return static_cast<const SwFormatURL&>(Get( RES_URL,bInP)); }
+    { return Get( RES_URL,bInP); }
 
 inline const SwFormatURL &SwFormat::GetURL(bool bInP) const
     { return m_aSet.GetURL(bInP); }
diff --git a/sw/inc/fmtwrapinfluenceonobjpos.hxx b/sw/inc/fmtwrapinfluenceonobjpos.hxx
index 7c9139d04dc7..bff1bd2945d8 100644
--- a/sw/inc/fmtwrapinfluenceonobjpos.hxx
+++ b/sw/inc/fmtwrapinfluenceonobjpos.hxx
@@ -57,7 +57,7 @@ public:
 };
 
 inline const SwFormatWrapInfluenceOnObjPos& SwAttrSet::GetWrapInfluenceOnObjPos(bool bInP) const
-    { return static_cast<const SwFormatWrapInfluenceOnObjPos&>(Get( RES_WRAP_INFLUENCE_ON_OBJPOS,bInP)); }
+    { return Get( RES_WRAP_INFLUENCE_ON_OBJPOS,bInP); }
 
  inline const SwFormatWrapInfluenceOnObjPos& SwFormat::GetWrapInfluenceOnObjPos(bool bInP) const
     { return m_aSet.GetWrapInfluenceOnObjPos(bInP); }
diff --git a/sw/inc/frmatr.hxx b/sw/inc/frmatr.hxx
index 02a1188c711c..51dda4f4a5d0 100644
--- a/sw/inc/frmatr.hxx
+++ b/sw/inc/frmatr.hxx
@@ -40,33 +40,33 @@
 
 // Implementation of FrameAttribute methods of SwAttrSet.
 inline const SvxPaperBinItem &SwAttrSet::GetPaperBin(bool bInP) const
-    { return static_cast<const SvxPaperBinItem&>(Get( RES_PAPER_BIN,bInP)); }
+    { return Get( RES_PAPER_BIN,bInP); }
 inline const SvxLRSpaceItem &SwAttrSet::GetLRSpace(bool bInP) const
-    { return static_cast<const SvxLRSpaceItem&>(Get( RES_LR_SPACE,bInP)); }
+    { return Get( RES_LR_SPACE,bInP); }
 inline const SvxULSpaceItem &SwAttrSet::GetULSpace(bool bInP) const
-    { return static_cast<const SvxULSpaceItem&>(Get( RES_UL_SPACE,bInP)); }
+    { return Get( RES_UL_SPACE,bInP); }
 inline const SvxPrintItem &SwAttrSet::GetPrint(bool bInP) const
-    { return static_cast<const SvxPrintItem&>(Get( RES_PRINT,bInP)); }
+    { return Get( RES_PRINT,bInP); }
 inline const SvxOpaqueItem &SwAttrSet::GetOpaque(bool bInP) const
-    { return static_cast<const SvxOpaqueItem&>(Get( RES_OPAQUE,bInP)); }
+    { return Get( RES_OPAQUE,bInP); }
 inline const SvxProtectItem &SwAttrSet::GetProtect(bool bInP) const
-    { return static_cast<const SvxProtectItem&>(Get( RES_PROTECT,bInP)); }
+    { return Get( RES_PROTECT,bInP); }
 inline const SvxBoxItem &SwAttrSet::GetBox(bool bInP) const
-    { return static_cast<const SvxBoxItem&>(Get( RES_BOX,bInP)); }
+    { return Get( RES_BOX,bInP); }
 inline const SvxFormatKeepItem &SwAttrSet::GetKeep(bool bInP) const
-    { return static_cast<const SvxFormatKeepItem&>(Get( RES_KEEP,bInP)); }
+    { return Get( RES_KEEP,bInP); }
 inline const SvxBrushItem &SwAttrSet::GetBackground(bool bInP) const
-    { return static_cast<const SvxBrushItem&>(Get( RES_BACKGROUND,bInP)); }
+    { return Get( RES_BACKGROUND,bInP); }
 inline const SvxShadowItem &SwAttrSet::GetShadow(bool bInP) const
-    { return static_cast<const SvxShadowItem&>(Get( RES_SHADOW,bInP)); }
+    { return Get( RES_SHADOW,bInP); }
 inline const SvxFormatBreakItem &SwAttrSet::GetBreak(bool bInP) const
-    { return static_cast<const SvxFormatBreakItem&>(Get( RES_BREAK,bInP)); }
+    { return Get( RES_BREAK,bInP); }
 inline const SvxMacroItem &SwAttrSet::GetMacro(bool bInP) const
-    { return static_cast<const SvxMacroItem&>(Get( RES_FRMMACRO,bInP)); }
+    { return Get( RES_FRMMACRO,bInP); }
 inline const SvxFrameDirectionItem &SwAttrSet::GetFrameDir(bool bInP) const
-    { return static_cast<const SvxFrameDirectionItem&>(Get( RES_FRAMEDIR,bInP)); }
+    { return Get( RES_FRAMEDIR,bInP); }
 inline const SdrTextVertAdjustItem &SwAttrSet::GetTextVertAdjust(bool bInP) const
-    { return static_cast<const SdrTextVertAdjustItem&>(Get( RES_TEXT_VERT_ADJUST,bInP)); }
+    { return Get( RES_TEXT_VERT_ADJUST,bInP); }
 
 // Implementation of FrameAttribute methods of SwFormat.
 inline const SvxPaperBinItem &SwFormat::GetPaperBin(bool bInP) const
diff --git a/sw/inc/hfspacingitem.hxx b/sw/inc/hfspacingitem.hxx
index ec850a13bb46..136c4fc3e7d7 100644
--- a/sw/inc/hfspacingitem.hxx
+++ b/sw/inc/hfspacingitem.hxx
@@ -41,7 +41,7 @@ public:
 };
 
 inline const SwHeaderAndFooterEatSpacingItem &SwAttrSet::GetHeaderAndFooterEatSpacing(bool bInP) const
-    { return static_cast<const SwHeaderAndFooterEatSpacingItem&>(Get( RES_HEADER_FOOTER_EAT_SPACING,bInP)); }
+    { return Get( RES_HEADER_FOOTER_EAT_SPACING,bInP); }
 
 inline const SwHeaderAndFooterEatSpacingItem &SwFormat::GetHeaderAndFooterEatSpacing(bool bInP) const
     { return m_aSet.GetHeaderAndFooterEatSpacing(bInP); }
diff --git a/sw/inc/hintids.hxx b/sw/inc/hintids.hxx
index ef869ddfe559..8e254b62ec0f 100644
--- a/sw/inc/hintids.hxx
+++ b/sw/inc/hintids.hxx
@@ -177,54 +177,51 @@
 #define     RES_PARATR_LIST_ISCOUNTED              TypedWhichId<SfxBoolItem>(86)
 #define RES_PARATR_LIST_END (87)
 
-enum RES_FRMATR
-{
-RES_FRMATR_BEGIN = RES_PARATR_LIST_END,
-    RES_FILL_ORDER = RES_FRMATR_BEGIN,              // 87
-    RES_FRM_SIZE,                                   // 88
-    RES_PAPER_BIN,                                  // 89
-    RES_LR_SPACE,                                   // 90
-    RES_UL_SPACE,                                   // 91
-    RES_PAGEDESC,                                   // 92
-    RES_BREAK,                                      // 93
-    RES_CNTNT,                                      // 94
-    RES_HEADER,                                     // 95
-    RES_FOOTER,                                     // 96
-    RES_PRINT,                                      // 97
-    RES_OPAQUE,                                     // 98
-    RES_PROTECT,                                    // 99
-    RES_SURROUND,                                   // 100
-    RES_VERT_ORIENT,                                // 101
-    RES_HORI_ORIENT,                                // 102
-    RES_ANCHOR,                                     // 103
-    RES_BACKGROUND,                                 // 104
-    RES_BOX,                                        // 105
-    RES_SHADOW,                                     // 106
-    RES_FRMMACRO,                                   // 107
-    RES_COL,                                        // 108
-    RES_KEEP,                                       // 109
-    RES_URL,                                        // 110
-    RES_EDIT_IN_READONLY,                           // 111
-    RES_LAYOUT_SPLIT,                               // 112
-    RES_CHAIN,                                      // 113
-    RES_TEXTGRID,                                   // 114
-    RES_LINENUMBER  ,                               // 115
-    RES_FTN_AT_TXTEND,                              // 116
-    RES_END_AT_TXTEND,                              // 117
-    RES_COLUMNBALANCE,                              // 118
-    RES_FRAMEDIR,                                   // 119
-    RES_HEADER_FOOTER_EAT_SPACING,                  // 120
-    RES_ROW_SPLIT,                                  // 121
-    RES_FOLLOW_TEXT_FLOW,                           // 122
-    RES_COLLAPSING_BORDERS,                         // 123
-    RES_WRAP_INFLUENCE_ON_OBJPOS,                   // 124
-    RES_AUTO_STYLE,                                 // 125
-    RES_FRMATR_STYLE_NAME,                          // 126
-    RES_FRMATR_CONDITIONAL_STYLE_NAME,              // 127
-    RES_FRMATR_GRABBAG,                             // 128
-    RES_TEXT_VERT_ADJUST,                           // 129
-RES_FRMATR_END
-};
+#define RES_FRMATR_BEGIN RES_PARATR_LIST_END
+#define     RES_FILL_ORDER                         TypedWhichId<SwFormatFillOrder>(RES_FRMATR_BEGIN)
+#define     RES_FRM_SIZE                           TypedWhichId<SwFormatFrameSize>(88)
+#define     RES_PAPER_BIN                          TypedWhichId<SvxPaperBinItem>(89)
+#define     RES_LR_SPACE                           TypedWhichId<SvxLRSpaceItem>(90)
+#define     RES_UL_SPACE                           TypedWhichId<SvxULSpaceItem>(91)
+#define     RES_PAGEDESC                           TypedWhichId<SwFormatPageDesc>(92)
+#define     RES_BREAK                              TypedWhichId<SvxFormatBreakItem>(93)
+#define     RES_CNTNT                              TypedWhichId<SwFormatContent>(94)
+#define     RES_HEADER                             TypedWhichId<SwFormatHeader>(95)
+#define     RES_FOOTER                             TypedWhichId<SwFormatFooter>(96)
+#define     RES_PRINT                              TypedWhichId<SvxPrintItem>(97)
+#define     RES_OPAQUE                             TypedWhichId<SvxOpaqueItem>(98)
+#define     RES_PROTECT                            TypedWhichId<SvxProtectItem>(99)
+#define     RES_SURROUND                           TypedWhichId<SwFormatSurround>(100)
+#define     RES_VERT_ORIENT                        TypedWhichId<SwFormatVertOrient>(101)
+#define     RES_HORI_ORIENT                        TypedWhichId<SwFormatHoriOrient>(102)
+#define     RES_ANCHOR                             TypedWhichId<SwFormatAnchor>(103)
+#define     RES_BACKGROUND                         TypedWhichId<SvxBrushItem>(104)
+#define     RES_BOX                                TypedWhichId<SvxBoxItem>(105)
+#define     RES_SHADOW                             TypedWhichId<SvxShadowItem>(106)
+#define     RES_FRMMACRO                           TypedWhichId<SvxMacroItem>(107)
+#define     RES_COL                                TypedWhichId<SwFormatCol>(108)
+#define     RES_KEEP                               TypedWhichId<SvxFormatKeepItem>(109)
+#define     RES_URL                                TypedWhichId<SwFormatURL>(110)
+#define     RES_EDIT_IN_READONLY                   TypedWhichId<SwFormatEditInReadonly>(111)
+#define     RES_LAYOUT_SPLIT                       TypedWhichId<SwFormatLayoutSplit>(112)
+#define     RES_CHAIN                              TypedWhichId<SwFormatChain>(113)
+#define     RES_TEXTGRID                           TypedWhichId<SwTextGridItem>(114)
+#define     RES_LINENUMBER                         TypedWhichId<SwFormatLineNumber>(115)
+#define     RES_FTN_AT_TXTEND                      TypedWhichId<SwFormatFootnoteAtTextEnd>(116)
+#define     RES_END_AT_TXTEND                      TypedWhichId<SwFormatEndAtTextEnd>(117)
+#define     RES_COLUMNBALANCE                      TypedWhichId<SwFormatNoBalancedColumns>(118)
+#define     RES_FRAMEDIR                           TypedWhichId<SvxFrameDirectionItem>(119)
+#define     RES_HEADER_FOOTER_EAT_SPACING          TypedWhichId<SwHeaderAndFooterEatSpacingItem>(120)
+#define     RES_ROW_SPLIT                          TypedWhichId<SwFormatRowSplit>(121)
+#define     RES_FOLLOW_TEXT_FLOW                   TypedWhichId<SwFormatFollowTextFlow>(122)
+#define     RES_COLLAPSING_BORDERS                 TypedWhichId<SfxBoolItem>(123)
+#define     RES_WRAP_INFLUENCE_ON_OBJPOS           TypedWhichId<SwFormatWrapInfluenceOnObjPos>(124)
+#define     RES_AUTO_STYLE                         TypedWhichId<SwFormatAutoFormat>(125)
+#define     RES_FRMATR_STYLE_NAME                  TypedWhichId<SfxStringItem>(126)
+#define     RES_FRMATR_CONDITIONAL_STYLE_NAME      TypedWhichId<SfxStringItem>(127)
+#define     RES_FRMATR_GRABBAG                     TypedWhichId<SfxGrabBagItem>(128)
+#define     RES_TEXT_VERT_ADJUST                   TypedWhichId<SdrTextVertAdjustItem>(129)
+#define RES_FRMATR_END 130
 
 #define RES_GRFATR_BEGIN RES_FRMATR_END
 #define     RES_GRFATR_MIRRORGRF    TypedWhichId<SwMirrorGrf>(RES_GRFATR_BEGIN) // 130
diff --git a/sw/inc/tgrditem.hxx b/sw/inc/tgrditem.hxx
index be7fd137b7ec..30cf95066fb8 100644
--- a/sw/inc/tgrditem.hxx
+++ b/sw/inc/tgrditem.hxx
@@ -107,7 +107,7 @@ public:
 };
 
 inline const SwTextGridItem &SwFormat::GetTextGrid(bool bInP) const
-    {   return static_cast<const SwTextGridItem&>(m_aSet.Get( RES_TEXTGRID, bInP )); }
+    {   return m_aSet.Get( RES_TEXTGRID, bInP ); }
 
 #endif
 
diff --git a/sw/inc/unostyle.hxx b/sw/inc/unostyle.hxx
index afd2a500ff38..5d76bd719808 100644
--- a/sw/inc/unostyle.hxx
+++ b/sw/inc/unostyle.hxx
@@ -104,8 +104,8 @@ namespace sw
     class ICoreFrameStyle
     {
         public:
-            virtual void SetItem(enum RES_FRMATR eAtr, const SfxPoolItem& rItem) =0;
-            virtual const SfxPoolItem* GetItem(enum RES_FRMATR eAtr) =0;
+            virtual void SetItem(sal_uInt16 eAtr, const SfxPoolItem& rItem) =0;
+            virtual const SfxPoolItem* GetItem(sal_uInt16 eAtr) =0;
             virtual css::document::XEventsSupplier& GetEventsSupplier() =0;
             virtual ~ICoreFrameStyle() {};
     };