use more TypedWhichId

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

12 files changed, 35 insertions, 36 deletions

diff --git a/sd/inc/app.hrc b/sd/inc/app.hrc
index b8fbe474ac76..bf944d2b3675 100644
--- a/sd/inc/app.hrc
+++ b/sd/inc/app.hrc
@@ -139,15 +139,15 @@
 #define SID_SWITCH_POINTEDIT                (SID_SD_START+74)
     // FREE
 // In svxids.hrc: SID_TEXTEDIT              (SID_SD_START+76)
-#define SID_SET_SNAPITEM                    (SID_SD_START+77)
+#define SID_SET_SNAPITEM                    TypedWhichId<SfxStringItem>(SID_SD_START+77)
     // FREE
 #define SID_DELETE_PAGE                     (SID_SD_START+80)
 #define SID_DELETE_LAYER                    (SID_SD_START+81)
 #define SID_DISMANTLE                       (SID_SD_START+82)
     // FREE
-#define SID_SCALE                           (SID_SD_START+85)
-#define SID_STATUS_PAGE                     (SID_SD_START+86)
-#define SID_STATUS_LAYOUT                   (SID_SD_START+87)
+#define SID_SCALE                           TypedWhichId<SfxStringItem>(SID_SD_START+85)
+#define SID_STATUS_PAGE                     TypedWhichId<SfxStringItem>(SID_SD_START+86)
+#define SID_STATUS_LAYOUT                   TypedWhichId<SfxStringItem>(SID_SD_START+87)
 #define SID_STATUS_SELMODE                  (SID_SD_START+88)
 // In sfxsids.hrc: SID_MODIFIED              TypedWhichId<SfxBoolItem>(SID_SD_START+89)
 #define SID_OBJECT_CROOK_ROTATE             (SID_SD_START+90)
@@ -165,7 +165,7 @@
     // FREE
 // In svxids.hrc:  SID_INSERT_MATH              (SID_SD_START+106)
 #define SID_OBJECT_SHEAR                    (SID_SD_START+107)
-#define SID_DELETE_SNAPITEM                 (SID_SD_START+108)
+#define SID_DELETE_SNAPITEM                 TypedWhichId<SfxStringItem>(SID_SD_START+108)
 #define SID_OBJECT_CLOSE                    (SID_SD_START+109)
 #define SID_ANIMATOR_ADD                    (SID_SD_START+110)
 #define SID_ANIMATOR_CREATE                 (SID_SD_START+111)
@@ -252,7 +252,7 @@
 #define ID_VAL_PAGELEFT                     (SID_SD_START+222)
 #define ID_VAL_PAGERIGHT                    (SID_SD_START+223)
 #define ID_VAL_SCALEOBJECTS                 (SID_SD_START+224)
-#define ID_VAL_PAGENAME                     (SID_SD_START+225)
+#define ID_VAL_PAGENAME                     TypedWhichId<SfxStringItem>(SID_SD_START+225)
 #define ID_VAL_WHATLAYOUT                   (SID_SD_START+226)
 #define ID_VAL_ISPAGEBACK                   (SID_SD_START+227)
 #define ID_VAL_ISPAGEOBJ                    (SID_SD_START+228)
@@ -312,12 +312,12 @@
 #define SID_PAGES_PER_ROW                   (SID_SD_START+284)
 #define SID_TEXT_FITTOSIZE                  (SID_SD_START+285)
 // In svxids.hrc: SID_TEXT_FITTOSIZE_VERTICAL   (SID_SD_START+286)
-#define SID_NAVIGATOR_PAGENAME              (SID_SD_START+287)
+#define SID_NAVIGATOR_PAGENAME              TypedWhichId<SfxStringItem>(SID_SD_START+287)
 #define SID_NAVIGATOR_STATE                 (SID_SD_START+288)
 #define SID_NAVIGATOR_INIT                  (SID_SD_START+289)
     // FREE
 #define SID_NAVIGATOR_PAGE                  (SID_SD_START+292)
-#define SID_NAVIGATOR_OBJECT                (SID_SD_START+293)
+#define SID_NAVIGATOR_OBJECT                TypedWhichId<SfxStringItem>(SID_SD_START+293)
 #define SID_ANIMATOR_INIT                   (SID_SD_START+294)
 #define SID_DRAWTBX_3D_OBJECTS              (SID_SD_START+295)
 #define SID_3D_CUBE                         (SID_SD_START+296)
diff --git a/sd/inc/sdattr.hrc b/sd/inc/sdattr.hrc
index 73ba06f69a60..958ab13e7fb2 100644
--- a/sd/inc/sdattr.hrc
+++ b/sd/inc/sdattr.hrc
@@ -22,24 +22,25 @@
 #include <svl/solar.hrc>
 
 class SdOptionsPrintItem;
+class SfxStringItem;
 class XColorItem;
 
 // Layer attributes
 #define ATTR_LAYER_START        SID_SD_START + 1234
-#define ATTR_LAYER_NAME         ATTR_LAYER_START
+#define ATTR_LAYER_NAME         TypedWhichId<SfxStringItem>(ATTR_LAYER_START)
 #define ATTR_LAYER_VISIBLE      ATTR_LAYER_START + 1
 #define ATTR_LAYER_PRINTABLE    ATTR_LAYER_START + 2
 #define ATTR_LAYER_LOCKED       ATTR_LAYER_START + 3
 #define ATTR_LAYER_THISPAGE     ATTR_LAYER_START + 4
-#define ATTR_LAYER_TITLE        ATTR_LAYER_START + 5
-#define ATTR_LAYER_DESC         ATTR_LAYER_START + 6
+#define ATTR_LAYER_TITLE        TypedWhichId<SfxStringItem>(ATTR_LAYER_START + 5)
+#define ATTR_LAYER_DESC         TypedWhichId<SfxStringItem>(ATTR_LAYER_START + 6)
 #define ATTR_LAYER_END          ATTR_LAYER_DESC
 
 // presentation attributes
 #define ATTR_PRESENT_START                   ATTR_LAYER_END + 1
 #define ATTR_PRESENT_ALL                     ATTR_PRESENT_START
 #define ATTR_PRESENT_CUSTOMSHOW              ATTR_PRESENT_START + 1
-#define ATTR_PRESENT_DIANAME                 ATTR_PRESENT_START + 2
+#define ATTR_PRESENT_DIANAME                 TypedWhichId<SfxStringItem>(ATTR_PRESENT_START + 2)
 #define ATTR_PRESENT_ENDLESS                 ATTR_PRESENT_START + 3
 #define ATTR_PRESENT_MANUEL                  ATTR_PRESENT_START + 4
 #define ATTR_PRESENT_MOUSE                   ATTR_PRESENT_START + 5
@@ -65,7 +66,7 @@ class XColorItem;
 #define ATTR_ANIMATION_FADEOUT          ATTR_ANIMATION_START + 4
 #define ATTR_ANIMATION_COLOR            ATTR_ANIMATION_START + 5
 #define ATTR_ANIMATION_SOUNDON          ATTR_ANIMATION_START + 6
-#define ATTR_ANIMATION_SOUNDFILE        ATTR_ANIMATION_START + 7
+#define ATTR_ANIMATION_SOUNDFILE        TypedWhichId<SfxStringItem>(ATTR_ANIMATION_START + 7)
 #define ATTR_ANIMATION_PLAYFULL         ATTR_ANIMATION_START + 8
 #define ATTR_ANIMATION_TEXTEFFECT       ATTR_ANIMATION_START + 10
 #define ATTR_ANIMATION_END              ATTR_ANIMATION_TEXTEFFECT
@@ -74,7 +75,7 @@ class XColorItem;
 #define ATTR_ACTION                     ATTR_ACTION_START
 #define ATTR_ACTION_EFFECT              ATTR_ACTION_START + 1
 #define ATTR_ACTION_EFFECTSPEED         ATTR_ACTION_START + 2
-#define ATTR_ACTION_FILENAME            ATTR_ACTION_START + 3
+#define ATTR_ACTION_FILENAME            TypedWhichId<SfxStringItem>(ATTR_ACTION_START + 3)
 #define ATTR_ACTION_SOUNDON             ATTR_ACTION_START + 4
 #define ATTR_ACTION_PLAYFULL            ATTR_ACTION_START + 5
 #define ATTR_ACTION_END                 ATTR_ACTION_PLAYFULL
diff --git a/sd/source/ui/dlg/layeroptionsdlg.cxx b/sd/source/ui/dlg/layeroptionsdlg.cxx
index a70c71f47c54..fae355ae97cb 100644
--- a/sd/source/ui/dlg/layeroptionsdlg.cxx
+++ b/sd/source/ui/dlg/layeroptionsdlg.cxx
@@ -35,9 +35,9 @@ SdInsertLayerDlg::SdInsertLayerDlg(weld::Window* pWindow, const SfxItemSet& rInA
 {
     m_xDialog->set_title(rStr);
 
-    m_xEdtName->set_text( static_cast<const SfxStringItem&>( rInAttrs.Get( ATTR_LAYER_NAME ) ).GetValue() );
-    m_xEdtTitle->set_text( static_cast<const SfxStringItem&>( rInAttrs.Get( ATTR_LAYER_TITLE ) ).GetValue() );
-    m_xEdtDesc->set_text( static_cast<const SfxStringItem&>( rInAttrs.Get( ATTR_LAYER_DESC ) ).GetValue() );
+    m_xEdtName->set_text( rInAttrs.Get( ATTR_LAYER_NAME ).GetValue() );
+    m_xEdtTitle->set_text( rInAttrs.Get( ATTR_LAYER_TITLE ).GetValue() );
+    m_xEdtDesc->set_text( rInAttrs.Get( ATTR_LAYER_DESC ).GetValue() );
     m_xEdtDesc->set_size_request(-1, m_xEdtDesc->get_height_rows(4));
     m_xCbxVisible->set_active( static_cast<const SfxBoolItem&>( rInAttrs.Get( ATTR_LAYER_VISIBLE ) ).GetValue() );
     m_xCbxPrintable->set_active( static_cast<const SfxBoolItem&>( rInAttrs.Get( ATTR_LAYER_PRINTABLE ) ).GetValue() );
diff --git a/sd/source/ui/dlg/present.cxx b/sd/source/ui/dlg/present.cxx
index cb5c7d871b36..ad5fd2260a6d 100644
--- a/sd/source/ui/dlg/present.cxx
+++ b/sd/source/ui/dlg/present.cxx
@@ -106,7 +106,7 @@ SdStartPresentationDlg::SdStartPresentationDlg(weld::Window* pWindow, const SfxI
     else
         m_xRbtAtDia->set_active(true);
 
-    m_xLbDias->set_active_text( static_cast<const SfxStringItem&>( rOutAttrs.Get( ATTR_PRESENT_DIANAME ) ).GetValue() );
+    m_xLbDias->set_active_text( rOutAttrs.Get( ATTR_PRESENT_DIANAME ).GetValue() );
     m_xCbxManuel->set_active( static_cast<const SfxBoolItem&>( rOutAttrs.Get( ATTR_PRESENT_MANUEL ) ).GetValue() );
     m_xCbxMousepointer->set_active( static_cast<const SfxBoolItem&>( rOutAttrs.Get( ATTR_PRESENT_MOUSE ) ).GetValue() );
     m_xCbxPen->set_active( static_cast<const SfxBoolItem&>( rOutAttrs.Get( ATTR_PRESENT_PEN ) ).GetValue() );
diff --git a/sd/source/ui/dlg/tpaction.cxx b/sd/source/ui/dlg/tpaction.cxx
index f89fa51f5b5d..ed2690ebdbd7 100644
--- a/sd/source/ui/dlg/tpaction.cxx
+++ b/sd/source/ui/dlg/tpaction.cxx
@@ -299,7 +299,7 @@ void SdTPAction::Reset( const SfxItemSet* rAttrs )
     // m_xEdtSound
     if( rAttrs->GetItemState( ATTR_ACTION_FILENAME ) != SfxItemState::DONTCARE )
     {
-            aFileName = static_cast<const SfxStringItem&>( rAttrs->Get( ATTR_ACTION_FILENAME ) ).GetValue();
+            aFileName = rAttrs->Get( ATTR_ACTION_FILENAME ).GetValue();
             SetEditText( aFileName );
     }
 
diff --git a/sd/source/ui/func/fuoaprms.cxx b/sd/source/ui/func/fuoaprms.cxx
index 0feaabfb4736..b0de894dc194 100644
--- a/sd/source/ui/func/fuoaprms.cxx
+++ b/sd/source/ui/func/fuoaprms.cxx
@@ -517,7 +517,7 @@ void FuObjectAnimationParameters::DoExecute( SfxRequest& rReq )
 
     if (pArgs->GetItemState(ATTR_ANIMATION_SOUNDFILE) == SfxItemState::SET)
     {
-        aSound = static_cast<const SfxStringItem&>(pArgs->Get(ATTR_ANIMATION_SOUNDFILE)).GetValue();
+        aSound = pArgs->Get(ATTR_ANIMATION_SOUNDFILE).GetValue();
         nSoundFileSet = ATTR_SET;
     }
     else
@@ -550,8 +550,7 @@ void FuObjectAnimationParameters::DoExecute( SfxRequest& rReq )
 
     if (pArgs->GetItemState(ATTR_ACTION_FILENAME) == SfxItemState::SET)
     {
-        aBookmark = static_cast<const SfxStringItem&>(pArgs->
-                        Get(ATTR_ACTION_FILENAME)).GetValue();
+        aBookmark = pArgs->Get(ATTR_ACTION_FILENAME).GetValue();
         nBookmarkSet = ATTR_SET;
     }
     else
diff --git a/sd/source/ui/func/fuprobjs.cxx b/sd/source/ui/func/fuprobjs.cxx
index 6042d1fbc881..32ec8f890b73 100644
--- a/sd/source/ui/func/fuprobjs.cxx
+++ b/sd/source/ui/func/fuprobjs.cxx
@@ -73,7 +73,7 @@ void FuPresentationObjects::DoExecute( SfxRequest& )
        if not, it is not allowed to edit the templates */
     SfxItemSetFixed<SID_STATUS_LAYOUT, SID_STATUS_LAYOUT> aSet(mpDoc->GetItemPool() );
     pOutlineViewShell->GetStatusBarState( aSet );
-    OUString aLayoutName = static_cast<const SfxStringItem&>(aSet.Get(SID_STATUS_LAYOUT)).GetValue();
+    OUString aLayoutName = aSet.Get(SID_STATUS_LAYOUT).GetValue();
     DBG_ASSERT(!aLayoutName.isEmpty(), "Layout not defined");
 
     bool    bUnique = false;
diff --git a/sd/source/ui/func/fusldlg.cxx b/sd/source/ui/func/fusldlg.cxx
index f609da1a9631..882d9c85af9a 100644
--- a/sd/source/ui/func/fusldlg.cxx
+++ b/sd/source/ui/func/fusldlg.cxx
@@ -129,7 +129,7 @@ void FuSlideShowDlg::DoExecute( SfxRequest& )
 
     if (!rPresentationSettings.mbAll)
     {
-        OUString aPage = ITEMVALUE( aDlgSet, ATTR_PRESENT_DIANAME, SfxStringItem );
+        OUString aPage = aDlgSet.Get(ATTR_PRESENT_DIANAME).GetValue();
         if( aPage != rPresentationSettings.maPresPage )
         {
             bValuesChanged = true;
diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx
index 348c4ec1fb9f..aecd672e78fa 100644
--- a/sd/source/ui/view/drviews2.cxx
+++ b/sd/source/ui/view/drviews2.cxx
@@ -1965,7 +1965,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
                 while( bLoop && pDlg->Execute() == RET_OK )
                 {
                     pDlg->GetAttr( aNewAttr );
-                    aLayerName   = static_cast<const SfxStringItem &>( aNewAttr.Get (ATTR_LAYER_NAME)).GetValue ();
+                    aLayerName   = aNewAttr.Get(ATTR_LAYER_NAME).GetValue ();
 
                     if( rLayerAdmin.GetLayer( aLayerName )
                         || aLayerName.isEmpty()
@@ -1989,8 +1989,8 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
                 }
                 else
                 {
-                    aLayerTitle  = static_cast<const SfxStringItem &>( aNewAttr.Get (ATTR_LAYER_TITLE)).GetValue ();
-                    aLayerDesc   = static_cast<const SfxStringItem &>( aNewAttr.Get (ATTR_LAYER_DESC)).GetValue ();
+                    aLayerTitle  = aNewAttr.Get(ATTR_LAYER_TITLE).GetValue();
+                    aLayerDesc   = aNewAttr.Get(ATTR_LAYER_DESC).GetValue ();
                     bIsVisible   = static_cast<const SfxBoolItem &>( aNewAttr.Get (ATTR_LAYER_VISIBLE)).GetValue ();
                     bIsLocked    = static_cast<const SfxBoolItem &>( aNewAttr.Get (ATTR_LAYER_LOCKED)).GetValue () ;
                     bIsPrintable = static_cast<const SfxBoolItem &>( aNewAttr.Get (ATTR_LAYER_PRINTABLE)).GetValue () ;
@@ -2122,7 +2122,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
                     if (nRet != RET_OK)
                         break;
                     pDlg->GetAttr( aNewAttr );
-                    aLayerName   = static_cast<const SfxStringItem &>( aNewAttr.Get (ATTR_LAYER_NAME)).GetValue ();
+                    aLayerName   = aNewAttr.Get(ATTR_LAYER_NAME).GetValue ();
                     if (bDelete)
                     {
                         if( (rLayerAdmin.GetLayer( aLayerName ) && aLayerName != aOldLayerName)
@@ -2145,8 +2145,8 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
                 switch (nRet)
                 {
                     case RET_OK :
-                        aLayerTitle  = static_cast<const SfxStringItem &>( aNewAttr.Get (ATTR_LAYER_TITLE)).GetValue ();
-                        aLayerDesc   = static_cast<const SfxStringItem &>( aNewAttr.Get (ATTR_LAYER_DESC)).GetValue ();
+                        aLayerTitle  = aNewAttr.Get(ATTR_LAYER_TITLE).GetValue ();
+                        aLayerDesc   = aNewAttr.Get(ATTR_LAYER_DESC).GetValue ();
                         bIsVisible   = static_cast<const SfxBoolItem &>( aNewAttr.Get (ATTR_LAYER_VISIBLE)).GetValue ();
                         bIsLocked    = static_cast<const SfxBoolItem &>( aNewAttr.Get (ATTR_LAYER_LOCKED)).GetValue ();
                         bIsPrintable = static_cast<const SfxBoolItem &>( aNewAttr.Get (ATTR_LAYER_PRINTABLE)).GetValue ();
diff --git a/sd/source/ui/view/drviewsd.cxx b/sd/source/ui/view/drviewsd.cxx
index 31fe06dde0df..59b040e68b97 100644
--- a/sd/source/ui/view/drviewsd.cxx
+++ b/sd/source/ui/view/drviewsd.cxx
@@ -123,8 +123,7 @@ void DrawViewShell::ExecNavigatorWin( SfxRequest& rReq )
             {
                 OUString aBookmarkStr("#");
                 const SfxItemSet* pArgs = rReq.GetArgs();
-                OUString aTarget = static_cast<const SfxStringItem&>( pArgs->
-                                 Get(SID_NAVIGATOR_OBJECT)).GetValue();
+                OUString aTarget = pArgs->Get(SID_NAVIGATOR_OBJECT).GetValue();
                 aBookmarkStr += aTarget;
                 SfxStringItem aStrItem(SID_FILE_NAME, aBookmarkStr);
                 SfxStringItem aReferer(SID_REFERER, GetDocSh()->GetMedium()->GetName());
diff --git a/sd/source/ui/view/drviewse.cxx b/sd/source/ui/view/drviewse.cxx
index 5a6a7577951e..5c74a0f50b10 100644
--- a/sd/source/ui/view/drviewse.cxx
+++ b/sd/source/ui/view/drviewse.cxx
@@ -117,7 +117,7 @@ static void ImpAddPrintableCharactersToTextEdit(SfxRequest const & rReq, ::sd::V
     OUString aInputString;
 
     if(SfxItemState::SET == pSet->GetItemState(SID_ATTR_CHAR))
-        aInputString = static_cast<const SfxStringItem&>(pSet->Get(SID_ATTR_CHAR)).GetValue();
+        aInputString = pSet->Get(SID_ATTR_CHAR).GetValue();
 
     if(aInputString.isEmpty())
         return;
diff --git a/sd/source/ui/view/outlnvsh.cxx b/sd/source/ui/view/outlnvsh.cxx
index 8add43b4ad4b..43117897da5a 100644
--- a/sd/source/ui/view/outlnvsh.cxx
+++ b/sd/source/ui/view/outlnvsh.cxx
@@ -409,7 +409,7 @@ void OutlineViewShell::FuSupport(SfxRequest &rReq)
         GetDocSh()->SetStyleFamily(static_cast<SfxStyleFamily>(rReq.GetArgs()->Get( SID_STYLE_FAMILY ).GetValue()));
 
     bool bPreviewState = false;
-    sal_uLong nSlot = rReq.GetSlot();
+    sal_uInt16 nSlot = rReq.GetSlot();
 
     std::unique_ptr<OutlineViewModelChangeGuard, o3tl::default_delete<OutlineViewModelChangeGuard>> aGuard;
     if( pOlView && (
@@ -820,7 +820,7 @@ void OutlineViewShell::GetMenuState( SfxItemSet &rSet )
     // if not, the templates must not be edited
     SfxItemSetFixed<SID_STATUS_LAYOUT, SID_STATUS_LAYOUT> aSet(*rSet.GetPool());
     GetStatusBarState(aSet);
-    OUString aTest = static_cast<const SfxStringItem&>(aSet.Get(SID_STATUS_LAYOUT)).GetValue();
+    OUString aTest = aSet.Get(SID_STATUS_LAYOUT).GetValue();
     if (aTest.isEmpty())
     {
         bUnique = false;
@@ -1468,7 +1468,7 @@ void OutlineViewShell::GetAttrState( SfxItemSet& rSet )
                 {
                     SfxItemSetFixed<SID_STATUS_LAYOUT, SID_STATUS_LAYOUT> aSet(*rSet.GetPool());
                     GetStatusBarState(aSet);
-                    OUString aRealStyle = static_cast<const SfxStringItem&>(aSet.Get(SID_STATUS_LAYOUT)).GetValue();
+                    OUString aRealStyle = aSet.Get(SID_STATUS_LAYOUT).GetValue();
                     if (aRealStyle.isEmpty())
                     {
                         // no unique layout name found