fdo#48253 Expand SAL_STATIC_CAST and SAL_CONST_CAST

Change-Id: I50f0887ceb4517d7ef234f970ca2ba679d533382

19 files changed, 100 insertions, 100 deletions

diff --git a/toolkit/inc/toolkit/helper/macros.hxx b/toolkit/inc/toolkit/helper/macros.hxx
index 3d59e609c421..01d5705c60f5 100644
--- a/toolkit/inc/toolkit/helper/macros.hxx
+++ b/toolkit/inc/toolkit/helper/macros.hxx
@@ -160,8 +160,8 @@ ClassName::ClassName( ::cppu::OWeakObject& rSource ) \
 ::com::sun::star::uno::Any ClassName::queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException) \
 { \
     ::com::sun::star::uno::Any aRet = ::cppu::queryInterface( rType, \
-                                        SAL_STATIC_CAST( ::com::sun::star::lang::XEventListener*, this ), \
-                                        SAL_STATIC_CAST( InterfaceName*, this ) ); \
+                                        (static_cast< ::com::sun::star::lang::XEventListener* >(this)), \
+                                        (static_cast< InterfaceName* >(this)) ); \
     return (aRet.hasValue() ? aRet : ListenerMultiplexerBase::queryInterface( rType )); \
 } \
 void ClassName::disposing( const ::com::sun::star::lang::EventObject& ) throw(::com::sun::star::uno::RuntimeException) \
diff --git a/toolkit/source/awt/vclxbitmap.cxx b/toolkit/source/awt/vclxbitmap.cxx
index f86d430bccc7..8d6cdd58ae26 100644
--- a/toolkit/source/awt/vclxbitmap.cxx
+++ b/toolkit/source/awt/vclxbitmap.cxx
@@ -43,10 +43,10 @@
 ::com::sun::star::uno::Any VCLXBitmap::queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException)
 {
     ::com::sun::star::uno::Any aRet = ::cppu::queryInterface( rType,
-                                        SAL_STATIC_CAST( ::com::sun::star::awt::XBitmap*, this ),
-                                        SAL_STATIC_CAST( ::com::sun::star::awt::XDisplayBitmap*, this ),
-                                        SAL_STATIC_CAST( ::com::sun::star::lang::XUnoTunnel*, this ),
-                                        SAL_STATIC_CAST( ::com::sun::star::lang::XTypeProvider*, this ) );
+                                        (static_cast< ::com::sun::star::awt::XBitmap* >(this)),
+                                        (static_cast< ::com::sun::star::awt::XDisplayBitmap* >(this)),
+                                        (static_cast< ::com::sun::star::lang::XUnoTunnel* >(this)),
+                                        (static_cast< ::com::sun::star::lang::XTypeProvider* >(this)) );
     return (aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType ));
 }
 
diff --git a/toolkit/source/awt/vclxcontainer.cxx b/toolkit/source/awt/vclxcontainer.cxx
index 5f4685c08077..7f48b8d0a849 100644
--- a/toolkit/source/awt/vclxcontainer.cxx
+++ b/toolkit/source/awt/vclxcontainer.cxx
@@ -60,8 +60,8 @@ VCLXContainer::~VCLXContainer()
 ::com::sun::star::uno::Any VCLXContainer::queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException)
 {
     ::com::sun::star::uno::Any aRet = ::cppu::queryInterface( rType,
-                                        SAL_STATIC_CAST( ::com::sun::star::awt::XVclContainer*, this ),
-                                        SAL_STATIC_CAST( ::com::sun::star::awt::XVclContainerPeer*, this ) );
+                                        (static_cast< ::com::sun::star::awt::XVclContainer* >(this)),
+                                        (static_cast< ::com::sun::star::awt::XVclContainerPeer* >(this)) );
     return (aRet.hasValue() ? aRet : VCLXWindow::queryInterface( rType ));
 }
 
diff --git a/toolkit/source/awt/vclxdevice.cxx b/toolkit/source/awt/vclxdevice.cxx
index 73adaa12cd37..e73b1f2cd13e 100644
--- a/toolkit/source/awt/vclxdevice.cxx
+++ b/toolkit/source/awt/vclxdevice.cxx
@@ -79,10 +79,10 @@ void VCLXDevice::SetCreatedWithToolkit( sal_Bool bCreatedWithToolkit )
 ::com::sun::star::uno::Any VCLXDevice::queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException)
 {
     ::com::sun::star::uno::Any aRet = ::cppu::queryInterface( rType,
-                                        SAL_STATIC_CAST( ::com::sun::star::awt::XDevice*, this ),
-                                        SAL_STATIC_CAST( ::com::sun::star::lang::XUnoTunnel*, this ),
-                                        SAL_STATIC_CAST( ::com::sun::star::lang::XTypeProvider*, this ),
-                                        SAL_STATIC_CAST( ::com::sun::star::awt::XUnitConversion*, this ) );
+                                        (static_cast< ::com::sun::star::awt::XDevice* >(this)),
+                                        (static_cast< ::com::sun::star::lang::XUnoTunnel* >(this)),
+                                        (static_cast< ::com::sun::star::lang::XTypeProvider* >(this)),
+                                        (static_cast< ::com::sun::star::awt::XUnitConversion* >(this)) );
     return (aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType ));
 }
 
diff --git a/toolkit/source/awt/vclxfont.cxx b/toolkit/source/awt/vclxfont.cxx
index d44e68b2b0bc..6b9e9cec0e10 100644
--- a/toolkit/source/awt/vclxfont.cxx
+++ b/toolkit/source/awt/vclxfont.cxx
@@ -82,10 +82,10 @@ sal_Bool VCLXFont::ImplAssertValidFontMetric()
 ::com::sun::star::uno::Any VCLXFont::queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException)
 {
     ::com::sun::star::uno::Any aRet = ::cppu::queryInterface( rType,
-                                        SAL_STATIC_CAST( ::com::sun::star::awt::XFont*, this ),
-                                        SAL_STATIC_CAST( ::com::sun::star::awt::XFont2*, this ),
-                                        SAL_STATIC_CAST( ::com::sun::star::lang::XUnoTunnel*, this ),
-                                        SAL_STATIC_CAST( ::com::sun::star::lang::XTypeProvider*, this ) );
+                                        (static_cast< ::com::sun::star::awt::XFont* >(this)),
+                                        (static_cast< ::com::sun::star::awt::XFont2* >(this)),
+                                        (static_cast< ::com::sun::star::lang::XUnoTunnel* >(this)),
+                                        (static_cast< ::com::sun::star::lang::XTypeProvider* >(this)) );
     return (aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType ));
 }
 
diff --git a/toolkit/source/awt/vclxgraphics.cxx b/toolkit/source/awt/vclxgraphics.cxx
index 8923ea34a706..2def418ce61f 100644
--- a/toolkit/source/awt/vclxgraphics.cxx
+++ b/toolkit/source/awt/vclxgraphics.cxx
@@ -49,9 +49,9 @@
 ::com::sun::star::uno::Any VCLXGraphics::queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException)
 {
     ::com::sun::star::uno::Any aRet = ::cppu::queryInterface( rType,
-                                        SAL_STATIC_CAST( ::com::sun::star::awt::XGraphics*, this ),
-                                        SAL_STATIC_CAST( ::com::sun::star::lang::XTypeProvider*, this ),
-                                        SAL_STATIC_CAST( ::com::sun::star::lang::XUnoTunnel*, this ) );
+                                        (static_cast< ::com::sun::star::awt::XGraphics* >(this)),
+                                        (static_cast< ::com::sun::star::lang::XTypeProvider* >(this)),
+                                        (static_cast< ::com::sun::star::lang::XUnoTunnel* >(this)) );
     return (aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType ));
 }
 
diff --git a/toolkit/source/awt/vclxmenu.cxx b/toolkit/source/awt/vclxmenu.cxx
index 26e3900f5cc0..d45d5dc25066 100644
--- a/toolkit/source/awt/vclxmenu.cxx
+++ b/toolkit/source/awt/vclxmenu.cxx
@@ -273,24 +273,24 @@ throw(::com::sun::star::uno::RuntimeException)
 
     if ( bIsPopupMenu )
         aRet = ::cppu::queryInterface(  rType,
-                                        SAL_STATIC_CAST( ::com::sun::star::awt::XMenu*, (::com::sun::star::awt::XMenuBar*) this ),
-                                        SAL_STATIC_CAST( ::com::sun::star::awt::XPopupMenu*, this ),
-                                        SAL_STATIC_CAST( ::com::sun::star::awt::XPopupMenuExtended*, this ),
-                                        SAL_STATIC_CAST( ::com::sun::star::awt::XMenuExtended*, (::com::sun::star::awt::XPopupMenuExtended*) this ),
-                                        SAL_STATIC_CAST( ::com::sun::star::awt::XMenuExtended2*, (::com::sun::star::awt::XPopupMenuExtended*) this ),
-                                        SAL_STATIC_CAST( ::com::sun::star::lang::XTypeProvider*, this ),
-                                        SAL_STATIC_CAST( ::com::sun::star::lang::XServiceInfo*, this ),
-                                        SAL_STATIC_CAST( ::com::sun::star::lang::XUnoTunnel*, this ) );
+                                        (static_cast< ::com::sun::star::awt::XMenu* >((::com::sun::star::awt::XMenuBar*) this) ),
+                                        (static_cast< ::com::sun::star::awt::XPopupMenu* >(this)),
+                                        (static_cast< ::com::sun::star::awt::XPopupMenuExtended* >(this)),
+                                        (static_cast< ::com::sun::star::awt::XMenuExtended* >((::com::sun::star::awt::XPopupMenuExtended*) this) ),
+                                        (static_cast< ::com::sun::star::awt::XMenuExtended2* >((::com::sun::star::awt::XPopupMenuExtended*) this) ),
+                                        (static_cast< ::com::sun::star::lang::XTypeProvider* >(this)),
+                                        (static_cast< ::com::sun::star::lang::XServiceInfo* >(this)),
+                                        (static_cast< ::com::sun::star::lang::XUnoTunnel* >(this)) );
     else
         aRet = ::cppu::queryInterface(  rType,
-                                        SAL_STATIC_CAST( ::com::sun::star::awt::XMenu*, (::com::sun::star::awt::XMenuBar*) this ),
-                                        SAL_STATIC_CAST( ::com::sun::star::awt::XMenuBar*, this ),
-                                        SAL_STATIC_CAST( ::com::sun::star::awt::XMenuBarExtended*, this ),
-                                        SAL_STATIC_CAST( ::com::sun::star::awt::XMenuExtended*, (::com::sun::star::awt::XMenuBarExtended*) this ),
-                                        SAL_STATIC_CAST( ::com::sun::star::awt::XMenuExtended2*, (::com::sun::star::awt::XMenuBarExtended*) this ),
-                                        SAL_STATIC_CAST( ::com::sun::star::lang::XTypeProvider*, this ),
-                                        SAL_STATIC_CAST( ::com::sun::star::lang::XServiceInfo*, this ),
-                                        SAL_STATIC_CAST( ::com::sun::star::lang::XUnoTunnel*, this ) );
+                                        (static_cast< ::com::sun::star::awt::XMenu* >((::com::sun::star::awt::XMenuBar*) this) ),
+                                        (static_cast< ::com::sun::star::awt::XMenuBar* >(this)),
+                                        (static_cast< ::com::sun::star::awt::XMenuBarExtended* >(this)),
+                                        (static_cast< ::com::sun::star::awt::XMenuExtended* >((::com::sun::star::awt::XMenuBarExtended*) this) ),
+                                        (static_cast< ::com::sun::star::awt::XMenuExtended2* >((::com::sun::star::awt::XMenuBarExtended*) this) ),
+                                        (static_cast< ::com::sun::star::lang::XTypeProvider* >(this)),
+                                        (static_cast< ::com::sun::star::lang::XServiceInfo* >(this)),
+                                        (static_cast< ::com::sun::star::lang::XUnoTunnel* >(this)) );
 
     return (aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType ));
 }
diff --git a/toolkit/source/awt/vclxpointer.cxx b/toolkit/source/awt/vclxpointer.cxx
index 0a646511a054..d2fda845811c 100644
--- a/toolkit/source/awt/vclxpointer.cxx
+++ b/toolkit/source/awt/vclxpointer.cxx
@@ -47,9 +47,9 @@ VCLXPointer::~VCLXPointer()
 ::com::sun::star::uno::Any VCLXPointer::queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException)
 {
     ::com::sun::star::uno::Any aRet = ::cppu::queryInterface( rType,
-                                        SAL_STATIC_CAST( ::com::sun::star::awt::XPointer*, this ),
-                                        SAL_STATIC_CAST( ::com::sun::star::lang::XUnoTunnel*, this ),
-                                        SAL_STATIC_CAST( ::com::sun::star::lang::XTypeProvider*, this ) );
+                                        (static_cast< ::com::sun::star::awt::XPointer* >(this)),
+                                        (static_cast< ::com::sun::star::lang::XUnoTunnel* >(this)),
+                                        (static_cast< ::com::sun::star::lang::XTypeProvider* >(this)) );
     return (aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType ));
 }
 
diff --git a/toolkit/source/awt/vclxprinter.cxx b/toolkit/source/awt/vclxprinter.cxx
index 25a6efb54bdf..f76a381461c3 100644
--- a/toolkit/source/awt/vclxprinter.cxx
+++ b/toolkit/source/awt/vclxprinter.cxx
@@ -80,11 +80,11 @@
 ::com::sun::star::uno::Any VCLXPrinterPropertySet::queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException)
 {
     ::com::sun::star::uno::Any aRet = ::cppu::queryInterface( rType,
-                                        SAL_STATIC_CAST( ::com::sun::star::beans::XMultiPropertySet*, this ),
-                                        SAL_STATIC_CAST( ::com::sun::star::beans::XFastPropertySet*, this ),
-                                        SAL_STATIC_CAST( ::com::sun::star::beans::XPropertySet*, (::cppu::OPropertySetHelper*) this ),
-                                        SAL_STATIC_CAST( ::com::sun::star::awt::XPrinterPropertySet*, this ),
-                                        SAL_STATIC_CAST( ::com::sun::star::lang::XTypeProvider*, this ) );
+                                        (static_cast< ::com::sun::star::beans::XMultiPropertySet* >(this)),
+                                        (static_cast< ::com::sun::star::beans::XFastPropertySet* >(this)),
+                                        (static_cast< ::com::sun::star::beans::XPropertySet* >((::cppu::OPropertySetHelper*) this) ),
+                                        (static_cast< ::com::sun::star::awt::XPrinterPropertySet* >(this)),
+                                        (static_cast< ::com::sun::star::lang::XTypeProvider* >(this)) );
     return (aRet.hasValue() ? aRet : OPropertySetHelper::queryInterface( rType ));
 }
 
@@ -307,7 +307,7 @@ VCLXPrinter::~VCLXPrinter()
 ::com::sun::star::uno::Any VCLXPrinter::queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException)
 {
     ::com::sun::star::uno::Any aRet = ::cppu::queryInterface( rType,
-                                        SAL_STATIC_CAST( ::com::sun::star::awt::XPrinter*, this ) );
+                                        (static_cast< ::com::sun::star::awt::XPrinter* >(this)) );
 
     if ( !aRet.hasValue() )
         aRet = VCLXPrinterPropertySet::queryInterface( rType );
@@ -392,7 +392,7 @@ VCLXInfoPrinter::~VCLXInfoPrinter()
 ::com::sun::star::uno::Any VCLXInfoPrinter::queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException)
 {
     ::com::sun::star::uno::Any aRet = ::cppu::queryInterface( rType,
-                                        SAL_STATIC_CAST( ::com::sun::star::awt::XInfoPrinter*, this ) );
+                                        (static_cast< ::com::sun::star::awt::XInfoPrinter* >(this)) );
 
     if ( !aRet.hasValue() )
         aRet = VCLXPrinterPropertySet::queryInterface( rType );
@@ -422,7 +422,7 @@ IMPL_XTYPEPROVIDER_END
 ::com::sun::star::uno::Any VCLXPrinterServer::queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException)
 {
     ::com::sun::star::uno::Any aRet = ::cppu::queryInterface( rType,
-                                        SAL_STATIC_CAST( ::com::sun::star::awt::XPrinterServer*, this ) );
+                                        (static_cast< ::com::sun::star::awt::XPrinterServer* >(this)) );
     return (aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType ));
 }
 
diff --git a/toolkit/source/awt/vclxregion.cxx b/toolkit/source/awt/vclxregion.cxx
index 8c2c7397ea92..59611ebcd68b 100644
--- a/toolkit/source/awt/vclxregion.cxx
+++ b/toolkit/source/awt/vclxregion.cxx
@@ -52,9 +52,9 @@ VCLXRegion::~VCLXRegion()
 ::com::sun::star::uno::Any VCLXRegion::queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException)
 {
     ::com::sun::star::uno::Any aRet = ::cppu::queryInterface( rType,
-                                        SAL_STATIC_CAST( ::com::sun::star::awt::XRegion*, this ),
-                                        SAL_STATIC_CAST( ::com::sun::star::lang::XUnoTunnel*, this ),
-                                        SAL_STATIC_CAST( ::com::sun::star::lang::XTypeProvider*, this ) );
+                                        (static_cast< ::com::sun::star::awt::XRegion* >(this)),
+                                        (static_cast< ::com::sun::star::lang::XUnoTunnel* >(this)),
+                                        (static_cast< ::com::sun::star::lang::XTypeProvider* >(this)) );
     return (aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType ));
 }
 
diff --git a/toolkit/source/awt/vclxsystemdependentwindow.cxx b/toolkit/source/awt/vclxsystemdependentwindow.cxx
index 2e96582691c4..660ca8957add 100644
--- a/toolkit/source/awt/vclxsystemdependentwindow.cxx
+++ b/toolkit/source/awt/vclxsystemdependentwindow.cxx
@@ -69,7 +69,7 @@ VCLXSystemDependentWindow::~VCLXSystemDependentWindow()
 ::com::sun::star::uno::Any VCLXSystemDependentWindow::queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException)
 {
     ::com::sun::star::uno::Any aRet = ::cppu::queryInterface( rType,
-                                        SAL_STATIC_CAST( ::com::sun::star::awt::XSystemDependentWindowPeer*, this ) );
+                                        (static_cast< ::com::sun::star::awt::XSystemDependentWindowPeer* >(this)) );
     return (aRet.hasValue() ? aRet : VCLXWindow::queryInterface( rType ));
 }
 
diff --git a/toolkit/source/awt/vclxwindows.cxx b/toolkit/source/awt/vclxwindows.cxx
index b8d13e24f5af..596e411a93ab 100644
--- a/toolkit/source/awt/vclxwindows.cxx
+++ b/toolkit/source/awt/vclxwindows.cxx
@@ -792,8 +792,8 @@ VCLXCheckBox::VCLXCheckBox() :  maActionListeners( *this ), maItemListeners( *th
 ::com::sun::star::uno::Any VCLXCheckBox::queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException)
 {
     ::com::sun::star::uno::Any aRet = ::cppu::queryInterface( rType,
-                                        SAL_STATIC_CAST( ::com::sun::star::awt::XButton*, this ),
-                                        SAL_STATIC_CAST( ::com::sun::star::awt::XCheckBox*, this ) );
+                                        (static_cast< ::com::sun::star::awt::XButton* >(this)),
+                                        (static_cast< ::com::sun::star::awt::XCheckBox* >(this)) );
     return (aRet.hasValue() ? aRet : VCLXGraphicControl::queryInterface( rType ));
 }
 
@@ -1093,8 +1093,8 @@ VCLXRadioButton::VCLXRadioButton() : maItemListeners( *this ), maActionListeners
 ::com::sun::star::uno::Any VCLXRadioButton::queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException)
 {
     ::com::sun::star::uno::Any aRet = ::cppu::queryInterface( rType,
-                                        SAL_STATIC_CAST( ::com::sun::star::awt::XRadioButton*, this ),
-                                        SAL_STATIC_CAST( ::com::sun::star::awt::XButton*, this ) );
+                                        (static_cast< ::com::sun::star::awt::XRadioButton* >(this)),
+                                        (static_cast< ::com::sun::star::awt::XButton* >(this)) );
     return (aRet.hasValue() ? aRet : VCLXGraphicControl::queryInterface( rType ));
 }
 
@@ -1354,7 +1354,7 @@ VCLXSpinField::VCLXSpinField() : maSpinListeners( *this )
 ::com::sun::star::uno::Any VCLXSpinField::queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException)
 {
     ::com::sun::star::uno::Any aRet = ::cppu::queryInterface( rType,
-                                        SAL_STATIC_CAST( ::com::sun::star::awt::XSpinField*, this ) );
+                                        (static_cast< ::com::sun::star::awt::XSpinField* >(this)) );
     return (aRet.hasValue() ? aRet : VCLXEdit::queryInterface( rType ));
 }
 
@@ -2202,7 +2202,7 @@ VCLXMessageBox::~VCLXMessageBox()
 ::com::sun::star::uno::Any VCLXMessageBox::queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException)
 {
     ::com::sun::star::uno::Any aRet = ::cppu::queryInterface( rType,
-                                        SAL_STATIC_CAST( ::com::sun::star::awt::XMessageBox*, this ) );
+                                        (static_cast< ::com::sun::star::awt::XMessageBox* >(this)) );
     return (aRet.hasValue() ? aRet : VCLXTopWindow::queryInterface( rType ));
 }
 
@@ -2290,9 +2290,9 @@ VCLXDialog::~VCLXDialog()
 ::com::sun::star::uno::Any VCLXDialog::queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException)
 {
     ::com::sun::star::uno::Any aRet = ::cppu::queryInterface( rType,
-                                        SAL_STATIC_CAST( ::com::sun::star::document::XVbaMethodParameter*, this ),
-                                        SAL_STATIC_CAST( ::com::sun::star::awt::XDialog2*, this ),
-                                        SAL_STATIC_CAST( ::com::sun::star::awt::XDialog*, this ) );
+                                        (static_cast< ::com::sun::star::document::XVbaMethodParameter* >(this)),
+                                        (static_cast< ::com::sun::star::awt::XDialog2* >(this)),
+                                        (static_cast< ::com::sun::star::awt::XDialog* >(this)) );
     return (aRet.hasValue() ? aRet : VCLXTopWindow::queryInterface( rType ));
 }
 
@@ -2924,7 +2924,7 @@ VCLXFixedHyperlink::~VCLXFixedHyperlink()
 ::com::sun::star::uno::Any VCLXFixedHyperlink::queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException)
 {
     ::com::sun::star::uno::Any aRet = ::cppu::queryInterface( rType,
-                                        SAL_STATIC_CAST( ::com::sun::star::awt::XFixedHyperlink*, this ) );
+                                        (static_cast< ::com::sun::star::awt::XFixedHyperlink* >(this)) );
     return (aRet.hasValue() ? aRet : VCLXWindow::queryInterface( rType ));
 }
 
@@ -3239,7 +3239,7 @@ VCLXFixedText::~VCLXFixedText()
 ::com::sun::star::uno::Any VCLXFixedText::queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException)
 {
     ::com::sun::star::uno::Any aRet = ::cppu::queryInterface( rType,
-                                        SAL_STATIC_CAST( ::com::sun::star::awt::XFixedText*, this ) );
+                                        (static_cast< ::com::sun::star::awt::XFixedText* >(this)) );
     return (aRet.hasValue() ? aRet : VCLXWindow::queryInterface( rType ));
 }
 
@@ -3381,7 +3381,7 @@ VCLXScrollBar::VCLXScrollBar() : maAdjustmentListeners( *this )
 ::com::sun::star::uno::Any VCLXScrollBar::queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException)
 {
     ::com::sun::star::uno::Any aRet = ::cppu::queryInterface( rType,
-                                        SAL_STATIC_CAST( ::com::sun::star::awt::XScrollBar*, this ) );
+                                        (static_cast< ::com::sun::star::awt::XScrollBar* >(this)) );
     return (aRet.hasValue() ? aRet : VCLXWindow::queryInterface( rType ));
 }
 
@@ -3865,9 +3865,9 @@ VCLXEdit::VCLXEdit() : maTextListeners( *this )
 ::com::sun::star::uno::Any VCLXEdit::queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException)
 {
     ::com::sun::star::uno::Any aRet = ::cppu::queryInterface( rType,
-                                        SAL_STATIC_CAST( ::com::sun::star::awt::XTextComponent*, this ),
-                                        SAL_STATIC_CAST( ::com::sun::star::awt::XTextEditField*, this ),
-                                        SAL_STATIC_CAST( ::com::sun::star::awt::XTextLayoutConstrains*, this ) );
+                                        (static_cast< ::com::sun::star::awt::XTextComponent* >(this)),
+                                        (static_cast< ::com::sun::star::awt::XTextEditField* >(this)),
+                                        (static_cast< ::com::sun::star::awt::XTextLayoutConstrains* >(this)) );
     return (aRet.hasValue() ? aRet : VCLXWindow::queryInterface( rType ));
 }
 
@@ -4844,7 +4844,7 @@ VCLXDateField::~VCLXDateField()
 ::com::sun::star::uno::Any VCLXDateField::queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException)
 {
     ::com::sun::star::uno::Any aRet = ::cppu::queryInterface( rType,
-                                        SAL_STATIC_CAST( ::com::sun::star::awt::XDateField*, this ) );
+                                        (static_cast< ::com::sun::star::awt::XDateField* >(this)) );
     return (aRet.hasValue() ? aRet : VCLXFormattedSpinField::queryInterface( rType ));
 }
 
@@ -5186,7 +5186,7 @@ VCLXTimeField::~VCLXTimeField()
 ::com::sun::star::uno::Any VCLXTimeField::queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException)
 {
     ::com::sun::star::uno::Any aRet = ::cppu::queryInterface( rType,
-                                        SAL_STATIC_CAST( ::com::sun::star::awt::XTimeField*, this ) );
+                                        (static_cast< ::com::sun::star::awt::XTimeField* >(this)) );
     return (aRet.hasValue() ? aRet : VCLXFormattedSpinField::queryInterface( rType ));
 }
 
@@ -5490,7 +5490,7 @@ VCLXNumericField::~VCLXNumericField()
 ::com::sun::star::uno::Any VCLXNumericField::queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException)
 {
     ::com::sun::star::uno::Any aRet = ::cppu::queryInterface( rType,
-                                        SAL_STATIC_CAST( ::com::sun::star::awt::XNumericField*, this ) );
+                                        (static_cast< ::com::sun::star::awt::XNumericField* >(this)) );
     return (aRet.hasValue() ? aRet : VCLXFormattedSpinField::queryInterface( rType ));
 }
 
@@ -5846,7 +5846,7 @@ MetricField *VCLXMetricField::GetMetricField() throw(::com::sun::star::uno::Runt
 ::com::sun::star::uno::Any VCLXMetricField::queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException)
 {
     ::com::sun::star::uno::Any aRet = ::cppu::queryInterface( rType,
-                                                              SAL_STATIC_CAST( ::com::sun::star::awt::XMetricField*, this ) );
+                                                              (static_cast< ::com::sun::star::awt::XMetricField* >(this)) );
     return (aRet.hasValue() ? aRet : VCLXFormattedSpinField::queryInterface( rType ));
 }
 
@@ -6085,7 +6085,7 @@ VCLXCurrencyField::~VCLXCurrencyField()
 ::com::sun::star::uno::Any VCLXCurrencyField::queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException)
 {
     ::com::sun::star::uno::Any aRet = ::cppu::queryInterface( rType,
-                                        SAL_STATIC_CAST( ::com::sun::star::awt::XCurrencyField*, this ) );
+                                        (static_cast< ::com::sun::star::awt::XCurrencyField* >(this)) );
     return (aRet.hasValue() ? aRet : VCLXFormattedSpinField::queryInterface( rType ));
 }
 
@@ -6433,7 +6433,7 @@ VCLXPatternField::~VCLXPatternField()
 ::com::sun::star::uno::Any VCLXPatternField::queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException)
 {
     ::com::sun::star::uno::Any aRet = ::cppu::queryInterface( rType,
-                                        SAL_STATIC_CAST( ::com::sun::star::awt::XPatternField*, this ) );
+                                        (static_cast< ::com::sun::star::awt::XPatternField* >(this)) );
     return (aRet.hasValue() ? aRet : VCLXFormattedSpinField::queryInterface( rType ));
 }
 
diff --git a/toolkit/source/controls/dialogcontrol.cxx b/toolkit/source/controls/dialogcontrol.cxx
index ca4d27053829..e50d96812ca8 100644
--- a/toolkit/source/controls/dialogcontrol.cxx
+++ b/toolkit/source/controls/dialogcontrol.cxx
@@ -722,7 +722,7 @@ IMPL_XTYPEPROVIDER_END
 uno::Any UnoMultiPageControl::queryAggregation( const uno::Type & rType ) throw(uno::RuntimeException)
 {
     uno::Any aRet = ::cppu::queryInterface( rType,
-                                        SAL_STATIC_CAST( awt::XTabListener*, this ), SAL_STATIC_CAST( awt::XSimpleTabController*, this ) );
+                                        (static_cast< awt::XTabListener* >(this)), (static_cast< awt::XSimpleTabController* >(this)) );
     return (aRet.hasValue() ? aRet : ControlContainerBase::queryAggregation( rType ));
 }
 
diff --git a/toolkit/source/controls/stdtabcontroller.cxx b/toolkit/source/controls/stdtabcontroller.cxx
index 22c1f328a0a3..72c28a0fd650 100644
--- a/toolkit/source/controls/stdtabcontroller.cxx
+++ b/toolkit/source/controls/stdtabcontroller.cxx
@@ -170,9 +170,9 @@ void StdTabController::ImplActivateControl( sal_Bool bFirst ) const
 Any StdTabController::queryAggregation( const Type & rType ) throw(RuntimeException)
 {
     Any aRet = ::cppu::queryInterface( rType,
-                                        SAL_STATIC_CAST( XTabController*, this ),
-                                        SAL_STATIC_CAST( XServiceInfo*, this ),
-                                        SAL_STATIC_CAST( XTypeProvider*, this ) );
+                                        (static_cast< XTabController* >(this)),
+                                        (static_cast< XServiceInfo* >(this)),
+                                        (static_cast< XTypeProvider* >(this)) );
     return (aRet.hasValue() ? aRet : OWeakAggObject::queryAggregation( rType ));
 }
 
diff --git a/toolkit/source/controls/stdtabcontrollermodel.cxx b/toolkit/source/controls/stdtabcontrollermodel.cxx
index f706dcbfd3d1..b59f1cbfeed1 100644
--- a/toolkit/source/controls/stdtabcontrollermodel.cxx
+++ b/toolkit/source/controls/stdtabcontrollermodel.cxx
@@ -224,10 +224,10 @@ void ImplWriteControls( const ::com::sun::star::uno::Reference< ::com::sun::star
 ::com::sun::star::uno::Any StdTabControllerModel::queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException)
 {
     ::com::sun::star::uno::Any aRet = ::cppu::queryInterface( rType,
-                                        SAL_STATIC_CAST( ::com::sun::star::awt::XTabControllerModel*, this ),
-                                        SAL_STATIC_CAST( ::com::sun::star::lang::XServiceInfo*, this ),
-                                        SAL_STATIC_CAST( ::com::sun::star::io::XPersistObject*, this ),
-                                        SAL_STATIC_CAST( ::com::sun::star::lang::XTypeProvider*, this ) );
+                                        (static_cast< ::com::sun::star::awt::XTabControllerModel* >(this)),
+                                        (static_cast< ::com::sun::star::lang::XServiceInfo* >(this)),
+                                        (static_cast< ::com::sun::star::io::XPersistObject* >(this)),
+                                        (static_cast< ::com::sun::star::lang::XTypeProvider* >(this)) );
     return (aRet.hasValue() ? aRet : OWeakAggObject::queryAggregation( rType ));
 }
 
diff --git a/toolkit/source/controls/tkscrollbar.cxx b/toolkit/source/controls/tkscrollbar.cxx
index 91fcda50e0e9..004fe62bb2e1 100644
--- a/toolkit/source/controls/tkscrollbar.cxx
+++ b/toolkit/source/controls/tkscrollbar.cxx
@@ -110,8 +110,8 @@ namespace toolkit
     uno::Any UnoScrollBarControl::queryAggregation( const uno::Type & rType ) throw(uno::RuntimeException)
     {
         uno::Any aRet = ::cppu::queryInterface( rType,
-                                            SAL_STATIC_CAST( awt::XAdjustmentListener*, this ),
-                                            SAL_STATIC_CAST( awt::XScrollBar*, this ) );
+                                            (static_cast< awt::XAdjustmentListener* >(this)),
+                                            (static_cast< awt::XScrollBar* >(this)) );
         return (aRet.hasValue() ? aRet : UnoControlBase::queryAggregation( rType ));
     }
 
diff --git a/toolkit/source/controls/unocontrolcontainer.cxx b/toolkit/source/controls/unocontrolcontainer.cxx
index a10a799fcd94..c3e3e03616ad 100644
--- a/toolkit/source/controls/unocontrolcontainer.cxx
+++ b/toolkit/source/controls/unocontrolcontainer.cxx
@@ -792,12 +792,12 @@ void UnoControlContainer::createPeer( const uno::Reference< awt::XToolkit >& rxT
                 sal_Int32 nDialogStep = 0;
                 aVal >>= nDialogStep;
                 uno::Reference< awt::XControlContainer > xContainer =
-                    SAL_STATIC_CAST( awt::XControlContainer*, this );
+                    (static_cast< awt::XControlContainer* >(this));
                 implUpdateVisibility( nDialogStep, xContainer );
 
                 uno::Reference< beans::XPropertyChangeListener > xListener =
-                    SAL_STATIC_CAST( beans::XPropertyChangeListener*,
-                        new DialogStepChangedListener( xContainer ) );
+                    (static_cast< beans::XPropertyChangeListener* >(
+                        new DialogStepChangedListener( xContainer ) ) );
                 xPSet->addPropertyChangeListener( aPropName, xListener );
             }
 
diff --git a/toolkit/source/controls/unocontrols.cxx b/toolkit/source/controls/unocontrols.cxx
index 01be8cceefa6..d82e1eb51953 100644
--- a/toolkit/source/controls/unocontrols.cxx
+++ b/toolkit/source/controls/unocontrols.cxx
@@ -1434,8 +1434,8 @@ UnoFixedHyperlinkControl::UnoFixedHyperlinkControl( const Reference< XMultiServi
 uno::Any UnoFixedHyperlinkControl::queryAggregation( const uno::Type & rType ) throw(uno::RuntimeException)
 {
     uno::Any aRet = ::cppu::queryInterface( rType,
-                                        SAL_STATIC_CAST( awt::XFixedHyperlink*, this ),
-                                        SAL_STATIC_CAST( awt::XLayoutConstrains*, this ) );
+                                        (static_cast< awt::XFixedHyperlink* >(this)),
+                                        (static_cast< awt::XLayoutConstrains* >(this)) );
     return (aRet.hasValue() ? aRet : UnoControlBase::queryAggregation( rType ));
 }
 
@@ -1615,8 +1615,8 @@ UnoFixedTextControl::UnoFixedTextControl( const Reference< XMultiServiceFactory
 uno::Any UnoFixedTextControl::queryAggregation( const uno::Type & rType ) throw(uno::RuntimeException)
 {
     uno::Any aRet = ::cppu::queryInterface( rType,
-                                        SAL_STATIC_CAST( awt::XFixedText*, this ),
-                                        SAL_STATIC_CAST( awt::XLayoutConstrains*, this ) );
+                                        (static_cast< awt::XFixedText* >(this)),
+                                        (static_cast< awt::XLayoutConstrains* >(this)) );
     return (aRet.hasValue() ? aRet : UnoControlBase::queryAggregation( rType ));
 }
 
@@ -2824,15 +2824,15 @@ void UnoComboBoxControl::dispose() throw(uno::RuntimeException)
 uno::Any UnoComboBoxControl::queryAggregation( const uno::Type & rType ) throw(uno::RuntimeException)
 {
     uno::Any aRet = ::cppu::queryInterface( rType,
-                                        SAL_STATIC_CAST( awt::XComboBox*, this ) );
+                                        (static_cast< awt::XComboBox* >(this)) );
     if ( !aRet.hasValue() )
     {
         aRet = ::cppu::queryInterface( rType,
-                                        SAL_STATIC_CAST( awt::XItemListener*, this ) );
+                                        (static_cast< awt::XItemListener* >(this)) );
         if ( !aRet.hasValue() )
         {
             aRet = ::cppu::queryInterface( rType,
-                                            SAL_STATIC_CAST( awt::XItemListListener*, this ) );
+                                            (static_cast< awt::XItemListListener* >(this)) );
         }
     }
     return (aRet.hasValue() ? aRet : UnoEditControl::queryAggregation( rType ));
@@ -3122,7 +3122,7 @@ UnoSpinFieldControl::UnoSpinFieldControl( const Reference< XMultiServiceFactory
 uno::Any UnoSpinFieldControl::queryAggregation( const uno::Type & rType ) throw(uno::RuntimeException)
 {
     uno::Any aRet = ::cppu::queryInterface( rType,
-                                        SAL_STATIC_CAST( awt::XSpinField*, this ) );
+                                        (static_cast< awt::XSpinField* >(this)) );
     return (aRet.hasValue() ? aRet : UnoEditControl::queryAggregation( rType ));
 }
 
@@ -3266,7 +3266,7 @@ UnoDateFieldControl::UnoDateFieldControl( const Reference< XMultiServiceFactory
 uno::Any UnoDateFieldControl::queryAggregation( const uno::Type & rType ) throw(uno::RuntimeException)
 {
     uno::Any aRet = ::cppu::queryInterface( rType,
-                                        SAL_STATIC_CAST( awt::XDateField*, this ) );
+                                        (static_cast< awt::XDateField* >(this)) );
     return (aRet.hasValue() ? aRet : UnoSpinFieldControl::queryAggregation( rType ));
 }
 
@@ -3507,7 +3507,7 @@ UnoTimeFieldControl::UnoTimeFieldControl( const Reference< XMultiServiceFactory
 uno::Any UnoTimeFieldControl::queryAggregation( const uno::Type & rType ) throw(uno::RuntimeException)
 {
     uno::Any aRet = ::cppu::queryInterface( rType,
-                                        SAL_STATIC_CAST( awt::XTimeField*, this ) );
+                                        (static_cast< awt::XTimeField* >(this)) );
     return (aRet.hasValue() ? aRet : UnoSpinFieldControl::queryAggregation( rType ));
 }
 
@@ -3708,7 +3708,7 @@ UnoNumericFieldControl::UnoNumericFieldControl( const Reference< XMultiServiceFa
 uno::Any UnoNumericFieldControl::queryAggregation( const uno::Type & rType ) throw(uno::RuntimeException)
 {
     uno::Any aRet = ::cppu::queryInterface( rType,
-                                        SAL_STATIC_CAST( awt::XNumericField*, this ) );
+                                        (static_cast< awt::XNumericField* >(this)) );
     return (aRet.hasValue() ? aRet : UnoSpinFieldControl::queryAggregation( rType ));
 }
 
@@ -3910,7 +3910,7 @@ UnoCurrencyFieldControl::UnoCurrencyFieldControl( const Reference< XMultiService
 uno::Any UnoCurrencyFieldControl::queryAggregation( const uno::Type & rType ) throw(uno::RuntimeException)
 {
     uno::Any aRet = ::cppu::queryInterface( rType,
-                                        SAL_STATIC_CAST( awt::XCurrencyField*, this ) );
+                                        (static_cast< awt::XCurrencyField* >(this)) );
     return (aRet.hasValue() ? aRet : UnoSpinFieldControl::queryAggregation( rType ));
 }
 
@@ -4128,7 +4128,7 @@ void UnoPatternFieldControl::ImplSetPeerProperty( const ::rtl::OUString& rPropNa
 uno::Any UnoPatternFieldControl::queryAggregation( const uno::Type & rType ) throw(uno::RuntimeException)
 {
     uno::Any aRet = ::cppu::queryInterface( rType,
-                                        SAL_STATIC_CAST( awt::XPatternField*, this ) );
+                                        (static_cast< awt::XPatternField* >(this)) );
     return (aRet.hasValue() ? aRet : UnoSpinFieldControl::queryAggregation( rType ));
 }
 
@@ -4250,7 +4250,7 @@ UnoProgressBarControl::UnoProgressBarControl( const Reference< XMultiServiceFact
 uno::Any UnoProgressBarControl::queryAggregation( const uno::Type & rType ) throw(uno::RuntimeException)
 {
     uno::Any aRet = ::cppu::queryInterface( rType,
-                                        SAL_STATIC_CAST( awt::XProgressBar*, this ) );
+                                        (static_cast< awt::XProgressBar* >(this)) );
     return (aRet.hasValue() ? aRet : UnoControlBase::queryAggregation( rType ));
 }
 
diff --git a/toolkit/source/helper/listenermultiplexer.cxx b/toolkit/source/helper/listenermultiplexer.cxx
index c8dd4b19cbd1..cdcc9327e451 100644
--- a/toolkit/source/helper/listenermultiplexer.cxx
+++ b/toolkit/source/helper/listenermultiplexer.cxx
@@ -44,7 +44,7 @@ ListenerMultiplexerBase::~ListenerMultiplexerBase()
 // ::com::sun::star::uno::XInterface
 ::com::sun::star::uno::Any ListenerMultiplexerBase::queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException)
 {
-    return ::cppu::queryInterface( rType, SAL_STATIC_CAST( ::com::sun::star::uno::XInterface*, this ) );
+    return ::cppu::queryInterface( rType, (static_cast< ::com::sun::star::uno::XInterface* >(this)) );
 }
 
 
@@ -60,7 +60,7 @@ EventListenerMultiplexer::EventListenerMultiplexer( ::cppu::OWeakObject& rSource
 ::com::sun::star::uno::Any EventListenerMultiplexer::queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException)
 {
     ::com::sun::star::uno::Any aRet = ::cppu::queryInterface( rType,
-                                        SAL_STATIC_CAST( ::com::sun::star::lang::XEventListener*, this ) );
+                                        (static_cast< ::com::sun::star::lang::XEventListener* >(this)) );
     return (aRet.hasValue() ? aRet : ListenerMultiplexerBase::queryInterface( rType ));
 }