kill ucbhelper XTYPEPROVIDER_DECL macro

Change-Id: I1daf6661dd7b5be396bec980da84feaab6e6b80f

40 files changed, 193 insertions, 62 deletions

diff --git a/include/ucbhelper/contenthelper.hxx b/include/ucbhelper/contenthelper.hxx
index 674a49afcc9c..ed832a72c972 100644
--- a/include/ucbhelper/contenthelper.hxx
+++ b/include/ucbhelper/contenthelper.hxx
@@ -332,7 +332,12 @@ public:
         throw();
 
     // XTypeProvider
-    XTYPEPROVIDER_DECL()
+    virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL
+    getImplementationId()
+        throw( com::sun::star::uno::RuntimeException, std::exception );
+    virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL
+    getTypes()
+        throw( com::sun::star::uno::RuntimeException, std::exception );
 
     // XServiceInfo
     virtual OUString SAL_CALL
diff --git a/include/ucbhelper/contentinfo.hxx b/include/ucbhelper/contentinfo.hxx
index 212c22e73665..2b4864adf900 100644
--- a/include/ucbhelper/contentinfo.hxx
+++ b/include/ucbhelper/contentinfo.hxx
@@ -76,7 +76,12 @@ public:
         throw();
 
     // XTypeProvider
-    XTYPEPROVIDER_DECL()
+    virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL
+    getImplementationId()
+        throw( com::sun::star::uno::RuntimeException, std::exception );
+    virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL
+    getTypes()
+        throw( com::sun::star::uno::RuntimeException, std::exception );
 
     // XPropertySetInfo
     virtual com::sun::star::uno::Sequence<
@@ -139,7 +144,12 @@ public:
         throw();
 
     // XTypeProvider
-    XTYPEPROVIDER_DECL()
+    virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL
+    getImplementationId()
+        throw( com::sun::star::uno::RuntimeException, std::exception );
+    virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL
+    getTypes()
+        throw( com::sun::star::uno::RuntimeException, std::exception );
 
     // XCommandInfo
     virtual com::sun::star::uno::Sequence<
diff --git a/include/ucbhelper/macros.hxx b/include/ucbhelper/macros.hxx
index 9f69cdab4166..72494f885b26 100644
--- a/include/ucbhelper/macros.hxx
+++ b/include/ucbhelper/macros.hxx
@@ -35,20 +35,6 @@
 #define CPPU_TYPE( T )      getCppuType( static_cast< T * >( 0 ) )
 #define CPPU_TYPE_REF( T )  CPPU_TYPE( com::sun::star::uno::Reference< T > )
 
-// XTypeProvider decl.
-
-
-
-#define XTYPEPROVIDER_DECL()                                                \
-    virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL              \
-    getImplementationId()                                                   \
-        throw( com::sun::star::uno::RuntimeException, std::exception );     \
-    virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL \
-    getTypes()                                                              \
-        throw( com::sun::star::uno::RuntimeException, std::exception );
-
-
-
 // XTypeProvider impl. internals
 
 
diff --git a/include/ucbhelper/propertyvalueset.hxx b/include/ucbhelper/propertyvalueset.hxx
index e2c6ed5263f8..506e5b3accef 100644
--- a/include/ucbhelper/propertyvalueset.hxx
+++ b/include/ucbhelper/propertyvalueset.hxx
@@ -87,7 +87,12 @@ public:
         throw();
 
     // XTypeProvider
-    XTYPEPROVIDER_DECL()
+    virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL
+    getImplementationId()
+        throw( com::sun::star::uno::RuntimeException, std::exception );
+    virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL
+    getTypes()
+        throw( com::sun::star::uno::RuntimeException, std::exception );
 
     // XRow
     virtual sal_Bool SAL_CALL
diff --git a/include/ucbhelper/providerhelper.hxx b/include/ucbhelper/providerhelper.hxx
index 908e91c91ea8..b49d8ecfd64e 100644
--- a/include/ucbhelper/providerhelper.hxx
+++ b/include/ucbhelper/providerhelper.hxx
@@ -152,8 +152,12 @@ public:
     // XTypeProvider
 
 
-    XTYPEPROVIDER_DECL()
-
+    virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL
+    getImplementationId()
+        throw( com::sun::star::uno::RuntimeException, std::exception );
+    virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL
+    getTypes()
+        throw( com::sun::star::uno::RuntimeException, std::exception );
 
     // XServiceInfo
 
diff --git a/include/ucbhelper/resultset.hxx b/include/ucbhelper/resultset.hxx
index 4d3a43d1dd3e..2e283094b874 100644
--- a/include/ucbhelper/resultset.hxx
+++ b/include/ucbhelper/resultset.hxx
@@ -116,7 +116,12 @@ public:
         throw();
 
     // XTypeProvider
-    XTYPEPROVIDER_DECL()
+    virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL
+    getImplementationId()
+        throw( com::sun::star::uno::RuntimeException, std::exception );
+    virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL
+    getTypes()
+        throw( com::sun::star::uno::RuntimeException, std::exception );
 
     // XServiceInfo
     XSERVICEINFO_NOFACTORY_DECL()
diff --git a/include/ucbhelper/resultsethelper.hxx b/include/ucbhelper/resultsethelper.hxx
index ed8ae971a0f4..ce87e82824d7 100644
--- a/include/ucbhelper/resultsethelper.hxx
+++ b/include/ucbhelper/resultsethelper.hxx
@@ -143,7 +143,12 @@ public:
         throw();
 
     // XTypeProvider
-    XTYPEPROVIDER_DECL()
+    virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL
+    getImplementationId()
+        throw( com::sun::star::uno::RuntimeException, std::exception );
+    virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL
+    getTypes()
+        throw( com::sun::star::uno::RuntimeException, std::exception );
 
     // XServiceInfo
     XSERVICEINFO_NOFACTORY_DECL()
diff --git a/include/ucbhelper/resultsetmetadata.hxx b/include/ucbhelper/resultsetmetadata.hxx
index 72d4af441f4d..1e6ce2bf01b7 100644
--- a/include/ucbhelper/resultsetmetadata.hxx
+++ b/include/ucbhelper/resultsetmetadata.hxx
@@ -202,7 +202,12 @@ public:
         throw();
 
     // XTypeProvider
-    XTYPEPROVIDER_DECL()
+    virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL
+    getImplementationId()
+        throw( com::sun::star::uno::RuntimeException, std::exception );
+    virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL
+    getTypes()
+        throw( com::sun::star::uno::RuntimeException, std::exception );
 
     // XResultSetMetaData
 
diff --git a/ucb/source/cacher/cachedcontentresultset.cxx b/ucb/source/cacher/cachedcontentresultset.cxx
index a59cdf4f1542..9bf55e382703 100644
--- a/ucb/source/cacher/cachedcontentresultset.cxx
+++ b/ucb/source/cacher/cachedcontentresultset.cxx
@@ -419,7 +419,10 @@ public:
         throw();
 
     // XTypeProvider
-    XTYPEPROVIDER_DECL()
+    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId()
+        throw( css::uno::RuntimeException, std::exception );
+    virtual css::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes()
+        throw( css::uno::RuntimeException, std::exception );
 
     // XPropertySetInfo
     virtual Sequence< com::sun::star::beans::Property > SAL_CALL
diff --git a/ucb/source/cacher/cachedcontentresultset.hxx b/ucb/source/cacher/cachedcontentresultset.hxx
index 32b96658454b..a1d314ed74a3 100644
--- a/ucb/source/cacher/cachedcontentresultset.hxx
+++ b/ucb/source/cacher/cachedcontentresultset.hxx
@@ -209,7 +209,10 @@ public:
 
     // XTypeProvider
 
-    XTYPEPROVIDER_DECL()
+    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId()
+        throw( css::uno::RuntimeException, std::exception );
+    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes()
+        throw( css::uno::RuntimeException, std::exception );
 
     // XServiceInfo
 
@@ -501,8 +504,10 @@ public:
         throw();
 
     // XTypeProvider
-    XTYPEPROVIDER_DECL()
-
+    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId()
+        throw( css::uno::RuntimeException, std::exception );
+    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes()
+        throw( css::uno::RuntimeException, std::exception );
 
     // XServiceInfo
     XSERVICEINFO_DECL()
diff --git a/ucb/source/cacher/cachedcontentresultsetstub.hxx b/ucb/source/cacher/cachedcontentresultsetstub.hxx
index 22b32bfb3bd0..f6251008d1eb 100644
--- a/ucb/source/cacher/cachedcontentresultsetstub.hxx
+++ b/ucb/source/cacher/cachedcontentresultsetstub.hxx
@@ -117,7 +117,10 @@ public:
 
     // XTypeProvider
 
-    XTYPEPROVIDER_DECL()
+    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId()
+        throw( css::uno::RuntimeException, std::exception );
+    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes()
+        throw( css::uno::RuntimeException, std::exception );
 
     // XServiceInfo
 
@@ -181,7 +184,10 @@ public:
         throw();
 
     // XTypeProvider
-    XTYPEPROVIDER_DECL()
+    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId()
+        throw( css::uno::RuntimeException, std::exception );
+    virtual css::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes()
+        throw( css::uno::RuntimeException, std::exception );
 
 
     // XServiceInfo
diff --git a/ucb/source/cacher/cacheddynamicresultset.hxx b/ucb/source/cacher/cacheddynamicresultset.hxx
index 39d5bddea1a7..37aa81cde37b 100644
--- a/ucb/source/cacher/cacheddynamicresultset.hxx
+++ b/ucb/source/cacher/cacheddynamicresultset.hxx
@@ -66,7 +66,10 @@ public:
 
     // XTypeProvider
 
-    XTYPEPROVIDER_DECL()
+    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId()
+        throw( css::uno::RuntimeException, std::exception );
+    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes()
+        throw( css::uno::RuntimeException, std::exception );
 
     // XServiceInfo
 
@@ -110,7 +113,10 @@ public:
         throw();
 
     // XTypeProvider
-    XTYPEPROVIDER_DECL()
+    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId()
+        throw( css::uno::RuntimeException, std::exception );
+    virtual css::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes()
+        throw( css::uno::RuntimeException, std::exception );
 
 
     // XServiceInfo
diff --git a/ucb/source/cacher/cacheddynamicresultsetstub.hxx b/ucb/source/cacher/cacheddynamicresultsetstub.hxx
index bcf92acc262e..5524e5611bde 100644
--- a/ucb/source/cacher/cacheddynamicresultsetstub.hxx
+++ b/ucb/source/cacher/cacheddynamicresultsetstub.hxx
@@ -60,7 +60,10 @@ public:
 
     // XTypeProvider
 
-    XTYPEPROVIDER_DECL()
+    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId()
+        throw( css::uno::RuntimeException, std::exception );
+    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes()
+        throw( css::uno::RuntimeException, std::exception );
 
     // XServiceInfo
 
@@ -96,8 +99,10 @@ public:
         throw();
 
     // XTypeProvider
-    XTYPEPROVIDER_DECL()
-
+    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId()
+        throw( css::uno::RuntimeException, std::exception );
+    virtual css::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes()
+        throw( css::uno::RuntimeException, std::exception );
 
     // XServiceInfo
     XSERVICEINFO_DECL()
diff --git a/ucb/source/core/provprox.hxx b/ucb/source/core/provprox.hxx
index 8cc8835d84a8..62b6fd62fb5c 100644
--- a/ucb/source/core/provprox.hxx
+++ b/ucb/source/core/provprox.hxx
@@ -112,7 +112,10 @@ public:
         throw();
 
     // XTypeProvider
-    XTYPEPROVIDER_DECL()
+    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId()
+        throw( css::uno::RuntimeException, std::exception );
+    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes()
+        throw( css::uno::RuntimeException, std::exception );
 
     // XServiceInfo
     XSERVICEINFO_NOFACTORY_DECL()
diff --git a/ucb/source/core/ucb.hxx b/ucb/source/core/ucb.hxx
index e2f7de83e2c9..36ab8f898c44 100644
--- a/ucb/source/core/ucb.hxx
+++ b/ucb/source/core/ucb.hxx
@@ -74,7 +74,10 @@ public:
         throw();
 
     // XTypeProvider
-    XTYPEPROVIDER_DECL()
+    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId()
+        throw( css::uno::RuntimeException, std::exception );
+    virtual css::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes()
+        throw( css::uno::RuntimeException, std::exception );
 
     // XServiceInfo
     XSERVICEINFO_DECL()
diff --git a/ucb/source/ucp/cmis/cmis_content.hxx b/ucb/source/ucp/cmis/cmis_content.hxx
index 26a4975ad815..7385ac60b86e 100644
--- a/ucb/source/ucp/cmis/cmis_content.hxx
+++ b/ucb/source/ucp/cmis/cmis_content.hxx
@@ -165,7 +165,10 @@ public:
     virtual void SAL_CALL release()
         throw();
 
-    XTYPEPROVIDER_DECL()
+    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId()
+        throw( css::uno::RuntimeException, std::exception );
+    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes()
+        throw( css::uno::RuntimeException, std::exception );
 
     virtual OUString SAL_CALL
     getImplementationName()
diff --git a/ucb/source/ucp/cmis/cmis_provider.hxx b/ucb/source/ucp/cmis/cmis_provider.hxx
index 83c4d447f75a..44b8d30dad6e 100644
--- a/ucb/source/ucp/cmis/cmis_provider.hxx
+++ b/ucb/source/ucp/cmis/cmis_provider.hxx
@@ -36,7 +36,10 @@ public:
         throw();
 
     // XTypeProvider
-    XTYPEPROVIDER_DECL()
+    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId()
+        throw( css::uno::RuntimeException, std::exception );
+    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes()
+        throw( css::uno::RuntimeException, std::exception );
 
     // XServiceInfo
     XSERVICEINFO_DECL()
diff --git a/ucb/source/ucp/cmis/cmis_repo_content.hxx b/ucb/source/ucp/cmis/cmis_repo_content.hxx
index 1fee7de290e7..1fba684f45e2 100644
--- a/ucb/source/ucp/cmis/cmis_repo_content.hxx
+++ b/ucb/source/ucp/cmis/cmis_repo_content.hxx
@@ -100,7 +100,10 @@ public:
     virtual void SAL_CALL release()
         throw();
 
-    XTYPEPROVIDER_DECL()
+    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId()
+        throw( css::uno::RuntimeException, std::exception );
+    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes()
+        throw( css::uno::RuntimeException, std::exception );
 
     virtual OUString SAL_CALL
     getImplementationName()
diff --git a/ucb/source/ucp/file/bc.hxx b/ucb/source/ucp/file/bc.hxx
index 5d3ed01e2986..43acb8e2e46e 100644
--- a/ucb/source/ucp/file/bc.hxx
+++ b/ucb/source/ucp/file/bc.hxx
@@ -121,7 +121,10 @@ namespace fileaccess {
 
         // XTypeProvider
 
-        XTYPEPROVIDER_DECL()
+        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId()
+            throw( css::uno::RuntimeException, std::exception );
+        virtual css::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes()
+            throw( css::uno::RuntimeException, std::exception );
 
 
         // XServiceInfo
diff --git a/ucb/source/ucp/file/filinpstr.hxx b/ucb/source/ucp/file/filinpstr.hxx
index 1af95bb59c1b..922927b5fde7 100644
--- a/ucb/source/ucp/file/filinpstr.hxx
+++ b/ucb/source/ucp/file/filinpstr.hxx
@@ -59,7 +59,10 @@ namespace fileaccess {
 
         // XTypeProvider
 
-        XTYPEPROVIDER_DECL()
+        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId()
+            throw( css::uno::RuntimeException, std::exception );
+        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes()
+            throw( css::uno::RuntimeException, std::exception );
 
         virtual com::sun::star::uno::Any SAL_CALL
         queryInterface(
diff --git a/ucb/source/ucp/file/prov.hxx b/ucb/source/ucp/file/prov.hxx
index 20179668e6cf..690408348359 100644
--- a/ucb/source/ucp/file/prov.hxx
+++ b/ucb/source/ucp/file/prov.hxx
@@ -106,7 +106,10 @@ namespace fileaccess {
 
         // XTypeProvider
 
-        XTYPEPROVIDER_DECL()
+        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId()
+            throw( css::uno::RuntimeException, std::exception );
+        virtual css::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes()
+            throw( css::uno::RuntimeException, std::exception );
 
         // XInitialization
         virtual void SAL_CALL
diff --git a/ucb/source/ucp/gio/gio_content.hxx b/ucb/source/ucp/gio/gio_content.hxx
index ea4b3e5362b8..7b879a57401e 100644
--- a/ucb/source/ucp/gio/gio_content.hxx
+++ b/ucb/source/ucp/gio/gio_content.hxx
@@ -154,7 +154,10 @@ public:
     virtual void SAL_CALL release()
         throw();
 
-    XTYPEPROVIDER_DECL()
+    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId()
+        throw( css::uno::RuntimeException, std::exception );
+    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes()
+        throw( css::uno::RuntimeException, std::exception );
 
     virtual OUString SAL_CALL
     getImplementationName()
diff --git a/ucb/source/ucp/gio/gio_provider.hxx b/ucb/source/ucp/gio/gio_provider.hxx
index 86e39a07f00a..a55d554f8792 100644
--- a/ucb/source/ucp/gio/gio_provider.hxx
+++ b/ucb/source/ucp/gio/gio_provider.hxx
@@ -44,7 +44,10 @@ public:
         throw();
 
     // XTypeProvider
-    XTYPEPROVIDER_DECL()
+    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId()
+        throw( css::uno::RuntimeException, std::exception );
+    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes()
+        throw( css::uno::RuntimeException, std::exception );
 
     // XServiceInfo
     XSERVICEINFO_DECL()
diff --git a/ucb/source/ucp/gvfs/gvfs_content.hxx b/ucb/source/ucp/gvfs/gvfs_content.hxx
index 628400957835..80abafdfa6f0 100644
--- a/ucb/source/ucp/gvfs/gvfs_content.hxx
+++ b/ucb/source/ucp/gvfs/gvfs_content.hxx
@@ -208,7 +208,10 @@ public:
         throw();
 
     // XTypeProvider
-    XTYPEPROVIDER_DECL()
+    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId()
+        throw( css::uno::RuntimeException, std::exception );
+    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes()
+        throw( css::uno::RuntimeException, std::exception );
 
         // XServiceInfo
         virtual OUString SAL_CALL getImplementationName()
diff --git a/ucb/source/ucp/gvfs/gvfs_provider.hxx b/ucb/source/ucp/gvfs/gvfs_provider.hxx
index f2b2c2b2d115..d2415bcf53a9 100644
--- a/ucb/source/ucp/gvfs/gvfs_provider.hxx
+++ b/ucb/source/ucp/gvfs/gvfs_provider.hxx
@@ -41,7 +41,10 @@ public:
         throw();
 
     // XTypeProvider
-    XTYPEPROVIDER_DECL()
+    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId()
+        throw( css::uno::RuntimeException, std::exception );
+    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes()
+        throw( css::uno::RuntimeException, std::exception );
 
     // XServiceInfo
     XSERVICEINFO_DECL()
diff --git a/ucb/source/ucp/hierarchy/hierarchycontent.hxx b/ucb/source/ucp/hierarchy/hierarchycontent.hxx
index 11760b60f9bb..ded8591df3e4 100644
--- a/ucb/source/ucp/hierarchy/hierarchycontent.hxx
+++ b/ucb/source/ucp/hierarchy/hierarchycontent.hxx
@@ -243,7 +243,10 @@ public:
         throw();
 
     // XTypeProvider
-    XTYPEPROVIDER_DECL()
+    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId()
+        throw( css::uno::RuntimeException, std::exception );
+    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes()
+        throw( css::uno::RuntimeException, std::exception );
 
     // XServiceInfo
     virtual OUString SAL_CALL
diff --git a/ucb/source/ucp/hierarchy/hierarchydatasource.cxx b/ucb/source/ucp/hierarchy/hierarchydatasource.cxx
index 5d4d9c9557fa..b70d5e3e35be 100644
--- a/ucb/source/ucp/hierarchy/hierarchydatasource.cxx
+++ b/ucb/source/ucp/hierarchy/hierarchydatasource.cxx
@@ -111,7 +111,10 @@ public:
     XSERVICEINFO_DECL()
 
     // XTypeProvider
-    XTYPEPROVIDER_DECL()
+    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId()
+        throw( css::uno::RuntimeException, std::exception );
+    virtual css::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes()
+        throw( css::uno::RuntimeException, std::exception );
 
     // XComponent
     virtual void SAL_CALL
diff --git a/ucb/source/ucp/hierarchy/hierarchydatasource.hxx b/ucb/source/ucp/hierarchy/hierarchydatasource.hxx
index 3d4536f3e34b..94e6255f5a78 100644
--- a/ucb/source/ucp/hierarchy/hierarchydatasource.hxx
+++ b/ucb/source/ucp/hierarchy/hierarchydatasource.hxx
@@ -66,7 +66,10 @@ public:
     XSERVICEINFO_DECL()
 
     // XTypeProvider
-    XTYPEPROVIDER_DECL()
+    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId()
+        throw( css::uno::RuntimeException, std::exception );
+    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes()
+        throw( css::uno::RuntimeException, std::exception );
 
     // XComponent
     virtual void SAL_CALL
diff --git a/ucb/source/ucp/hierarchy/hierarchyprovider.hxx b/ucb/source/ucp/hierarchy/hierarchyprovider.hxx
index c045b9930fa8..7cbd9b822b4a 100644
--- a/ucb/source/ucp/hierarchy/hierarchyprovider.hxx
+++ b/ucb/source/ucp/hierarchy/hierarchyprovider.hxx
@@ -113,7 +113,10 @@ public:
         throw();
 
     // XTypeProvider
-    XTYPEPROVIDER_DECL()
+    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId()
+        throw( css::uno::RuntimeException, std::exception );
+    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes()
+        throw( css::uno::RuntimeException, std::exception );
 
     // XServiceInfo
     XSERVICEINFO_DECL()
diff --git a/ucb/source/ucp/package/pkgcontent.hxx b/ucb/source/ucp/package/pkgcontent.hxx
index 4661ef5366a4..18b73a99d461 100644
--- a/ucb/source/ucp/package/pkgcontent.hxx
+++ b/ucb/source/ucp/package/pkgcontent.hxx
@@ -263,7 +263,10 @@ public:
         throw();
 
     // XTypeProvider
-    XTYPEPROVIDER_DECL()
+    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId()
+        throw( css::uno::RuntimeException, std::exception );
+    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes()
+        throw( css::uno::RuntimeException, std::exception );
 
     // XServiceInfo
     virtual OUString SAL_CALL
diff --git a/ucb/source/ucp/package/pkgprovider.hxx b/ucb/source/ucp/package/pkgprovider.hxx
index 49283edb4171..008f20f7a4d9 100644
--- a/ucb/source/ucp/package/pkgprovider.hxx
+++ b/ucb/source/ucp/package/pkgprovider.hxx
@@ -69,7 +69,10 @@ public:
         throw();
 
     // XTypeProvider
-    XTYPEPROVIDER_DECL()
+    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId()
+        throw( css::uno::RuntimeException, std::exception );
+    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes()
+        throw( css::uno::RuntimeException, std::exception );
 
     // XServiceInfo
     XSERVICEINFO_DECL()
diff --git a/ucb/source/ucp/tdoc/tdoc_content.hxx b/ucb/source/ucp/tdoc/tdoc_content.hxx
index 35195e7972ab..71729e6f56c8 100644
--- a/ucb/source/ucp/tdoc/tdoc_content.hxx
+++ b/ucb/source/ucp/tdoc/tdoc_content.hxx
@@ -269,7 +269,10 @@ public:
         throw();
 
     // XTypeProvider
-    XTYPEPROVIDER_DECL()
+    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId()
+        throw( css::uno::RuntimeException, std::exception );
+    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes()
+        throw( css::uno::RuntimeException, std::exception );
 
     // XServiceInfo
     virtual OUString SAL_CALL
diff --git a/ucb/source/ucp/tdoc/tdoc_provider.hxx b/ucb/source/ucp/tdoc/tdoc_provider.hxx
index 8c6fb7ddb2cf..b4eb222e24eb 100644
--- a/ucb/source/ucp/tdoc/tdoc_provider.hxx
+++ b/ucb/source/ucp/tdoc/tdoc_provider.hxx
@@ -76,7 +76,10 @@ public:
         throw();
 
     // XTypeProvider
-    XTYPEPROVIDER_DECL()
+    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId()
+        throw( css::uno::RuntimeException, std::exception );
+    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes()
+        throw( css::uno::RuntimeException, std::exception );
 
     // XServiceInfo
     XSERVICEINFO_DECL()
diff --git a/ucb/source/ucp/webdav-neon/webdavcontent.hxx b/ucb/source/ucp/webdav-neon/webdavcontent.hxx
index e7d79170cf6a..3e143efede8b 100644
--- a/ucb/source/ucp/webdav-neon/webdavcontent.hxx
+++ b/ucb/source/ucp/webdav-neon/webdavcontent.hxx
@@ -247,7 +247,10 @@ public:
         throw();
 
     // XTypeProvider
-    XTYPEPROVIDER_DECL()
+    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId()
+        throw( css::uno::RuntimeException, std::exception );
+    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes()
+        throw( css::uno::RuntimeException, std::exception );
 
     // XServiceInfo
     virtual OUString SAL_CALL
diff --git a/ucb/source/ucp/webdav-neon/webdavprovider.hxx b/ucb/source/ucp/webdav-neon/webdavprovider.hxx
index 45c142b25be0..a19aae71f8a9 100644
--- a/ucb/source/ucp/webdav-neon/webdavprovider.hxx
+++ b/ucb/source/ucp/webdav-neon/webdavprovider.hxx
@@ -97,7 +97,10 @@ public:
         throw();
 
     // XTypeProvider
-    XTYPEPROVIDER_DECL()
+    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId()
+        throw( css::uno::RuntimeException, std::exception );
+    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes()
+        throw( css::uno::RuntimeException, std::exception );
 
     // XServiceInfo
     XSERVICEINFO_DECL()
diff --git a/ucb/source/ucp/webdav/webdavcontent.hxx b/ucb/source/ucp/webdav/webdavcontent.hxx
index 6b4d07b02a14..5230b9411907 100644
--- a/ucb/source/ucp/webdav/webdavcontent.hxx
+++ b/ucb/source/ucp/webdav/webdavcontent.hxx
@@ -233,7 +233,10 @@ public:
         throw();
 
     // XTypeProvider
-    XTYPEPROVIDER_DECL()
+    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId()
+        throw( css::uno::RuntimeException, std::exception );
+    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes()
+        throw( css::uno::RuntimeException, std::exception );
 
     // XServiceInfo
     virtual OUString SAL_CALL
diff --git a/ucb/source/ucp/webdav/webdavprovider.hxx b/ucb/source/ucp/webdav/webdavprovider.hxx
index 5cfcb6971b5a..972db444388c 100644
--- a/ucb/source/ucp/webdav/webdavprovider.hxx
+++ b/ucb/source/ucp/webdav/webdavprovider.hxx
@@ -85,7 +85,10 @@ public:
         throw();
 
     // XTypeProvider
-    XTYPEPROVIDER_DECL()
+    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId()
+        throw( css::uno::RuntimeException, std::exception );
+    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes()
+        throw( css::uno::RuntimeException, std::exception );
 
     // XServiceInfo
     XSERVICEINFO_DECL()
diff --git a/ucbhelper/source/provider/resultset.cxx b/ucbhelper/source/provider/resultset.cxx
index 8c3d79112e19..84be7cbab68a 100644
--- a/ucbhelper/source/provider/resultset.cxx
+++ b/ucbhelper/source/provider/resultset.cxx
@@ -107,7 +107,10 @@ public:
         throw();
 
     // XTypeProvider
-    XTYPEPROVIDER_DECL()
+    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId()
+        throw( css::uno::RuntimeException, std::exception );
+    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes()
+        throw( css::uno::RuntimeException, std::exception );
 
     // XPropertySetInfo
     virtual uno::Sequence< beans::Property > SAL_CALL getProperties()
diff --git a/xmlhelp/source/cxxhelp/provider/content.hxx b/xmlhelp/source/cxxhelp/provider/content.hxx
index 85919d11b2ac..5c3e48b97ab9 100644
--- a/xmlhelp/source/cxxhelp/provider/content.hxx
+++ b/xmlhelp/source/cxxhelp/provider/content.hxx
@@ -73,7 +73,10 @@ namespace chelp
             throw();
 
         // XTypeProvider
-        XTYPEPROVIDER_DECL()
+        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId()
+            throw( css::uno::RuntimeException, std::exception );
+        virtual css::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes()
+            throw( css::uno::RuntimeException, std::exception );
 
         // XServiceInfo
         virtual OUString SAL_CALL
diff --git a/xmlhelp/source/cxxhelp/provider/provider.hxx b/xmlhelp/source/cxxhelp/provider/provider.hxx
index d31b3d5ec4a3..4d7b85d764c0 100644
--- a/xmlhelp/source/cxxhelp/provider/provider.hxx
+++ b/xmlhelp/source/cxxhelp/provider/provider.hxx
@@ -68,8 +68,11 @@ namespace chelp {
         virtual void SAL_CALL release()
             throw();
 
-            // XTypeProvider
-            XTYPEPROVIDER_DECL()
+        // XTypeProvider
+        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId()
+            throw( css::uno::RuntimeException, std::exception );
+        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes()
+            throw( css::uno::RuntimeException, std::exception );
 
             // XServiceInfo
             XSERVICEINFO_DECL()