de-macroize XINTERFACE_DECL

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

7 files changed, 70 insertions, 30 deletions

diff --git a/ucb/source/cacher/cachedcontentresultset.cxx b/ucb/source/cacher/cachedcontentresultset.cxx
index 37cb74e5c373..311e2bcdfe7a 100644
--- a/ucb/source/cacher/cachedcontentresultset.cxx
+++ b/ucb/source/cacher/cachedcontentresultset.cxx
@@ -411,7 +411,12 @@ public:
     virtual ~CCRS_PropertySetInfo();
 
     // XInterface
-    XINTERFACE_DECL()
+    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType )
+        throw( css::uno::RuntimeException, std::exception );
+    virtual void SAL_CALL acquire()
+        throw();
+    virtual void SAL_CALL release()
+        throw();
 
     // XTypeProvider
     XTYPEPROVIDER_DECL()
diff --git a/ucb/source/cacher/cachedcontentresultset.hxx b/ucb/source/cacher/cachedcontentresultset.hxx
index a18a688450e7..32b96658454b 100644
--- a/ucb/source/cacher/cachedcontentresultset.hxx
+++ b/ucb/source/cacher/cachedcontentresultset.hxx
@@ -199,9 +199,13 @@ public:
     virtual ~CachedContentResultSet();
 
 
-    // XInterface inherited
-
-    XINTERFACE_DECL()
+    // XInterface
+    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType )
+        throw( css::uno::RuntimeException, std::exception );
+    virtual void SAL_CALL acquire()
+        throw();
+    virtual void SAL_CALL release()
+        throw();
 
     // XTypeProvider
 
@@ -489,8 +493,12 @@ public:
 
 
     // XInterface
-    XINTERFACE_DECL()
-
+    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType )
+        throw( css::uno::RuntimeException, std::exception );
+    virtual void SAL_CALL acquire()
+        throw();
+    virtual void SAL_CALL release()
+        throw();
 
     // XTypeProvider
     XTYPEPROVIDER_DECL()
diff --git a/ucb/source/cacher/cachedcontentresultsetstub.hxx b/ucb/source/cacher/cachedcontentresultsetstub.hxx
index 70fe3e3977b8..22b32bfb3bd0 100644
--- a/ucb/source/cacher/cachedcontentresultsetstub.hxx
+++ b/ucb/source/cacher/cachedcontentresultsetstub.hxx
@@ -96,9 +96,13 @@ public:
 
 
 
-    // XInterface inherited
-
-    XINTERFACE_DECL()
+    // XInterface
+    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType )
+        throw( css::uno::RuntimeException, std::exception );
+    virtual void SAL_CALL acquire()
+        throw();
+    virtual void SAL_CALL release()
+        throw();
 
     // own inherited
 
@@ -169,8 +173,12 @@ public:
 
 
     // XInterface
-    XINTERFACE_DECL()
-
+    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType )
+        throw( css::uno::RuntimeException, std::exception );
+    virtual void SAL_CALL acquire()
+        throw();
+    virtual void SAL_CALL release()
+        throw();
 
     // XTypeProvider
     XTYPEPROVIDER_DECL()
diff --git a/ucb/source/cacher/cacheddynamicresultset.hxx b/ucb/source/cacher/cacheddynamicresultset.hxx
index 93c4fa0804e1..39d5bddea1a7 100644
--- a/ucb/source/cacher/cacheddynamicresultset.hxx
+++ b/ucb/source/cacher/cacheddynamicresultset.hxx
@@ -56,10 +56,13 @@ public:
     virtual ~CachedDynamicResultSet();
 
 
-
-    // XInterface inherited
-
-    XINTERFACE_DECL()
+    // XInterface
+    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType )
+        throw( css::uno::RuntimeException, std::exception );
+    virtual void SAL_CALL acquire()
+        throw();
+    virtual void SAL_CALL release()
+        throw();
 
     // XTypeProvider
 
@@ -99,8 +102,12 @@ public:
 
 
     // XInterface
-    XINTERFACE_DECL()
-
+    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType )
+        throw( css::uno::RuntimeException, std::exception );
+    virtual void SAL_CALL acquire()
+        throw();
+    virtual void SAL_CALL release()
+        throw();
 
     // XTypeProvider
     XTYPEPROVIDER_DECL()
diff --git a/ucb/source/cacher/cacheddynamicresultsetstub.hxx b/ucb/source/cacher/cacheddynamicresultsetstub.hxx
index f7777ad6902e..bcf92acc262e 100644
--- a/ucb/source/cacher/cacheddynamicresultsetstub.hxx
+++ b/ucb/source/cacher/cacheddynamicresultsetstub.hxx
@@ -50,10 +50,13 @@ public:
     virtual ~CachedDynamicResultSetStub();
 
 
-
-    // XInterface inherited
-
-    XINTERFACE_DECL()
+    // XInterface
+    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType )
+        throw( css::uno::RuntimeException, std::exception );
+    virtual void SAL_CALL acquire()
+        throw();
+    virtual void SAL_CALL release()
+        throw();
 
     // XTypeProvider
 
@@ -84,10 +87,13 @@ public:
 
     virtual ~CachedDynamicResultSetStubFactory();
 
-
     // XInterface
-    XINTERFACE_DECL()
-
+    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType )
+        throw( css::uno::RuntimeException, std::exception );
+    virtual void SAL_CALL acquire()
+        throw();
+    virtual void SAL_CALL release()
+        throw();
 
     // XTypeProvider
     XTYPEPROVIDER_DECL()
diff --git a/ucb/source/cacher/contentresultsetwrapper.hxx b/ucb/source/cacher/contentresultsetwrapper.hxx
index 143a9639dce6..1aeb56e2c2f7 100644
--- a/ucb/source/cacher/contentresultsetwrapper.hxx
+++ b/ucb/source/cacher/contentresultsetwrapper.hxx
@@ -529,9 +529,12 @@ public:
 
 
     // XInterface
-
-    XINTERFACE_DECL()
-
+    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType )
+        throw( css::uno::RuntimeException, std::exception );
+    virtual void SAL_CALL acquire()
+        throw();
+    virtual void SAL_CALL release()
+        throw();
 
     //XEventListener
 
diff --git a/ucb/source/cacher/dynamicresultsetwrapper.hxx b/ucb/source/cacher/dynamicresultsetwrapper.hxx
index a5c695c532fb..a8dfd2a95eed 100644
--- a/ucb/source/cacher/dynamicresultsetwrapper.hxx
+++ b/ucb/source/cacher/dynamicresultsetwrapper.hxx
@@ -193,9 +193,12 @@ public:
 
 
     // XInterface
-
-    XINTERFACE_DECL()
-
+    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType )
+        throw( css::uno::RuntimeException, std::exception );
+    virtual void SAL_CALL acquire()
+        throw();
+    virtual void SAL_CALL release()
+        throw();
 
     // XEventListener ( base of XDynamicResultSetListener )