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>

52 files changed, 375 insertions, 108 deletions

diff --git a/include/ucbhelper/activedatasink.hxx b/include/ucbhelper/activedatasink.hxx
index deaf6aca4205..5adf7be58fe0 100644
--- a/include/ucbhelper/activedatasink.hxx
+++ b/include/ucbhelper/activedatasink.hxx
@@ -45,8 +45,13 @@ class UCBHELPER_DLLPUBLIC ActiveDataSink : public cppu::OWeakObject,
         com::sun::star::io::XInputStream > m_xStream;
 
 public:
-     // XInterface
-    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
     XTYPEPROVIDER_DECL()
diff --git a/include/ucbhelper/activedatastreamer.hxx b/include/ucbhelper/activedatastreamer.hxx
index 799f7ee500d8..0c1af6a52056 100644
--- a/include/ucbhelper/activedatastreamer.hxx
+++ b/include/ucbhelper/activedatastreamer.hxx
@@ -44,8 +44,13 @@ class ActiveDataStreamer : public cppu::OWeakObject,
         com::sun::star::io::XStream > m_xStream;
 
 public:
-     // XInterface
-    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
     XTYPEPROVIDER_DECL()
diff --git a/include/ucbhelper/commandenvironment.hxx b/include/ucbhelper/commandenvironment.hxx
index 1c9ce54a4741..9a6ad0b8db3a 100644
--- a/include/ucbhelper/commandenvironment.hxx
+++ b/include/ucbhelper/commandenvironment.hxx
@@ -70,7 +70,12 @@ public:
     virtual ~CommandEnvironment();
 
     // 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/include/ucbhelper/contenthelper.hxx b/include/ucbhelper/contenthelper.hxx
index e1318eb6a618..674a49afcc9c 100644
--- a/include/ucbhelper/contenthelper.hxx
+++ b/include/ucbhelper/contenthelper.hxx
@@ -324,7 +324,12 @@ public:
     virtual ~ContentImplHelper();
 
     // 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/include/ucbhelper/contentinfo.hxx b/include/ucbhelper/contentinfo.hxx
index fbaa877cdb34..212c22e73665 100644
--- a/include/ucbhelper/contentinfo.hxx
+++ b/include/ucbhelper/contentinfo.hxx
@@ -68,7 +68,12 @@ public:
     virtual ~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()
@@ -126,7 +131,12 @@ public:
     virtual ~CommandProcessorInfo();
 
     // 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/include/ucbhelper/macros.hxx b/include/ucbhelper/macros.hxx
index e8b8cee3a8f8..c6f31a6b9baf 100644
--- a/include/ucbhelper/macros.hxx
+++ b/include/ucbhelper/macros.hxx
@@ -37,23 +37,6 @@
 
 
 
-// XInterface decl.
-
-
-
-#define XINTERFACE_DECL()                                                   \
-    virtual com::sun::star::uno::Any SAL_CALL                               \
-    queryInterface( const com::sun::star::uno::Type & rType )               \
-        throw( com::sun::star::uno::RuntimeException, std::exception );     \
-    virtual void SAL_CALL                                                   \
-    acquire()                                                               \
-        throw();                                                            \
-    virtual void SAL_CALL                                                   \
-    release()                                                               \
-        throw();
-
-
-
 // XInterface impl. internals.
 
 
diff --git a/include/ucbhelper/propertyvalueset.hxx b/include/ucbhelper/propertyvalueset.hxx
index 1a65aba46869..e2c6ed5263f8 100644
--- a/include/ucbhelper/propertyvalueset.hxx
+++ b/include/ucbhelper/propertyvalueset.hxx
@@ -79,7 +79,12 @@ public:
     virtual ~PropertyValueSet();
 
     // 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/include/ucbhelper/providerhelper.hxx b/include/ucbhelper/providerhelper.hxx
index 88c1118d37be..908e91c91ea8 100644
--- a/include/ucbhelper/providerhelper.hxx
+++ b/include/ucbhelper/providerhelper.hxx
@@ -142,10 +142,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
 
diff --git a/include/ucbhelper/resultset.hxx b/include/ucbhelper/resultset.hxx
index 67e86b6257b4..4d3a43d1dd3e 100644
--- a/include/ucbhelper/resultset.hxx
+++ b/include/ucbhelper/resultset.hxx
@@ -108,7 +108,12 @@ public:
     virtual ~ResultSet();
 
     // 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/include/ucbhelper/resultsethelper.hxx b/include/ucbhelper/resultsethelper.hxx
index 60dbbcfc1eed..ed8ae971a0f4 100644
--- a/include/ucbhelper/resultsethelper.hxx
+++ b/include/ucbhelper/resultsethelper.hxx
@@ -135,7 +135,12 @@ public:
     virtual ~ResultSetImplHelper();
 
     // 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/include/ucbhelper/resultsetmetadata.hxx b/include/ucbhelper/resultsetmetadata.hxx
index d663b3898685..72d4af441f4d 100644
--- a/include/ucbhelper/resultsetmetadata.hxx
+++ b/include/ucbhelper/resultsetmetadata.hxx
@@ -194,7 +194,12 @@ public:
     virtual ~ResultSetMetaData();
 
     // 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.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 )
 
diff --git a/ucb/source/core/identify.hxx b/ucb/source/core/identify.hxx
index a7bfec4d6725..dae7402e7a0f 100644
--- a/ucb/source/core/identify.hxx
+++ b/ucb/source/core/identify.hxx
@@ -39,7 +39,12 @@ public:
     virtual ~ContentIdentifier();
 
     // 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/core/provprox.hxx b/ucb/source/core/provprox.hxx
index 842375ac0d9e..dd9faba94198 100644
--- a/ucb/source/core/provprox.hxx
+++ b/ucb/source/core/provprox.hxx
@@ -60,7 +60,12 @@ public:
     virtual ~UcbContentProviderProxyFactory();
 
     // 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()
@@ -111,7 +116,12 @@ public:
     virtual ~UcbContentProviderProxy();
 
     // 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/core/ucb.hxx b/ucb/source/core/ucb.hxx
index d702a76b6851..e2f7de83e2c9 100644
--- a/ucb/source/core/ucb.hxx
+++ b/ucb/source/core/ucb.hxx
@@ -66,7 +66,12 @@ public:
     virtual ~UniversalContentBroker();
 
     // 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/core/ucbprops.hxx b/ucb/source/core/ucbprops.hxx
index 853a4c748054..2723d9e7f778 100644
--- a/ucb/source/core/ucbprops.hxx
+++ b/ucb/source/core/ucbprops.hxx
@@ -59,7 +59,12 @@ public:
     virtual ~UcbPropertiesManager();
 
     // 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/core/ucbstore.cxx b/ucb/source/core/ucbstore.cxx
index be2e6ddf755a..3bbd9245a1d7 100644
--- a/ucb/source/core/ucbstore.cxx
+++ b/ucb/source/core/ucbstore.cxx
@@ -133,7 +133,12 @@ public:
     virtual ~PropertySetInfo_Impl();
 
     // 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/core/ucbstore.hxx b/ucb/source/core/ucbstore.hxx
index 929466c13ed5..50a8fd50a96d 100644
--- a/ucb/source/core/ucbstore.hxx
+++ b/ucb/source/core/ucbstore.hxx
@@ -64,7 +64,12 @@ public:
     virtual ~UcbStore();
 
     // 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()
@@ -126,7 +131,12 @@ public:
     virtual ~PropertySetRegistry();
 
     // 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()
@@ -205,7 +215,12 @@ public:
     virtual ~PersistentPropertySet();
 
     // 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/sorter/sortdynres.hxx b/ucb/source/sorter/sortdynres.hxx
index a6c3d7e08041..dc459c3f8f36 100644
--- a/ucb/source/sorter/sortdynres.hxx
+++ b/ucb/source/sorter/sortdynres.hxx
@@ -89,9 +89,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
 
@@ -165,9 +168,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 )
 
@@ -208,9 +214,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
 
diff --git a/ucb/source/sorter/sortresult.cxx b/ucb/source/sorter/sortresult.cxx
index e6616dba3e5c..bbeec37c593a 100644
--- a/ucb/source/sorter/sortresult.cxx
+++ b/ucb/source/sorter/sortresult.cxx
@@ -104,7 +104,12 @@ public:
     virtual     ~SRSPropertySetInfo();
 
     // 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/sorter/sortresult.hxx b/ucb/source/sorter/sortresult.hxx
index 49160502dac9..24bb1c8b8bd3 100644
--- a/ucb/source/sorter/sortresult.hxx
+++ b/ucb/source/sorter/sortresult.hxx
@@ -192,7 +192,12 @@ public:
     void                ResortNew( EventList* pList );
 
     // 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/ucp/cmis/cmis_content.hxx b/ucb/source/ucp/cmis/cmis_content.hxx
index 1fee368f3805..26a4975ad815 100644
--- a/ucb/source/ucp/cmis/cmis_content.hxx
+++ b/ucb/source/ucp/cmis/cmis_content.hxx
@@ -157,7 +157,13 @@ public:
 
     virtual OUString getParentURL();
 
-    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_DECL()
 
diff --git a/ucb/source/ucp/cmis/cmis_provider.hxx b/ucb/source/ucp/cmis/cmis_provider.hxx
index fd23cac0c2df..83c4d447f75a 100644
--- a/ucb/source/ucp/cmis/cmis_provider.hxx
+++ b/ucb/source/ucp/cmis/cmis_provider.hxx
@@ -28,7 +28,12 @@ public:
     virtual ~ContentProvider();
 
     // 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/ucp/cmis/cmis_repo_content.hxx b/ucb/source/ucp/cmis/cmis_repo_content.hxx
index 68118e44336a..1fee7de290e7 100644
--- a/ucb/source/ucp/cmis/cmis_repo_content.hxx
+++ b/ucb/source/ucp/cmis/cmis_repo_content.hxx
@@ -92,7 +92,13 @@ public:
 
     virtual OUString getParentURL();
 
-    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_DECL()
 
diff --git a/ucb/source/ucp/ftp/ftpcontent.hxx b/ucb/source/ucp/ftp/ftpcontent.hxx
index e797cb266a28..0cf88a9892c3 100644
--- a/ucb/source/ucp/ftp/ftpcontent.hxx
+++ b/ucb/source/ucp/ftp/ftpcontent.hxx
@@ -69,7 +69,12 @@ namespace ftp
         virtual ~FTPContent();
 
         // 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/ucp/ftp/ftpcontentprovider.hxx b/ucb/source/ucp/ftp/ftpcontentprovider.hxx
index ade75efe20f9..565a79b2ba46 100644
--- a/ucb/source/ucp/ftp/ftpcontentprovider.hxx
+++ b/ucb/source/ucp/ftp/ftpcontentprovider.hxx
@@ -60,7 +60,12 @@ namespace ftp {
         ~FTPContentProvider();
 
         // 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/ucp/gio/gio_content.hxx b/ucb/source/ucp/gio/gio_content.hxx
index f55716b613d9..ea4b3e5362b8 100644
--- a/ucb/source/ucp/gio/gio_content.hxx
+++ b/ucb/source/ucp/gio/gio_content.hxx
@@ -146,7 +146,13 @@ public:
 
     virtual OUString getParentURL();
 
-    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_DECL()
 
diff --git a/ucb/source/ucp/gio/gio_provider.hxx b/ucb/source/ucp/gio/gio_provider.hxx
index c4c61243baa3..86e39a07f00a 100644
--- a/ucb/source/ucp/gio/gio_provider.hxx
+++ b/ucb/source/ucp/gio/gio_provider.hxx
@@ -36,7 +36,12 @@ public:
     virtual ~ContentProvider();
 
     // 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/ucp/gvfs/gvfs_content.hxx b/ucb/source/ucp/gvfs/gvfs_content.hxx
index 495bbfa3c1de..628400957835 100644
--- a/ucb/source/ucp/gvfs/gvfs_content.hxx
+++ b/ucb/source/ucp/gvfs/gvfs_content.hxx
@@ -200,7 +200,12 @@ public:
     virtual ~Content();
 
     // 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/ucp/gvfs/gvfs_provider.hxx b/ucb/source/ucp/gvfs/gvfs_provider.hxx
index 8ff142c3c916..f2b2c2b2d115 100644
--- a/ucb/source/ucp/gvfs/gvfs_provider.hxx
+++ b/ucb/source/ucp/gvfs/gvfs_provider.hxx
@@ -33,7 +33,12 @@ public:
     virtual ~ContentProvider();
 
     // 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/ucp/hierarchy/hierarchycontent.hxx b/ucb/source/ucp/hierarchy/hierarchycontent.hxx
index 69d0f1052dd5..11760b60f9bb 100644
--- a/ucb/source/ucp/hierarchy/hierarchycontent.hxx
+++ b/ucb/source/ucp/hierarchy/hierarchycontent.hxx
@@ -235,7 +235,12 @@ public:
     virtual ~HierarchyContent();
 
     // 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/ucp/hierarchy/hierarchydatasource.cxx b/ucb/source/ucp/hierarchy/hierarchydatasource.cxx
index f57e0ada7856..5370e6a3b778 100644
--- a/ucb/source/ucp/hierarchy/hierarchydatasource.cxx
+++ b/ucb/source/ucp/hierarchy/hierarchydatasource.cxx
@@ -100,7 +100,12 @@ public:
     virtual ~HierarchyDataAccess();
 
     // 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();
 
     // XServiceInfo
     XSERVICEINFO_DECL()
diff --git a/ucb/source/ucp/hierarchy/hierarchydatasource.hxx b/ucb/source/ucp/hierarchy/hierarchydatasource.hxx
index 38489e05ee94..3d4536f3e34b 100644
--- a/ucb/source/ucp/hierarchy/hierarchydatasource.hxx
+++ b/ucb/source/ucp/hierarchy/hierarchydatasource.hxx
@@ -55,7 +55,12 @@ public:
     virtual ~HierarchyDataSource();
 
     // 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();
 
     // XServiceInfo
     XSERVICEINFO_DECL()
diff --git a/ucb/source/ucp/hierarchy/hierarchyprovider.hxx b/ucb/source/ucp/hierarchy/hierarchyprovider.hxx
index dff3aa942733..c045b9930fa8 100644
--- a/ucb/source/ucp/hierarchy/hierarchyprovider.hxx
+++ b/ucb/source/ucp/hierarchy/hierarchyprovider.hxx
@@ -105,7 +105,12 @@ public:
     virtual ~HierarchyContentProvider();
 
     // 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/ucp/package/pkgcontent.hxx b/ucb/source/ucp/package/pkgcontent.hxx
index f67581e7a37b..4661ef5366a4 100644
--- a/ucb/source/ucp/package/pkgcontent.hxx
+++ b/ucb/source/ucp/package/pkgcontent.hxx
@@ -255,7 +255,12 @@ public:
     virtual ~Content();
 
     // 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/ucp/package/pkgprovider.hxx b/ucb/source/ucp/package/pkgprovider.hxx
index ebab55583ea6..49283edb4171 100644
--- a/ucb/source/ucp/package/pkgprovider.hxx
+++ b/ucb/source/ucp/package/pkgprovider.hxx
@@ -61,7 +61,12 @@ public:
     virtual ~ContentProvider();
 
     // 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/ucp/tdoc/tdoc_content.hxx b/ucb/source/ucp/tdoc/tdoc_content.hxx
index e73131714b45..35195e7972ab 100644
--- a/ucb/source/ucp/tdoc/tdoc_content.hxx
+++ b/ucb/source/ucp/tdoc/tdoc_content.hxx
@@ -261,7 +261,12 @@ public:
     virtual ~Content();
 
     // 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/ucp/tdoc/tdoc_provider.hxx b/ucb/source/ucp/tdoc/tdoc_provider.hxx
index 465aa6bbface..8c6fb7ddb2cf 100644
--- a/ucb/source/ucp/tdoc/tdoc_provider.hxx
+++ b/ucb/source/ucp/tdoc/tdoc_provider.hxx
@@ -68,7 +68,12 @@ public:
     virtual ~ContentProvider();
 
     // 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/ucp/webdav-neon/webdavcontent.hxx b/ucb/source/ucp/webdav-neon/webdavcontent.hxx
index b7290735261d..e7d79170cf6a 100644
--- a/ucb/source/ucp/webdav-neon/webdavcontent.hxx
+++ b/ucb/source/ucp/webdav-neon/webdavcontent.hxx
@@ -239,7 +239,12 @@ public:
     virtual ~Content();
 
     // 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/ucp/webdav-neon/webdavprovider.hxx b/ucb/source/ucp/webdav-neon/webdavprovider.hxx
index 6638637c6cea..45c142b25be0 100644
--- a/ucb/source/ucp/webdav-neon/webdavprovider.hxx
+++ b/ucb/source/ucp/webdav-neon/webdavprovider.hxx
@@ -89,7 +89,12 @@ public:
     virtual ~ContentProvider();
 
     // 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/ucp/webdav/webdavcontent.hxx b/ucb/source/ucp/webdav/webdavcontent.hxx
index 1438f9396a6d..807d1f9400e8 100644
--- a/ucb/source/ucp/webdav/webdavcontent.hxx
+++ b/ucb/source/ucp/webdav/webdavcontent.hxx
@@ -225,7 +225,12 @@ public:
     virtual ~Content();
 
     // 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/ucp/webdav/webdavprovider.hxx b/ucb/source/ucp/webdav/webdavprovider.hxx
index 52148ec09b49..5cfcb6971b5a 100644
--- a/ucb/source/ucp/webdav/webdavprovider.hxx
+++ b/ucb/source/ucp/webdav/webdavprovider.hxx
@@ -77,7 +77,12 @@ public:
     virtual ~ContentProvider();
 
     // 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/ucbhelper/source/client/content.cxx b/ucbhelper/source/client/content.cxx
index e1ef0bb281bb..2cffd349e300 100644
--- a/ucbhelper/source/client/content.cxx
+++ b/ucbhelper/source/client/content.cxx
@@ -143,7 +143,12 @@ public:
     : m_rContent( rContent ) {}
 
     // 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();
 
     // XContentEventListener
     virtual void SAL_CALL contentEvent( const ContentEvent& evt )
diff --git a/ucbhelper/source/provider/resultset.cxx b/ucbhelper/source/provider/resultset.cxx
index 3b8c9073de13..6202e4c40c06 100644
--- a/ucbhelper/source/provider/resultset.cxx
+++ b/ucbhelper/source/provider/resultset.cxx
@@ -99,7 +99,12 @@ public:
     virtual ~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/xmlhelp/source/cxxhelp/provider/content.hxx b/xmlhelp/source/cxxhelp/provider/content.hxx
index 25f0ef194478..85919d11b2ac 100644
--- a/xmlhelp/source/cxxhelp/provider/content.hxx
+++ b/xmlhelp/source/cxxhelp/provider/content.hxx
@@ -65,7 +65,12 @@ namespace chelp
         virtual ~Content();
 
         // 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/xmlhelp/source/cxxhelp/provider/provider.hxx b/xmlhelp/source/cxxhelp/provider/provider.hxx
index 5e84122dd0e7..d31b3d5ec4a3 100644
--- a/xmlhelp/source/cxxhelp/provider/provider.hxx
+++ b/xmlhelp/source/cxxhelp/provider/provider.hxx
@@ -61,7 +61,12 @@ namespace chelp {
         virtual ~ContentProvider();
 
         // 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()