de-macroize XINTERFACE_COMMON_IMPL

Change-Id: I7cffc8a111dd939272c6dbef8827b6f5c04a4590
Reviewed-on: https://gerrit.libreoffice.org/8455
Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
Tested-by: Norbert Thiebaud <nthiebaud@gmail.com>

7 files changed, 72 insertions, 15 deletions

diff --git a/ucb/source/cacher/cachedcontentresultset.cxx b/ucb/source/cacher/cachedcontentresultset.cxx
index 311e2bcdfe7a..e6929265598f 100644
--- a/ucb/source/cacher/cachedcontentresultset.cxx
+++ b/ucb/source/cacher/cachedcontentresultset.cxx
@@ -917,9 +917,18 @@ void SAL_CALL CachedContentResultSet
 }
 
 
-// XInterface methods. ( inherited )
+// XInterface methods.
+void SAL_CALL CachedContentResultSet::acquire()
+    throw()
+{
+    OWeakObject::acquire();
+}
 
-XINTERFACE_COMMON_IMPL( CachedContentResultSet )
+void SAL_CALL CachedContentResultSet::release()
+    throw()
+{
+    OWeakObject::release();
+}
 
 Any SAL_CALL CachedContentResultSet
     ::queryInterface( const Type&  rType )
diff --git a/ucb/source/cacher/cachedcontentresultsetstub.cxx b/ucb/source/cacher/cachedcontentresultsetstub.cxx
index dd3d896a9f83..98653b180e85 100644
--- a/ucb/source/cacher/cachedcontentresultsetstub.cxx
+++ b/ucb/source/cacher/cachedcontentresultsetstub.cxx
@@ -53,8 +53,17 @@ CachedContentResultSetStub::~CachedContentResultSetStub()
 
 
 // XInterface methods.
+void SAL_CALL CachedContentResultSetStub::acquire()
+    throw()
+{
+    OWeakObject::acquire();
+}
 
-XINTERFACE_COMMON_IMPL( CachedContentResultSetStub )
+void SAL_CALL CachedContentResultSetStub::release()
+    throw()
+{
+    OWeakObject::release();
+}
 
 Any SAL_CALL CachedContentResultSetStub
     ::queryInterface( const Type&  rType )
diff --git a/ucb/source/cacher/cacheddynamicresultset.cxx b/ucb/source/cacher/cacheddynamicresultset.cxx
index 917a6f692c18..2f56d04c60e1 100644
--- a/ucb/source/cacher/cacheddynamicresultset.cxx
+++ b/ucb/source/cacher/cacheddynamicresultset.cxx
@@ -75,8 +75,17 @@ void SAL_CALL CachedDynamicResultSet
 
 
 // XInterface methods.
+void SAL_CALL CachedDynamicResultSet::acquire()
+    throw()
+{
+    OWeakObject::acquire();
+}
 
-XINTERFACE_COMMON_IMPL( CachedDynamicResultSet )
+void SAL_CALL CachedDynamicResultSet::release()
+    throw()
+{
+    OWeakObject::release();
+}
 
 Any SAL_CALL CachedDynamicResultSet
     ::queryInterface( const Type&  rType )
diff --git a/ucb/source/cacher/cacheddynamicresultsetstub.cxx b/ucb/source/cacher/cacheddynamicresultsetstub.cxx
index efbb359edf6d..36fe89cad150 100644
--- a/ucb/source/cacher/cacheddynamicresultsetstub.cxx
+++ b/ucb/source/cacher/cacheddynamicresultsetstub.cxx
@@ -76,8 +76,17 @@ void SAL_CALL CachedDynamicResultSetStub
 
 
 // XInterface methods.
+void SAL_CALL CachedDynamicResultSetStub::acquire()
+    throw()
+{
+    OWeakObject::acquire();
+}
 
-XINTERFACE_COMMON_IMPL( CachedDynamicResultSetStub )
+void SAL_CALL CachedDynamicResultSetStub::release()
+    throw()
+{
+    OWeakObject::release();
+}
 
 Any SAL_CALL CachedDynamicResultSetStub
     ::queryInterface( const Type&  rType )
diff --git a/ucb/source/cacher/contentresultsetwrapper.cxx b/ucb/source/cacher/contentresultsetwrapper.cxx
index 516b719eebdd..42c16c2e1ad1 100644
--- a/ucb/source/cacher/contentresultsetwrapper.cxx
+++ b/ucb/source/cacher/contentresultsetwrapper.cxx
@@ -1407,9 +1407,19 @@ ContentResultSetWrapperListener::~ContentResultSetWrapperListener()
 
 
 // XInterface methods.
+void SAL_CALL ContentResultSetWrapperListener::acquire()
+    throw()
+{
+    OWeakObject::acquire();
+}
+
+void SAL_CALL ContentResultSetWrapperListener::release()
+    throw()
+{
+    OWeakObject::release();
+}
 
 //list all interfaces inclusive baseclasses of interfaces
-XINTERFACE_COMMON_IMPL( ContentResultSetWrapperListener )
 QUERYINTERFACE_IMPL_START( ContentResultSetWrapperListener )
 
     static_cast< XEventListener * >(
diff --git a/ucb/source/core/provprox.cxx b/ucb/source/core/provprox.cxx
index f0864f03ca68..aa475e731298 100644
--- a/ucb/source/core/provprox.cxx
+++ b/ucb/source/core/provprox.cxx
@@ -129,13 +129,18 @@ UcbContentProviderProxy::~UcbContentProviderProxy()
 }
 
 
-
 // XInterface methods.
+void SAL_CALL UcbContentProviderProxy::acquire()
+    throw()
+{
+    OWeakObject::acquire();
+}
 
-
-
-XINTERFACE_COMMON_IMPL( UcbContentProviderProxy );
-
+void SAL_CALL UcbContentProviderProxy::release()
+    throw()
+{
+    OWeakObject::release();
+}
 
 // virtual
 Any SAL_CALL
diff --git a/ucb/source/ucp/hierarchy/hierarchydatasource.cxx b/ucb/source/ucp/hierarchy/hierarchydatasource.cxx
index 5370e6a3b778..4208f12aefaa 100644
--- a/ucb/source/ucp/hierarchy/hierarchydatasource.cxx
+++ b/ucb/source/ucp/hierarchy/hierarchydatasource.cxx
@@ -610,11 +610,17 @@ HierarchyDataAccess::~HierarchyDataAccess()
 
 
 // XInterface methods.
+void SAL_CALL HierarchyDataAccess::acquire()
+    throw()
+{
+    OWeakObject::acquire();
+}
 
-
-
-XINTERFACE_COMMON_IMPL( HierarchyDataAccess );
-
+void SAL_CALL HierarchyDataAccess::release()
+    throw()
+{
+    OWeakObject::release();
+}
 
 // virtual
 uno::Any SAL_CALL HierarchyDataAccess::queryInterface( const uno::Type & aType )