summaryrefslogtreecommitdiff
path: root/ucb
diff options
context:
space:
mode:
authorNorbert Thiebaud <nthiebaud@gmail.com>2014-03-04 14:00:38 -0600
committerNorbert Thiebaud <nthiebaud@gmail.com>2014-03-05 09:44:17 -0600
commit149da07aed965ba8cc3330163821922f10381d8c (patch)
tree8859e4284f6fbc4e3f75e21ce7f257a43606e24b /ucb
parent7ec9ea3c52609f033c57d9af90d334583e32b80e (diff)
kill QUERYINTERFACE_IMPL_START/END
Change-Id: I9b9457cac9b93b550ccb16522b035aeb53be9bf3
Diffstat (limited to 'ucb')
-rw-r--r--ucb/source/cacher/contentresultsetwrapper.cxx23
1 files changed, 12 insertions, 11 deletions
diff --git a/ucb/source/cacher/contentresultsetwrapper.cxx b/ucb/source/cacher/contentresultsetwrapper.cxx
index dfa4c9b2fb8d..aca8dc38c983 100644
--- a/ucb/source/cacher/contentresultsetwrapper.cxx
+++ b/ucb/source/cacher/contentresultsetwrapper.cxx
@@ -1420,17 +1420,18 @@ void SAL_CALL ContentResultSetWrapperListener::release()
OWeakObject::release();
}
-//list all interfaces inclusive baseclasses of interfaces
-QUERYINTERFACE_IMPL_START( ContentResultSetWrapperListener )
-
- static_cast< XEventListener * >(
- static_cast< XPropertyChangeListener * >(this))
- , (static_cast< XPropertyChangeListener* >(this))
- , (static_cast< XVetoableChangeListener* >(this))
-
-QUERYINTERFACE_IMPL_END
-
-
+css::uno::Any SAL_CALL ContentResultSetWrapperListener::queryInterface( const css::uno::Type & rType )
+ throw( com::sun::star::uno::RuntimeException, std::exception )
+{
+ //list all interfaces inclusive baseclasses of interfaces
+ css::uno::Any aRet = cppu::queryInterface( rType,
+ static_cast< XEventListener * >(
+ static_cast< XPropertyChangeListener * >(this)),
+ static_cast< XPropertyChangeListener* >(this),
+ static_cast< XVetoableChangeListener* >(this)
+ );
+ return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType );
+}
//XEventListener methods.