use more TypedWhichId

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

5 files changed, 19 insertions, 22 deletions

diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx
index ada1d46c1521..6b9d906ec907 100644
--- a/cui/source/tabpages/backgrnd.cxx
+++ b/cui/source/tabpages/backgrnd.cxx
@@ -204,7 +204,7 @@ bool SvxBkgTabPage::FillItemSet( SfxItemSet* rCoreSet )
     {
         if (SfxItemState::SET == maSet.GetItemState(SID_ATTR_BRUSH_ROW))
         {
-            SvxBrushItem aBrushItem(static_cast<const SvxBrushItem&>(maSet.Get(SID_ATTR_BRUSH_ROW)));
+            SvxBrushItem aBrushItem(maSet.Get(SID_ATTR_BRUSH_ROW));
             rCoreSet->Put(aBrushItem);
         }
     }
@@ -212,7 +212,7 @@ bool SvxBkgTabPage::FillItemSet( SfxItemSet* rCoreSet )
     {
         if (SfxItemState::SET == maSet.GetItemState(SID_ATTR_BRUSH_TABLE))
         {
-            SvxBrushItem aBrushItem(static_cast<const SvxBrushItem&>(maSet.Get(SID_ATTR_BRUSH_TABLE)));
+            SvxBrushItem aBrushItem(maSet.Get(SID_ATTR_BRUSH_TABLE));
             rCoreSet->Put(aBrushItem);
         }
     }
diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx
index 13c01c8f43f9..e91bef4a8822 100644
--- a/cui/source/tabpages/numfmt.cxx
+++ b/cui/source/tabpages/numfmt.cxx
@@ -364,8 +364,8 @@ void SvxNumberFormatTabPage::Reset( const SfxItemSet* rSet )
 
     if(eState==SfxItemState::SET)
     {
-        const SfxBoolItem* pBoolLangItem = static_cast<const SfxBoolItem*>(
-                      GetItem( *rSet, SID_ATTR_NUMBERFORMAT_NOLANGUAGE));
+        const SfxBoolItem* pBoolLangItem =
+                      GetItem( *rSet, SID_ATTR_NUMBERFORMAT_NOLANGUAGE);
 
         if(pBoolLangItem!=nullptr && pBoolLangItem->GetValue())
         {
@@ -415,8 +415,8 @@ void SvxNumberFormatTabPage::Reset( const SfxItemSet* rSet )
 
     if ( eState == SfxItemState::SET )
     {
-        const SfxBoolItem* pBoolItem = static_cast<const SfxBoolItem*>(
-                      GetItem( *rSet, SID_ATTR_NUMBERFORMAT_SOURCE ));
+        const SfxBoolItem* pBoolItem =
+                      GetItem( *rSet, SID_ATTR_NUMBERFORMAT_SOURCE );
         if ( pBoolItem )
             m_xCbSourceFormat->set_active(pBoolItem->GetValue());
         else
@@ -514,8 +514,7 @@ void SvxNumberFormatTabPage::Reset( const SfxItemSet* rSet )
     }
     eState = rSet->GetItemState( SID_ATTR_NUMBERFORMAT_ADD_AUTO );
     if(SfxItemState::SET == eState)
-         pAutoEntryAttr = static_cast<const SfxBoolItem*>(
-                      GetItem( *rSet, SID_ATTR_NUMBERFORMAT_ADD_AUTO ));
+         pAutoEntryAttr = GetItem( *rSet, SID_ATTR_NUMBERFORMAT_ADD_AUTO );
     // no_NO is an alias for nb_NO and normally isn't listed, we need it for
     // backwards compatibility, but only if the format passed is of
     // LanguageType no_NO.
@@ -735,8 +734,8 @@ bool SvxNumberFormatTabPage::FillItemSet( SfxItemSet* rCoreAttrs )
         if ( m_xCbSourceFormat->get_sensitive() )
         {
             SfxItemState _eItemState = rMyItemSet.GetItemState( SID_ATTR_NUMBERFORMAT_SOURCE, false );
-            const SfxBoolItem* pBoolItem = static_cast<const SfxBoolItem*>(
-                        GetItem( rMyItemSet, SID_ATTR_NUMBERFORMAT_SOURCE ));
+            const SfxBoolItem* pBoolItem =
+                        GetItem( rMyItemSet, SID_ATTR_NUMBERFORMAT_SOURCE );
             bool bOld = pBoolItem && pBoolItem->GetValue();
             rCoreAttrs->Put( SfxBoolItem( SID_ATTR_NUMBERFORMAT_SOURCE, m_xCbSourceFormat->get_active() ) );
             if ( !bDataChanged )
diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx
index c3b8e154fc26..36a7874996a2 100644
--- a/cui/source/tabpages/page.cxx
+++ b/cui/source/tabpages/page.cxx
@@ -583,15 +583,14 @@ void SvxPageDescPage::Reset( const SfxItemSet* rSet )
 
     if(SfxItemState::SET == rSet->GetItemState(SID_SWREGISTER_MODE))
     {
-        m_xRegisterCB->set_active(static_cast<const SfxBoolItem&>(rSet->Get(
-                                  SID_SWREGISTER_MODE)).GetValue());
+        m_xRegisterCB->set_active(rSet->Get(SID_SWREGISTER_MODE).GetValue());
         m_xRegisterCB->save_state();
         RegisterModify(*m_xRegisterCB);
     }
     if(SfxItemState::SET == rSet->GetItemState(SID_SWREGISTER_COLLECTION))
     {
         m_xRegisterLB->set_active_text(
-                static_cast<const SfxStringItem&>(rSet->Get(SID_SWREGISTER_COLLECTION)).GetValue());
+                rSet->Get(SID_SWREGISTER_COLLECTION).GetValue());
         m_xRegisterLB->save_value();
     }
 
@@ -850,7 +849,7 @@ bool SvxPageDescPage::FillItemSet( SfxItemSet* rSet )
     if (m_xRegisterCB->get_visible() &&
        (m_xRegisterCB->get_active() || m_xRegisterCB->get_state_changed_from_saved()))
     {
-        const SfxBoolItem& rRegItem = static_cast<const SfxBoolItem&>(rOldSet.Get(SID_SWREGISTER_MODE));
+        const SfxBoolItem& rRegItem = rOldSet.Get(SID_SWREGISTER_MODE);
         std::unique_ptr<SfxBoolItem> pRegItem(rRegItem.Clone());
         bool bCheck = m_xRegisterCB->get_active();
         pRegItem->SetValue(bCheck);
diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx
index 1771c15d209f..e1c9437983cf 100644
--- a/cui/source/tabpages/paragrph.cxx
+++ b/cui/source/tabpages/paragrph.cxx
@@ -1626,8 +1626,7 @@ void SvxExtParagraphTabPage::Reset( const SfxItemSet* rSet )
         {
             aApplyCollState.bTriStateEnabled = false;
 
-            const SvxPageModelItem& rModel =
-                static_cast<const SvxPageModelItem&>(rSet->Get( SID_ATTR_PARA_MODEL ));
+            const SvxPageModelItem& rModel = rSet->Get( SID_ATTR_PARA_MODEL );
             const OUString& aStr( rModel.GetValue() );
 
             if (!aStr.isEmpty() && m_xApplyCollBox->find_text(aStr) != -1)
diff --git a/cui/source/tabpages/swpossizetabpage.cxx b/cui/source/tabpages/swpossizetabpage.cxx
index 82a7672d5b5d..5bea85ba73f5 100644
--- a/cui/source/tabpages/swpossizetabpage.cxx
+++ b/cui/source/tabpages/swpossizetabpage.cxx
@@ -794,11 +794,11 @@ bool SvxSwPosSizeTabPage::FillItemSet( SfxItemSet* rSet)
             if ( m_pHMap )
             {
                 const SfxInt16Item& rHoriOrient =
-                        static_cast<const SfxInt16Item&>(rOldSet.Get( SID_ATTR_TRANSFORM_HORI_ORIENT));
+                        rOldSet.Get( SID_ATTR_TRANSFORM_HORI_ORIENT );
                 const SfxInt16Item& rHoriRelation =
-                        static_cast<const SfxInt16Item&>(rOldSet.Get( SID_ATTR_TRANSFORM_HORI_RELATION));
+                        rOldSet.Get( SID_ATTR_TRANSFORM_HORI_RELATION);
                 const SfxInt32Item& rHoriPosition =
-                        static_cast<const SfxInt32Item&>(rOldSet.Get( SID_ATTR_TRANSFORM_HORI_POSITION)) ;
+                        rOldSet.Get( SID_ATTR_TRANSFORM_HORI_POSITION);
 
                 sal_uInt16 nMapPos = GetMapPos(m_pHMap, *m_xHoriLB);
                 short nAlign = GetAlignment(m_pHMap, nMapPos, *m_xHoriToLB);
@@ -823,11 +823,11 @@ bool SvxSwPosSizeTabPage::FillItemSet( SfxItemSet* rSet)
             if ( m_pVMap )
             {
                 const SfxInt16Item& rVertOrient =
-                        static_cast<const SfxInt16Item&>(rOldSet.Get( SID_ATTR_TRANSFORM_VERT_ORIENT));
+                        rOldSet.Get( SID_ATTR_TRANSFORM_VERT_ORIENT);
                 const SfxInt16Item& rVertRelation =
-                        static_cast<const SfxInt16Item&>(rOldSet.Get( SID_ATTR_TRANSFORM_VERT_RELATION));
+                        rOldSet.Get( SID_ATTR_TRANSFORM_VERT_RELATION);
                 const SfxInt32Item& rVertPosition =
-                        static_cast<const SfxInt32Item&>(rOldSet.Get( SID_ATTR_TRANSFORM_VERT_POSITION));
+                        rOldSet.Get( SID_ATTR_TRANSFORM_VERT_POSITION);
 
                 sal_uInt16 nMapPos = GetMapPos(m_pVMap, *m_xVertLB);
                 short nAlign = GetAlignment(m_pVMap, nMapPos, *m_xVertToLB);