kill ucbhelper XTYPEPROVIDER_DECL macro

Change-Id: I1daf6661dd7b5be396bec980da84feaab6e6b80f

8 files changed, 48 insertions, 23 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