summaryrefslogtreecommitdiff
path: root/ucb/source/cacher
diff options
context:
space:
mode:
authorThomas Arnhold <thomas@arnhold.org>2012-05-04 15:51:56 +0200
committerThomas Arnhold <thomas@arnhold.org>2012-05-04 15:52:57 +0200
commit135c63c8f9cc363c0895542b0f3bed48b61ea836 (patch)
tree5afa3bcc304e246b38058c2ad7b0d1fd1e76a05f /ucb/source/cacher
parentc48fe716225b1b784d657685396b6cf5fee4fc3d (diff)
fdo#48253 Expand SAL_STATIC_CAST and SAL_CONST_CAST
Change-Id: I50f0887ceb4517d7ef234f970ca2ba679d533382
Diffstat (limited to 'ucb/source/cacher')
-rw-r--r--ucb/source/cacher/contentresultsetwrapper.cxx18
-rw-r--r--ucb/source/cacher/dynamicresultsetwrapper.cxx6
2 files changed, 12 insertions, 12 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
//--------------------------------------------------------------------------