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 /xmlhelp | |
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 'xmlhelp')
-rw-r--r-- | xmlhelp/source/cxxhelp/provider/bufferedinputstream.cxx | 4 | ||||
-rw-r--r-- | xmlhelp/source/cxxhelp/provider/inputstream.cxx | 4 | ||||
-rw-r--r-- | xmlhelp/source/cxxhelp/provider/resultsetbase.cxx | 14 | ||||
-rw-r--r-- | xmlhelp/source/cxxhelp/provider/urlparameter.cxx | 4 | ||||
-rw-r--r-- | xmlhelp/source/treeview/tvfactory.cxx | 6 | ||||
-rw-r--r-- | xmlhelp/source/treeview/tvread.cxx | 10 |
6 files changed, 21 insertions, 21 deletions
diff --git a/xmlhelp/source/cxxhelp/provider/bufferedinputstream.cxx b/xmlhelp/source/cxxhelp/provider/bufferedinputstream.cxx index 15a5c0388b21..4384a2cfedca 100644 --- a/xmlhelp/source/cxxhelp/provider/bufferedinputstream.cxx +++ b/xmlhelp/source/cxxhelp/provider/bufferedinputstream.cxx @@ -105,8 +105,8 @@ BufferedInputStream::~BufferedInputStream() Any SAL_CALL BufferedInputStream::queryInterface( const Type& rType ) throw( RuntimeException ) { Any aRet = ::cppu::queryInterface( rType, - SAL_STATIC_CAST( XInputStream*,this ), - SAL_STATIC_CAST( XSeekable*,this ) ); + (static_cast< XInputStream* >(this)), + (static_cast< XSeekable* >(this)) ); return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType ); } diff --git a/xmlhelp/source/cxxhelp/provider/inputstream.cxx b/xmlhelp/source/cxxhelp/provider/inputstream.cxx index 58ae720b7d11..e48529505585 100644 --- a/xmlhelp/source/cxxhelp/provider/inputstream.cxx +++ b/xmlhelp/source/cxxhelp/provider/inputstream.cxx @@ -62,8 +62,8 @@ XInputStream_impl::queryInterface( throw( uno::RuntimeException) { uno::Any aRet = cppu::queryInterface( rType, - SAL_STATIC_CAST( io::XInputStream*,this ), - SAL_STATIC_CAST( io::XSeekable*,this ) ); + (static_cast< io::XInputStream* >(this)), + (static_cast< io::XSeekable* >(this)) ); return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType ); } diff --git a/xmlhelp/source/cxxhelp/provider/resultsetbase.cxx b/xmlhelp/source/cxxhelp/provider/resultsetbase.cxx index 7a7f93555a7d..d209bb63d5f3 100644 --- a/xmlhelp/source/cxxhelp/provider/resultsetbase.cxx +++ b/xmlhelp/source/cxxhelp/provider/resultsetbase.cxx @@ -93,12 +93,12 @@ ResultSetBase::queryInterface( throw( uno::RuntimeException ) { 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 ); } @@ -461,7 +461,7 @@ public: throw( uno::RuntimeException ) { 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/xmlhelp/source/cxxhelp/provider/urlparameter.cxx b/xmlhelp/source/cxxhelp/provider/urlparameter.cxx index a7187e71b098..29bdc809e4a2 100644 --- a/xmlhelp/source/cxxhelp/provider/urlparameter.cxx +++ b/xmlhelp/source/cxxhelp/provider/urlparameter.cxx @@ -1082,8 +1082,8 @@ InputStreamTransformer::~InputStreamTransformer() Any SAL_CALL InputStreamTransformer::queryInterface( const Type& rType ) throw( RuntimeException ) { Any aRet = ::cppu::queryInterface( rType, - SAL_STATIC_CAST( XInputStream*,this ), - SAL_STATIC_CAST( XSeekable*,this ) ); + (static_cast< XInputStream* >(this)), + (static_cast< XSeekable* >(this)) ); return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType ); } diff --git a/xmlhelp/source/treeview/tvfactory.cxx b/xmlhelp/source/treeview/tvfactory.cxx index 6f8ca210c424..ffebbd1434c5 100644 --- a/xmlhelp/source/treeview/tvfactory.cxx +++ b/xmlhelp/source/treeview/tvfactory.cxx @@ -82,9 +82,9 @@ TVFactory::queryInterface( throw( RuntimeException ) { Any aRet = cppu::queryInterface( rType, - SAL_STATIC_CAST( XServiceInfo*, this ), - SAL_STATIC_CAST( XTypeProvider*, this ), - SAL_STATIC_CAST( XMultiServiceFactory*, this ) ); + (static_cast< XServiceInfo* >(this)), + (static_cast< XTypeProvider* >(this)), + (static_cast< XMultiServiceFactory* >(this)) ); return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType ); } diff --git a/xmlhelp/source/treeview/tvread.cxx b/xmlhelp/source/treeview/tvread.cxx index 46736516fdf4..af4be054b32e 100644 --- a/xmlhelp/source/treeview/tvread.cxx +++ b/xmlhelp/source/treeview/tvread.cxx @@ -268,11 +268,11 @@ TVBase::queryInterface( throw( RuntimeException ) { Any aRet = cppu::queryInterface( rType, - SAL_STATIC_CAST( XTypeProvider*, this ), - SAL_STATIC_CAST( XNameAccess*, this ), - SAL_STATIC_CAST( XHierarchicalNameAccess*, this ), - SAL_STATIC_CAST( XChangesNotifier*, this ), - SAL_STATIC_CAST( XComponent*, this ) ); + (static_cast< XTypeProvider* >(this)), + (static_cast< XNameAccess* >(this)), + (static_cast< XHierarchicalNameAccess* >(this)), + (static_cast< XChangesNotifier* >(this)), + (static_cast< XComponent* >(this)) ); return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType ); } |