kill ucbhelper XSERVICEINFO_DECL

Change-Id: Ide6ecff036de4ea30a58ef2d63d5590e9e9786dc

include/ucbhelper/macros.hxx

@@ -219,16 +219,6 @@ GETTYPES_IMPL_END
     static com::sun::star::uno::Sequence< OUString >                   \
     getSupportedServiceNames_Static();
 
-#define XSERVICEINFO_DECL()                                                 \
-    XSERVICEINFO_NOFACTORY_DECL()                                           \
-                                                                            \
-    static com::sun::star::uno::Reference<                                  \
-            com::sun::star::lang::XSingleServiceFactory >                   \
-    createServiceFactory( const com::sun::star::uno::Reference<             \
-            com::sun::star::lang::XMultiServiceFactory >& rxServiceMgr );
-
-
-
 // XServiceInfo impl. internals
 
 

ucb/source/cacher/cachedcontentresultset.hxx

@@ -510,8 +510,19 @@ public:
         throw( css::uno::RuntimeException, std::exception );
 
     // XServiceInfo
-    XSERVICEINFO_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();
 
+    static css::uno::Reference< css::lang::XSingleServiceFactory >
+    createServiceFactory( const css::uno::Reference<
+                          css::lang::XMultiServiceFactory >& rxServiceMgr );
 
     // XCachedContentResultSetFactory
 

ucb/source/cacher/cachedcontentresultsetstub.hxx

@@ -191,8 +191,19 @@ public:
 
 
     // XServiceInfo
-    XSERVICEINFO_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();
 
+    static css::uno::Reference< css::lang::XSingleServiceFactory >
+    createServiceFactory( const css::uno::Reference<
+                          css::lang::XMultiServiceFactory >& rxServiceMgr );
 
     // XCachedContentResultSetStubFactory
 

ucb/source/cacher/cacheddynamicresultset.hxx

@@ -120,8 +120,19 @@ public:
 
 
     // XServiceInfo
-    XSERVICEINFO_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();
 
+    static css::uno::Reference< css::lang::XSingleServiceFactory >
+    createServiceFactory( const css::uno::Reference<
+                          css::lang::XMultiServiceFactory >& rxServiceMgr );
 
     // XCachedDynamicResultSetFactory
 

ucb/source/cacher/cacheddynamicresultsetstub.hxx

@@ -105,8 +105,19 @@ public:
         throw( css::uno::RuntimeException, std::exception );
 
     // XServiceInfo
-    XSERVICEINFO_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();
 
+    static css::uno::Reference< css::lang::XSingleServiceFactory >
+    createServiceFactory( const css::uno::Reference<
+                          css::lang::XMultiServiceFactory >& rxServiceMgr );
 
     // XCachedDynamicResultSetStubFactory
 

ucb/source/core/provprox.hxx

@@ -59,7 +59,19 @@ public:
     virtual ~UcbContentProviderProxyFactory();
 
     // XServiceInfo
-    XSERVICEINFO_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();
+
+    static css::uno::Reference< css::lang::XSingleServiceFactory >
+    createServiceFactory( const css::uno::Reference<
+                          css::lang::XMultiServiceFactory >& rxServiceMgr );
 
     // XContentProviderFactory
     virtual ::com::sun::star::uno::Reference<

ucb/source/core/ucb.hxx

@@ -80,7 +80,19 @@ public:
         throw( css::uno::RuntimeException, std::exception );
 
     // XServiceInfo
-    XSERVICEINFO_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();
+
+    static css::uno::Reference< css::lang::XSingleServiceFactory >
+    createServiceFactory( const css::uno::Reference<
+                          css::lang::XMultiServiceFactory >& rxServiceMgr );
 
     // XComponent
     virtual void SAL_CALL

ucb/source/core/ucbprops.hxx

@@ -57,7 +57,19 @@ public:
     virtual ~UcbPropertiesManager();
 
     // XServiceInfo
-    XSERVICEINFO_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();
+
+    static css::uno::Reference< css::lang::XSingleServiceFactory >
+    createServiceFactory( const css::uno::Reference<
+                          css::lang::XMultiServiceFactory >& rxServiceMgr );
 
     // XPropertySetInfo
     virtual com::sun::star::uno::Sequence<

ucb/source/core/ucbstore.hxx

@@ -63,7 +63,19 @@ public:
     virtual ~UcbStore();
 
     // XServiceInfo
-    XSERVICEINFO_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();
+
+    static css::uno::Reference< css::lang::XSingleServiceFactory >
+    createServiceFactory( const css::uno::Reference<
+                          css::lang::XMultiServiceFactory >& rxServiceMgr );
 
     // XPropertySetRegistryFactory
     virtual com::sun::star::uno::Reference<

ucb/source/ucp/cmis/cmis_provider.hxx

@@ -42,7 +42,19 @@ public:
         throw( css::uno::RuntimeException, std::exception );
 
     // XServiceInfo
-    XSERVICEINFO_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();
+
+    static css::uno::Reference< css::lang::XSingleServiceFactory >
+    createServiceFactory( const css::uno::Reference<
+                          css::lang::XMultiServiceFactory >& rxServiceMgr );
 
     // XContentProvider
     virtual ::com::sun::star::uno::Reference<

ucb/source/ucp/gio/gio_provider.hxx

@@ -50,7 +50,19 @@ public:
         throw( css::uno::RuntimeException, std::exception );
 
     // XServiceInfo
-    XSERVICEINFO_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();
+
+    static css::uno::Reference< css::lang::XSingleServiceFactory >
+    createServiceFactory( const css::uno::Reference<
+                          css::lang::XMultiServiceFactory >& rxServiceMgr );
 
     // XContentProvider
     virtual ::com::sun::star::uno::Reference<

ucb/source/ucp/gvfs/gvfs_provider.hxx

@@ -47,7 +47,19 @@ public:
         throw( css::uno::RuntimeException, std::exception );
 
     // XServiceInfo
-    XSERVICEINFO_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();
+
+    static css::uno::Reference< css::lang::XSingleServiceFactory >
+    createServiceFactory( const css::uno::Reference<
+                          css::lang::XMultiServiceFactory >& rxServiceMgr );
 
     // XContentProvider
     virtual ::com::sun::star::uno::Reference<

ucb/source/ucp/hierarchy/hierarchydatasource.cxx

@@ -108,7 +108,19 @@ public:
         throw();
 
     // XServiceInfo
-    XSERVICEINFO_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();
+
+    static css::uno::Reference< css::lang::XSingleServiceFactory >
+    createServiceFactory( const css::uno::Reference<
+                          css::lang::XMultiServiceFactory >& rxServiceMgr );
 
     // XTypeProvider
     virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId()

ucb/source/ucp/hierarchy/hierarchydatasource.hxx

@@ -63,7 +63,19 @@ public:
         throw();
 
     // XServiceInfo
-    XSERVICEINFO_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();
+
+    static css::uno::Reference< css::lang::XSingleServiceFactory >
+    createServiceFactory( const css::uno::Reference<
+                          css::lang::XMultiServiceFactory >& rxServiceMgr );
 
     // XTypeProvider
     virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId()

ucb/source/ucp/hierarchy/hierarchyprovider.hxx

@@ -119,7 +119,19 @@ public:
         throw( css::uno::RuntimeException, std::exception );
 
     // XServiceInfo
-    XSERVICEINFO_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();
+
+    static css::uno::Reference< css::lang::XSingleServiceFactory >
+    createServiceFactory( const css::uno::Reference<
+                          css::lang::XMultiServiceFactory >& rxServiceMgr );
 
     // XContentProvider
     virtual com::sun::star::uno::Reference<

ucb/source/ucp/package/pkgprovider.hxx

@@ -75,7 +75,19 @@ public:
         throw( css::uno::RuntimeException, std::exception );
 
     // XServiceInfo
-    XSERVICEINFO_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();
+
+    static css::uno::Reference< css::lang::XSingleServiceFactory >
+    createServiceFactory( const css::uno::Reference<
+                          css::lang::XMultiServiceFactory >& rxServiceMgr );
 
     // XContentProvider
     virtual ::com::sun::star::uno::Reference<

ucb/source/ucp/tdoc/tdoc_provider.hxx

@@ -82,7 +82,19 @@ public:
         throw( css::uno::RuntimeException, std::exception );
 
     // XServiceInfo
-    XSERVICEINFO_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();
+
+    static css::uno::Reference< css::lang::XSingleServiceFactory >
+    createServiceFactory( const css::uno::Reference<
+                          css::lang::XMultiServiceFactory >& rxServiceMgr );
 
     // XContentProvider
     virtual com::sun::star::uno::Reference<

ucb/source/ucp/webdav-neon/webdavprovider.hxx

@@ -103,7 +103,19 @@ public:
         throw( css::uno::RuntimeException, std::exception );
 
     // XServiceInfo
-    XSERVICEINFO_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();
+
+    static css::uno::Reference< css::lang::XSingleServiceFactory >
+    createServiceFactory( const css::uno::Reference<
+                          css::lang::XMultiServiceFactory >& rxServiceMgr );
 
     // XContentProvider
     virtual ::com::sun::star::uno::Reference<

ucb/source/ucp/webdav/webdavprovider.hxx

@@ -91,7 +91,19 @@ public:
         throw( css::uno::RuntimeException, std::exception );
 
     // XServiceInfo
-    XSERVICEINFO_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();
+
+    static css::uno::Reference< css::lang::XSingleServiceFactory >
+    createServiceFactory( const css::uno::Reference<
+                          css::lang::XMultiServiceFactory >& rxServiceMgr );
 
     // XContentProvider
     virtual ::com::sun::star::uno::Reference<