fdo#48253 Expand SAL_STATIC_CAST and SAL_CONST_CAST

Change-Id: I50f0887ceb4517d7ef234f970ca2ba679d533382

6 files changed, 21 insertions, 21 deletions

diff --git a/io/source/stm/odata.cxx b/io/source/stm/odata.cxx
index 5583e24b8fe4..3e40e25da82e 100644
--- a/io/source/stm/odata.cxx
+++ b/io/source/stm/odata.cxx
@@ -440,7 +440,7 @@ void ODataInputStream::setSuccessor( const Reference < XConnectable > &r ) throw
          if( m_succ.is() ) {
               /// set this instance as the sink !
               m_succ->setPredecessor( Reference< XConnectable > (
-                  SAL_STATIC_CAST( XConnectable * , this ) ) );
+                  (static_cast< XConnectable *  >(this)) ) );
          }
      }
 }
@@ -459,7 +459,7 @@ void ODataInputStream::setPredecessor( const Reference < XConnectable > &r )
         m_pred = r;
         if( m_pred.is() ) {
             m_pred->setSuccessor( Reference< XConnectable > (
-                SAL_STATIC_CAST( XConnectable * , this ) ) );
+                (static_cast< XConnectable *  >(this)) ) );
         }
     }
 }
@@ -850,7 +850,7 @@ void ODataOutputStream::setSuccessor( const Reference < XConnectable > &r )
          {
               /// set this instance as the sink !
               m_succ->setPredecessor( Reference < XConnectable > (
-                  SAL_STATIC_CAST( XConnectable * , this  ) ));
+                  (static_cast< XConnectable *  >(this)) ));
          }
      }
 }
@@ -867,7 +867,7 @@ void ODataOutputStream::setPredecessor( const Reference < XConnectable > &r )
         m_pred = r;
         if( m_pred.is() ) {
             m_pred->setSuccessor( Reference< XConnectable > (
-                SAL_STATIC_CAST( XConnectable * , this  ) ));
+                (static_cast< XConnectable *  >(this)) ));
         }
     }
 }
@@ -1097,7 +1097,7 @@ void OObjectOutputStream::writeObject( const Reference< XPersistObject > & xPObj
 
     if( bWriteObj )
         xPObj->write( Reference< XObjectOutputStream > (
-            SAL_STATIC_CAST( XObjectOutputStream * , this ) ) );
+            (static_cast< XObjectOutputStream *  >(this)) ) );
 
     sal_Int32 nObjLen = m_rMarkable->offsetToMark( nObjLenMark ) -4;
     m_rMarkable->jumpToMark( nObjLenMark );
@@ -1195,7 +1195,7 @@ Reference< XInterface > SAL_CALL OObjectOutputStream_CreateInstance(
     throw(Exception)
 {
     OObjectOutputStream *p = new OObjectOutputStream;
-    return  Reference< XInterface > ( SAL_STATIC_CAST( OWeakObject * , p ) );
+    return  Reference< XInterface > ( (static_cast< OWeakObject *  >(p)) );
 }
 
 OUString OObjectOutputStream_getImplementationName()
@@ -1383,7 +1383,7 @@ Reference< XPersistObject >  OObjectInputStream::readObject() throw (::com::sun:
 
                 m_aPersistVector[nId] = xLoadedObj;
                 xLoadedObj->read( Reference< XObjectInputStream >(
-                    SAL_STATIC_CAST( XObjectInputStream *, this ) ) );
+                    (static_cast< XObjectInputStream * >(this)) ) );
             }
             else
             {
@@ -1516,7 +1516,7 @@ Sequence< OUString > OObjectInputStream::getSupportedServiceNames(void) throw ()
 Reference< XInterface > SAL_CALL OObjectInputStream_CreateInstance( const Reference < XComponentContext > & rCtx ) throw(Exception)
 {
     OObjectInputStream *p = new OObjectInputStream( rCtx );
-    return Reference< XInterface> ( SAL_STATIC_CAST( OWeakObject *, p ) );
+    return Reference< XInterface> ( (static_cast< OWeakObject * >(p)) );
 }
 
 OUString OObjectInputStream_getImplementationName()
diff --git a/io/source/stm/omark.cxx b/io/source/stm/omark.cxx
index 49fa8e20e0b6..4070f52551c6 100644
--- a/io/source/stm/omark.cxx
+++ b/io/source/stm/omark.cxx
@@ -367,7 +367,7 @@ void OMarkableOutputStream::setSuccessor( const Reference< XConnectable > &r )
 
          if( m_succ.is() ) {
               m_succ->setPredecessor( Reference < XConnectable > (
-                  SAL_STATIC_CAST( XConnectable * , this  ) ) );
+                  (static_cast< XConnectable *  >(this)) ) );
          }
      }
 }
@@ -385,7 +385,7 @@ void OMarkableOutputStream::setPredecessor( const Reference< XConnectable > &r )
         m_pred = r;
         if( m_pred.is() ) {
             m_pred->setSuccessor( Reference < XConnectable > (
-                SAL_STATIC_CAST ( XConnectable * , this ) ) );
+                (static_cast< XConnectable *  >(this )) ) );
         }
     }
 }
@@ -900,7 +900,7 @@ void OMarkableInputStream::setSuccessor( const Reference< XConnectable > &r )
          if( m_succ.is() ) {
               /// set this instance as the sink !
               m_succ->setPredecessor( Reference< XConnectable > (
-                  SAL_STATIC_CAST( XConnectable * , this ) ) );
+                  (static_cast< XConnectable *  >(this)) ) );
          }
      }
 }
@@ -919,7 +919,7 @@ void OMarkableInputStream::setPredecessor( const Reference < XConnectable >  &r
         m_pred = r;
         if( m_pred.is() ) {
             m_pred->setSuccessor( Reference< XConnectable > (
-                SAL_STATIC_CAST( XConnectable * , this ) ) );
+                (static_cast< XConnectable *  >(this)) ) );
         }
     }
 }
diff --git a/io/source/stm/opipe.cxx b/io/source/stm/opipe.cxx
index 9de67a94537b..5d9fd0f0e770 100644
--- a/io/source/stm/opipe.cxx
+++ b/io/source/stm/opipe.cxx
@@ -386,7 +386,7 @@ void OPipeImpl::setSuccessor( const Reference < XConnectable >  &r )
          if( m_succ.is() )
          {
               m_succ->setPredecessor(
-                  Reference< XConnectable > ( SAL_STATIC_CAST( XConnectable * , this ) ) );
+                  Reference< XConnectable > ( (static_cast< XConnectable *  >(this)) ) );
          }
      }
 }
@@ -405,7 +405,7 @@ void OPipeImpl::setPredecessor( const Reference < XConnectable > &r )
         m_pred = r;
         if( m_pred.is() ) {
             m_pred->setSuccessor(
-                Reference < XConnectable > ( SAL_STATIC_CAST( XConnectable * , this ) ) );
+                Reference < XConnectable > ( (static_cast< XConnectable *  >(this)) ) );
         }
     }
 }
@@ -459,7 +459,7 @@ Reference < XInterface > SAL_CALL OPipeImpl_CreateInstance(
 {
     OPipeImpl *p = new OPipeImpl;
 
-    return Reference < XInterface > ( SAL_STATIC_CAST( OWeakObject * , p ) );
+    return Reference < XInterface > ( (static_cast< OWeakObject *  >(p)) );
 }
 
 
diff --git a/io/test/stm/datatest.cxx b/io/test/stm/datatest.cxx
index 4504403a4231..7a54cd234209 100644
--- a/io/test/stm/datatest.cxx
+++ b/io/test/stm/datatest.cxx
@@ -349,7 +349,7 @@ void ODataStreamTest::testSimple(   const Reference < XDataInputStream > &rInput
 Reference < XInterface > SAL_CALL ODataStreamTest_CreateInstance( const Reference < XMultiServiceFactory > & rSMgr ) throw(Exception)
 {
     ODataStreamTest *p = new ODataStreamTest( rSMgr );
-    return Reference < XInterface > ( SAL_STATIC_CAST( OWeakObject * , p ) );
+    return Reference < XInterface > ( (static_cast< OWeakObject *  >(p)) );
 }
 
 Sequence<OUString> ODataStreamTest_getSupportedServiceNames( int i) throw ()
@@ -627,7 +627,7 @@ Reference < XInterface > SAL_CALL OMyPersistObject_CreateInstance(
     throw(Exception)
 {
     MyPersistObject *p = new MyPersistObject( );
-    return Reference < XInterface > ( SAL_STATIC_CAST( OWeakObject * , p ) );
+    return Reference < XInterface > ( (static_cast< OWeakObject *  >(p)) );
 }
 
 Sequence<OUString> OMyPersistObject_getSupportedServiceNames( ) throw ()
@@ -1077,7 +1077,7 @@ void OObjectStreamTest::testObject(     const Reference<  XObjectOutputStream >
 Reference < XInterface > SAL_CALL OObjectStreamTest_CreateInstance( const Reference < XMultiServiceFactory > & rSMgr ) throw(Exception)
 {
     OObjectStreamTest *p = new OObjectStreamTest( rSMgr );
-    return Reference < XInterface > ( SAL_STATIC_CAST( OWeakObject * , p ) );
+    return Reference < XInterface > ( (static_cast< OWeakObject *  >(p)) );
 }
 
 Sequence<OUString> OObjectStreamTest_getSupportedServiceNames( int i) throw ()
diff --git a/io/test/stm/marktest.cxx b/io/test/stm/marktest.cxx
index ab1d771878ef..d0d9976e49c6 100644
--- a/io/test/stm/marktest.cxx
+++ b/io/test/stm/marktest.cxx
@@ -380,7 +380,7 @@ void OMarkableOutputStreamTest::testSimple(     const Reference< XOutputStream >
 Reference < XInterface > SAL_CALL OMarkableOutputStreamTest_CreateInstance( const Reference< XMultiServiceFactory > & rSMgr ) throw(Exception)
 {
     OMarkableOutputStreamTest *p = new OMarkableOutputStreamTest( rSMgr );
-    return Reference < XInterface > ( SAL_STATIC_CAST( OWeakObject * , p ) );
+    return Reference < XInterface > ( (static_cast< OWeakObject *  >(p)) );
 }
 
 
@@ -652,7 +652,7 @@ void OMarkableInputStreamTest::testSimple(      const Reference< XOutputStream >
 Reference < XInterface > SAL_CALL OMarkableInputStreamTest_CreateInstance( const Reference< XMultiServiceFactory > & rSMgr ) throw(Exception)
 {
     OMarkableInputStreamTest *p = new OMarkableInputStreamTest( rSMgr );
-    return Reference < XInterface > ( SAL_STATIC_CAST( OWeakObject * , p ) );
+    return Reference < XInterface > ( (static_cast< OWeakObject *  >(p)) );
 }
 
 
diff --git a/io/test/stm/pipetest.cxx b/io/test/stm/pipetest.cxx
index ebb89e69c117..c67ff9a86bf1 100644
--- a/io/test/stm/pipetest.cxx
+++ b/io/test/stm/pipetest.cxx
@@ -413,7 +413,7 @@ void OPipeTest::testMultithreading( const Reference < XInterface > &r )
 Reference < XInterface > SAL_CALL OPipeTest_CreateInstance( const Reference< XMultiServiceFactory>  & rSMgr ) throw (Exception)
 {
     OPipeTest *p = new OPipeTest( rSMgr );
-    Reference< XInterface > x ( SAL_STATIC_CAST( OWeakObject * , p ) );
+    Reference< XInterface > x ( (static_cast< OWeakObject *  >(p)) );
     return x;
 }