summaryrefslogtreecommitdiff
path: root/ucb/source/cacher
diff options
context:
space:
mode:
authorNorbert Thiebaud <nthiebaud@gmail.com>2014-03-04 15:00:14 -0600
committerNorbert Thiebaud <nthiebaud@gmail.com>2014-03-05 09:44:18 -0600
commite090a0f5802904ca8cded9208993e09bc08a3052 (patch)
tree6ca12ded814c240102202f4a4effc89a9143c8f2 /ucb/source/cacher
parent149da07aed965ba8cc3330163821922f10381d8c (diff)
kill XINTERFACE_IMPL_2
Change-Id: Ic735b7d6ddfaacab9af7405e4dacc62f818bed8c
Diffstat (limited to 'ucb/source/cacher')
-rw-r--r--ucb/source/cacher/cachedcontentresultset.cxx25
-rw-r--r--ucb/source/cacher/dynamicresultsetwrapper.cxx25
2 files changed, 40 insertions, 10 deletions
diff --git a/ucb/source/cacher/cachedcontentresultset.cxx b/ucb/source/cacher/cachedcontentresultset.cxx
index e6929265598f..15912091e074 100644
--- a/ucb/source/cacher/cachedcontentresultset.cxx
+++ b/ucb/source/cacher/cachedcontentresultset.cxx
@@ -521,12 +521,27 @@ CCRS_PropertySetInfo::~CCRS_PropertySetInfo()
// XInterface methods.
-//list all interfaces inclusive baseclasses of interfaces
-XINTERFACE_IMPL_2( CCRS_PropertySetInfo
- , XTypeProvider
- , XPropertySetInfo
- );
+void SAL_CALL CCRS_PropertySetInfo::acquire()
+ throw()
+{
+ OWeakObject::acquire();
+}
+
+void SAL_CALL CCRS_PropertySetInfo::release()
+ throw()
+{
+ OWeakObject::release();
+}
+css::uno::Any SAL_CALL CCRS_PropertySetInfo::queryInterface( const css::uno::Type & rType )
+ throw( css::uno::RuntimeException, std::exception )
+{
+ css::uno::Any aRet = cppu::queryInterface( rType,
+ (static_cast< XTypeProvider* >(this)),
+ (static_cast< XPropertySetInfo* >(this))
+ );
+ return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType );
+}
// XTypeProvider methods.
diff --git a/ucb/source/cacher/dynamicresultsetwrapper.cxx b/ucb/source/cacher/dynamicresultsetwrapper.cxx
index caf63780aed7..b0c510b11920 100644
--- a/ucb/source/cacher/dynamicresultsetwrapper.cxx
+++ b/ucb/source/cacher/dynamicresultsetwrapper.cxx
@@ -470,12 +470,27 @@ DynamicResultSetWrapperListener::~DynamicResultSetWrapperListener()
// XInterface methods.
-//list all interfaces inclusive baseclasses of interfaces
-XINTERFACE_IMPL_2( DynamicResultSetWrapperListener
- , XDynamicResultSetListener
- , XEventListener //base of XDynamicResultSetListener
- );
+void SAL_CALL DynamicResultSetWrapperListener::acquire()
+ throw()
+{
+ OWeakObject::acquire();
+}
+
+void SAL_CALL DynamicResultSetWrapperListener::release()
+ throw()
+{
+ OWeakObject::release();
+}
+css::uno::Any SAL_CALL DynamicResultSetWrapperListener::queryInterface( const css::uno::Type & rType )
+ throw( css::uno::RuntimeException, std::exception )
+{
+ css::uno::Any aRet = cppu::queryInterface( rType,
+ (static_cast< XDynamicResultSetListener* >(this)),
+ (static_cast< XEventListener* >(this))
+ );
+ return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType );
+}
// XDynamicResultSetListener methods: