expand out an UNO macro

to make the ongoing convert-to-UNO-constructor work easier

Change-Id: I99596561832b10538505cf4dfdabaf11d6e4d7cb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98664
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

4 files changed, 39 insertions, 4 deletions

diff --git a/ucb/source/core/provprox.cxx b/ucb/source/core/provprox.cxx
index 252fdaa2277d..71c337fe1238 100644
--- a/ucb/source/core/provprox.cxx
+++ b/ucb/source/core/provprox.cxx
@@ -66,7 +66,15 @@ UcbContentProviderProxyFactory::getSupportedServiceNames_Static()
 // Service factory implementation.
 
 
-ONE_INSTANCE_SERVICE_FACTORY_IMPL( UcbContentProviderProxyFactory );
+css::uno::Reference< css::lang::XSingleServiceFactory >
+UcbContentProviderProxyFactory::createServiceFactory( const css::uno::Reference< css::lang::XMultiServiceFactory >& rxServiceMgr )
+{
+    return cppu::createOneInstanceFactory(
+                rxServiceMgr,
+                UcbContentProviderProxyFactory::getImplementationName_Static(),
+                UcbContentProviderProxyFactory_CreateInstance,
+                UcbContentProviderProxyFactory::getSupportedServiceNames_Static() );
+}
 
 
 // XContentProviderFactory methods.
diff --git a/ucb/source/core/ucb.cxx b/ucb/source/core/ucb.cxx
index 6a2796a2282d..f97377e023a9 100644
--- a/ucb/source/core/ucb.cxx
+++ b/ucb/source/core/ucb.cxx
@@ -299,7 +299,16 @@ UniversalContentBroker::getSupportedServiceNames_Static()
 // Service factory implementation.
 
 
-ONE_INSTANCE_SERVICE_FACTORY_IMPL( UniversalContentBroker );
+css::uno::Reference< css::lang::XSingleServiceFactory >
+UniversalContentBroker::createServiceFactory( const css::uno::Reference< css::lang::XMultiServiceFactory >& rxServiceMgr )
+{
+    return cppu::createOneInstanceFactory(
+                rxServiceMgr,
+                UniversalContentBroker::getImplementationName_Static(),
+                UniversalContentBroker_CreateInstance,
+                UniversalContentBroker::getSupportedServiceNames_Static() );
+}
+
 
 
 // XInitialization methods.
diff --git a/ucb/source/core/ucbprops.cxx b/ucb/source/core/ucbprops.cxx
index fe52f20e1354..1a3863c44bde 100644
--- a/ucb/source/core/ucbprops.cxx
+++ b/ucb/source/core/ucbprops.cxx
@@ -212,7 +212,16 @@ UcbPropertiesManager::getSupportedServiceNames_Static()
 // Service factory implementation.
 
 
-ONE_INSTANCE_SERVICE_FACTORY_IMPL( UcbPropertiesManager );
+css::uno::Reference< css::lang::XSingleServiceFactory >
+UcbPropertiesManager::createServiceFactory( const css::uno::Reference< css::lang::XMultiServiceFactory >& rxServiceMgr )
+{
+    return cppu::createOneInstanceFactory(
+                rxServiceMgr,
+                UcbPropertiesManager::getImplementationName_Static(),
+                UcbPropertiesManager_CreateInstance,
+                UcbPropertiesManager::getSupportedServiceNames_Static() );
+}
+
 
 
 // XPropertySetInfo methods.
diff --git a/ucb/source/core/ucbstore.cxx b/ucb/source/core/ucbstore.cxx
index 782bb4cffed8..09b747879a8c 100644
--- a/ucb/source/core/ucbstore.cxx
+++ b/ucb/source/core/ucbstore.cxx
@@ -178,7 +178,16 @@ UcbStore::getSupportedServiceNames_Static()
 // Service factory implementation.
 
 
-ONE_INSTANCE_SERVICE_FACTORY_IMPL( UcbStore );
+css::uno::Reference< css::lang::XSingleServiceFactory >
+UcbStore::createServiceFactory( const css::uno::Reference< css::lang::XMultiServiceFactory >& rxServiceMgr )
+{
+    return cppu::createOneInstanceFactory(
+                rxServiceMgr,
+                UcbStore::getImplementationName_Static(),
+                UcbStore_CreateInstance,
+                UcbStore::getSupportedServiceNames_Static() );
+}
+
 
 
 // XPropertySetRegistryFactory methods.