kill ucbhelper XTYPEPROVIDER_DECL macro

Change-Id: I1daf6661dd7b5be396bec980da84feaab6e6b80f

5 files changed, 36 insertions, 11 deletions

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()