fdo#48253: Expand SAL_STATIC_CAST leftovers

Change-Id: Ibda77aa3010928513bd7d0b57a1d1045343607b5

6 files changed, 10 insertions, 15 deletions

diff --git a/binfilter/bf_sch/source/core/sch_chtmode2.cxx b/binfilter/bf_sch/source/core/sch_chtmode2.cxx
index 6dbbcc51c..2bd471aea 100644
--- a/binfilter/bf_sch/source/core/sch_chtmode2.cxx
+++ b/binfilter/bf_sch/source/core/sch_chtmode2.cxx
@@ -401,7 +401,7 @@ enum ChartStyleV0
 /*N*/                   if( bForceSolidLine )
 /*N*/                   {
 /*N*/                       XLineStyle eLineStyle =
-/*N*/                           SAL_STATIC_CAST( const XLineStyleItem *, &(pSymbolAttr->Get( XATTR_LINESTYLE )) )->GetValue(); // bug in Win-C++ compiler: casting to pointer
+/*N*/                           (static_cast< const XLineStyleItem * >( &(pSymbolAttr->Get( XATTR_LINESTYLE )) ))->GetValue(); // bug in Win-C++ compiler: casting to pointer
 /*N*/
 /*N*/                       if( eLineStyle == XLINE_NONE )
 /*N*/                       {
diff --git a/binfilter/bf_sch/source/core/sch_chtmode3.cxx b/binfilter/bf_sch/source/core/sch_chtmode3.cxx
index 272021cb1..599d8a3c0 100644
--- a/binfilter/bf_sch/source/core/sch_chtmode3.cxx
+++ b/binfilter/bf_sch/source/core/sch_chtmode3.cxx
@@ -62,8 +62,6 @@
 #define ITEMID_SIZE 0
 #include <bf_svx/sizeitem.hxx>
 #endif
-// header for SAL_STATIC_CAST
-#include <sal/types.h>
 
 #include <bf_svx/xlnedit.hxx>
 #include <bf_svx/xlnstit.hxx>
@@ -654,7 +652,7 @@ namespace binfilter {
 /*?*/           else        // rectangle with border, if linesytle is NONE
 /*?*/           {
 /*?*/               XLineStyle eLineStyle =
-/*?*/                   SAL_STATIC_CAST( const XLineStyleItem *, &(rSymbolAttr.Get( XATTR_LINESTYLE )) )->GetValue(); // bug in Win-C++ compiler: casting to pointer
+/*?*/                   (static_cast< const XLineStyleItem * >( &(rSymbolAttr.Get( XATTR_LINESTYLE )) ))->GetValue(); // bug in Win-C++ compiler: casting to pointer
 /*?*/
 /*?*/               if( eLineStyle == XLINE_NONE )            // clear items for defaults to take effect
 /*?*/               {
diff --git a/binfilter/bf_sch/source/ui/app/sch_schopt.cxx b/binfilter/bf_sch/source/ui/app/sch_schopt.cxx
index e1ddf9849..89a5283fc 100644
--- a/binfilter/bf_sch/source/ui/app/sch_schopt.cxx
+++ b/binfilter/bf_sch/source/ui/app/sch_schopt.cxx
@@ -27,9 +27,6 @@
  ************************************************************************/
 
 #include <com/sun/star/uno/Sequence.hxx>
-// header for SvStream
-// header for SAL_STATIC_CAST
-#include <sal/types.h>
 
 #include "schopt.hxx"
 
@@ -66,7 +63,7 @@ using namespace ::com::sun::star;
 
 /*N*/ XColorEntry* SchColorTable::Get( ULONG nKey ) const
 /*N*/ {
-/*N*/   return SAL_STATIC_CAST( XColorEntry*, Table::Get( nKey ) );
+/*N*/   return (static_cast< XColorEntry* >(Table::Get( nKey )) );
 /*N*/ }
 
 /*N*/ Color SchColorTable::GetColor( ULONG nKey ) const
@@ -145,7 +142,7 @@ using namespace ::com::sun::star;
 /*N*/       // set color values
 /*N*/       for( sal_Int32 i=0; i < nCount; i++ )
 /*N*/       {
-/*N*/           aCol.SetColor( SAL_STATIC_CAST( ColorData, aColorSeq[ i ] ));
+/*N*/           aCol.SetColor( (static_cast< ColorData >( aColorSeq[ i ] ) ));
 /*N*/
 /*N*/           aName = aPrefix;
 /*N*/           aName.Append( String::CreateFromInt32( i + 1 ));
diff --git a/binfilter/bf_sch/source/ui/unoidl/sch_ChXChartDocument.cxx b/binfilter/bf_sch/source/ui/unoidl/sch_ChXChartDocument.cxx
index f7bc3f35b..f6682efb4 100644
--- a/binfilter/bf_sch/source/ui/unoidl/sch_ChXChartDocument.cxx
+++ b/binfilter/bf_sch/source/ui/unoidl/sch_ChXChartDocument.cxx
@@ -1111,8 +1111,8 @@ uno::Reference< chart::XChartData > SAL_CALL ChXChartDocument::getData() throw(
     {
         uno::Reference< lang::XComponent > xComp( (static_cast< SfxBaseModel* >(this)));
         // XChartData is inherited twice
-        m_xChartData = SAL_STATIC_CAST( chart::XChartDataArray*,
-                                        new ChXChartDataArray( xComp, m_pModel ));
+        m_xChartData = (static_cast< chart::XChartDataArray* >(
+                                        new ChXChartDataArray( xComp, m_pModel )));
     }
 
     return m_xChartData;
diff --git a/binfilter/bf_sch/source/ui/unoidl/sch_ChXChartObject.cxx b/binfilter/bf_sch/source/ui/unoidl/sch_ChXChartObject.cxx
index 6db181b27..13d19e9ab 100644
--- a/binfilter/bf_sch/source/ui/unoidl/sch_ChXChartObject.cxx
+++ b/binfilter/bf_sch/source/ui/unoidl/sch_ChXChartObject.cxx
@@ -330,7 +330,7 @@ void SAL_CALL ChXChartObject::setPropertyValue( const ::rtl::OUString& aProperty
                         mpModel->SetLegendHasBeenMoved( FALSE );
                         // note: SetShowLegend sets pos to CHLEGEND_RIGHT
                         pSet->Put( SvxChartLegendPosItem(
-                            SAL_STATIC_CAST( SvxChartLegendPos, (static_cast< int >(ePos)))));
+                            (static_cast< SvxChartLegendPos >( (static_cast< int >(ePos))))));
                     }
                     break;
 
@@ -735,8 +735,8 @@ void SAL_CALL ChXChartObject::setPropertyValues (
                     mpModel->SetLegendHasBeenMoved (FALSE);
                     // note: SetShowLegend sets pos to CHLEGEND_RIGHT
                     aModifications.Put (SvxChartLegendPosItem (
-                        SAL_STATIC_CAST (SvxChartLegendPos,
-                            (static_cast< int >(ePos)))));
+                        (static_cast< SvxChartLegendPos >(
+                            (static_cast< int >(ePos))))));
                 }
                 break;
 
diff --git a/binfilter/bf_sch/source/ui/unoidl/sch_ChXDiagram.cxx b/binfilter/bf_sch/source/ui/unoidl/sch_ChXDiagram.cxx
index 3cc842eeb..a488d30a1 100644
--- a/binfilter/bf_sch/source/ui/unoidl/sch_ChXDiagram.cxx
+++ b/binfilter/bf_sch/source/ui/unoidl/sch_ChXDiagram.cxx
@@ -252,7 +252,7 @@ uno::Any ChXDiagram::GetAnyByItem( SfxItemSet& aSet, const SfxItemPropertyMap* p
     {
         case CHATTR_DATA_SWITCH:    // BM: SwitchData is enum now
             {
-                sal_Bool bIsOn = SAL_STATIC_CAST( const SfxBoolItem&, aSet.Get( CHATTR_DATA_SWITCH ) ).GetValue();
+                sal_Bool bIsOn = (static_cast< const SfxBoolItem& >( aSet.Get( CHATTR_DATA_SWITCH ) )).GetValue();
                 chart::ChartDataRowSource eRowSource =
                     bIsOn ? chart::ChartDataRowSource_COLUMNS : chart::ChartDataRowSource_ROWS;
                 aAny <<= eRowSource;