More loplugin:cstylecast: toolkit

auto-rewrite with <https://gerrit.libreoffice.org/#/c/47798/> "Enable
loplugin:cstylecast for some more cases" plus
solenv/clang-format/reformat-formatted-files

Change-Id: Iaee0fee0cbc6e5311342b83d847cb89bd1056973

28 files changed, 181 insertions, 182 deletions

diff --git a/toolkit/source/awt/scrollabledialog.cxx b/toolkit/source/awt/scrollabledialog.cxx
index 230d53e14471..0a808114a17f 100644
--- a/toolkit/source/awt/scrollabledialog.cxx
+++ b/toolkit/source/awt/scrollabledialog.cxx
@@ -112,7 +112,7 @@ void ScrollableDialog::lcl_Scroll( long nX, long nY )
 
 IMPL_LINK( ScrollableDialog, ScrollBarHdl, ScrollBar*, pSB, void )
 {
-    sal_uInt16 nPos = (sal_uInt16) pSB->GetThumbPos();
+    sal_uInt16 nPos = static_cast<sal_uInt16>(pSB->GetThumbPos());
     if( pSB == maVScrollBar.get() )
         lcl_Scroll(mnScrollPos.X(), nPos );
     else if( pSB == maHScrollBar.get() )
diff --git a/toolkit/source/awt/vclxaccessiblecomponent.cxx b/toolkit/source/awt/vclxaccessiblecomponent.cxx
index fde43fd16a89..a94714d51096 100644
--- a/toolkit/source/awt/vclxaccessiblecomponent.cxx
+++ b/toolkit/source/awt/vclxaccessiblecomponent.cxx
@@ -503,7 +503,7 @@ uno::Reference< accessibility::XAccessible > VCLXAccessibleComponent::getAccessi
     uno::Reference< accessibility::XAccessible > xAcc;
     if ( GetWindow() )
     {
-        vcl::Window* pChild = GetWindow()->GetAccessibleChildWindow( (sal_uInt16)i );
+        vcl::Window* pChild = GetWindow()->GetAccessibleChildWindow( static_cast<sal_uInt16>(i) );
         if ( pChild )
             xAcc = pChild->GetAccessible();
     }
@@ -735,7 +735,7 @@ sal_Int32 SAL_CALL VCLXAccessibleComponent::getForeground(  )
                 aFont = pWindow->GetFont();
             nColor = aFont.GetColor().GetColor();
             // COL_AUTO is not very meaningful for AT
-            if ( nColor == (sal_Int32)COL_AUTO)
+            if ( nColor == sal_Int32(COL_AUTO))
                 nColor = pWindow->GetTextColor().GetColor();
         }
     }
diff --git a/toolkit/source/awt/vclxcontainer.cxx b/toolkit/source/awt/vclxcontainer.cxx
index 3e86c74d1c50..27be3f5e6c98 100644
--- a/toolkit/source/awt/vclxcontainer.cxx
+++ b/toolkit/source/awt/vclxcontainer.cxx
@@ -128,7 +128,7 @@ void VCLXContainer::setTabOrder( const css::uno::Sequence< css::uno::Reference<
     SolarMutexGuard aGuard;
 
     sal_uInt32 nCount = Components.getLength();
-    DBG_ASSERT( nCount == (sal_uInt32)Tabs.getLength(), "setTabOrder: TabCount != ComponentCount" );
+    DBG_ASSERT( nCount == static_cast<sal_uInt32>(Tabs.getLength()), "setTabOrder: TabCount != ComponentCount" );
     const css::uno::Reference< css::awt::XWindow > * pComps = Components.getConstArray();
     const css::uno::Any* pTabs = Tabs.getConstArray();
 
diff --git a/toolkit/source/awt/vclxgraphics.cxx b/toolkit/source/awt/vclxgraphics.cxx
index 6d8559b25820..a250142a5952 100644
--- a/toolkit/source/awt/vclxgraphics.cxx
+++ b/toolkit/source/awt/vclxgraphics.cxx
@@ -192,28 +192,28 @@ void VCLXGraphics::setTextColor( sal_Int32 nColor )
 {
     SolarMutexGuard aGuard;
 
-    maTextColor = Color( (sal_uInt32)nColor );
+    maTextColor = Color( static_cast<sal_uInt32>(nColor) );
 }
 
 void VCLXGraphics::setTextFillColor( sal_Int32 nColor )
 {
     SolarMutexGuard aGuard;
 
-    maTextFillColor = Color( (sal_uInt32)nColor );
+    maTextFillColor = Color( static_cast<sal_uInt32>(nColor) );
 }
 
 void VCLXGraphics::setLineColor( sal_Int32 nColor )
 {
     SolarMutexGuard aGuard;
 
-    maLineColor = Color( (sal_uInt32)nColor );
+    maLineColor = Color( static_cast<sal_uInt32>(nColor) );
 }
 
 void VCLXGraphics::setFillColor( sal_Int32 nColor )
 {
     SolarMutexGuard aGuard;
 
-    maFillColor = Color( (sal_uInt32)nColor );
+    maFillColor = Color( static_cast<sal_uInt32>(nColor) );
 }
 
 void VCLXGraphics::setRasterOp( awt::RasterOperation eROP )
@@ -310,14 +310,14 @@ void VCLXGraphics::draw( const uno::Reference< awt::XDisplayBitmap >& rxBitmapHa
 
         if(nDestWidth != nSourceWidth)
         {
-            float zoomX = (float)nDestWidth / (float)nSourceWidth;
-            aSz.Width() = (long) ((float)aSz.Width() * zoomX);
+            float zoomX = static_cast<float>(nDestWidth) / static_cast<float>(nSourceWidth);
+            aSz.Width() = static_cast<long>(static_cast<float>(aSz.Width()) * zoomX);
         }
 
         if(nDestHeight != nSourceHeight)
         {
-            float zoomY = (float)nDestHeight / (float)nSourceHeight;
-            aSz.Height() = (long) ((float)aSz.Height() * zoomY);
+            float zoomY = static_cast<float>(nDestHeight) / static_cast<float>(nSourceHeight);
+            aSz.Height() = static_cast<long>(static_cast<float>(aSz.Height()) * zoomY);
         }
 
         if(nSourceX || nSourceY || aSz.Width() != nSourceWidth || aSz.Height() != nSourceHeight)
@@ -400,7 +400,7 @@ void VCLXGraphics::drawPolyPolygon( const uno::Sequence< uno::Sequence< sal_Int3
     if( mpOutputDevice )
     {
         InitOutputDevice( InitOutDevFlags::COLORS );
-        sal_uInt16 nPolys = (sal_uInt16) DataX.getLength();
+        sal_uInt16 nPolys = static_cast<sal_uInt16>(DataX.getLength());
         tools::PolyPolygon aPolyPoly( nPolys );
         for ( sal_uInt16 n = 0; n < nPolys; n++ )
             aPolyPoly[n] = VCLUnoHelper::CreatePolygon( DataX.getConstArray()[n], DataY.getConstArray()[n] );
diff --git a/toolkit/source/awt/vclxmenu.cxx b/toolkit/source/awt/vclxmenu.cxx
index 93e78e301e2c..741f38dffdaa 100644
--- a/toolkit/source/awt/vclxmenu.cxx
+++ b/toolkit/source/awt/vclxmenu.cxx
@@ -322,11 +322,11 @@ void VCLXMenu::removeItem(
     if (!mpMenu)
         return;
 
-    sal_Int32 nItemCount = (sal_Int32)mpMenu->GetItemCount();
+    sal_Int32 nItemCount = static_cast<sal_Int32>(mpMenu->GetItemCount());
     if ( ( nCount > 0 ) && ( nPos >= 0 ) && ( nPos < nItemCount ) && ( nItemCount > 0 ))
     {
         sal_Int16 nP = sal::static_int_cast< sal_Int16 >(
-            std::min( (int)(nPos+nCount), (int)nItemCount ));
+            std::min( static_cast<int>(nPos+nCount), static_cast<int>(nItemCount) ));
         while( nP-nPos > 0 )
             mpMenu->RemoveItem( --nP );
     }
@@ -603,7 +603,7 @@ namespace
     {
         css::awt::KeyEvent aAWTKey;
         aAWTKey.Modifiers = 0;
-        aAWTKey.KeyCode   = (sal_Int16)aVCLKey.GetCode();
+        aAWTKey.KeyCode   = static_cast<sal_Int16>(aVCLKey.GetCode());
 
         if (aVCLKey.IsShift())
             aAWTKey.Modifiers |= css::awt::KeyModifier::SHIFT;
@@ -623,7 +623,7 @@ namespace
         bool bMod1  = ((aAWTKey.Modifiers & css::awt::KeyModifier::MOD1 ) == css::awt::KeyModifier::MOD1  );
         bool bMod2  = ((aAWTKey.Modifiers & css::awt::KeyModifier::MOD2 ) == css::awt::KeyModifier::MOD2  );
         bool bMod3  = ((aAWTKey.Modifiers & css::awt::KeyModifier::MOD3 ) == css::awt::KeyModifier::MOD3  );
-        sal_uInt16   nKey   = (sal_uInt16)aAWTKey.KeyCode;
+        sal_uInt16   nKey   = static_cast<sal_uInt16>(aAWTKey.KeyCode);
 
         return vcl::KeyCode(nKey, bShift, bMod1, bMod2, bMod3);
     }
diff --git a/toolkit/source/awt/vclxspinbutton.cxx b/toolkit/source/awt/vclxspinbutton.cxx
index a6aef4795ba4..2288524e8496 100644
--- a/toolkit/source/awt/vclxspinbutton.cxx
+++ b/toolkit/source/awt/vclxspinbutton.cxx
@@ -311,8 +311,7 @@ namespace toolkit
                 break;
 
             case BASEPROPERTY_ORIENTATION:
-                aReturn <<= (sal_Int32)
-                    (   ( 0 != ( GetWindow()->GetStyle() & WB_HSCROLL ) )
+                aReturn <<= static_cast<sal_Int32>(   ( 0 != ( GetWindow()->GetStyle() & WB_HSCROLL ) )
                     ?   ScrollBarOrientation::HORIZONTAL
                     :   ScrollBarOrientation::VERTICAL
                     );
diff --git a/toolkit/source/awt/vclxtoolkit.cxx b/toolkit/source/awt/vclxtoolkit.cxx
index 744306d01ec9..2dc9dd02eccb 100644
--- a/toolkit/source/awt/vclxtoolkit.cxx
+++ b/toolkit/source/awt/vclxtoolkit.cxx
@@ -1329,7 +1329,7 @@ css::uno::Sequence< css::uno::Reference< css::awt::XWindowPeer > > VCLXToolkit::
 
         if ( aDescr.ParentIndex == -1 )
             aDescr.Parent = nullptr;
-        else if ( ( aDescr.ParentIndex >= 0 ) && ( aDescr.ParentIndex < (short)n ) )
+        else if ( ( aDescr.ParentIndex >= 0 ) && ( aDescr.ParentIndex < static_cast<short>(n) ) )
             aDescr.Parent = aSeq.getConstArray()[aDescr.ParentIndex];
         aSeq.getArray()[n] = createWindow( aDescr );
     }
diff --git a/toolkit/source/awt/vclxtopwindow.cxx b/toolkit/source/awt/vclxtopwindow.cxx
index 17d79d7bfecd..69330da50fa6 100644
--- a/toolkit/source/awt/vclxtopwindow.cxx
+++ b/toolkit/source/awt/vclxtopwindow.cxx
@@ -227,7 +227,7 @@ void SAL_CALL VCLXTopWindow_Base::setDisplay( ::sal_Int32 _display )
 {
     SolarMutexGuard aGuard;
 
-    if ( ( _display < 0 ) || ( _display >= (sal_Int32)Application::GetScreenCount() ) )
+    if ( ( _display < 0 ) || ( _display >= static_cast<sal_Int32>(Application::GetScreenCount()) ) )
         throw IndexOutOfBoundsException();
 
     SystemWindow* pWindow = dynamic_cast< SystemWindow* >( GetWindowImpl() );
diff --git a/toolkit/source/awt/vclxwindow.cxx b/toolkit/source/awt/vclxwindow.cxx
index f0a3cd605588..fb1fdb11a1cb 100644
--- a/toolkit/source/awt/vclxwindow.cxx
+++ b/toolkit/source/awt/vclxwindow.cxx
@@ -1137,7 +1137,7 @@ void VCLXWindow::setBackground( sal_Int32 nColor )
 
     if ( GetWindow() )
     {
-        Color aColor( (sal_uInt32)nColor );
+        Color aColor( static_cast<sal_uInt32>(nColor) );
         GetWindow()->SetBackground( aColor );
         GetWindow()->SetControlBackground( aColor );
 
@@ -1211,7 +1211,7 @@ void VCLXWindow::setForeground( sal_Int32 nColor )
 
     if ( GetWindow() )
     {
-        Color aColor( (sal_uInt32)nColor );
+        Color aColor( static_cast<sal_uInt32>(nColor) );
         GetWindow()->SetControlForeground( aColor );
     }
 }
@@ -1282,7 +1282,7 @@ void VCLXWindow::PushPropertyIds( std::vector< sal_uInt16 > &rIds,
 
     for ( int nId = nFirstId; nId != BASEPROPERTY_NOTFOUND;
           nId = va_arg( pVarArgs, int ) )
-        rIds.push_back( (sal_uInt16) nId );
+        rIds.push_back( static_cast<sal_uInt16>(nId) );
 
     va_end( pVarArgs );
 }
@@ -2001,10 +2001,10 @@ css::uno::Any VCLXWindow::getProperty( const OUString& PropertyName )
             }
             break;
             case BASEPROPERTY_BACKGROUNDCOLOR:
-                aProp <<= (sal_Int32) GetWindow()->GetControlBackground().GetColor();
+                aProp <<= static_cast<sal_Int32>(GetWindow()->GetControlBackground().GetColor());
             break;
             case BASEPROPERTY_DISPLAYBACKGROUNDCOLOR:
-                aProp <<= (sal_Int32) GetWindow()->GetDisplayBackground().GetColor().GetColor();
+                aProp <<= static_cast<sal_Int32>(GetWindow()->GetDisplayBackground().GetColor().GetColor());
             break;
             case BASEPROPERTY_FONTRELIEF:
                 aProp <<= (sal_Int16) GetWindow()->GetControlFont().GetRelief();
@@ -2013,16 +2013,16 @@ css::uno::Any VCLXWindow::getProperty( const OUString& PropertyName )
                 aProp <<= (sal_Int16) GetWindow()->GetControlFont().GetEmphasisMark();
             break;
             case BASEPROPERTY_TEXTCOLOR:
-                aProp <<= (sal_Int32) GetWindow()->GetControlForeground().GetColor();
+                aProp <<= static_cast<sal_Int32>(GetWindow()->GetControlForeground().GetColor());
             break;
             case BASEPROPERTY_TEXTLINECOLOR:
-                aProp <<= (sal_Int32) GetWindow()->GetTextLineColor().GetColor();
+                aProp <<= static_cast<sal_Int32>(GetWindow()->GetTextLineColor().GetColor());
             break;
             case BASEPROPERTY_FILLCOLOR:
-                aProp <<= (sal_Int32) GetWindow()->GetFillColor().GetColor();
+                aProp <<= static_cast<sal_Int32>(GetWindow()->GetFillColor().GetColor());
             break;
             case BASEPROPERTY_LINECOLOR:
-                aProp <<= (sal_Int32) GetWindow()->GetLineColor().GetColor();
+                aProp <<= static_cast<sal_Int32>(GetWindow()->GetLineColor().GetColor());
             break;
             case BASEPROPERTY_BORDER:
             {
@@ -2064,11 +2064,11 @@ css::uno::Any VCLXWindow::getProperty( const OUString& PropertyName )
                     {
                         WinBits nStyle = GetWindow()->GetStyle();
                         if ( nStyle & WB_LEFT )
-                            aProp <<= (sal_Int16) PROPERTY_ALIGN_LEFT;
+                            aProp <<= sal_Int16(PROPERTY_ALIGN_LEFT);
                         else if ( nStyle & WB_CENTER )
-                            aProp <<= (sal_Int16) PROPERTY_ALIGN_CENTER;
+                            aProp <<= sal_Int16(PROPERTY_ALIGN_CENTER);
                         else if ( nStyle & WB_RIGHT )
-                            aProp <<= (sal_Int16) PROPERTY_ALIGN_RIGHT;
+                            aProp <<= sal_Int16(PROPERTY_ALIGN_RIGHT);
                     }
                     break;
                     default: break;
@@ -2119,11 +2119,11 @@ css::uno::Any VCLXWindow::getProperty( const OUString& PropertyName )
             break;
 
             case BASEPROPERTY_SYMBOL_COLOR:
-                aProp <<= (sal_Int32)GetWindow()->GetSettings().GetStyleSettings().GetButtonTextColor().GetColor();
+                aProp <<= static_cast<sal_Int32>(GetWindow()->GetSettings().GetStyleSettings().GetButtonTextColor().GetColor());
                 break;
 
             case BASEPROPERTY_BORDERCOLOR:
-                aProp <<= (sal_Int32)GetWindow()->GetSettings().GetStyleSettings().GetMonoColor().GetColor();
+                aProp <<= static_cast<sal_Int32>(GetWindow()->GetSettings().GetStyleSettings().GetMonoColor().GetColor());
                 break;
         }
     }
diff --git a/toolkit/source/awt/vclxwindow1.cxx b/toolkit/source/awt/vclxwindow1.cxx
index 613fbb0b1fe8..f774ab13ab51 100644
--- a/toolkit/source/awt/vclxwindow1.cxx
+++ b/toolkit/source/awt/vclxwindow1.cxx
@@ -86,7 +86,7 @@ void VCLXWindow::SetSystemParent_Impl( const css::uno::Any& rHandle )
 #elif defined( IOS )
     // Nothing
 #elif defined( UNX )
-    aSysParentData.aWindow = (long)nHandle;
+    aSysParentData.aWindow = static_cast<long>(nHandle);
     aSysParentData.bXEmbedSupport = bXEmbed;
 #endif
 
diff --git a/toolkit/source/awt/vclxwindows.cxx b/toolkit/source/awt/vclxwindows.cxx
index 41ca3c429955..70bea4148914 100644
--- a/toolkit/source/awt/vclxwindows.cxx
+++ b/toolkit/source/awt/vclxwindows.cxx
@@ -131,19 +131,19 @@ namespace toolkit
             sal_Int32 nWhiteLuminance = Color( COL_WHITE ).GetLuminance();
 
             Color aLightShadow( nBackgroundColor );
-            aLightShadow.IncreaseLuminance( (sal_uInt8)( ( nWhiteLuminance - nBackgroundLuminance ) * 2 / 3 ) );
+            aLightShadow.IncreaseLuminance( static_cast<sal_uInt8>( ( nWhiteLuminance - nBackgroundLuminance ) * 2 / 3 ) );
             aStyleSettings.SetLightBorderColor( aLightShadow );
 
             Color aLight( nBackgroundColor );
-            aLight.IncreaseLuminance( (sal_uInt8)( ( nWhiteLuminance - nBackgroundLuminance ) * 1 / 3 ) );
+            aLight.IncreaseLuminance( static_cast<sal_uInt8>( ( nWhiteLuminance - nBackgroundLuminance ) * 1 / 3 ) );
             aStyleSettings.SetLightColor( aLight );
 
             Color aShadow( nBackgroundColor );
-            aShadow.DecreaseLuminance( (sal_uInt8)( nBackgroundLuminance * 1 / 3 ) );
+            aShadow.DecreaseLuminance( static_cast<sal_uInt8>( nBackgroundLuminance * 1 / 3 ) );
             aStyleSettings.SetShadowColor( aShadow );
 
             Color aDarkShadow( nBackgroundColor );
-            aDarkShadow.DecreaseLuminance( (sal_uInt8)( nBackgroundLuminance * 2 / 3 ) );
+            aDarkShadow.DecreaseLuminance( static_cast<sal_uInt8>( nBackgroundLuminance * 2 / 3 ) );
             aStyleSettings.SetDarkShadowColor( aDarkShadow );
         }
 
@@ -195,9 +195,9 @@ namespace toolkit
 
         StyleSettings aStyleSettings = _pWindow->GetSettings().GetStyleSettings();
         if ( aStyleSettings.GetOptions() & StyleSettingsOptions::Mono )
-            aEffect <<= (sal_Int16)FLAT;
+            aEffect <<= sal_Int16(FLAT);
         else
-            aEffect <<= (sal_Int16)LOOK3D;
+            aEffect <<= sal_Int16(LOOK3D);
         return aEffect;
     }
 }
@@ -557,7 +557,7 @@ css::uno::Any VCLXButton::getProperty( const OUString& PropertyName )
             {
                 if ( GetWindow()->GetType() == WindowType::PUSHBUTTON )
                 {
-                     aProp <<= (sal_Int16)static_cast<PushButton*>(pButton.get())->GetState();
+                     aProp <<= static_cast<sal_Int16>(static_cast<PushButton*>(pButton.get())->GetState());
                 }
             }
             break;
@@ -998,7 +998,7 @@ css::uno::Any VCLXCheckBox::getProperty( const OUString& PropertyName )
                  aProp <<= pCheckBox->IsTriStateEnabled();
                 break;
             case BASEPROPERTY_STATE:
-                 aProp <<= (sal_Int16)pCheckBox->GetState();
+                 aProp <<= static_cast<sal_Int16>(pCheckBox->GetState());
                 break;
             default:
             {
@@ -1173,7 +1173,7 @@ css::uno::Any VCLXRadioButton::getProperty( const OUString& PropertyName )
                 aProp = ::toolkit::getVisualEffect( pButton );
                 break;
             case BASEPROPERTY_STATE:
-                aProp <<= (sal_Int16) ( pButton->IsChecked() ? 1 : 0 );
+                aProp <<= static_cast<sal_Int16>( pButton->IsChecked() ? 1 : 0 );
                 break;
             case BASEPROPERTY_AUTOTOGGLE:
                 aProp <<= pButton->IsRadioCheckEnabled();
@@ -1937,7 +1937,7 @@ css::uno::Any VCLXListBox::getProperty( const OUString& PropertyName )
             break;
             case BASEPROPERTY_LINECOUNT:
             {
-                 aProp <<= (sal_Int16) pListBox->GetDropDownLineCount();
+                 aProp <<= static_cast<sal_Int16>(pListBox->GetDropDownLineCount());
             }
             break;
             case BASEPROPERTY_STRINGITEMLIST:
@@ -3991,10 +3991,10 @@ css::uno::Any VCLXEdit::getProperty( const OUString& PropertyName )
                  aProp <<= pEdit->IsReadOnly();
                 break;
             case BASEPROPERTY_ECHOCHAR:
-                 aProp <<= (sal_Int16) pEdit->GetEchoChar();
+                 aProp <<= static_cast<sal_Int16>(pEdit->GetEchoChar());
                 break;
             case BASEPROPERTY_MAXTEXTLEN:
-                 aProp <<= (sal_Int16) pEdit->GetMaxTextLen();
+                 aProp <<= static_cast<sal_Int16>(pEdit->GetMaxTextLen());
                 break;
             default:
             {
@@ -4356,7 +4356,7 @@ css::uno::Any VCLXComboBox::getProperty( const OUString& PropertyName )
         {
             case BASEPROPERTY_LINECOUNT:
             {
-                 aProp <<= (sal_Int16)  pComboBox->GetDropDownLineCount();
+                 aProp <<= static_cast<sal_Int16>(pComboBox->GetDropDownLineCount());
             }
             break;
             case BASEPROPERTY_AUTOCOMPLETE:
@@ -5426,7 +5426,7 @@ void VCLXNumericField::setValue( double Value )
         // (e.g., input 105 using 2 digits returns 1,05)
         // Thus, to set a value of 1,05, insert 105 and 2 digits
         pNumericFormatter->SetValue(
-            (long)ImplCalcLongValue( Value, pNumericFormatter->GetDecimalDigits() ) );
+            static_cast<long>(ImplCalcLongValue( Value, pNumericFormatter->GetDecimalDigits() )) );
 
         // #107218# Call same listeners like VCL would do after user interaction
         VclPtr< Edit > pEdit = GetAs< Edit >();
@@ -5446,7 +5446,7 @@ double VCLXNumericField::getValue()
 
     NumericFormatter* pNumericFormatter = static_cast<NumericFormatter*>(GetFormatter());
     return pNumericFormatter
-        ? ImplCalcDoubleValue( (double)pNumericFormatter->GetValue(), pNumericFormatter->GetDecimalDigits() )
+        ? ImplCalcDoubleValue( static_cast<double>(pNumericFormatter->GetValue()), pNumericFormatter->GetDecimalDigits() )
         : 0;
 }
 
@@ -5457,7 +5457,7 @@ void VCLXNumericField::setMin( double Value )
     NumericFormatter* pNumericFormatter = static_cast<NumericFormatter*>(GetFormatter());
     if ( pNumericFormatter )
         pNumericFormatter->SetMin(
-            (long)ImplCalcLongValue( Value, pNumericFormatter->GetDecimalDigits() ) );
+            static_cast<long>(ImplCalcLongValue( Value, pNumericFormatter->GetDecimalDigits() )) );
 }
 
 double VCLXNumericField::getMin()
@@ -5466,7 +5466,7 @@ double VCLXNumericField::getMin()
 
     NumericFormatter* pNumericFormatter = static_cast<NumericFormatter*>(GetFormatter());
     return pNumericFormatter
-        ? ImplCalcDoubleValue( (double)pNumericFormatter->GetMin(), pNumericFormatter->GetDecimalDigits() )
+        ? ImplCalcDoubleValue( static_cast<double>(pNumericFormatter->GetMin()), pNumericFormatter->GetDecimalDigits() )
         : 0;
 }
 
@@ -5477,7 +5477,7 @@ void VCLXNumericField::setMax( double Value )
     NumericFormatter* pNumericFormatter = static_cast<NumericFormatter*>(GetFormatter());
     if ( pNumericFormatter )
         pNumericFormatter->SetMax(
-            (long)ImplCalcLongValue( Value, pNumericFormatter->GetDecimalDigits() ) );
+            static_cast<long>(ImplCalcLongValue( Value, pNumericFormatter->GetDecimalDigits() )) );
 }
 
 double VCLXNumericField::getMax()
@@ -5486,7 +5486,7 @@ double VCLXNumericField::getMax()
 
     NumericFormatter* pNumericFormatter = static_cast<NumericFormatter*>(GetFormatter());
     return pNumericFormatter
-        ? ImplCalcDoubleValue( (double)pNumericFormatter->GetMax(), pNumericFormatter->GetDecimalDigits() )
+        ? ImplCalcDoubleValue( static_cast<double>(pNumericFormatter->GetMax()), pNumericFormatter->GetDecimalDigits() )
         : 0;
 }
 
@@ -5497,7 +5497,7 @@ void VCLXNumericField::setFirst( double Value )
     VclPtr< NumericField > pNumericField = GetAs< NumericField >();
     if ( pNumericField )
         pNumericField->SetFirst(
-            (long)ImplCalcLongValue( Value, pNumericField->GetDecimalDigits() ) );
+            static_cast<long>(ImplCalcLongValue( Value, pNumericField->GetDecimalDigits() )) );
 }
 
 double VCLXNumericField::getFirst()
@@ -5506,7 +5506,7 @@ double VCLXNumericField::getFirst()
 
     VclPtr< NumericField > pNumericField = GetAs< NumericField >();
     return pNumericField
-        ? ImplCalcDoubleValue( (double)pNumericField->GetFirst(), pNumericField->GetDecimalDigits() )
+        ? ImplCalcDoubleValue( static_cast<double>(pNumericField->GetFirst()), pNumericField->GetDecimalDigits() )
         : 0;
 }
 
@@ -5517,7 +5517,7 @@ void VCLXNumericField::setLast( double Value )
     VclPtr< NumericField > pNumericField = GetAs< NumericField >();
     if ( pNumericField )
         pNumericField->SetLast(
-            (long)ImplCalcLongValue( Value, pNumericField->GetDecimalDigits() ) );
+            static_cast<long>(ImplCalcLongValue( Value, pNumericField->GetDecimalDigits() )) );
 }
 
 double VCLXNumericField::getLast()
@@ -5526,7 +5526,7 @@ double VCLXNumericField::getLast()
 
     VclPtr< NumericField > pNumericField = GetAs< NumericField >();
     return pNumericField
-        ? ImplCalcDoubleValue( (double)pNumericField->GetLast(), pNumericField->GetDecimalDigits() )
+        ? ImplCalcDoubleValue( static_cast<double>(pNumericField->GetLast()), pNumericField->GetDecimalDigits() )
         : 0;
 }
 
@@ -5548,7 +5548,7 @@ void VCLXNumericField::setSpinSize( double Value )
     VclPtr< NumericField > pNumericField = GetAs< NumericField >();
     if ( pNumericField )
         pNumericField->SetSpinSize(
-            (long)ImplCalcLongValue( Value, pNumericField->GetDecimalDigits() ) );
+            static_cast<long>(ImplCalcLongValue( Value, pNumericField->GetDecimalDigits() )) );
 }
 
 double VCLXNumericField::getSpinSize()
@@ -5557,7 +5557,7 @@ double VCLXNumericField::getSpinSize()
 
     VclPtr< NumericField > pNumericField = GetAs< NumericField >();
     return pNumericField
-        ? ImplCalcDoubleValue( (double)pNumericField->GetSpinSize(), pNumericField->GetDecimalDigits() )
+        ? ImplCalcDoubleValue( static_cast<double>(pNumericField->GetSpinSize()), pNumericField->GetDecimalDigits() )
         : 0;
 }
 
@@ -5930,7 +5930,7 @@ css::uno::Any VCLXMetricField::getProperty( const OUString& PropertyName )
                 aProp <<= GetAs< NumericField >()->IsUseThousandSep();
                 break;
             case BASEPROPERTY_UNIT:
-                aProp <<= (sal_uInt16) (GetAs< MetricField >()->GetUnit());
+                aProp <<= static_cast<sal_uInt16>(GetAs< MetricField >()->GetUnit());
                 break;
             case BASEPROPERTY_CUSTOMUNITTEXT:
                 aProp <<= GetAs< MetricField >()->GetCustomUnitText();
@@ -6040,7 +6040,7 @@ double VCLXCurrencyField::getValue()
 
     LongCurrencyFormatter* pCurrencyFormatter = static_cast<LongCurrencyFormatter*>(GetFormatter());
     return pCurrencyFormatter
-        ? ImplCalcDoubleValue( (double)pCurrencyFormatter->GetValue(), pCurrencyFormatter->GetDecimalDigits() )
+        ? ImplCalcDoubleValue( static_cast<double>(pCurrencyFormatter->GetValue()), pCurrencyFormatter->GetDecimalDigits() )
         : 0;
 }
 
@@ -6060,7 +6060,7 @@ double VCLXCurrencyField::getMin()
 
     LongCurrencyFormatter* pCurrencyFormatter = static_cast<LongCurrencyFormatter*>(GetFormatter());
     return pCurrencyFormatter
-        ? ImplCalcDoubleValue( (double)pCurrencyFormatter->GetMin(), pCurrencyFormatter->GetDecimalDigits() )
+        ? ImplCalcDoubleValue( static_cast<double>(pCurrencyFormatter->GetMin()), pCurrencyFormatter->GetDecimalDigits() )
         : 0;
 }
 
@@ -6080,7 +6080,7 @@ double VCLXCurrencyField::getMax()
 
     LongCurrencyFormatter* pCurrencyFormatter = static_cast<LongCurrencyFormatter*>(GetFormatter());
     return pCurrencyFormatter
-        ? ImplCalcDoubleValue( (double)pCurrencyFormatter->GetMax(), pCurrencyFormatter->GetDecimalDigits() )
+        ? ImplCalcDoubleValue( static_cast<double>(pCurrencyFormatter->GetMax()), pCurrencyFormatter->GetDecimalDigits() )
         : 0;
 }
 
@@ -6100,7 +6100,7 @@ double VCLXCurrencyField::getFirst()
 
     VclPtr< LongCurrencyField > pCurrencyField = GetAs< LongCurrencyField >();
     return pCurrencyField
-        ? ImplCalcDoubleValue( (double)pCurrencyField->GetFirst(), pCurrencyField->GetDecimalDigits() )
+        ? ImplCalcDoubleValue( static_cast<double>(pCurrencyField->GetFirst()), pCurrencyField->GetDecimalDigits() )
         : 0;
 }
 
@@ -6120,7 +6120,7 @@ double VCLXCurrencyField::getLast()
 
     VclPtr< LongCurrencyField > pCurrencyField = GetAs< LongCurrencyField >();
     return pCurrencyField
-        ? ImplCalcDoubleValue( (double)pCurrencyField->GetLast(), pCurrencyField->GetDecimalDigits() )
+        ? ImplCalcDoubleValue( static_cast<double>(pCurrencyField->GetLast()), pCurrencyField->GetDecimalDigits() )
         : 0;
 }
 
@@ -6140,7 +6140,7 @@ double VCLXCurrencyField::getSpinSize()
 
     VclPtr< LongCurrencyField > pCurrencyField = GetAs< LongCurrencyField >();
     return pCurrencyField
-        ? ImplCalcDoubleValue( (double)pCurrencyField->GetSpinSize(), pCurrencyField->GetDecimalDigits() )
+        ? ImplCalcDoubleValue( static_cast<double>(pCurrencyField->GetSpinSize()), pCurrencyField->GetDecimalDigits() )
         : 0;
 }
 
diff --git a/toolkit/source/controls/animatedimages.cxx b/toolkit/source/controls/animatedimages.cxx
index 9357b20e5fe8..4d8f55f8ff6e 100644
--- a/toolkit/source/controls/animatedimages.cxx
+++ b/toolkit/source/controls/animatedimages.cxx
@@ -336,7 +336,7 @@ namespace toolkit {
             return makeAny( css::awt::VisualEffect::NONE );
 
         case BASEPROPERTY_STEP_TIME:
-            return makeAny( (sal_Int32) 100 );
+            return makeAny( sal_Int32(100) );
 
         case BASEPROPERTY_AUTO_REPEAT:
             return makeAny( true );
diff --git a/toolkit/source/controls/controlmodelcontainerbase.cxx b/toolkit/source/controls/controlmodelcontainerbase.cxx
index 3aaff3f1f459..88012e542899 100644
--- a/toolkit/source/controls/controlmodelcontainerbase.cxx
+++ b/toolkit/source/controls/controlmodelcontainerbase.cxx
@@ -857,7 +857,7 @@ void SAL_CALL ControlModelContainerBase::getGroup( sal_Int32 _nGroup, Sequence<
 
     implUpdateGroupStructure();
 
-    if ( ( _nGroup < 0 ) || ( _nGroup >= (sal_Int32)maGroups.size() ) )
+    if ( ( _nGroup < 0 ) || ( _nGroup >= static_cast<sal_Int32>(maGroups.size()) ) )
     {
         SAL_WARN("toolkit", "invalid argument and I am not allowed to throw an exception!" );
         _rGroup.realloc( 0 );
diff --git a/toolkit/source/controls/formattedcontrol.cxx b/toolkit/source/controls/formattedcontrol.cxx
index b25f2c2a582c..fcacdf3178f0 100644
--- a/toolkit/source/controls/formattedcontrol.cxx
+++ b/toolkit/source/controls/formattedcontrol.cxx
@@ -361,7 +361,7 @@ namespace toolkit
 
             throw IllegalArgumentException(
                 ("Unable to convert the given value for the property "
-                 + GetPropertyName((sal_uInt16)nPropId)
+                 + GetPropertyName(static_cast<sal_uInt16>(nPropId))
                  + " (double, integer, or string expected)."),
                 static_cast< XPropertySet* >(this),
                 1);
diff --git a/toolkit/source/controls/geometrycontrolmodel.cxx b/toolkit/source/controls/geometrycontrolmodel.cxx
index bababc8c81d0..e7c27c0e896f 100644
--- a/toolkit/source/controls/geometrycontrolmodel.cxx
+++ b/toolkit/source/controls/geometrycontrolmodel.cxx
@@ -188,13 +188,13 @@
 
         switch ( nHandle )
         {
-            case GCM_PROPERTY_ID_POS_X:             aDefault <<= (sal_Int32) 0; break;
-            case GCM_PROPERTY_ID_POS_Y:             aDefault <<= (sal_Int32) 0; break;
-            case GCM_PROPERTY_ID_WIDTH:             aDefault <<= (sal_Int32) 0; break;
-            case GCM_PROPERTY_ID_HEIGHT:            aDefault <<= (sal_Int32) 0; break;
+            case GCM_PROPERTY_ID_POS_X:             aDefault <<= sal_Int32(0); break;
+            case GCM_PROPERTY_ID_POS_Y:             aDefault <<= sal_Int32(0); break;
+            case GCM_PROPERTY_ID_WIDTH:             aDefault <<= sal_Int32(0); break;
+            case GCM_PROPERTY_ID_HEIGHT:            aDefault <<= sal_Int32(0); break;
             case GCM_PROPERTY_ID_NAME:              aDefault <<= OUString(); break;
-            case GCM_PROPERTY_ID_TABINDEX:          aDefault <<= (sal_Int16) -1; break;
-            case GCM_PROPERTY_ID_STEP:              aDefault <<= (sal_Int32) 0; break;
+            case GCM_PROPERTY_ID_TABINDEX:          aDefault <<= sal_Int16(-1); break;
+            case GCM_PROPERTY_ID_STEP:              aDefault <<= sal_Int32(0); break;
             case GCM_PROPERTY_ID_TAG:               aDefault <<= OUString(); break;
             case GCM_PROPERTY_ID_RESOURCERESOLVER:  aDefault <<= Reference< resource::XStringResourceResolver >(); break;
             default:                            OSL_FAIL( "ImplGetDefaultValueByHandle - unknown Property" );
@@ -516,8 +516,8 @@
     ::cppu::IPropertyArrayHelper* OCommonGeometryControlModel::createArrayHelper( sal_Int32 _nId ) const
     {
         OSL_ENSURE( _nId == m_nPropertyMapId, "OCommonGeometryControlModel::createArrayHelper: invalid argument!" );
-        OSL_ENSURE( _nId < (sal_Int32)AggregateProperties::get().size(), "OCommonGeometryControlModel::createArrayHelper: invalid status info (1)!" );
-        OSL_ENSURE( _nId < (sal_Int32)AmbiguousPropertyIds::get().size(), "OCommonGeometryControlModel::createArrayHelper: invalid status info (2)!" );
+        OSL_ENSURE( _nId < static_cast<sal_Int32>(AggregateProperties::get().size()), "OCommonGeometryControlModel::createArrayHelper: invalid status info (1)!" );
+        OSL_ENSURE( _nId < static_cast<sal_Int32>(AmbiguousPropertyIds::get().size()), "OCommonGeometryControlModel::createArrayHelper: invalid status info (2)!" );
 
         // our own properties
         Sequence< Property > aProps;
diff --git a/toolkit/source/controls/grid/defaultgridcolumnmodel.cxx b/toolkit/source/controls/grid/defaultgridcolumnmodel.cxx
index 7ece076514cb..4fb3025032d9 100644
--- a/toolkit/source/controls/grid/defaultgridcolumnmodel.cxx
+++ b/toolkit/source/controls/grid/defaultgridcolumnmodel.cxx
@@ -231,7 +231,7 @@ private:
     {
         ::comphelper::ComponentGuard aGuard( *this, rBHelper );
 
-        if ( index >=0 && index < ((sal_Int32)m_aColumns.size()))
+        if ( index >=0 && index < static_cast<sal_Int32>(m_aColumns.size()))
             return m_aColumns[index];
 
         throw css::lang::IndexOutOfBoundsException();
diff --git a/toolkit/source/controls/roadmapcontrol.cxx b/toolkit/source/controls/roadmapcontrol.cxx
index 8d0a3ce774ee..48e7902b2a93 100644
--- a/toolkit/source/controls/roadmapcontrol.cxx
+++ b/toolkit/source/controls/roadmapcontrol.cxx
@@ -108,12 +108,12 @@ static void lcl_throwIndexOutOfBoundsException( )
                     aReturn <<= true;
                     break;
                 case BASEPROPERTY_CURRENTITEMID:
-                    aReturn <<= (sal_Int16) -1;
+                    aReturn <<= sal_Int16(-1);
                     break;
                 case BASEPROPERTY_TEXT:
                    break;
                 case BASEPROPERTY_BORDER:
-                    aReturn <<= (sal_Int16) 2;              // No Border
+                    aReturn <<= sal_Int16(2);              // No Border
                     break;
                 case BASEPROPERTY_DEFAULTCONTROL:
                     aReturn <<= OUString::createFromAscii( szServiceName_UnoControlRoadmap );
@@ -182,7 +182,7 @@ static void lcl_throwIndexOutOfBoundsException( )
 
     Any SAL_CALL UnoControlRoadmapModel::getByIndex( sal_Int32 Index )
     {
-        if (( Index >= (sal_Int32)maRoadmapItems.size()) || (Index < 0))
+        if (( Index >= static_cast<sal_Int32>(maRoadmapItems.size())) || (Index < 0))
             lcl_throwIndexOutOfBoundsException( );
         Any aAny( maRoadmapItems.at( Index ) );
         return aAny;
@@ -191,7 +191,7 @@ static void lcl_throwIndexOutOfBoundsException( )
 
     void UnoControlRoadmapModel::MakeRMItemValidation( sal_Int32 Index, const Reference< XInterface >& xRoadmapItem )
     {
-        if ((Index > (sal_Int32)maRoadmapItems.size()) || ( Index < 0 ) )
+        if ((Index > static_cast<sal_Int32>(maRoadmapItems.size())) || ( Index < 0 ) )
             lcl_throwIndexOutOfBoundsException( );
         if ( !xRoadmapItem.is() )
             lcl_throwIllegalArgumentException();
@@ -271,7 +271,7 @@ static void lcl_throwIndexOutOfBoundsException( )
 
     void SAL_CALL UnoControlRoadmapModel::insertByIndex( const sal_Int32 Index, const Any& Element)
     {
-        if ( ( Index >= ( (sal_Int32)maRoadmapItems.size() + 1 ) ) || (Index < 0))
+        if ( ( Index >= ( static_cast<sal_Int32>(maRoadmapItems.size()) + 1 ) ) || (Index < 0))
             lcl_throwIndexOutOfBoundsException( );
         Reference< XInterface > xRoadmapItem;
         Element >>= xRoadmapItem;
@@ -284,7 +284,7 @@ static void lcl_throwIndexOutOfBoundsException( )
         sal_Int16 n_CurrentItemID = GetCurrentItemID( xPropertySet );
         if ( Index <= n_CurrentItemID )
         {
-            Any aAny(( sal_Int16 ) ( n_CurrentItemID + 1 ) );
+            Any aAny(static_cast<sal_Int16>( n_CurrentItemID + 1 ) );
             xPropertySet->setPropertyValue( GetPropertyName( BASEPROPERTY_CURRENTITEMID ), aAny );
         }
     }
@@ -292,7 +292,7 @@ static void lcl_throwIndexOutOfBoundsException( )
 
     void SAL_CALL UnoControlRoadmapModel::removeByIndex( sal_Int32 Index)
     {
-        if (( Index > (sal_Int32)maRoadmapItems.size()) || (Index < 0))
+        if (( Index > static_cast<sal_Int32>(maRoadmapItems.size())) || (Index < 0))
             lcl_throwIndexOutOfBoundsException( );
         Reference< XInterface > xRoadmapItem;
         maRoadmapItems.erase( maRoadmapItems.begin() + Index );
@@ -303,7 +303,7 @@ static void lcl_throwIndexOutOfBoundsException( )
         Any aAny;
         if ( Index <= n_CurrentItemID )
         {
-            if ( n_CurrentItemID >= (sal_Int32)maRoadmapItems.size() )
+            if ( n_CurrentItemID >= static_cast<sal_Int32>(maRoadmapItems.size()) )
             {
                 n_CurrentItemID = sal::static_int_cast< sal_Int16 >(
                     maRoadmapItems.size()-1);
@@ -312,9 +312,9 @@ static void lcl_throwIndexOutOfBoundsException( )
                 aAny <<= n_CurrentItemID;
             }
             else if (Index == n_CurrentItemID)
-                aAny <<= ( sal_Int16 ) -1;
+                aAny <<= sal_Int16(-1);
             else if( Index < n_CurrentItemID)
-                aAny <<= ( sal_Int16 ) ( n_CurrentItemID - 1 );
+                aAny <<= static_cast<sal_Int16>( n_CurrentItemID - 1 );
             xPropertySet->setPropertyValue( GetPropertyName( BASEPROPERTY_CURRENTITEMID ), aAny );
         }
     }
diff --git a/toolkit/source/controls/stdtabcontrollermodel.cxx b/toolkit/source/controls/stdtabcontrollermodel.cxx
index 2a7dc44a6d8f..ca35f7fad168 100644
--- a/toolkit/source/controls/stdtabcontrollermodel.cxx
+++ b/toolkit/source/controls/stdtabcontrollermodel.cxx
@@ -31,7 +31,7 @@
 
 #include <tools/debug.hxx>
 
-#define UNOCONTROL_STREAMVERSION    (short)2
+#define UNOCONTROL_STREAMVERSION    short(2)
 
 
 //  class UnoControlModelEntryList
@@ -330,7 +330,7 @@ void StdTabControllerModel::getGroup( sal_Int32 nGroup, css::uno::Sequence< css:
         UnoControlModelEntry* pEntry = maControls[ n ];
         if ( pEntry->bGroup )
         {
-            if ( nG == (sal_uInt32)nGroup )
+            if ( nG == static_cast<sal_uInt32>(nGroup) )
             {
                 sal_uInt32 nCount = ImplGetControlCount( *pEntry->pGroup );
                 aSeq = css::uno::Sequence< css::uno::Reference< css::awt::XControlModel > >( nCount );
diff --git a/toolkit/source/controls/tabpagecontainer.cxx b/toolkit/source/controls/tabpagecontainer.cxx
index 5102f883b5a8..59b20b6c71ea 100644
--- a/toolkit/source/controls/tabpagecontainer.cxx
+++ b/toolkit/source/controls/tabpagecontainer.cxx
@@ -73,7 +73,7 @@ uno::Any UnoControlTabPageContainerModel::ImplGetDefaultValue( sal_uInt16 nPropI
         case BASEPROPERTY_DEFAULTCONTROL:
             return uno::makeAny( OUString("com.sun.star.awt.tab.UnoControlTabPageContainer") );
         case BASEPROPERTY_BORDER:
-            return uno::makeAny((sal_Int16) 0);              // No Border
+            return uno::makeAny(sal_Int16(0));              // No Border
         default:
             return UnoControlModel::ImplGetDefaultValue( nPropId );
     }
diff --git a/toolkit/source/controls/tkspinbutton.cxx b/toolkit/source/controls/tkspinbutton.cxx
index e4200d3fd04a..000e8698e443 100644
--- a/toolkit/source/controls/tkspinbutton.cxx
+++ b/toolkit/source/controls/tkspinbutton.cxx
@@ -156,7 +156,7 @@ public:
             return makeAny( OUString("com.sun.star.awt.UnoControlSpinButton") );
 
         case BASEPROPERTY_BORDER:
-            return makeAny( (sal_Int16) 0 );
+            return makeAny( sal_Int16(0) );
 
         case BASEPROPERTY_REPEAT:
             return makeAny( true );
diff --git a/toolkit/source/controls/tree/treedatamodel.cxx b/toolkit/source/controls/tree/treedatamodel.cxx
index fd43049ca663..0c5cd4347b6b 100644
--- a/toolkit/source/controls/tree/treedatamodel.cxx
+++ b/toolkit/source/controls/tree/treedatamodel.cxx
@@ -325,7 +325,7 @@ void SAL_CALL MutableTreeNode::insertChildByIndex( sal_Int32 nChildIndex, const
 {
     ::osl::Guard< ::osl::Mutex > aGuard( maMutex );
 
-    if( (nChildIndex < 0) || (nChildIndex > (sal_Int32)maChildren.size()) )
+    if( (nChildIndex < 0) || (nChildIndex > static_cast<sal_Int32>(maChildren.size())) )
         throw IndexOutOfBoundsException();
 
     Reference< XTreeNode > xNode( xChildNode.get() );
@@ -349,7 +349,7 @@ void SAL_CALL MutableTreeNode::removeChildByIndex( sal_Int32 nChildIndex )
 {
     ::osl::Guard< ::osl::Mutex > aGuard( maMutex );
 
-    if( (nChildIndex < 0) || (nChildIndex >= (sal_Int32)maChildren.size()) )
+    if( (nChildIndex < 0) || (nChildIndex >= static_cast<sal_Int32>(maChildren.size())) )
         throw IndexOutOfBoundsException();
 
     MutableTreeNodeRef xImpl;
@@ -439,7 +439,7 @@ Reference< XTreeNode > SAL_CALL MutableTreeNode::getChildAt( sal_Int32 nChildInd
 {
     ::osl::Guard< ::osl::Mutex > aGuard( maMutex );
 
-    if( (nChildIndex < 0) || (nChildIndex >= (sal_Int32)maChildren.size()) )
+    if( (nChildIndex < 0) || (nChildIndex >= static_cast<sal_Int32>(maChildren.size())) )
         throw IndexOutOfBoundsException();
     return getReference( maChildren[nChildIndex].get() );
 }
@@ -447,7 +447,7 @@ Reference< XTreeNode > SAL_CALL MutableTreeNode::getChildAt( sal_Int32 nChildInd
 sal_Int32 SAL_CALL MutableTreeNode::getChildCount(  )
 {
     ::osl::Guard< ::osl::Mutex > aGuard( maMutex );
-    return (sal_Int32)maChildren.size();
+    return static_cast<sal_Int32>(maChildren.size());
 }
 
 Reference< XTreeNode > SAL_CALL MutableTreeNode::getParent(  )
diff --git a/toolkit/source/controls/unocontrolcontainer.cxx b/toolkit/source/controls/unocontrolcontainer.cxx
index 5b533dddb22a..be64fb6eee17 100644
--- a/toolkit/source/controls/unocontrolcontainer.cxx
+++ b/toolkit/source/controls/unocontrolcontainer.cxx
@@ -628,7 +628,7 @@ sal_Int32 UnoControlContainer::impl_addControl( const uno::Reference< awt::XCont
     {
         container::ContainerEvent aEvent;
         aEvent.Source = *this;
-        _pName ? ( aEvent.Accessor <<= *_pName ) : ( aEvent.Accessor <<= (sal_Int32)id );
+        _pName ? ( aEvent.Accessor <<= *_pName ) : ( aEvent.Accessor <<= static_cast<sal_Int32>(id) );
         aEvent.Element <<= _rxControl;
         maCListeners.elementInserted( aEvent );
     }
diff --git a/toolkit/source/controls/unocontrolcontainermodel.cxx b/toolkit/source/controls/unocontrolcontainermodel.cxx
index 5c7b11c76043..d7ded7950c2f 100644
--- a/toolkit/source/controls/unocontrolcontainermodel.cxx
+++ b/toolkit/source/controls/unocontrolcontainermodel.cxx
@@ -64,7 +64,7 @@ css::uno::Any UnoControlContainerModel::ImplGetDefaultValue( sal_uInt16 nPropId
 {
     css::uno::Any aDefault;
     if ( nPropId == BASEPROPERTY_BORDER )
-        aDefault <<= (sal_Int16) 0;
+        aDefault <<= sal_Int16(0);
     else
         aDefault = UnoControlModel::ImplGetDefaultValue( nPropId );
     return aDefault;
diff --git a/toolkit/source/controls/unocontrolmodel.cxx b/toolkit/source/controls/unocontrolmodel.cxx
index e28a6d8aa2c4..642575a5a2ea 100644
--- a/toolkit/source/controls/unocontrolmodel.cxx
+++ b/toolkit/source/controls/unocontrolmodel.cxx
@@ -60,7 +60,7 @@ using namespace ::com::sun::star::i18n;
 using ::com::sun::star::awt::FontDescriptor;
 
 
-#define UNOCONTROL_STREAMVERSION    (short)2
+#define UNOCONTROL_STREAMVERSION    short(2)
 
 static void lcl_ImplMergeFontProperty( FontDescriptor& rFD, sal_uInt16 nPropId, const Any& rValue )
 {
@@ -80,7 +80,7 @@ static void lcl_ImplMergeFontProperty( FontDescriptor& rFD, sal_uInt16 nPropId,
                                                             break;
         case BASEPROPERTY_FONTDESCRIPTORPART_CHARSET:       rValue >>= rFD.CharSet;
                                                             break;
-        case BASEPROPERTY_FONTDESCRIPTORPART_HEIGHT:        rValue >>= nExtractFloat; rFD.Height = (sal_Int16)nExtractFloat;
+        case BASEPROPERTY_FONTDESCRIPTORPART_HEIGHT:        rValue >>= nExtractFloat; rFD.Height = static_cast<sal_Int16>(nExtractFloat);
                                                             break;
         case BASEPROPERTY_FONTDESCRIPTORPART_WEIGHT:        rValue >>= rFD.Weight;
                                                             break;
@@ -174,7 +174,7 @@ css::uno::Any UnoControlModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const
             case BASEPROPERTY_FONTDESCRIPTORPART_STYLENAME:     aDefault <<= aFD.StyleName;         break;
             case BASEPROPERTY_FONTDESCRIPTORPART_FAMILY:        aDefault <<= aFD.Family;            break;
             case BASEPROPERTY_FONTDESCRIPTORPART_CHARSET:       aDefault <<= aFD.CharSet;           break;
-            case BASEPROPERTY_FONTDESCRIPTORPART_HEIGHT:        aDefault <<= (float)aFD.Height;     break;
+            case BASEPROPERTY_FONTDESCRIPTORPART_HEIGHT:        aDefault <<= static_cast<float>(aFD.Height);     break;
             case BASEPROPERTY_FONTDESCRIPTORPART_WEIGHT:        aDefault <<= aFD.Weight;            break;
             case BASEPROPERTY_FONTDESCRIPTORPART_SLANT:         aDefault <<= (sal_Int16)aFD.Slant;  break;
             case BASEPROPERTY_FONTDESCRIPTORPART_UNDERLINE:     aDefault <<= aFD.Underline;         break;
@@ -224,35 +224,35 @@ css::uno::Any UnoControlModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const
             case BASEPROPERTY_STATE:
             case BASEPROPERTY_EXTDATEFORMAT:
             case BASEPROPERTY_EXTTIMEFORMAT:
-            case BASEPROPERTY_ECHOCHAR:             aDefault <<= (sal_Int16) 0; break;
-            case BASEPROPERTY_BORDER:               aDefault <<= (sal_Int16) 1; break;
-            case BASEPROPERTY_DECIMALACCURACY:      aDefault <<= (sal_Int16) 2; break;
-            case BASEPROPERTY_LINECOUNT:            aDefault <<= (sal_Int16) 5; break;
-            case BASEPROPERTY_ALIGN:                aDefault <<= (sal_Int16) PROPERTY_ALIGN_LEFT; break;
-            case BASEPROPERTY_IMAGEALIGN:           aDefault <<= (sal_Int16) 1 /*ImageAlign::Top*/; break;
-            case BASEPROPERTY_IMAGEPOSITION:        aDefault <<= (sal_Int16) 12 /*ImagePosition::Centered*/; break;
-            case BASEPROPERTY_PUSHBUTTONTYPE:       aDefault <<= (sal_Int16) 0 /*PushButtonType::STANDARD*/; break;
-            case BASEPROPERTY_MOUSE_WHEEL_BEHAVIOUR:aDefault <<= (sal_Int16) awt::MouseWheelBehavior::SCROLL_FOCUS_ONLY; break;
+            case BASEPROPERTY_ECHOCHAR:             aDefault <<= sal_Int16(0); break;
+            case BASEPROPERTY_BORDER:               aDefault <<= sal_Int16(1); break;
+            case BASEPROPERTY_DECIMALACCURACY:      aDefault <<= sal_Int16(2); break;
+            case BASEPROPERTY_LINECOUNT:            aDefault <<= sal_Int16(5); break;
+            case BASEPROPERTY_ALIGN:                aDefault <<= sal_Int16(PROPERTY_ALIGN_LEFT); break;
+            case BASEPROPERTY_IMAGEALIGN:           aDefault <<= sal_Int16(1) /*ImageAlign::Top*/; break;
+            case BASEPROPERTY_IMAGEPOSITION:        aDefault <<= sal_Int16(12) /*ImagePosition::Centered*/; break;
+            case BASEPROPERTY_PUSHBUTTONTYPE:       aDefault <<= sal_Int16(0) /*PushButtonType::STANDARD*/; break;
+            case BASEPROPERTY_MOUSE_WHEEL_BEHAVIOUR:aDefault <<= sal_Int16(awt::MouseWheelBehavior::SCROLL_FOCUS_ONLY); break;
 
             case BASEPROPERTY_DATEMAX:              aDefault <<= util::Date( 31, 12, 2200 );    break;
             case BASEPROPERTY_DATEMIN:              aDefault <<= util::Date( 1, 1, 1900 );  break;
             case BASEPROPERTY_TIMEMAX:              aDefault <<= util::Time(0, 0, 59, 23, false);  break;
             case BASEPROPERTY_TIMEMIN:              aDefault <<= util::Time();      break;
-            case BASEPROPERTY_VALUEMAX_DOUBLE:      aDefault <<= (double) 1000000;  break;
-            case BASEPROPERTY_VALUEMIN_DOUBLE:      aDefault <<= (double) -1000000; break;
-            case BASEPROPERTY_VALUESTEP_DOUBLE:     aDefault <<= (double ) 1;       break;
-            case BASEPROPERTY_PROGRESSVALUE_MAX:    aDefault <<= (sal_Int32) 100;   break;
-            case BASEPROPERTY_PROGRESSVALUE_MIN:    aDefault <<= (sal_Int32)   0;   break;
-            case BASEPROPERTY_SCROLLVALUE_MAX:      aDefault <<= (sal_Int32) 100;   break;
-            case BASEPROPERTY_SCROLLVALUE_MIN:      aDefault <<= (sal_Int32)   0;   break;
-            case BASEPROPERTY_LINEINCREMENT:        aDefault <<= (sal_Int32)   1;   break;
-            case BASEPROPERTY_BLOCKINCREMENT:       aDefault <<= (sal_Int32)  10;   break;
-            case BASEPROPERTY_ORIENTATION:          aDefault <<= (sal_Int32)   0;   break;
-            case BASEPROPERTY_SPINVALUE:            aDefault <<= (sal_Int32)   0;   break;
-            case BASEPROPERTY_SPININCREMENT:        aDefault <<= (sal_Int32)   1;   break;
-            case BASEPROPERTY_SPINVALUE_MIN:        aDefault <<= (sal_Int32)   0;   break;
-            case BASEPROPERTY_SPINVALUE_MAX:        aDefault <<= (sal_Int32) 100;   break;
-            case BASEPROPERTY_REPEAT_DELAY:         aDefault <<= (sal_Int32)  50;   break;    // 50 milliseconds
+            case BASEPROPERTY_VALUEMAX_DOUBLE:      aDefault <<= double(1000000);  break;
+            case BASEPROPERTY_VALUEMIN_DOUBLE:      aDefault <<= double(-1000000); break;
+            case BASEPROPERTY_VALUESTEP_DOUBLE:     aDefault <<= double(1);       break;
+            case BASEPROPERTY_PROGRESSVALUE_MAX:    aDefault <<= sal_Int32(100);   break;
+            case BASEPROPERTY_PROGRESSVALUE_MIN:    aDefault <<= sal_Int32(0);   break;
+            case BASEPROPERTY_SCROLLVALUE_MAX:      aDefault <<= sal_Int32(100);   break;
+            case BASEPROPERTY_SCROLLVALUE_MIN:      aDefault <<= sal_Int32(0);   break;
+            case BASEPROPERTY_LINEINCREMENT:        aDefault <<= sal_Int32(1);   break;
+            case BASEPROPERTY_BLOCKINCREMENT:       aDefault <<= sal_Int32(10);   break;
+            case BASEPROPERTY_ORIENTATION:          aDefault <<= sal_Int32(0);   break;
+            case BASEPROPERTY_SPINVALUE:            aDefault <<= sal_Int32(0);   break;
+            case BASEPROPERTY_SPININCREMENT:        aDefault <<= sal_Int32(1);   break;
+            case BASEPROPERTY_SPINVALUE_MIN:        aDefault <<= sal_Int32(0);   break;
+            case BASEPROPERTY_SPINVALUE_MAX:        aDefault <<= sal_Int32(100);   break;
+            case BASEPROPERTY_REPEAT_DELAY:         aDefault <<= sal_Int32(50);   break;    // 50 milliseconds
             case BASEPROPERTY_DEFAULTCONTROL:       aDefault <<= const_cast<UnoControlModel*>(this)->getServiceName();    break;
 
             case BASEPROPERTY_AUTOHSCROLL:
@@ -741,7 +741,7 @@ void UnoControlModel::write( const css::uno::Reference< css::io::XObjectOutputSt
                     sal::static_int_cast< sal_Int16 >(aFD.Slant) );
                 OutStream->writeShort( aFD.Underline );
                 OutStream->writeShort( aFD.Strikeout );
-                OutStream->writeShort( (short)(aFD.Orientation * 10) );
+                OutStream->writeShort( static_cast<short>(aFD.Orientation * 10) );
                 OutStream->writeBoolean( aFD.Kerning );
                 OutStream->writeBoolean( aFD.WordLineMode );
             }
@@ -767,7 +767,7 @@ void UnoControlModel::read( const css::uno::Reference< css::io::XObjectInputStre
     DBG_ASSERT( xMark.is(), "read: no css::io::XMarkableStream!" );
 
     short nVersion = InStream->readShort();
-    sal_uInt32 nProps = (sal_uInt32)InStream->readLong();
+    sal_uInt32 nProps = static_cast<sal_uInt32>(InStream->readLong());
     css::uno::Sequence< OUString> aProps( nProps );
     css::uno::Sequence< css::uno::Any> aValues( nProps );
     bool bInvalidEntries = false;
@@ -784,7 +784,7 @@ void UnoControlModel::read( const css::uno::Reference< css::io::XObjectInputStre
         sal_Int32 nPropDataBeginMark = xMark->createMark();
         sal_Int32 nPropDataLen = InStream->readLong();
 
-        sal_uInt16 nPropId = (sal_uInt16)InStream->readShort();
+        sal_uInt16 nPropId = static_cast<sal_uInt16>(InStream->readShort());
 
         css::uno::Any aValue;
         bool bIsVoid = InStream->readBoolean();
@@ -838,12 +838,12 @@ void UnoControlModel::read( const css::uno::Reference< css::io::XObjectInputStre
                     aFD.Family = InStream->readShort();
                     aFD.CharSet = InStream->readShort();
                     aFD.Pitch = InStream->readShort();
-                    aFD.CharacterWidth = (float)InStream->readDouble();
-                    aFD.Weight = (float)InStream->readDouble();
+                    aFD.CharacterWidth = static_cast<float>(InStream->readDouble());
+                    aFD.Weight = static_cast<float>(InStream->readDouble());
                     aFD.Slant =  (css::awt::FontSlant)InStream->readShort();
                     aFD.Underline = InStream->readShort();
                     aFD.Strikeout = InStream->readShort();
-                    aFD.Orientation = (float)InStream->readDouble();
+                    aFD.Orientation = static_cast<float>(InStream->readDouble());
                     aFD.Kerning = InStream->readBoolean() != 0;
                     aFD.WordLineMode = InStream->readBoolean() != 0;
                     aFD.Type = InStream->readShort();
@@ -877,7 +877,7 @@ void UnoControlModel::read( const css::uno::Reference< css::io::XObjectInputStre
                     long nEntries = InStream->readLong();
                     css::uno::Sequence<sal_uInt16> aSeq( nEntries );
                     for ( long n = 0; n < nEntries; n++ )
-                        aSeq.getArray()[n] = (sal_uInt16)InStream->readShort();
+                        aSeq.getArray()[n] = static_cast<sal_uInt16>(InStream->readShort());
                     aValue <<= aSeq;
                 }
                 else if ( *pType == cppu::UnoType< css::uno::Sequence<sal_Int16> >::get() )
@@ -885,7 +885,7 @@ void UnoControlModel::read( const css::uno::Reference< css::io::XObjectInputStre
                     long nEntries = InStream->readLong();
                     css::uno::Sequence<sal_Int16> aSeq( nEntries );
                     for ( long n = 0; n < nEntries; n++ )
-                        aSeq.getArray()[n] = (sal_Int16)InStream->readShort();
+                        aSeq.getArray()[n] = static_cast<sal_Int16>(InStream->readShort());
                     aValue <<= aSeq;
                 }
                 else if ( pType->getTypeClass() == TypeClass_ENUM )
@@ -934,8 +934,8 @@ void UnoControlModel::read( const css::uno::Reference< css::io::XObjectInputStre
                             if ( maData.find(BASEPROPERTY_FONTDESCRIPTOR) != maData.end() ) // due to defaults...
                                 maData[BASEPROPERTY_FONTDESCRIPTOR] >>= *pFD;
                         }
-                        pFD->Width = (sal_Int16)InStream->readLong();
-                        pFD->Height = (sal_Int16)InStream->readLong();
+                        pFD->Width = static_cast<sal_Int16>(InStream->readLong());
+                        pFD->Height = static_cast<sal_Int16>(InStream->readLong());
                         InStream->readShort(); // ignore css::awt::FontWidth - it was
                                                // misspelled and is no longer needed
                         pFD->CharacterWidth = css::awt::FontWidth::DONTKNOW;
@@ -955,7 +955,7 @@ void UnoControlModel::read( const css::uno::Reference< css::io::XObjectInputStre
                         pFD->Slant =  (css::awt::FontSlant)InStream->readShort();
                         pFD->Underline = InStream->readShort();
                         pFD->Strikeout = InStream->readShort();
-                        pFD->Orientation = ( (float)(double)InStream->readShort() ) / 10;
+                        pFD->Orientation = static_cast<float>(static_cast<double>(InStream->readShort())) / 10;
                         pFD->Kerning = InStream->readBoolean() != 0;
                         pFD->WordLineMode = InStream->readBoolean() != 0;
                     }
@@ -992,7 +992,7 @@ void UnoControlModel::read( const css::uno::Reference< css::io::XObjectInputStre
     }
     if ( bInvalidEntries )
     {
-        for ( i = 0; i < (sal_uInt32)aProps.getLength(); i++ )
+        for ( i = 0; i < static_cast<sal_uInt32>(aProps.getLength()); i++ )
         {
             if ( aProps.getConstArray()[i].isEmpty() )
             {
@@ -1052,7 +1052,7 @@ sal_Bool UnoControlModel::convertFastPropertyValue( Any & rConvertedValue, Any &
     }
     else
     {
-        const css::uno::Type* pDestType = GetPropertyType( (sal_uInt16)nPropId );
+        const css::uno::Type* pDestType = GetPropertyType( static_cast<sal_uInt16>(nPropId) );
         if ( pDestType->getTypeClass() == TypeClass_ANY )
         {
             rConvertedValue = rValue;
@@ -1082,7 +1082,7 @@ sal_Bool UnoControlModel::convertFastPropertyValue( Any & rConvertedValue, Any &
                             sal_Int32 nAsInteger = 0;
                             bConverted = ( rValue >>= nAsInteger );
                             if ( bConverted )
-                                rConvertedValue <<= (double)nAsInteger;
+                                rConvertedValue <<= static_cast<double>(nAsInteger);
                         }
                     }
                     break;
@@ -1146,7 +1146,7 @@ sal_Bool UnoControlModel::convertFastPropertyValue( Any & rConvertedValue, Any &
                 {
                     throw css::lang::IllegalArgumentException(
                         "Unable to convert the given value for the property "
-                        + GetPropertyName( (sal_uInt16)nPropId )
+                        + GetPropertyName( static_cast<sal_uInt16>(nPropId) )
                         + ".\nExpected type: " + pDestType->getTypeName()
                         + "\nFound type: " + rValue.getValueType().getTypeName(),
                         static_cast< css::beans::XPropertySet* >(this),
@@ -1169,7 +1169,7 @@ void UnoControlModel::setFastPropertyValue_NoBroadcast( sal_Int32 nPropId, const
     const css::uno::Any* pProp = it == maData.end() ? nullptr : &(it->second);
     ENSURE_OR_RETURN_VOID( pProp, "UnoControlModel::setFastPropertyValue_NoBroadcast: invalid property id!" );
 
-    DBG_ASSERT( ( rValue.getValueType().getTypeClass() != css::uno::TypeClass_VOID ) || ( GetPropertyAttribs( (sal_uInt16)nPropId ) & css::beans::PropertyAttribute::MAYBEVOID ), "Property should not be VOID!" );
+    DBG_ASSERT( ( rValue.getValueType().getTypeClass() != css::uno::TypeClass_VOID ) || ( GetPropertyAttribs( static_cast<sal_uInt16>(nPropId) ) & css::beans::PropertyAttribute::MAYBEVOID ), "Property should not be VOID!" );
     maData[ nPropId ] = rValue;
 }
 
@@ -1197,7 +1197,7 @@ void UnoControlModel::getFastPropertyValue( css::uno::Any& rValue, sal_Int32 nPr
                                                                 break;
             case BASEPROPERTY_FONTDESCRIPTORPART_CHARSET:       rValue <<= aFD.CharSet;
                                                                 break;
-            case BASEPROPERTY_FONTDESCRIPTORPART_HEIGHT:        rValue <<= (float)aFD.Height;
+            case BASEPROPERTY_FONTDESCRIPTORPART_HEIGHT:        rValue <<= static_cast<float>(aFD.Height);
                                                                 break;
             case BASEPROPERTY_FONTDESCRIPTORPART_WEIGHT:        rValue <<= aFD.Weight;
                                                                 break;
@@ -1236,7 +1236,7 @@ void UnoControlModel::setPropertyValue( const OUString& rPropertyName, const css
     sal_Int32 nPropId = 0;
     {
         ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
-        nPropId = (sal_Int32) GetPropertyId( rPropertyName );
+        nPropId = static_cast<sal_Int32>(GetPropertyId( rPropertyName ));
         DBG_ASSERT( nPropId, "Invalid ID in UnoControlModel::setPropertyValue" );
     }
     if( !nPropId )
@@ -1261,7 +1261,7 @@ void UnoControlModel::setFastPropertyValue( sal_Int32 nPropId, const css::uno::A
         (*pProp) >>= aOldFontDescriptor;
 
         FontDescriptor aNewFontDescriptor( aOldFontDescriptor );
-        lcl_ImplMergeFontProperty( aNewFontDescriptor, (sal_uInt16)nPropId, rValue );
+        lcl_ImplMergeFontProperty( aNewFontDescriptor, static_cast<sal_uInt16>(nPropId), rValue );
 
         Any aNewValue;
         aNewValue <<= aNewFontDescriptor;
@@ -1320,7 +1320,7 @@ void UnoControlModel::setPropertyValues( const css::uno::Sequence< OUString >& r
                     pFD.reset( new awt::FontDescriptor );
                     (*pProp) >>= *pFD;
                 }
-                lcl_ImplMergeFontProperty( *pFD, (sal_uInt16)pHandles[n], pValues[n] );
+                lcl_ImplMergeFontProperty( *pFD, static_cast<sal_uInt16>(pHandles[n]), pValues[n] );
                 pHandles[n] = -1;
                 nValidHandles--;
             }
diff --git a/toolkit/source/controls/unocontrols.cxx b/toolkit/source/controls/unocontrols.cxx
index f74f468b7562..dd2d11eaccd2 100644
--- a/toolkit/source/controls/unocontrols.cxx
+++ b/toolkit/source/controls/unocontrols.cxx
@@ -130,7 +130,7 @@ uno::Any UnoControlEditModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const
     switch ( nPropId )
     {
     case BASEPROPERTY_LINE_END_FORMAT:
-        aReturn <<= (sal_Int16)awt::LineEndFormat::LINE_FEED;   // LF
+        aReturn <<= sal_Int16(awt::LineEndFormat::LINE_FEED);   // LF
         break;
     case BASEPROPERTY_DEFAULTCONTROL:
         aReturn <<= OUString::createFromAscii( szServiceName_UnoControlEdit );
@@ -719,7 +719,7 @@ uno::Any UnoControlButtonModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const
     case BASEPROPERTY_TOGGLE:
         return uno::makeAny( false );
     case BASEPROPERTY_ALIGN:
-        return uno::makeAny( (sal_Int16)PROPERTY_ALIGN_CENTER );
+        return uno::makeAny( sal_Int16(PROPERTY_ALIGN_CENTER) );
     case BASEPROPERTY_FOCUSONCLICK:
         return uno::makeAny( true );
     }
@@ -865,7 +865,7 @@ void SAL_CALL UnoButtonControl::disposing( const lang::EventObject& Source )
 void SAL_CALL UnoButtonControl::itemStateChanged( const awt::ItemEvent& rEvent )
 {
     // forward to model
-    ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_STATE ), uno::Any((sal_Int16)rEvent.Selected), false );
+    ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_STATE ), uno::Any(static_cast<sal_Int16>(rEvent.Selected)), false );
 
     // multiplex
     ItemEvent aEvent( rEvent );
@@ -1123,7 +1123,7 @@ uno::Any UnoControlRadioButtonModel::ImplGetDefaultValue( sal_uInt16 nPropId ) c
         return uno::makeAny( OUString::createFromAscii( szServiceName_UnoControlRadioButton ) );
 
     case BASEPROPERTY_VISUALEFFECT:
-        return uno::makeAny( (sal_Int16)awt::VisualEffect::LOOK3D );
+        return uno::makeAny( sal_Int16(awt::VisualEffect::LOOK3D) );
     }
 
     return GraphicControlModel::ImplGetDefaultValue( nPropId );
@@ -1282,7 +1282,7 @@ sal_Bool UnoRadioButtonControl::getState()
 
 void UnoRadioButtonControl::itemStateChanged( const awt::ItemEvent& rEvent )
 {
-    ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_STATE ), uno::Any((sal_Int16)rEvent.Selected), false );
+    ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_STATE ), uno::Any(static_cast<sal_Int16>(rEvent.Selected)), false );
 
     // compatibility:
     // in OOo 1.0.x, when the user clicked a radio button in a group of buttons, this resulted
@@ -1370,7 +1370,7 @@ uno::Any UnoControlCheckBoxModel::ImplGetDefaultValue( sal_uInt16 nPropId ) cons
         return uno::makeAny( OUString::createFromAscii( szServiceName_UnoControlCheckBox ) );
 
     case BASEPROPERTY_VISUALEFFECT:
-        return uno::makeAny( (sal_Int16)awt::VisualEffect::LOOK3D );
+        return uno::makeAny( sal_Int16(awt::VisualEffect::LOOK3D) );
     }
 
     return GraphicControlModel::ImplGetDefaultValue( nPropId );
@@ -1506,7 +1506,7 @@ void UnoCheckBoxControl::setLabel( const OUString&  rLabel )
 
 void UnoCheckBoxControl::setState( short n )
 {
-    ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_STATE ), uno::Any((sal_Int16) n), true );
+    ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_STATE ), uno::Any(static_cast<sal_Int16>(n)), true );
 }
 
 short UnoCheckBoxControl::getState()
@@ -1524,7 +1524,7 @@ void UnoCheckBoxControl::enableTriState( sal_Bool b )
 
 void UnoCheckBoxControl::itemStateChanged( const awt::ItemEvent& rEvent )
 {
-    ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_STATE ), uno::Any((sal_Int16) rEvent.Selected), false );
+    ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_STATE ), uno::Any(static_cast<sal_Int16>(rEvent.Selected)), false );
 
     if ( maItemListeners.getLength() )
         maItemListeners.itemStateChanged( rEvent );
@@ -1589,7 +1589,7 @@ uno::Any UnoControlFixedHyperlinkModel::ImplGetDefaultValue( sal_uInt16 nPropId
     }
     else if ( nPropId == BASEPROPERTY_BORDER )
     {
-        return uno::Any((sal_Int16) 0);
+        return uno::Any(sal_Int16(0));
     }
     else if ( nPropId == BASEPROPERTY_URL )
     {
@@ -1684,7 +1684,7 @@ OUString UnoFixedHyperlinkControl::getURL(  )
 
 void UnoFixedHyperlinkControl::setAlignment( short nAlign )
 {
-    ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_ALIGN ), uno::Any((sal_Int16) nAlign), true );
+    ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_ALIGN ), uno::Any(static_cast<sal_Int16>(nAlign)), true );
 }
 
 short UnoFixedHyperlinkControl::getAlignment()
@@ -1780,7 +1780,7 @@ uno::Any UnoControlFixedTextModel::ImplGetDefaultValue( sal_uInt16 nPropId ) con
     }
     else if ( nPropId == BASEPROPERTY_BORDER )
     {
-        return uno::Any((sal_Int16)0);
+        return uno::Any(sal_Int16(0));
     }
 
     return UnoControlModel::ImplGetDefaultValue( nPropId );
@@ -1875,7 +1875,7 @@ OUString UnoFixedTextControl::getText()
 
 void UnoFixedTextControl::setAlignment( short nAlign )
 {
-    ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_ALIGN ), uno::Any((sal_Int16) nAlign), true );
+    ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_ALIGN ), uno::Any(static_cast<sal_Int16>(nAlign)), true );
 }
 
 short UnoFixedTextControl::getAlignment()
@@ -2732,8 +2732,8 @@ void UnoListBoxControl::addItems( const uno::Sequence< OUString>& aItems, sal_In
     uno::Any aVal = ImplGetPropertyValue( GetPropertyName( BASEPROPERTY_STRINGITEMLIST ) );
     uno::Sequence< OUString> aSeq;
     aVal >>= aSeq;
-    sal_uInt16 nNewItems = (sal_uInt16)aItems.getLength();
-    sal_uInt16 nOldLen = (sal_uInt16)aSeq.getLength();
+    sal_uInt16 nNewItems = static_cast<sal_uInt16>(aItems.getLength());
+    sal_uInt16 nOldLen = static_cast<sal_uInt16>(aSeq.getLength());
     sal_uInt16 nNewLen = nOldLen + nNewItems;
 
     uno::Sequence< OUString> aNewSeq( nNewLen );
@@ -2764,7 +2764,7 @@ void UnoListBoxControl::removeItems( sal_Int16 nPos, sal_Int16 nCount )
     uno::Any aVal = ImplGetPropertyValue( GetPropertyName( BASEPROPERTY_STRINGITEMLIST ) );
     uno::Sequence< OUString> aSeq;
     aVal >>= aSeq;
-    sal_uInt16 nOldLen = (sal_uInt16)aSeq.getLength();
+    sal_uInt16 nOldLen = static_cast<sal_uInt16>(aSeq.getLength());
     if ( nOldLen && ( nPos < nOldLen ) )
     {
         if ( nCount > ( nOldLen-nPos ) )
@@ -2794,7 +2794,7 @@ sal_Int16 UnoListBoxControl::getItemCount()
     uno::Any aVal = ImplGetPropertyValue( GetPropertyName( BASEPROPERTY_STRINGITEMLIST ) );
     uno::Sequence< OUString> aSeq;
     aVal >>= aSeq;
-    return (sal_Int16)aSeq.getLength();
+    return static_cast<sal_Int16>(aSeq.getLength());
 }
 
 OUString UnoListBoxControl::getItem( sal_Int16 nPos )
@@ -3341,8 +3341,8 @@ void UnoComboBoxControl::addItems( const uno::Sequence< OUString>& aItems, sal_I
     uno::Any aVal = ImplGetPropertyValue( GetPropertyName( BASEPROPERTY_STRINGITEMLIST ) );
     uno::Sequence< OUString> aSeq;
     aVal >>= aSeq;
-    sal_uInt16 nNewItems = (sal_uInt16)aItems.getLength();
-    sal_uInt16 nOldLen = (sal_uInt16)aSeq.getLength();
+    sal_uInt16 nNewItems = static_cast<sal_uInt16>(aItems.getLength());
+    sal_uInt16 nOldLen = static_cast<sal_uInt16>(aSeq.getLength());
     sal_uInt16 nNewLen = nOldLen + nNewItems;
 
     uno::Sequence< OUString> aNewSeq( nNewLen );
@@ -3373,7 +3373,7 @@ void UnoComboBoxControl::removeItems( sal_Int16 nPos, sal_Int16 nCount )
     uno::Any aVal = ImplGetPropertyValue( GetPropertyName( BASEPROPERTY_STRINGITEMLIST ) );
     uno::Sequence< OUString> aSeq;
     aVal >>= aSeq;
-    sal_uInt16 nOldLen = (sal_uInt16)aSeq.getLength();
+    sal_uInt16 nOldLen = static_cast<sal_uInt16>(aSeq.getLength());
     if ( nOldLen && ( nPos < nOldLen ) )
     {
         if ( nCount > ( nOldLen-nPos ) )
@@ -3403,7 +3403,7 @@ sal_Int16 UnoComboBoxControl::getItemCount()
     uno::Any aVal = ImplGetPropertyValue( GetPropertyName( BASEPROPERTY_STRINGITEMLIST ) );
     uno::Sequence< OUString> aSeq;
     aVal >>= aSeq;
-    return (sal_Int16)aSeq.getLength();
+    return static_cast<sal_Int16>(aSeq.getLength());
 }
 
 OUString UnoComboBoxControl::getItem( sal_Int16 nPos )
diff --git a/toolkit/source/helper/formpdfexport.cxx b/toolkit/source/helper/formpdfexport.cxx
index a5f8548bf246..a2e18dad1d5f 100644
--- a/toolkit/source/helper/formpdfexport.cxx
+++ b/toolkit/source/helper/formpdfexport.cxx
@@ -569,7 +569,7 @@ namespace toolkitform
                     for( sal_Int32 i = 0; i < aSelectIndices.getLength(); i++ )
                     {
                         sal_Int16 nIndex = aSelectIndices.getConstArray()[i];
-                        if( nIndex >= 0 && nIndex < (sal_Int16)pListWidget->Entries.size() )
+                        if( nIndex >= 0 && nIndex < static_cast<sal_Int16>(pListWidget->Entries.size()) )
                             pListWidget->SelectedEntries.push_back( nIndex );
                     }
                 }
diff --git a/toolkit/source/helper/unopropertyarrayhelper.cxx b/toolkit/source/helper/unopropertyarrayhelper.cxx
index fce8ee8ac834..8ac6f95103c8 100644
--- a/toolkit/source/helper/unopropertyarrayhelper.cxx
+++ b/toolkit/source/helper/unopropertyarrayhelper.cxx
@@ -121,7 +121,7 @@ sal_Bool UnoPropertyArrayHelper::hasPropertyByName(const OUString& rPropertyName
 
 sal_Int32 UnoPropertyArrayHelper::getHandleByName( const OUString & rPropertyName )
 {
-    sal_Int32 nId = (sal_Int32 ) GetPropertyId( rPropertyName );
+    sal_Int32 nId = static_cast<sal_Int32>(GetPropertyId( rPropertyName ));
     return nId ? nId : -1;
 }
 
diff --git a/toolkit/source/helper/vclunohelper.cxx b/toolkit/source/helper/vclunohelper.cxx
index 05252e6d16f5..c65a04976f1c 100644
--- a/toolkit/source/helper/vclunohelper.cxx
+++ b/toolkit/source/helper/vclunohelper.cxx
@@ -175,7 +175,7 @@ tools::Polygon VCLUnoHelper::CreatePolygon( const css::uno::Sequence< sal_Int32
     sal_Int32 nLen = DataX.getLength();
     const sal_Int32* pDataX = DataX.getConstArray();
     const sal_Int32* pDataY = DataY.getConstArray();
-    tools::Polygon aPoly( (sal_uInt16) nLen );
+    tools::Polygon aPoly( static_cast<sal_uInt16>(nLen) );
     for ( sal_Int32 n = 0; n < nLen; n++ )
     {
         Point aPnt;
@@ -202,8 +202,8 @@ css::awt::FontDescriptor VCLUnoHelper::CreateFontDescriptor( const vcl::Font& rF
     css::awt::FontDescriptor aFD;
     aFD.Name = rFont.GetFamilyName();
     aFD.StyleName = rFont.GetStyleName();
-    aFD.Height = (sal_Int16)rFont.GetFontSize().Height();
-    aFD.Width = (sal_Int16)rFont.GetFontSize().Width();
+    aFD.Height = static_cast<sal_Int16>(rFont.GetFontSize().Height());
+    aFD.Width = static_cast<sal_Int16>(rFont.GetFontSize().Width());
     aFD.Family = sal::static_int_cast< sal_Int16 >(rFont.GetFamilyType());
     aFD.CharSet = rFont.GetCharSet();
     aFD.Pitch = sal::static_int_cast< sal_Int16 >(rFont.GetPitch());
@@ -230,8 +230,8 @@ vcl::Font VCLUnoHelper::CreateFont( const css::awt::FontDescriptor& rDescr, cons
         aFont.SetFontSize( Size( rDescr.Width, rDescr.Height ) );
     if ( (FontFamily)rDescr.Family != FAMILY_DONTKNOW )
         aFont.SetFamily( (FontFamily)rDescr.Family );
-    if ( (rtl_TextEncoding)rDescr.CharSet != RTL_TEXTENCODING_DONTKNOW )
-        aFont.SetCharSet( (rtl_TextEncoding)rDescr.CharSet );
+    if ( static_cast<rtl_TextEncoding>(rDescr.CharSet) != RTL_TEXTENCODING_DONTKNOW )
+        aFont.SetCharSet( static_cast<rtl_TextEncoding>(rDescr.CharSet) );
     if ( (FontPitch)rDescr.Pitch != PITCH_DONTKNOW )
         aFont.SetPitch( (FontPitch)rDescr.Pitch );
     if ( rDescr.CharacterWidth )
@@ -246,7 +246,7 @@ vcl::Font VCLUnoHelper::CreateFont( const css::awt::FontDescriptor& rDescr, cons
         aFont.SetStrikeout( (FontStrikeout)rDescr.Strikeout );
 
     // Not DONTKNOW
-    aFont.SetOrientation( (short)rDescr.Orientation );
+    aFont.SetOrientation( static_cast<short>(rDescr.Orientation) );
     aFont.SetKerning( static_cast<FontKerning>(rDescr.Kerning) );
     aFont.SetWordLineMode( rDescr.WordLineMode );
 
@@ -266,10 +266,10 @@ vcl::Font VCLUnoHelper::CreateFont( const css::uno::Reference< css::awt::XFont >
 css::awt::SimpleFontMetric VCLUnoHelper::CreateFontMetric( const FontMetric& rFontMetric )
 {
     css::awt::SimpleFontMetric aFM;
-    aFM.Ascent = (sal_Int16)rFontMetric.GetAscent();
-    aFM.Descent = (sal_Int16)rFontMetric.GetDescent();
-    aFM.Leading = (sal_Int16)rFontMetric.GetInternalLeading();
-    aFM.Slant = (sal_Int16)rFontMetric.GetSlant();
+    aFM.Ascent = static_cast<sal_Int16>(rFontMetric.GetAscent());
+    aFM.Descent = static_cast<sal_Int16>(rFontMetric.GetDescent());
+    aFM.Leading = static_cast<sal_Int16>(rFontMetric.GetInternalLeading());
+    aFM.Slant = static_cast<sal_Int16>(rFontMetric.GetSlant());
     aFM.FirstChar = 0x0020;
     aFM.LastChar = 0xFFFD;
     return aFM;
@@ -393,7 +393,7 @@ namespace
                 if ( aUnit.nMeasurementUnit == _nUnit )
                 {
                     _rFieldToUNOValueFactor = aUnit.nFieldToMeasureFactor;
-                    return (sal_Int16)aUnit.eFieldUnit;
+                    return static_cast<sal_Int16>(aUnit.eFieldUnit);
                 }
             }
         }
@@ -401,7 +401,7 @@ namespace
             return -1;
 
         _rFieldToUNOValueFactor = 1;
-        return (sal_Int16)FUNIT_NONE;
+        return sal_Int16(FUNIT_NONE);
     }
 }
 
@@ -410,7 +410,7 @@ namespace
 
 sal_Int16 VCLUnoHelper::ConvertToMeasurementUnit( FieldUnit _nFieldUnit, sal_Int16 _nUNOToFieldValueFactor )
 {
-    return convertMeasurementUnit( (sal_Int16)_nFieldUnit, FieldUnitToMeasurementUnit, _nUNOToFieldValueFactor );
+    return convertMeasurementUnit( static_cast<sal_Int16>(_nFieldUnit), FieldUnitToMeasurementUnit, _nUNOToFieldValueFactor );
 }