diff options
| author | Thomas Arnhold <thomas@arnhold.org> | 2012-05-04 15:51:56 +0200 |
|---|---|---|
| committer | Thomas Arnhold <thomas@arnhold.org> | 2012-05-04 15:52:57 +0200 |
| commit | 135c63c8f9cc363c0895542b0f3bed48b61ea836 (patch) | |
| tree | 5afa3bcc304e246b38058c2ad7b0d1fd1e76a05f /cppuhelper | |
| parent | One more fix for Mac OS X fpicker build (diff) | |
| download | core-135c63c8f9cc363c0895542b0f3bed48b61ea836.tar.gz core-135c63c8f9cc363c0895542b0f3bed48b61ea836.zip | |
fdo#48253 Expand SAL_STATIC_CAST and SAL_CONST_CAST
Change-Id: I50f0887ceb4517d7ef234f970ca2ba679d533382
Diffstat (limited to 'cppuhelper')
| -rw-r--r-- | cppuhelper/source/propshlp.cxx | 2 | ||||
| -rw-r--r-- | cppuhelper/test/testpropshlp.cxx | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/cppuhelper/source/propshlp.cxx b/cppuhelper/source/propshlp.cxx index f1ce426ec64a..082341941cb0 100644 --- a/cppuhelper/source/propshlp.cxx +++ b/cppuhelper/source/propshlp.cxx @@ -254,7 +254,7 @@ Any OPropertySetHelper2::queryInterface( const ::com::sun::star::uno::Type & rTy void OPropertySetHelper::disposing() SAL_THROW(()) { // Create an event with this as sender - Reference < XPropertySet > rSource( SAL_STATIC_CAST( XPropertySet * , this ) , UNO_QUERY ); + Reference < XPropertySet > rSource( (static_cast< XPropertySet * >(this)) , UNO_QUERY ); EventObject aEvt; aEvt.Source = rSource; diff --git a/cppuhelper/test/testpropshlp.cxx b/cppuhelper/test/testpropshlp.cxx index 858668fbb67b..2c3cc5a7e22a 100644 --- a/cppuhelper/test/testpropshlp.cxx +++ b/cppuhelper/test/testpropshlp.cxx @@ -325,11 +325,11 @@ public: test_OPropertySetHelper( Property * p, sal_Int32 n ) : MutexContainer() , OBroadcastHelper( ((MutexContainer *)this)->aMutex ) -// , OPropertySetHelper( *SAL_STATIC_CAST(OBroadcastHelper *,this)) +// , OPropertySetHelper( *(static_cast< OBroadcastHelper * >(this))) // MSCI 4 bug ! : // OBroadcastHelper == OBroadcastHelperVar<OMultiTypeInterfaceContainerHelper> , OPropertySetHelper( - *SAL_STATIC_CAST(OBroadcastHelper *,this)) + *(static_cast< OBroadcastHelper * >(this))) , bBOOL( sal_False ) , nINT16( 0 ) , nINT32( 0 ) @@ -359,7 +359,7 @@ public: { disposing(); EventObject aEvt; - aEvt.Source = Reference < XInterface > ( SAL_STATIC_CAST( OWeakObject * ,this) ); + aEvt.Source = Reference < XInterface > ( (static_cast< OWeakObject * >(this)) ); rBHelper.aLC.disposeAndClear( aEvt ); rBHelper.bDisposed = sal_True; |