From 617a2feff0978d06aa2759038715dfde90d369db Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel.grandin@collabora.co.uk>
Date: Tue, 19 Dec 2017 15:39:54 +0200
Subject: 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>
---
 sw/source/uibase/frmdlg/colex.cxx  | 9 ++++-----
 sw/source/uibase/frmdlg/colmgr.cxx | 6 +++---
 sw/source/uibase/frmdlg/frmmgr.cxx | 6 +++---
 3 files changed, 10 insertions(+), 11 deletions(-)

(limited to 'sw/source/uibase/frmdlg')

diff --git a/sw/source/uibase/frmdlg/colex.cxx b/sw/source/uibase/frmdlg/colex.cxx
index c7c481f35c3d..cd71648e72fc 100644
--- a/sw/source/uibase/frmdlg/colex.cxx
+++ b/sw/source/uibase/frmdlg/colex.cxx
@@ -44,8 +44,7 @@ void SwPageExample::UpdateExample( const SfxItemSet& rSet )
 {
     if (SfxItemState::DEFAULT <= rSet.GetItemState(RES_FRAMEDIR))
     {
-        const SvxFrameDirectionItem& rDirItem =
-                    static_cast<const SvxFrameDirectionItem&>(rSet.Get(RES_FRAMEDIR));
+        const SvxFrameDirectionItem& rDirItem = rSet.Get(RES_FRAMEDIR);
         m_bVertical = rDirItem.GetValue() == SvxFrameDirection::Vertical_RL_TB||
                     rDirItem.GetValue() == SvxFrameDirection::Vertical_LR_TB;
     }
@@ -128,7 +127,7 @@ void SwPageExample::UpdateExample( const SfxItemSet& rSet )
             if(SfxItemState::SET == rHeaderSet.GetItemState(RES_BACKGROUND))
             {
                 // create FillAttributes from SvxBrushItem //SetHdColor(rItem.GetColor());
-                const SvxBrushItem& rItem = static_cast< const SvxBrushItem& >(rHeaderSet.Get(RES_BACKGROUND));
+                const SvxBrushItem& rItem = rHeaderSet.Get(RES_BACKGROUND);
                 SfxItemSet aTempSet(*rHeaderSet.GetPool(), svl::Items<XATTR_FILL_FIRST, XATTR_FILL_LAST>{});
 
                 setSvxBrushItemAsFillAttributesToTargetSet(rItem, aTempSet);
@@ -166,7 +165,7 @@ void SwPageExample::UpdateExample( const SfxItemSet& rSet )
             if( rFooterSet.GetItemState( RES_BACKGROUND ) == SfxItemState::SET )
             {
                 // create FillAttributes from SvxBrushItem //SetFtColor(rItem.GetColor());
-                const SvxBrushItem& rItem = static_cast< const SvxBrushItem& >(rFooterSet.Get(RES_BACKGROUND));
+                const SvxBrushItem& rItem = rFooterSet.Get(RES_BACKGROUND);
                 SfxItemSet aTempSet(*rFooterSet.GetPool(), svl::Items<XATTR_FILL_FIRST, XATTR_FILL_LAST>{});
 
                 setSvxBrushItemAsFillAttributesToTargetSet(rItem, aTempSet);
@@ -612,7 +611,7 @@ void SwPageGridExample::UpdateExample( const SfxItemSet& rSet )
     DELETEZ(pGridItem);
     //get the grid information
     if(SfxItemState::DEFAULT <= rSet.GetItemState(RES_TEXTGRID))
-        pGridItem = static_cast<SwTextGridItem*>(static_cast<const SwTextGridItem&>(rSet.Get(RES_TEXTGRID)).Clone());
+        pGridItem = static_cast<SwTextGridItem*>(rSet.Get(RES_TEXTGRID).Clone());
     SwPageExample::UpdateExample(rSet);
 }
 
diff --git a/sw/source/uibase/frmdlg/colmgr.cxx b/sw/source/uibase/frmdlg/colmgr.cxx
index 5231eb6ef6b6..ade307c7c29c 100644
--- a/sw/source/uibase/frmdlg/colmgr.cxx
+++ b/sw/source/uibase/frmdlg/colmgr.cxx
@@ -110,12 +110,12 @@ void SwColMgr::SetActualWidth(sal_uInt16 nW)
 
 // ctor
 SwColMgr::SwColMgr(const SfxItemSet& rSet) :
-    aFormatCol(static_cast<const SwFormatCol&>(rSet.Get(RES_COL)))
+    aFormatCol(rSet.Get(RES_COL))
 {
-    nWidth = (sal_uInt16)static_cast<const SwFormatFrameSize&>(rSet.Get(RES_FRM_SIZE)).GetWidth();
+    nWidth = (sal_uInt16)rSet.Get(RES_FRM_SIZE).GetWidth();
     if (nWidth < MINLAY)
         nWidth = USHRT_MAX;
-    const SvxLRSpaceItem &rLR = static_cast<const SvxLRSpaceItem&>(rSet.Get(RES_LR_SPACE));
+    const SvxLRSpaceItem &rLR = rSet.Get(RES_LR_SPACE);
     nWidth = nWidth - (sal_uInt16)rLR.GetLeft();
     nWidth = nWidth - (sal_uInt16)rLR.GetRight();
     ::FitToActualSize(aFormatCol, nWidth);
diff --git a/sw/source/uibase/frmdlg/frmmgr.cxx b/sw/source/uibase/frmdlg/frmmgr.cxx
index 2bf04a3cce44..2a7bce931465 100644
--- a/sw/source/uibase/frmdlg/frmmgr.cxx
+++ b/sw/source/uibase/frmdlg/frmmgr.cxx
@@ -254,7 +254,7 @@ void SwFlyFrameAttrMgr::ValidateMetrics( SvxSwFrameValidation& rVal,
     // OD 18.09.2003 #i18732# - adjustment for allowing vertical position
     //      aligned to page for fly frame anchored to paragraph or to character.
     const RndStdIds eAnchorType = rVal.nAnchorType;
-    const SwFormatFrameSize& rSize = static_cast<const SwFormatFrameSize&>(m_aSet.Get(RES_FRM_SIZE));
+    const SwFormatFrameSize& rSize = m_aSet.Get(RES_FRM_SIZE);
     m_pOwnSh->CalcBoundRect( aBoundRect, eAnchorType,
                            rVal.nHRelOrient,
                            rVal.nVRelOrient,
@@ -518,7 +518,7 @@ void SwFlyFrameAttrMgr::SetLRSpace( long nLeft, long nRight )
 {
     OSL_ENSURE( LONG_MAX != nLeft && LONG_MAX != nRight, "Which border to set?" );
 
-    SvxLRSpaceItem aTmp( static_cast<const SvxLRSpaceItem&>(m_aSet.Get( RES_LR_SPACE )) );
+    SvxLRSpaceItem aTmp( m_aSet.Get( RES_LR_SPACE ) );
     if( LONG_MAX != nLeft )
         aTmp.SetLeft( sal_uInt16(nLeft) );
     if( LONG_MAX != nRight )
@@ -530,7 +530,7 @@ void SwFlyFrameAttrMgr::SetULSpace( long nTop, long nBottom )
 {
     OSL_ENSURE(LONG_MAX != nTop && LONG_MAX != nBottom, "Which border to set?" );
 
-    SvxULSpaceItem aTmp( static_cast<const SvxULSpaceItem&>(m_aSet.Get( RES_UL_SPACE )) );
+    SvxULSpaceItem aTmp( m_aSet.Get( RES_UL_SPACE ) );
     if( LONG_MAX != nTop )
         aTmp.SetUpper( sal_uInt16(nTop) );
     if( LONG_MAX != nBottom )
-- 
cgit