diff options
Diffstat (limited to 'ucb/source/ucp')
| -rw-r--r-- | ucb/source/ucp/cmis/cmis_provider.cxx | 6 | ||||
| -rw-r--r-- | ucb/source/ucp/ftp/ftpcontent.cxx | 9 | ||||
| -rw-r--r-- | ucb/source/ucp/ftp/ftpcontentprovider.cxx | 4 | ||||
| -rw-r--r-- | ucb/source/ucp/hierarchy/hierarchyprovider.cxx | 6 | ||||
| -rw-r--r-- | ucb/source/ucp/package/pkgprovider.cxx | 6 | ||||
| -rw-r--r-- | ucb/source/ucp/tdoc/tdoc_provider.cxx | 6 | ||||
| -rw-r--r-- | ucb/source/ucp/webdav/webdavprovider.cxx | 6 |
7 files changed, 17 insertions, 26 deletions
diff --git a/ucb/source/ucp/cmis/cmis_provider.cxx b/ucb/source/ucp/cmis/cmis_provider.cxx index f733cf0ea22a..0e68e0473a79 100644 --- a/ucb/source/ucp/cmis/cmis_provider.cxx +++ b/ucb/source/ucp/cmis/cmis_provider.cxx @@ -94,10 +94,8 @@ XTYPEPROVIDER_IMPL_3( ContentProvider, com::sun::star::ucb::XContentProvider ); XSERVICEINFO_IMPL_1( ContentProvider, - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( - "com.sun.star.comp.CmisContentProvider" )), - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( - "com.sun.star.ucb.CmisContentProvider" )) ); + "com.sun.star.comp.CmisContentProvider", + "com.sun.star.ucb.CmisContentProvider" ); ONE_INSTANCE_SERVICE_FACTORY_IMPL( ContentProvider ); diff --git a/ucb/source/ucp/ftp/ftpcontent.cxx b/ucb/source/ucp/ftp/ftpcontent.cxx index 02da7ac7b859..67f118facc83 100644 --- a/ucb/source/ucp/ftp/ftpcontent.cxx +++ b/ucb/source/ucp/ftp/ftpcontent.cxx @@ -174,11 +174,12 @@ XTYPEPROVIDER_IMPL_6( FTPContent, #undef XSERVICEINFO_CREATE_INSTANCE_IMPL #define XSERVICEINFO_CREATE_INSTANCE_IMPL( Class ) +#undef STATICALLY_LINKED_SERVICE +#define STATICALLY_LINKED_SERVICE( Class, ImplName, Service, Num ) + XSERVICEINFO_IMPL_1( FTPContent, - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( - "com.sun.star.comp.FTPContent")), - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( - "com.sun.star.ucb.FTPContent"))); + "com.sun.star.comp.FTPContent", + "com.sun.star.ucb.FTPContent" ); diff --git a/ucb/source/ucp/ftp/ftpcontentprovider.cxx b/ucb/source/ucp/ftp/ftpcontentprovider.cxx index 427527937a52..5b50a41bfd7a 100644 --- a/ucb/source/ucp/ftp/ftpcontentprovider.cxx +++ b/ucb/source/ucp/ftp/ftpcontentprovider.cxx @@ -103,8 +103,8 @@ XTYPEPROVIDER_IMPL_3(FTPContentProvider, XSERVICEINFO_IMPL_1( FTPContentProvider, - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.FTPContentProvider")), - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(FTP_CONTENT_PROVIDER_SERVICE_NAME))); + "com.sun.star.comp.FTPContentProvider", + FTP_CONTENT_PROVIDER_SERVICE_NAME); //========================================================================= // diff --git a/ucb/source/ucp/hierarchy/hierarchyprovider.cxx b/ucb/source/ucp/hierarchy/hierarchyprovider.cxx index c5bf7c585968..f3a339e1e6f3 100644 --- a/ucb/source/ucp/hierarchy/hierarchyprovider.cxx +++ b/ucb/source/ucp/hierarchy/hierarchyprovider.cxx @@ -100,10 +100,8 @@ XTYPEPROVIDER_IMPL_4( HierarchyContentProvider, //========================================================================= XSERVICEINFO_IMPL_1( HierarchyContentProvider, - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( - "com.sun.star.comp.ucb.HierarchyContentProvider" )), - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( - HIERARCHY_CONTENT_PROVIDER_SERVICE_NAME )) ); + "com.sun.star.comp.ucb.HierarchyContentProvider", + HIERARCHY_CONTENT_PROVIDER_SERVICE_NAME ); //========================================================================= // diff --git a/ucb/source/ucp/package/pkgprovider.cxx b/ucb/source/ucp/package/pkgprovider.cxx index fbaa9fdddb52..d9b6efde5523 100644 --- a/ucb/source/ucp/package/pkgprovider.cxx +++ b/ucb/source/ucp/package/pkgprovider.cxx @@ -181,10 +181,8 @@ XTYPEPROVIDER_IMPL_3( ContentProvider, //========================================================================= XSERVICEINFO_IMPL_1( ContentProvider, - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( - "com.sun.star.comp.ucb.PackageContentProvider" )), - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( - PACKAGE_CONTENT_PROVIDER_SERVICE_NAME )) ); + "com.sun.star.comp.ucb.PackageContentProvider", + PACKAGE_CONTENT_PROVIDER_SERVICE_NAME ); //========================================================================= // diff --git a/ucb/source/ucp/tdoc/tdoc_provider.cxx b/ucb/source/ucp/tdoc/tdoc_provider.cxx index be5a4f1920fb..fafea334e33b 100644 --- a/ucb/source/ucp/tdoc/tdoc_provider.cxx +++ b/ucb/source/ucp/tdoc/tdoc_provider.cxx @@ -105,10 +105,8 @@ XTYPEPROVIDER_IMPL_4( ContentProvider, XSERVICEINFO_IMPL_1( ContentProvider, - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( - "com.sun.star.comp.ucb.TransientDocumentsContentProvider" ) ), - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( - TDOC_CONTENT_PROVIDER_SERVICE_NAME ) ) ); + "com.sun.star.comp.ucb.TransientDocumentsContentProvider", + TDOC_CONTENT_PROVIDER_SERVICE_NAME ); //========================================================================= // diff --git a/ucb/source/ucp/webdav/webdavprovider.cxx b/ucb/source/ucp/webdav/webdavprovider.cxx index ba24d632c276..8dbca76ebb87 100644 --- a/ucb/source/ucp/webdav/webdavprovider.cxx +++ b/ucb/source/ucp/webdav/webdavprovider.cxx @@ -93,10 +93,8 @@ XTYPEPROVIDER_IMPL_3( ContentProvider, //========================================================================= XSERVICEINFO_IMPL_1( ContentProvider, - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( - "com.sun.star.comp.WebDAVContentProvider" )), - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( - WEBDAV_CONTENT_PROVIDER_SERVICE_NAME )) ); + "com.sun.star.comp.WebDAVContentProvider", + WEBDAV_CONTENT_PROVIDER_SERVICE_NAME ); //========================================================================= // |