[Libreoffice-commits] core.git: include/ucbhelper ucb/source
Noel Grandin (via logerrit)
logerrit at kemper.freedesktop.org
Mon Jul 13 16:33:53 UTC 2020
include/ucbhelper/macros.hxx | 14 --------------
ucb/source/cacher/cachedcontentresultset.cxx | 11 ++++++++++-
ucb/source/cacher/cachedcontentresultsetstub.cxx | 11 ++++++++++-
ucb/source/cacher/cacheddynamicresultset.cxx | 11 ++++++++++-
ucb/source/cacher/cacheddynamicresultsetstub.cxx | 11 ++++++++++-
ucb/source/core/provprox.cxx | 10 +++++++++-
ucb/source/core/ucb.cxx | 11 ++++++++++-
ucb/source/core/ucbprops.cxx | 11 ++++++++++-
ucb/source/core/ucbstore.cxx | 11 ++++++++++-
ucb/source/ucp/cmis/cmis_provider.cxx | 11 ++++++++++-
ucb/source/ucp/gio/gio_provider.cxx | 11 ++++++++++-
ucb/source/ucp/hierarchy/hierarchydatasource.cxx | 11 ++++++++++-
ucb/source/ucp/hierarchy/hierarchyprovider.cxx | 11 ++++++++++-
ucb/source/ucp/package/pkgprovider.cxx | 11 ++++++++++-
ucb/source/ucp/webdav-neon/webdavprovider.cxx | 11 ++++++++++-
ucb/source/ucp/webdav/webdavprovider.cxx | 10 +++++++++-
16 files changed, 148 insertions(+), 29 deletions(-)
New commits:
commit 15f44cb6fbf2459dca522e4f5b7f525fd1d6c5e7
Author: Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Mon Jul 13 15:13:59 2020 +0200
Commit: Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Mon Jul 13 18:33:07 2020 +0200
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 at collabora.co.uk>
diff --git a/include/ucbhelper/macros.hxx b/include/ucbhelper/macros.hxx
index 831f856dc876..8e62bc278e84 100644
--- a/include/ucbhelper/macros.hxx
+++ b/include/ucbhelper/macros.hxx
@@ -167,20 +167,6 @@ Class::getSupportedServiceNames() \
return getSupportedServiceNames_Static(); \
}
-// XServiceInfo impl.
-
-
-#define ONE_INSTANCE_SERVICE_FACTORY_IMPL( Class ) \
-css::uno::Reference< css::lang::XSingleServiceFactory > \
-Class::createServiceFactory( const css::uno::Reference< css::lang::XMultiServiceFactory >& rxServiceMgr ) \
-{ \
- return cppu::createOneInstanceFactory( \
- rxServiceMgr, \
- Class::getImplementationName_Static(), \
- Class##_CreateInstance, \
- Class::getSupportedServiceNames_Static() ); \
-}
-
#endif /* ! INCLUDED_UCBHELPER_MACROS_HXX */
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/ucb/source/cacher/cachedcontentresultset.cxx b/ucb/source/cacher/cachedcontentresultset.cxx
index cd22e829b7e1..5b21d033fe99 100644
--- a/ucb/source/cacher/cachedcontentresultset.cxx
+++ b/ucb/source/cacher/cachedcontentresultset.cxx
@@ -2075,7 +2075,16 @@ CachedContentResultSetFactory::getSupportedServiceNames_Static()
// Service factory implementation.
-ONE_INSTANCE_SERVICE_FACTORY_IMPL( CachedContentResultSetFactory );
+css::uno::Reference< css::lang::XSingleServiceFactory >
+CachedContentResultSetFactory::createServiceFactory( const css::uno::Reference< css::lang::XMultiServiceFactory >& rxServiceMgr )
+{
+ return cppu::createOneInstanceFactory(
+ rxServiceMgr,
+ CachedContentResultSetFactory::getImplementationName_Static(),
+ CachedContentResultSetFactory_CreateInstance,
+ CachedContentResultSetFactory::getSupportedServiceNames_Static() );
+}
+
// CachedContentResultSetFactory XCachedContentResultSetFactory methods.
diff --git a/ucb/source/cacher/cachedcontentresultsetstub.cxx b/ucb/source/cacher/cachedcontentresultsetstub.cxx
index 942fc1983346..43a8a25e0843 100644
--- a/ucb/source/cacher/cachedcontentresultsetstub.cxx
+++ b/ucb/source/cacher/cachedcontentresultsetstub.cxx
@@ -526,7 +526,16 @@ CachedContentResultSetStubFactory::getSupportedServiceNames_Static()
// Service factory implementation.
-ONE_INSTANCE_SERVICE_FACTORY_IMPL( CachedContentResultSetStubFactory );
+css::uno::Reference< css::lang::XSingleServiceFactory >
+CachedContentResultSetStubFactory::createServiceFactory( const css::uno::Reference< css::lang::XMultiServiceFactory >& rxServiceMgr )
+{
+ return cppu::createOneInstanceFactory(
+ rxServiceMgr,
+ CachedContentResultSetStubFactory::getImplementationName_Static(),
+ CachedContentResultSetStubFactory_CreateInstance,
+ CachedContentResultSetStubFactory::getSupportedServiceNames_Static() );
+}
+
// CachedContentResultSetStubFactory XCachedContentResultSetStubFactory methods.
diff --git a/ucb/source/cacher/cacheddynamicresultset.cxx b/ucb/source/cacher/cacheddynamicresultset.cxx
index 089d78c5061e..cc5e47c4ee4f 100644
--- a/ucb/source/cacher/cacheddynamicresultset.cxx
+++ b/ucb/source/cacher/cacheddynamicresultset.cxx
@@ -180,7 +180,16 @@ CachedDynamicResultSetFactory::getSupportedServiceNames_Static()
// Service factory implementation.
-ONE_INSTANCE_SERVICE_FACTORY_IMPL( CachedDynamicResultSetFactory );
+css::uno::Reference< css::lang::XSingleServiceFactory >
+CachedDynamicResultSetFactory::createServiceFactory( const css::uno::Reference< css::lang::XMultiServiceFactory >& rxServiceMgr )
+{
+ return cppu::createOneInstanceFactory(
+ rxServiceMgr,
+ CachedDynamicResultSetFactory::getImplementationName_Static(),
+ CachedDynamicResultSetFactory_CreateInstance,
+ CachedDynamicResultSetFactory::getSupportedServiceNames_Static() );
+}
+
// CachedDynamicResultSetFactory XCachedDynamicResultSetFactory methods.
diff --git a/ucb/source/cacher/cacheddynamicresultsetstub.cxx b/ucb/source/cacher/cacheddynamicresultsetstub.cxx
index 53e0ef034389..8ec25e605e30 100644
--- a/ucb/source/cacher/cacheddynamicresultsetstub.cxx
+++ b/ucb/source/cacher/cacheddynamicresultsetstub.cxx
@@ -171,7 +171,16 @@ CachedDynamicResultSetStubFactory::getSupportedServiceNames_Static()
// Service factory implementation.
-ONE_INSTANCE_SERVICE_FACTORY_IMPL( CachedDynamicResultSetStubFactory );
+css::uno::Reference< css::lang::XSingleServiceFactory >
+CachedDynamicResultSetStubFactory::createServiceFactory( const css::uno::Reference< css::lang::XMultiServiceFactory >& rxServiceMgr )
+{
+ return cppu::createOneInstanceFactory(
+ rxServiceMgr,
+ CachedDynamicResultSetStubFactory::getImplementationName_Static(),
+ CachedDynamicResultSetStubFactory_CreateInstance,
+ CachedDynamicResultSetStubFactory::getSupportedServiceNames_Static() );
+}
+
// CachedDynamicResultSetStubFactory XCachedDynamicResultSetStubFactory methods.
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.
diff --git a/ucb/source/ucp/cmis/cmis_provider.cxx b/ucb/source/ucp/cmis/cmis_provider.cxx
index 0d6a452226a4..d2773794eacf 100644
--- a/ucb/source/ucp/cmis/cmis_provider.cxx
+++ b/ucb/source/ucp/cmis/cmis_provider.cxx
@@ -135,7 +135,16 @@ ContentProvider::getSupportedServiceNames_Static()
return aSNS;
}
-ONE_INSTANCE_SERVICE_FACTORY_IMPL( ContentProvider );
+css::uno::Reference< css::lang::XSingleServiceFactory >
+ContentProvider::createServiceFactory( const css::uno::Reference< css::lang::XMultiServiceFactory >& rxServiceMgr )
+{
+ return cppu::createOneInstanceFactory(
+ rxServiceMgr,
+ ContentProvider::getImplementationName_Static(),
+ ContentProvider_CreateInstance,
+ ContentProvider::getSupportedServiceNames_Static() );
+}
+
}
diff --git a/ucb/source/ucp/gio/gio_provider.cxx b/ucb/source/ucp/gio/gio_provider.cxx
index 92302c2caedf..2dbbd73fea9b 100644
--- a/ucb/source/ucp/gio/gio_provider.cxx
+++ b/ucb/source/ucp/gio/gio_provider.cxx
@@ -111,7 +111,16 @@ ContentProvider::getSupportedServiceNames_Static()
return aSNS;
}
-ONE_INSTANCE_SERVICE_FACTORY_IMPL( ContentProvider );
+css::uno::Reference< css::lang::XSingleServiceFactory >
+ContentProvider::createServiceFactory( const css::uno::Reference< css::lang::XMultiServiceFactory >& rxServiceMgr )
+{
+ return cppu::createOneInstanceFactory(
+ rxServiceMgr,
+ ContentProvider::getImplementationName_Static(),
+ ContentProvider_CreateInstance,
+ ContentProvider::getSupportedServiceNames_Static() );
+}
+
}
diff --git a/ucb/source/ucp/hierarchy/hierarchydatasource.cxx b/ucb/source/ucp/hierarchy/hierarchydatasource.cxx
index 5e5c63f940a7..c3e9340b57ac 100644
--- a/ucb/source/ucp/hierarchy/hierarchydatasource.cxx
+++ b/ucb/source/ucp/hierarchy/hierarchydatasource.cxx
@@ -212,7 +212,16 @@ HierarchyDataSource::getSupportedServiceNames_Static()
return { "com.sun.star.ucb.DefaultHierarchyDataSource", "com.sun.star.ucb.HierarchyDataSource" };
}
-ONE_INSTANCE_SERVICE_FACTORY_IMPL( HierarchyDataSource );
+css::uno::Reference< css::lang::XSingleServiceFactory >
+HierarchyDataSource::createServiceFactory( const css::uno::Reference< css::lang::XMultiServiceFactory >& rxServiceMgr )
+{
+ return cppu::createOneInstanceFactory(
+ rxServiceMgr,
+ HierarchyDataSource::getImplementationName_Static(),
+ HierarchyDataSource_CreateInstance,
+ HierarchyDataSource::getSupportedServiceNames_Static() );
+}
+
// XComponent methods.
diff --git a/ucb/source/ucp/hierarchy/hierarchyprovider.cxx b/ucb/source/ucp/hierarchy/hierarchyprovider.cxx
index d95d39dd0a9d..605c0b9d9b32 100644
--- a/ucb/source/ucp/hierarchy/hierarchyprovider.cxx
+++ b/ucb/source/ucp/hierarchy/hierarchyprovider.cxx
@@ -117,7 +117,16 @@ HierarchyContentProvider::getSupportedServiceNames_Static()
// Service factory implementation.
-ONE_INSTANCE_SERVICE_FACTORY_IMPL( HierarchyContentProvider );
+css::uno::Reference< css::lang::XSingleServiceFactory >
+HierarchyContentProvider::createServiceFactory( const css::uno::Reference< css::lang::XMultiServiceFactory >& rxServiceMgr )
+{
+ return cppu::createOneInstanceFactory(
+ rxServiceMgr,
+ HierarchyContentProvider::getImplementationName_Static(),
+ HierarchyContentProvider_CreateInstance,
+ HierarchyContentProvider::getSupportedServiceNames_Static() );
+}
+
// XContentProvider methods.
diff --git a/ucb/source/ucp/package/pkgprovider.cxx b/ucb/source/ucp/package/pkgprovider.cxx
index ee3db6ce087f..1183879b1d05 100644
--- a/ucb/source/ucp/package/pkgprovider.cxx
+++ b/ucb/source/ucp/package/pkgprovider.cxx
@@ -160,7 +160,16 @@ ContentProvider::getSupportedServiceNames_Static()
// Service factory implementation.
-ONE_INSTANCE_SERVICE_FACTORY_IMPL( ContentProvider );
+css::uno::Reference< css::lang::XSingleServiceFactory >
+ContentProvider::createServiceFactory( const css::uno::Reference< css::lang::XMultiServiceFactory >& rxServiceMgr )
+{
+ return cppu::createOneInstanceFactory(
+ rxServiceMgr,
+ ContentProvider::getImplementationName_Static(),
+ ContentProvider_CreateInstance,
+ ContentProvider::getSupportedServiceNames_Static() );
+}
+
// XContentProvider methods.
diff --git a/ucb/source/ucp/webdav-neon/webdavprovider.cxx b/ucb/source/ucp/webdav-neon/webdavprovider.cxx
index 2b0bd5bfe92b..c022e0f8f531 100644
--- a/ucb/source/ucp/webdav-neon/webdavprovider.cxx
+++ b/ucb/source/ucp/webdav-neon/webdavprovider.cxx
@@ -116,7 +116,16 @@ ContentProvider::getSupportedServiceNames_Static()
// Service factory implementation.
-ONE_INSTANCE_SERVICE_FACTORY_IMPL( ContentProvider );
+css::uno::Reference< css::lang::XSingleServiceFactory >
+ContentProvider::createServiceFactory( const css::uno::Reference< css::lang::XMultiServiceFactory >& rxServiceMgr )
+{
+ return cppu::createOneInstanceFactory(
+ rxServiceMgr,
+ ContentProvider::getImplementationName_Static(),
+ ContentProvider_CreateInstance,
+ ContentProvider::getSupportedServiceNames_Static() );
+}
+
// XContentProvider methods.
diff --git a/ucb/source/ucp/webdav/webdavprovider.cxx b/ucb/source/ucp/webdav/webdavprovider.cxx
index 6c1d77b94d0c..002f90194023 100644
--- a/ucb/source/ucp/webdav/webdavprovider.cxx
+++ b/ucb/source/ucp/webdav/webdavprovider.cxx
@@ -103,8 +103,16 @@ ContentProvider::getSupportedServiceNames_Static()
// Service factory implementation.
+css::uno::Reference< css::lang::XSingleServiceFactory >
+ContentProvider::createServiceFactory( const css::uno::Reference< css::lang::XMultiServiceFactory >& rxServiceMgr )
+{
+ return cppu::createOneInstanceFactory(
+ rxServiceMgr,
+ ContentProvider::getImplementationName_Static(),
+ ContentProvider_CreateInstance,
+ ContentProvider::getSupportedServiceNames_Static() );
+}
-ONE_INSTANCE_SERVICE_FACTORY_IMPL( ContentProvider );
// XContentProvider methods.
More information about the Libreoffice-commits
mailing list