fdo#48253 Expand SAL_STATIC_CAST and SAL_CONST_CAST

Change-Id: I50f0887ceb4517d7ef234f970ca2ba679d533382

5 files changed, 18 insertions, 18 deletions

diff --git a/svtools/source/edit/textview.cxx b/svtools/source/edit/textview.cxx
index c776702e9437..7e2955dd23ed 100644
--- a/svtools/source/edit/textview.cxx
+++ b/svtools/source/edit/textview.cxx
@@ -105,7 +105,7 @@ TETextDataObject::~TETextDataObject()
 // uno::XInterface
 uno::Any TETextDataObject::queryInterface( const uno::Type & rType ) throw(uno::RuntimeException)
 {
-    uno::Any aRet = ::cppu::queryInterface( rType, SAL_STATIC_CAST( datatransfer::XTransferable*, this ) );
+    uno::Any aRet = ::cppu::queryInterface( rType, (static_cast< datatransfer::XTransferable* >(this)) );
     return (aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType ));
 }
 
diff --git a/svtools/source/graphic/provider.cxx b/svtools/source/graphic/provider.cxx
index bbc2bc7abee0..9b8c7757f550 100644
--- a/svtools/source/graphic/provider.cxx
+++ b/svtools/source/graphic/provider.cxx
@@ -63,7 +63,7 @@ namespace unographic {
 
 uno::Reference< uno::XInterface > SAL_CALL GraphicProvider_CreateInstance( const uno::Reference< lang::XMultiServiceFactory >& )
 {
-    return SAL_STATIC_CAST( ::cppu::OWeakObject*, new GraphicProvider );
+    return (static_cast< ::cppu::OWeakObject* >(new GraphicProvider ));
 }
 
 GraphicProvider::GraphicProvider()
diff --git a/svtools/source/graphic/renderer.cxx b/svtools/source/graphic/renderer.cxx
index 07e054d3dd93..1b0a46c0f7f6 100644
--- a/svtools/source/graphic/renderer.cxx
+++ b/svtools/source/graphic/renderer.cxx
@@ -54,7 +54,7 @@ namespace unographic {
 
 uno::Reference< uno::XInterface > SAL_CALL GraphicRendererVCL_CreateInstance( const uno::Reference< lang::XMultiServiceFactory >& )
 {
-    return SAL_STATIC_CAST( ::cppu::OWeakObject*, new GraphicRendererVCL );
+    return (static_cast< ::cppu::OWeakObject* >(new GraphicRendererVCL ));
 }
 
 
diff --git a/svtools/source/uno/contextmenuhelper.cxx b/svtools/source/uno/contextmenuhelper.cxx
index 22d361a17a1e..6d8578e7952c 100644
--- a/svtools/source/uno/contextmenuhelper.cxx
+++ b/svtools/source/uno/contextmenuhelper.cxx
@@ -113,7 +113,7 @@ throw ( uno::RuntimeException )
 {
     uno::Any a = ::cppu::queryInterface(
                 aType,
-                SAL_STATIC_CAST( XStatusListener*, this ));
+                (static_cast< XStatusListener* >(this)));
 
     if( a.hasValue() )
         return a;
@@ -156,7 +156,7 @@ bool StateEventHelper::isCommandEnabled()
 {
     // Be sure that we cannot die during condition wait
     uno::Reference< frame::XStatusListener > xSelf(
-        SAL_STATIC_CAST( frame::XStatusListener*, this ));
+        (static_cast< frame::XStatusListener* >(this)));
 
     uno::Reference< frame::XDispatch > xDispatch;
     util::URL                          aTargetURL;
diff --git a/svtools/source/uno/unoiface.cxx b/svtools/source/uno/unoiface.cxx
index fc48708d873a..cdb58e639bb9 100644
--- a/svtools/source/uno/unoiface.cxx
+++ b/svtools/source/uno/unoiface.cxx
@@ -194,10 +194,10 @@ VCLXMultiLineEdit::~VCLXMultiLineEdit()
 ::com::sun::star::uno::Any VCLXMultiLineEdit::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::XTextArea*, this ),
-                                        SAL_STATIC_CAST( ::com::sun::star::awt::XTextLayoutConstrains*, this ),
-                                        SAL_STATIC_CAST( ::com::sun::star::lang::XTypeProvider*, this ) );
+                                        (static_cast< ::com::sun::star::awt::XTextComponent* >(this)),
+                                        (static_cast< ::com::sun::star::awt::XTextArea* >(this)),
+                                        (static_cast< ::com::sun::star::awt::XTextLayoutConstrains* >(this)),
+                                        (static_cast< ::com::sun::star::lang::XTypeProvider* >(this)) );
     return (aRet.hasValue() ? aRet : VCLXWindow::queryInterface( rType ));
 }
 
@@ -558,9 +558,9 @@ VCLXFileControl::~VCLXFileControl()
 ::com::sun::star::uno::Any VCLXFileControl::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::XTextLayoutConstrains*, this ),
-                                        SAL_STATIC_CAST( ::com::sun::star::lang::XTypeProvider*, this ) );
+                                        (static_cast< ::com::sun::star::awt::XTextComponent* >(this)),
+                                        (static_cast< ::com::sun::star::awt::XTextLayoutConstrains* >(this)),
+                                        (static_cast< ::com::sun::star::lang::XTypeProvider* >(this)) );
     return (aRet.hasValue() ? aRet : VCLXWindow::queryInterface( rType ));
 }
 
@@ -1675,8 +1675,8 @@ SVTXNumericField::~SVTXNumericField()
 ::com::sun::star::uno::Any SVTXNumericField::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 ),
-                                        SAL_STATIC_CAST( ::com::sun::star::lang::XTypeProvider*, this ) );
+                                        (static_cast< ::com::sun::star::awt::XNumericField* >(this)),
+                                        (static_cast< ::com::sun::star::lang::XTypeProvider* >(this)) );
     return (aRet.hasValue() ? aRet : SVTXFormattedField::queryInterface( rType ));
 }
 
@@ -1842,8 +1842,8 @@ SVTXCurrencyField::~SVTXCurrencyField()
 ::com::sun::star::uno::Any SVTXCurrencyField::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 ),
-                                        SAL_STATIC_CAST( ::com::sun::star::lang::XTypeProvider*, this ) );
+                                        (static_cast< ::com::sun::star::awt::XCurrencyField* >(this)),
+                                        (static_cast< ::com::sun::star::lang::XTypeProvider* >(this)) );
     return (aRet.hasValue() ? aRet : SVTXFormattedField::queryInterface( rType ));
 }
 
@@ -2133,8 +2133,8 @@ void VCLXProgressBar::ImplUpdateValue()
 ::com::sun::star::uno::Any VCLXProgressBar::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::XProgressBar*, this ),
-                                        SAL_STATIC_CAST( ::com::sun::star::lang::XTypeProvider*, this ) );
+                                        (static_cast< ::com::sun::star::awt::XProgressBar* >(this)),
+                                        (static_cast< ::com::sun::star::lang::XTypeProvider* >(this)) );
     return (aRet.hasValue() ? aRet : VCLXWindow::queryInterface( rType ));
 }