const_cast: convert some C-style casts and remove some redundant ones

Change-Id: I302db31913a60a677b8dc226e48bd8f43b055a1e

7 files changed, 9 insertions, 10 deletions

diff --git a/cui/source/dialogs/hltpbase.cxx b/cui/source/dialogs/hltpbase.cxx
index c8e4683b2fa5..92c9703cc7f5 100644
--- a/cui/source/dialogs/hltpbase.cxx
+++ b/cui/source/dialogs/hltpbase.cxx
@@ -369,7 +369,7 @@ SvxMacroTableDtor* SvxHyperlinkTabPageBase::GetMacroTable()
     const SvxHyperlinkItem *pHyperlinkItem = static_cast<const SvxHyperlinkItem *>(
                                        GetItemSet().GetItem (SID_HYPERLINK_GETLINK));
 
-    return ( (SvxMacroTableDtor*)pHyperlinkItem->GetMacroTbl() );
+    return const_cast<SvxMacroTableDtor*>(pHyperlinkItem->GetMacroTbl());
 }
 
 // try to detect the current protocol that is used in rStrURL
diff --git a/cui/source/dialogs/iconcdlg.cxx b/cui/source/dialogs/iconcdlg.cxx
index 9832ce92d329..f33f839d2527 100644
--- a/cui/source/dialogs/iconcdlg.cxx
+++ b/cui/source/dialogs/iconcdlg.cxx
@@ -230,7 +230,7 @@ IconChoiceDialog ::~IconChoiceDialog ()
             }
 
             if ( pData->bOnDemand )
-                delete (SfxItemSet*)&pData->pPage->GetItemSet();
+                delete &pData->pPage->GetItemSet();
             delete pData->pPage;
         }
         delete pData;
@@ -403,7 +403,7 @@ IMPL_LINK_NOARG(IconChoiceDialog, ResetHdl)
     {
         // CSet on AIS has problems here, therefore separated
         const SfxItemSet* _pSet = &( pData->pPage->GetItemSet() );
-        pData->pPage->Reset( *(SfxItemSet*)_pSet );
+        pData->pPage->Reset( *const_cast<SfxItemSet*>(_pSet) );
     }
     else
         pData->pPage->Reset( *pSet );
@@ -558,7 +558,7 @@ void IconChoiceDialog::ResetPageImpl ()
     {
         // CSet on AIS has problems here, therefore separated
         const SfxItemSet* _pSet = &pData->pPage->GetItemSet();
-        pData->pPage->Reset( *(SfxItemSet*)_pSet );
+        pData->pPage->Reset( *const_cast<SfxItemSet*>(_pSet) );
     }
     else
         pData->pPage->Reset( *pSet );
diff --git a/cui/source/dialogs/linkdlg.cxx b/cui/source/dialogs/linkdlg.cxx
index 2e60a3d6d0e8..b66020d1b9a7 100644
--- a/cui/source/dialogs/linkdlg.cxx
+++ b/cui/source/dialogs/linkdlg.cxx
@@ -632,7 +632,7 @@ void SvBaseLinksDlg::InsertEntry( const SvBaseLink& rLink, sal_uLong nPos, bool
 {
     OUString aEntry, sFileNm, sLinkNm, sTypeNm, sFilter;
 
-    pLinkMgr->GetDisplayNames( (SvBaseLink*)&rLink, &sTypeNm, &sFileNm, &sLinkNm, &sFilter );
+    pLinkMgr->GetDisplayNames( &rLink, &sTypeNm, &sFileNm, &sLinkNm, &sFilter );
 
     // GetTab(0) gives the position of the bitmap which is automatically inserted by the TabListBox.
     // So the first text column's width is Tab(2)-Tab(1).
diff --git a/cui/source/inc/iconcdlg.hxx b/cui/source/inc/iconcdlg.hxx
index 06d42ce6c2f0..8831eb65f3d0 100644
--- a/cui/source/inc/iconcdlg.hxx
+++ b/cui/source/inc/iconcdlg.hxx
@@ -165,7 +165,7 @@ protected :
 
     virtual void            PageCreated( sal_uInt16 nId, IconChoicePage& rPage );
     SfxItemSet*     CreateInputItemSet( sal_uInt16 nId );
-    inline SfxItemSet*      GetInputSetImpl() { return (SfxItemSet*)pSet; }
+    inline SfxItemSet*      GetInputSetImpl() { return const_cast<SfxItemSet*>(pSet); }
     inline IconChoicePage*  GetTabPage( sal_uInt16 nPageId )
                                 { return ( GetPageData (nPageId)->pPage?GetPageData (nPageId)->pPage:NULL); }
     void                    RefreshInputSet();
diff --git a/cui/source/options/cfgchart.cxx b/cui/source/options/cfgchart.cxx
index 8e18319a5c36..0e21077b6931 100644
--- a/cui/source/options/cfgchart.cxx
+++ b/cui/source/options/cfgchart.cxx
@@ -65,8 +65,7 @@ ColorData SvxChartColorTable::getColorData( size_t _nIndex ) const
         return COL_BLACK;
     }
 
-    // GetColor should be const but unfortunately isn't
-    return const_cast< XColorEntry & >( m_aColorEntries[ _nIndex ] ).GetColor().GetRGBColor();
+    return m_aColorEntries[ _nIndex ].GetColor().GetRGBColor();
 }
 
 // mutators
diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx
index 95a820f46f24..af67a18f11bf 100644
--- a/cui/source/tabpages/backgrnd.cxx
+++ b/cui/source/tabpages/backgrnd.cxx
@@ -539,7 +539,7 @@ void SvxBackgroundTabPage::Reset( const SfxItemSet* rSet )
     if ( pBgdAttr )
     {
         FillControls_Impl(*pBgdAttr, aUserData);
-        aBgdColor = ( (SvxBrushItem*)pBgdAttr )->GetColor();
+        aBgdColor = const_cast<SvxBrushItem*>(pBgdAttr)->GetColor();
     }
     else
     {
diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx
index c9a0f7cfcbc5..070763e07a99 100644
--- a/cui/source/tabpages/chardlg.cxx
+++ b/cui/source/tabpages/chardlg.cxx
@@ -1610,7 +1610,7 @@ bool SvxCharEffectsPage::FillItemSetColor_Impl( SfxItemSet& rSet )
 
     if ( !bChanged && pExampleSet &&
          pExampleSet->GetItemState( nWhich, false, reinterpret_cast<const SfxPoolItem**>(&pItem) ) == SfxItemState::SET &&
-         ( (SvxColorItem*)pItem )->GetValue() != aSelectedColor )
+         pItem->GetValue() != aSelectedColor )
         bChanged = true;
 
     bool bModified = false;