fdo#48253 Expand SAL_STATIC_CAST and SAL_CONST_CAST

Change-Id: I50f0887ceb4517d7ef234f970ca2ba679d533382

18 files changed, 81 insertions, 83 deletions

diff --git a/ucb/source/cacher/contentresultsetwrapper.cxx b/ucb/source/cacher/contentresultsetwrapper.cxx
index d6cbbfc02377..6b0c43367ac2 100644
--- a/ucb/source/cacher/contentresultsetwrapper.cxx
+++ b/ucb/source/cacher/contentresultsetwrapper.cxx
@@ -351,14 +351,14 @@ sal_Bool SAL_CALL ContentResultSetWrapper
 //list all interfaces inclusive baseclasses of interfaces
 QUERYINTERFACE_IMPL_START( ContentResultSetWrapper )
 
-    SAL_STATIC_CAST( XComponent*, this ),
-    SAL_STATIC_CAST( XCloseable*, this ),
-    SAL_STATIC_CAST( XResultSetMetaDataSupplier*, this ),
-    SAL_STATIC_CAST( XPropertySet*, this ),
+    (static_cast< XComponent* >(this)),
+    (static_cast< XCloseable* >(this)),
+    (static_cast< XResultSetMetaDataSupplier* >(this)),
+    (static_cast< XPropertySet* >(this)),
 
-    SAL_STATIC_CAST( XContentAccess*, this ),
-    SAL_STATIC_CAST( XResultSet*, this ),
-    SAL_STATIC_CAST( XRow*, this )
+    (static_cast< XContentAccess* >(this)),
+    (static_cast< XResultSet* >(this)),
+    (static_cast< XRow* >(this))
 
 QUERYINTERFACE_IMPL_END
 
@@ -1424,8 +1424,8 @@ QUERYINTERFACE_IMPL_START( ContentResultSetWrapperListener )
 
     static_cast< XEventListener * >(
                      static_cast< XPropertyChangeListener * >(this))
-    , SAL_STATIC_CAST( XPropertyChangeListener*, this )
-    , SAL_STATIC_CAST( XVetoableChangeListener*, this )
+    , (static_cast< XPropertyChangeListener* >(this))
+    , (static_cast< XVetoableChangeListener* >(this))
 
 QUERYINTERFACE_IMPL_END
 
diff --git a/ucb/source/cacher/dynamicresultsetwrapper.cxx b/ucb/source/cacher/dynamicresultsetwrapper.cxx
index cbdf6dbefeb8..1bd35d0ac5e2 100644
--- a/ucb/source/cacher/dynamicresultsetwrapper.cxx
+++ b/ucb/source/cacher/dynamicresultsetwrapper.cxx
@@ -136,9 +136,9 @@ void SAL_CALL DynamicResultSetWrapper
 //--------------------------------------------------------------------------
 //list all interfaces inclusive baseclasses of interfaces
 QUERYINTERFACE_IMPL_START( DynamicResultSetWrapper )
-    SAL_STATIC_CAST( XComponent*, this ) //base of XDynamicResultSet
-    , SAL_STATIC_CAST( XDynamicResultSet*, this )
-    , SAL_STATIC_CAST( XSourceInitialization*, this )
+    (static_cast< XComponent* >(this)) //base of XDynamicResultSet
+    , (static_cast< XDynamicResultSet* >(this))
+    , (static_cast< XSourceInitialization* >(this))
 QUERYINTERFACE_IMPL_END
 
 //--------------------------------------------------------------------------
diff --git a/ucb/source/core/ucb.cxx b/ucb/source/core/ucb.cxx
index 9e339ee09b92..417cd4aafb56 100644
--- a/ucb/source/core/ucb.cxx
+++ b/ucb/source/core/ucb.cxx
@@ -308,7 +308,7 @@ void SAL_CALL UniversalContentBroker::dispose()
     if ( m_pDisposeEventListeners && m_pDisposeEventListeners->getLength() )
     {
         EventObject aEvt;
-        aEvt.Source = SAL_STATIC_CAST( XComponent*, this );
+        aEvt.Source = (static_cast< XComponent* >(this));
         m_pDisposeEventListeners->disposeAndClear( aEvt );
     }
 
diff --git a/ucb/source/ucp/file/bc.cxx b/ucb/source/ucp/file/bc.cxx
index 8c6e2e7a47f5..ad48bd416e66 100644
--- a/ucb/source/ucp/file/bc.cxx
+++ b/ucb/source/ucp/file/bc.cxx
@@ -163,16 +163,16 @@ BaseContent::queryInterface( const Type& rType )
     throw( RuntimeException )
 {
     Any aRet = cppu::queryInterface( rType,
-                                     SAL_STATIC_CAST( lang::XComponent*, this ),
-                                     SAL_STATIC_CAST( lang::XTypeProvider*, this ),
-                                     SAL_STATIC_CAST( lang::XServiceInfo*, this ),
-                                     SAL_STATIC_CAST( XCommandProcessor*, this ),
-                                     SAL_STATIC_CAST( container::XChild*, this ),
-                                     SAL_STATIC_CAST( beans::XPropertiesChangeNotifier*, this ),
-                                     SAL_STATIC_CAST( beans::XPropertyContainer*, this ),
-                                     SAL_STATIC_CAST( XContentCreator*,this ),
-                                     SAL_STATIC_CAST( beans::XPropertySetInfoChangeNotifier*, this ),
-                                     SAL_STATIC_CAST( XContent*,this) );
+                                     (static_cast< lang::XComponent* >(this)),
+                                     (static_cast< lang::XTypeProvider* >(this)),
+                                     (static_cast< lang::XServiceInfo* >(this)),
+                                     (static_cast< XCommandProcessor* >(this)),
+                                     (static_cast< container::XChild* >(this)),
+                                     (static_cast< beans::XPropertiesChangeNotifier* >(this)),
+                                     (static_cast< beans::XPropertyContainer* >(this)),
+                                     (static_cast< XContentCreator* >(this)),
+                                     (static_cast< beans::XPropertySetInfoChangeNotifier* >(this)),
+                                     (static_cast< XContent* >(this)) );
     return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType );
 }
 
diff --git a/ucb/source/ucp/file/filcmd.cxx b/ucb/source/ucp/file/filcmd.cxx
index 93a2a21531cf..36569bba64f9 100644
--- a/ucb/source/ucp/file/filcmd.cxx
+++ b/ucb/source/ucp/file/filcmd.cxx
@@ -72,7 +72,7 @@ XCommandInfo_impl::queryInterface(
   throw( uno::RuntimeException )
 {
     uno::Any aRet = cppu::queryInterface( rType,
-                                          SAL_STATIC_CAST( XCommandInfo*,this) );
+                                          (static_cast< XCommandInfo* >(this)) );
     return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType );
 }
 
diff --git a/ucb/source/ucp/file/filid.cxx b/ucb/source/ucp/file/filid.cxx
index 77d06879bd3b..50200af6c656 100644
--- a/ucb/source/ucp/file/filid.cxx
+++ b/ucb/source/ucp/file/filid.cxx
@@ -84,8 +84,8 @@ FileContentIdentifier::queryInterface(
     throw( uno::RuntimeException )
 {
     uno::Any aRet = cppu::queryInterface( rType,
-                                          SAL_STATIC_CAST( lang::XTypeProvider*, this),
-                                          SAL_STATIC_CAST( XContentIdentifier*, this) );
+                                          (static_cast< lang::XTypeProvider* >(this)),
+                                          (static_cast< XContentIdentifier* >(this)) );
     return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType );
 }
 
diff --git a/ucb/source/ucp/file/filinpstr.cxx b/ucb/source/ucp/file/filinpstr.cxx
index 1a2fc293bdb7..289450b523b3 100644
--- a/ucb/source/ucp/file/filinpstr.cxx
+++ b/ucb/source/ucp/file/filinpstr.cxx
@@ -112,9 +112,9 @@ XInputStream_impl::queryInterface(
     throw( uno::RuntimeException)
 {
     uno::Any aRet = cppu::queryInterface( rType,
-                                          SAL_STATIC_CAST( io::XInputStream*,this ),
-                                          SAL_STATIC_CAST( lang::XTypeProvider*,this ),
-                                          SAL_STATIC_CAST( io::XSeekable*,this ) );
+                                          (static_cast< io::XInputStream* >(this)),
+                                          (static_cast< lang::XTypeProvider* >(this)),
+                                          (static_cast< io::XSeekable* >(this)) );
     return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType );
 }
 
diff --git a/ucb/source/ucp/file/filinsreq.cxx b/ucb/source/ucp/file/filinsreq.cxx
index 0ab0aeab6aed..ea674c1cc692 100644
--- a/ucb/source/ucp/file/filinsreq.cxx
+++ b/ucb/source/ucp/file/filinsreq.cxx
@@ -70,8 +70,8 @@ XInteractionSupplyNameImpl::queryInterface( const Type& rType )
     throw( RuntimeException )
 {
     Any aRet = cppu::queryInterface( rType,
-                                     SAL_STATIC_CAST( lang::XTypeProvider*, this ),
-                                     SAL_STATIC_CAST( XInteractionSupplyName*,this) );
+                                     (static_cast< lang::XTypeProvider* >(this)),
+                                     (static_cast< XInteractionSupplyName* >(this)) );
     return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType );
 }
 
@@ -109,8 +109,8 @@ XInteractionAbortImpl::queryInterface( const Type& rType )
     throw( RuntimeException )
 {
     Any aRet = cppu::queryInterface( rType,
-                                     SAL_STATIC_CAST( lang::XTypeProvider*, this ),
-                                     SAL_STATIC_CAST( XInteractionAbort*,this) );
+                                     (static_cast< lang::XTypeProvider* >(this)),
+                                     (static_cast< XInteractionAbort* >(this)) );
     return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType );
 }
 
@@ -169,8 +169,8 @@ XInteractionRequestImpl::queryInterface( const Type& rType )
     Any aRet =
         cppu::queryInterface(
             rType,
-            SAL_STATIC_CAST( lang::XTypeProvider*, this ),
-            SAL_STATIC_CAST( XInteractionRequest*,this) );
+            (static_cast< lang::XTypeProvider* >(this)),
+            (static_cast< XInteractionRequest* >(this)) );
     return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType );
 }
 
diff --git a/ucb/source/ucp/file/filprp.cxx b/ucb/source/ucp/file/filprp.cxx
index 27b630d05dfd..db2adf886c0a 100644
--- a/ucb/source/ucp/file/filprp.cxx
+++ b/ucb/source/ucp/file/filprp.cxx
@@ -110,8 +110,8 @@ XPropertySetInfo_impl::queryInterface(
   throw( RuntimeException )
 {
   Any aRet = cppu::queryInterface( rType,
-                    SAL_STATIC_CAST( lang::XTypeProvider*,this),
-                    SAL_STATIC_CAST( beans::XPropertySetInfo*,this) );
+                    (static_cast< lang::XTypeProvider* >(this)),
+                    (static_cast< beans::XPropertySetInfo* >(this)) );
   return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType );
 }
 
diff --git a/ucb/source/ucp/file/filrow.cxx b/ucb/source/ucp/file/filrow.cxx
index e063c23702cd..a52b0700ce2c 100644
--- a/ucb/source/ucp/file/filrow.cxx
+++ b/ucb/source/ucp/file/filrow.cxx
@@ -115,8 +115,8 @@ XRow_impl::queryInterface(
   throw( uno::RuntimeException )
 {
   uno::Any aRet = cppu::queryInterface( rType,
-                    SAL_STATIC_CAST( lang::XTypeProvider*,this),
-                    SAL_STATIC_CAST( sdbc::XRow*,this) );
+                    (static_cast< lang::XTypeProvider* >(this)),
+                    (static_cast< sdbc::XRow* >(this)) );
   return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType );
 }
 
diff --git a/ucb/source/ucp/file/filrset.cxx b/ucb/source/ucp/file/filrset.cxx
index af0d34a7ce12..627536fa2031 100644
--- a/ucb/source/ucp/file/filrset.cxx
+++ b/ucb/source/ucp/file/filrset.cxx
@@ -135,16 +135,16 @@ XResultSet_impl::queryInterface(
 {
     uno::Any aRet = cppu::queryInterface(
         rType,
-        SAL_STATIC_CAST( lang::XComponent*, this),
-        SAL_STATIC_CAST( lang::XTypeProvider*, this),
-        SAL_STATIC_CAST( lang::XEventListener*, this),
-        SAL_STATIC_CAST( sdbc::XRow*, this),
-        SAL_STATIC_CAST( sdbc::XResultSet*, this),
-        SAL_STATIC_CAST( sdbc::XCloseable*, this),
-        SAL_STATIC_CAST( sdbc::XResultSetMetaDataSupplier*, this),
-        SAL_STATIC_CAST( beans::XPropertySet*, this ),
-        SAL_STATIC_CAST( ucb::XContentAccess*, this),
-        SAL_STATIC_CAST( ucb::XDynamicResultSet*,this) );
+        (static_cast< lang::XComponent* >(this)),
+        (static_cast< lang::XTypeProvider* >(this)),
+        (static_cast< lang::XEventListener* >(this)),
+        (static_cast< sdbc::XRow* >(this)),
+        (static_cast< sdbc::XResultSet* >(this)),
+        (static_cast< sdbc::XCloseable* >(this)),
+        (static_cast< sdbc::XResultSetMetaDataSupplier* >(this)),
+        (static_cast< beans::XPropertySet* >(this)),
+        (static_cast< ucb::XContentAccess* >(this)),
+        (static_cast< ucb::XDynamicResultSet* >(this)) );
     return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType );
 }
 
diff --git a/ucb/source/ucp/file/filstr.cxx b/ucb/source/ucp/file/filstr.cxx
index 1b3bb7f07fb4..2bec4c61bcea 100644
--- a/ucb/source/ucp/file/filstr.cxx
+++ b/ucb/source/ucp/file/filstr.cxx
@@ -53,13 +53,13 @@ XStream_impl::queryInterface(
     throw( uno::RuntimeException)
 {
     uno::Any aRet = cppu::queryInterface( rType,
-                                          SAL_STATIC_CAST( lang::XTypeProvider*,this ),
-                                          SAL_STATIC_CAST( io::XStream*,this ),
-                                          SAL_STATIC_CAST( io::XInputStream*,this ),
-                                          SAL_STATIC_CAST( io::XOutputStream*,this ),
-                                          SAL_STATIC_CAST( io::XSeekable*,this ),
-                                          SAL_STATIC_CAST( io::XTruncate*,this ),
-                                          SAL_STATIC_CAST( io::XAsyncOutputMonitor*,this ) );
+                                          (static_cast< lang::XTypeProvider* >(this)),
+                                          (static_cast< io::XStream* >(this)),
+                                          (static_cast< io::XInputStream* >(this)),
+                                          (static_cast< io::XOutputStream* >(this)),
+                                          (static_cast< io::XSeekable* >(this)),
+                                          (static_cast< io::XTruncate* >(this)),
+                                          (static_cast< io::XAsyncOutputMonitor* >(this)) );
     return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType );
 }
 
diff --git a/ucb/source/ucp/file/prov.cxx b/ucb/source/ucp/file/prov.cxx
index bd9889e8063e..ae819bdde75e 100644
--- a/ucb/source/ucp/file/prov.cxx
+++ b/ucb/source/ucp/file/prov.cxx
@@ -132,13 +132,13 @@ FileProvider::queryInterface(
 {
     Any aRet = cppu::queryInterface(
         rType,
-        SAL_STATIC_CAST( XContentProvider*, this ),
-        SAL_STATIC_CAST( XInitialization*, this ),
-        SAL_STATIC_CAST( XContentIdentifierFactory*, this ),
-        SAL_STATIC_CAST( XServiceInfo*,     this ),
-        SAL_STATIC_CAST( XTypeProvider*,    this ),
-        SAL_STATIC_CAST( XFileIdentifierConverter*,this ),
-        SAL_STATIC_CAST( XPropertySet*, this ) );
+        (static_cast< XContentProvider* >(this)),
+        (static_cast< XInitialization* >(this)),
+        (static_cast< XContentIdentifierFactory* >(this)),
+        (static_cast< XServiceInfo* >(this)),
+        (static_cast< XTypeProvider* >(this)),
+        (static_cast< XFileIdentifierConverter* >(this)),
+        (static_cast< XPropertySet* >(this)) );
     return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType );
 }
 
@@ -452,7 +452,7 @@ XPropertySetInfoImpl2::queryInterface(
     throw( RuntimeException )
 {
     Any aRet = cppu::queryInterface( rType,
-                                          SAL_STATIC_CAST( XPropertySetInfo*,this) );
+                                          (static_cast< XPropertySetInfo* >(this)) );
     return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType );
 }
 
diff --git a/ucb/source/ucp/ftp/ftpcontentidentifier.cxx b/ucb/source/ucp/ftp/ftpcontentidentifier.cxx
index 94a3d84bcc01..9e76eee96cda 100644
--- a/ucb/source/ucp/ftp/ftpcontentidentifier.cxx
+++ b/ucb/source/ucp/ftp/ftpcontentidentifier.cxx
@@ -64,8 +64,8 @@ FTPContentIdentifier::queryInterface(
 {
     Any aRet =
         ::cppu::queryInterface(rType,
-                               SAL_STATIC_CAST(XTypeProvider*,this),
-                               SAL_STATIC_CAST(XContentIdentifier*,this));
+                               (static_cast< XTypeProvider* >(this)),
+                               (static_cast< XContentIdentifier* >(this)));
 
     return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType );
 }
diff --git a/ucb/source/ucp/ftp/ftpintreq.cxx b/ucb/source/ucp/ftp/ftpintreq.cxx
index 47da4e36dbd8..45a6dde67945 100644
--- a/ucb/source/ucp/ftp/ftpintreq.cxx
+++ b/ucb/source/ucp/ftp/ftpintreq.cxx
@@ -69,8 +69,8 @@ XInteractionApproveImpl::queryInterface( const Type& rType )
 {
     Any aRet = cppu::queryInterface(
         rType,
-        SAL_STATIC_CAST( lang::XTypeProvider*, this ),
-        SAL_STATIC_CAST( XInteractionApprove*,this) );
+        (static_cast< lang::XTypeProvider* >(this)),
+        (static_cast< XInteractionApprove* >(this)) );
     return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType );
 }
 
@@ -128,8 +128,8 @@ XInteractionDisapproveImpl::queryInterface( const Type& rType )
 {
     Any aRet = cppu::queryInterface(
         rType,
-        SAL_STATIC_CAST( lang::XTypeProvider*, this ),
-        SAL_STATIC_CAST( XInteractionDisapprove*,this) );
+        (static_cast< lang::XTypeProvider* >(this)),
+        (static_cast< XInteractionDisapprove* >(this)) );
     return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType );
 }
 
@@ -188,8 +188,8 @@ XInteractionRequestImpl::queryInterface( const Type& rType )
 {
     Any aRet = cppu::queryInterface(
         rType,
-        SAL_STATIC_CAST( lang::XTypeProvider*, this ),
-        SAL_STATIC_CAST( XInteractionRequest*,this) );
+        (static_cast< lang::XTypeProvider* >(this)),
+        (static_cast< XInteractionRequest* >(this)) );
     return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType );
 }
 
diff --git a/ucb/source/ucp/ftp/ftpresultsetbase.cxx b/ucb/source/ucp/ftp/ftpresultsetbase.cxx
index 641701600399..8d8d73f28fc3 100644
--- a/ucb/source/ucp/ftp/ftpresultsetbase.cxx
+++ b/ucb/source/ucp/ftp/ftpresultsetbase.cxx
@@ -94,12 +94,12 @@ ResultSetBase::queryInterface(
 {
     uno::Any aRet = cppu::queryInterface(
         rType,
-        SAL_STATIC_CAST( lang::XComponent*, this),
-        SAL_STATIC_CAST( sdbc::XRow*, this),
-        SAL_STATIC_CAST( sdbc::XResultSet*, this),
-        SAL_STATIC_CAST( sdbc::XResultSetMetaDataSupplier*, this),
-        SAL_STATIC_CAST( beans::XPropertySet*, this ),
-        SAL_STATIC_CAST( ucb::XContentAccess*, this) );
+        (static_cast< lang::XComponent* >(this)),
+        (static_cast< sdbc::XRow* >(this)),
+        (static_cast< sdbc::XResultSet* >(this)),
+        (static_cast< sdbc::XResultSetMetaDataSupplier* >(this)),
+        (static_cast< beans::XPropertySet* >(this)),
+        (static_cast< ucb::XContentAccess* >(this)) );
     return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType );
 }
 
@@ -468,7 +468,7 @@ public:
     {
         uno::Any aRet = cppu::queryInterface(
             rType,
-            SAL_STATIC_CAST( beans::XPropertySetInfo*, this ) );
+            (static_cast< beans::XPropertySetInfo* >(this)) );
         return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType );
     }
 
diff --git a/ucb/source/ucp/ftp/test_activedatasink.cxx b/ucb/source/ucp/ftp/test_activedatasink.cxx
index 29b78dcdc3a6..6acc7ee9bf84 100644
--- a/ucb/source/ucp/ftp/test_activedatasink.cxx
+++ b/ucb/source/ucp/ftp/test_activedatasink.cxx
@@ -43,7 +43,7 @@ using namespace com::sun::star::io;
 
 Any SAL_CALL Test_ActiveDataSink::queryInterface( const Type& rType ) throw( RuntimeException ) {
     Any aRet = ::cppu::queryInterface(rType,
-                                      SAL_STATIC_CAST( XActiveDataSink*,this ));
+                                      (static_cast< XActiveDataSink* >(this)));
 
     return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType );
 }
diff --git a/ucb/source/ucp/ftp/test_multiservicefac.cxx b/ucb/source/ucp/ftp/test_multiservicefac.cxx
index acbfe6510848..79429a4276ab 100644
--- a/ucb/source/ucp/ftp/test_multiservicefac.cxx
+++ b/ucb/source/ucp/ftp/test_multiservicefac.cxx
@@ -48,9 +48,7 @@ Test_MultiServiceFactory::queryInterface(
         RuntimeException
     )
 {
-    Any aRet = ::cppu::queryInterface(rType,
-                                      SAL_STATIC_CAST( XMultiServiceFactory*,
-                                                       this ));
+    Any aRet = ::cppu::queryInterface(rType, (static_cast< XMultiServiceFactory* >( this )) );
 
     return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType );