kill ucbhelper XSERVICEINFO_NOFACTORY_DECL

Change-Id: I02bb3e7a06451347d8ce72af17461bec91803954

include/ucbhelper/macros.hxx

@@ -199,26 +199,6 @@ GETTYPES_IMPL_START( Class )                                                \
     CPPU_TYPE_REF( I11 )                                                    \
 GETTYPES_IMPL_END
 
-// XServiceInfo decl.
-
-
-
-#define XSERVICEINFO_NOFACTORY_DECL()                                       \
-    virtual OUString SAL_CALL                                          \
-    getImplementationName()                                                 \
-        throw( com::sun::star::uno::RuntimeException, std::exception );     \
-    virtual sal_Bool SAL_CALL                                               \
-    supportsService( const OUString& ServiceName )                     \
-        throw( com::sun::star::uno::RuntimeException, std::exception );     \
-    virtual com::sun::star::uno::Sequence< OUString > SAL_CALL         \
-    getSupportedServiceNames()                                              \
-        throw( com::sun::star::uno::RuntimeException, std::exception );     \
-                                                                            \
-    static OUString                                                    \
-    getImplementationName_Static();                                         \
-    static com::sun::star::uno::Sequence< OUString >                   \
-    getSupportedServiceNames_Static();
-
 // XServiceInfo impl. internals
 
 

include/ucbhelper/resultset.hxx

@@ -124,7 +124,15 @@ public:
         throw( com::sun::star::uno::RuntimeException, std::exception );
 
     // XServiceInfo
-    XSERVICEINFO_NOFACTORY_DECL()
+    virtual OUString SAL_CALL getImplementationName()
+        throw( css::uno::RuntimeException, std::exception );
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
+        throw( css::uno::RuntimeException, std::exception );
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
+        throw( css::uno::RuntimeException, std::exception );
+
+    static OUString getImplementationName_Static();
+    static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
 
     // XComponent
     virtual void SAL_CALL

include/ucbhelper/resultsethelper.hxx

@@ -151,7 +151,15 @@ public:
         throw( com::sun::star::uno::RuntimeException, std::exception );
 
     // XServiceInfo
-    XSERVICEINFO_NOFACTORY_DECL()
+    virtual OUString SAL_CALL getImplementationName()
+        throw( css::uno::RuntimeException, std::exception );
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
+        throw( css::uno::RuntimeException, std::exception );
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
+        throw( css::uno::RuntimeException, std::exception );
+
+    static OUString getImplementationName_Static();
+    static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
 
     // XComponent ( base class of XDynamicResultSet )
     virtual void SAL_CALL

ucb/source/cacher/cachedcontentresultset.hxx

@@ -215,9 +215,15 @@ public:
         throw( css::uno::RuntimeException, std::exception );
 
     // XServiceInfo
+    virtual OUString SAL_CALL getImplementationName()
+        throw( css::uno::RuntimeException, std::exception );
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
+        throw( css::uno::RuntimeException, std::exception );
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
+        throw( css::uno::RuntimeException, std::exception );
 
-    XSERVICEINFO_NOFACTORY_DECL()
-
+    static OUString getImplementationName_Static();
+    static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
 
     // XPropertySet inherited
 

ucb/source/cacher/cachedcontentresultsetstub.hxx

@@ -123,9 +123,15 @@ public:
         throw( css::uno::RuntimeException, std::exception );
 
     // XServiceInfo
+    virtual OUString SAL_CALL getImplementationName()
+        throw( css::uno::RuntimeException, std::exception );
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
+        throw( css::uno::RuntimeException, std::exception );
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
+        throw( css::uno::RuntimeException, std::exception );
 
-    XSERVICEINFO_NOFACTORY_DECL()
-
+    static OUString getImplementationName_Static();
+    static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
 
     // XFetchProvider
 

ucb/source/cacher/cacheddynamicresultset.hxx

@@ -72,8 +72,15 @@ public:
         throw( css::uno::RuntimeException, std::exception );
 
     // XServiceInfo
+    virtual OUString SAL_CALL getImplementationName()
+        throw( css::uno::RuntimeException, std::exception );
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
+        throw( css::uno::RuntimeException, std::exception );
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
+        throw( css::uno::RuntimeException, std::exception );
 
-    XSERVICEINFO_NOFACTORY_DECL()
+    static OUString getImplementationName_Static();
+    static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
 
 
     // own methods ( inherited )

ucb/source/cacher/cacheddynamicresultsetstub.hxx

@@ -66,8 +66,16 @@ public:
         throw( css::uno::RuntimeException, std::exception );
 
     // XServiceInfo
+    virtual OUString SAL_CALL getImplementationName()
+        throw( css::uno::RuntimeException, std::exception );
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
+        throw( css::uno::RuntimeException, std::exception );
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
+        throw( css::uno::RuntimeException, std::exception );
+
+    static OUString getImplementationName_Static();
+    static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
 
-    XSERVICEINFO_NOFACTORY_DECL()
 };
 
 

ucb/source/core/provprox.hxx

@@ -130,7 +130,15 @@ public:
         throw( css::uno::RuntimeException, std::exception );
 
     // XServiceInfo
-    XSERVICEINFO_NOFACTORY_DECL()
+    virtual OUString SAL_CALL getImplementationName()
+        throw( css::uno::RuntimeException, std::exception );
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
+        throw( css::uno::RuntimeException, std::exception );
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
+        throw( css::uno::RuntimeException, std::exception );
+
+    static OUString getImplementationName_Static();
+    static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
 
     // XContentProviderSupplier
     virtual ::com::sun::star::uno::Reference<

ucb/source/core/ucbstore.hxx

@@ -130,7 +130,15 @@ public:
 
 
     // XServiceInfo
-    XSERVICEINFO_NOFACTORY_DECL()
+    virtual OUString SAL_CALL getImplementationName()
+        throw( css::uno::RuntimeException, std::exception );
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
+        throw( css::uno::RuntimeException, std::exception );
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
+        throw( css::uno::RuntimeException, std::exception );
+
+    static OUString getImplementationName_Static();
+    static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
 
     // XPropertySetRegistry
     virtual com::sun::star::uno::Reference<
@@ -200,7 +208,15 @@ public:
     virtual ~PersistentPropertySet();
 
     // XServiceInfo
-    XSERVICEINFO_NOFACTORY_DECL()
+    virtual OUString SAL_CALL getImplementationName()
+        throw( css::uno::RuntimeException, std::exception );
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
+        throw( css::uno::RuntimeException, std::exception );
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
+        throw( css::uno::RuntimeException, std::exception );
+
+    static OUString getImplementationName_Static();
+    static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
 
     // XComponent
     virtual void SAL_CALL