summaryrefslogtreecommitdiff
path: root/ucb/source/cacher/contentresultsetwrapper.cxx
diff options
context:
space:
mode:
authorNorbert Thiebaud <nthiebaud@gmail.com>2014-03-04 13:23:41 -0600
committerNorbert Thiebaud <nthiebaud@gmail.com>2014-03-05 09:44:17 -0600
commit7ec9ea3c52609f033c57d9af90d334583e32b80e (patch)
treec6bcd5d68ca9aa8999771105615571b4b98c8e61 /ucb/source/cacher/contentresultsetwrapper.cxx
parent10fe4b9fd17e1da11ea7ebfa354f40c2e2da3f3f (diff)
de-macroize QUERYINTERFACE_IMPL_START QUERYINTERFACE_IMPL_END
Change-Id: I152d82e34446111cead4b060f789260552d5920d
Diffstat (limited to 'ucb/source/cacher/contentresultsetwrapper.cxx')
-rw-r--r--ucb/source/cacher/contentresultsetwrapper.cxx29
1 files changed, 15 insertions, 14 deletions
diff --git a/ucb/source/cacher/contentresultsetwrapper.cxx b/ucb/source/cacher/contentresultsetwrapper.cxx
index 42c16c2e1ad1..dfa4c9b2fb8d 100644
--- a/ucb/source/cacher/contentresultsetwrapper.cxx
+++ b/ucb/source/cacher/contentresultsetwrapper.cxx
@@ -338,20 +338,21 @@ sal_Bool SAL_CALL ContentResultSetWrapper
// XInterface methods.
-//list all interfaces inclusive baseclasses of interfaces
-QUERYINTERFACE_IMPL_START( ContentResultSetWrapper )
-
- (static_cast< XComponent* >(this)),
- (static_cast< XCloseable* >(this)),
- (static_cast< XResultSetMetaDataSupplier* >(this)),
- (static_cast< XPropertySet* >(this)),
-
- (static_cast< XContentAccess* >(this)),
- (static_cast< XResultSet* >(this)),
- (static_cast< XRow* >(this))
-
-QUERYINTERFACE_IMPL_END
-
+css::uno::Any SAL_CALL ContentResultSetWrapper::queryInterface( const css::uno::Type & rType )
+ throw( css::uno::RuntimeException, std::exception )
+{
+ //list all interfaces inclusive baseclasses of interfaces
+ css::uno::Any aRet = cppu::queryInterface( rType,
+ (static_cast< XComponent* >(this)),
+ (static_cast< XCloseable* >(this)),
+ (static_cast< XResultSetMetaDataSupplier* >(this)),
+ (static_cast< XPropertySet* >(this)),
+ (static_cast< XContentAccess* >(this)),
+ (static_cast< XResultSet* >(this)),
+ (static_cast< XRow* >(this))
+ );
+ return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType );
+}
// XComponent methods.