diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2014-03-04 13:23:41 -0600 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2014-03-05 09:44:17 -0600 |
| commit | 7ec9ea3c52609f033c57d9af90d334583e32b80e (patch) | |
| tree | c6bcd5d68ca9aa8999771105615571b4b98c8e61 | |
| parent | 10fe4b9fd17e1da11ea7ebfa354f40c2e2da3f3f (diff) | |
de-macroize QUERYINTERFACE_IMPL_START QUERYINTERFACE_IMPL_END
Change-Id: I152d82e34446111cead4b060f789260552d5920d
| -rw-r--r-- | include/ucbhelper/macros.hxx | 4 | ||||
| -rw-r--r-- | ucb/source/cacher/contentresultsetwrapper.cxx | 29 | ||||
| -rw-r--r-- | ucb/source/cacher/dynamicresultsetwrapper.cxx | 20 |
3 files changed, 26 insertions, 27 deletions
diff --git a/include/ucbhelper/macros.hxx b/include/ucbhelper/macros.hxx index 4a494e99e1b1..2df37a36d489 100644 --- a/include/ucbhelper/macros.hxx +++ b/include/ucbhelper/macros.hxx @@ -66,12 +66,8 @@ com::sun::star::uno::Any SAL_CALL Class::queryInterface( \ return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType ); \ } - - // XInterface impl. - - // 2 interfaces implemented #define XINTERFACE_IMPL_2( Class, Ifc1, Ifc2 ) \ XINTERFACE_COMMON_IMPL( Class ) \ 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. diff --git a/ucb/source/cacher/dynamicresultsetwrapper.cxx b/ucb/source/cacher/dynamicresultsetwrapper.cxx index 3e777ca9abe0..caf63780aed7 100644 --- a/ucb/source/cacher/dynamicresultsetwrapper.cxx +++ b/ucb/source/cacher/dynamicresultsetwrapper.cxx @@ -121,16 +121,18 @@ void SAL_CALL DynamicResultSetWrapper m_xMyResultTwo = xResultSet; } - // XInterface methods. - -//list all interfaces inclusive baseclasses of interfaces -QUERYINTERFACE_IMPL_START( DynamicResultSetWrapper ) - (static_cast< XComponent* >(this)) //base of XDynamicResultSet - , (static_cast< XDynamicResultSet* >(this)) - , (static_cast< XSourceInitialization* >(this)) -QUERYINTERFACE_IMPL_END - +css::uno::Any SAL_CALL DynamicResultSetWrapper::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)), //base of XDynamicResultSet + (static_cast< XDynamicResultSet* >(this)), + (static_cast< XSourceInitialization* >(this)) + ); + return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType ); +} // XComponent methods. |