diff options
| author | Tor Lillqvist <tml@iki.fi> | 2012-03-29 07:58:09 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2012-03-29 09:49:47 +0300 |
| commit | 6a14f51af652d36eed60f3b8a6b8fe995e3a7b6d (patch) | |
| tree | f153a12ac68826b85caa7c782c8b6629eac10551 /ucb | |
| parent | 1ea166153b0dafba9a7483748e0b7851c3b27fd9 (diff) | |
Follow-up to revert of "Initial experiments with static linking of (some) ..."
Revert "this requires string literals now" and "fix after recent
XSERVICEINFO_IMPL_1 change".
This reverts commits f7d571d2eefea079be3d89f3253ed90cbd9fa07f and
186ab8e77bd7c7a42ffcca6fa7f8e1819ad04b7d.
Diffstat (limited to 'ucb')
| -rw-r--r-- | ucb/source/ucp/gio/gio_provider.cxx | 6 | ||||
| -rw-r--r-- | ucb/source/ucp/gvfs/gvfs_provider.cxx | 6 | ||||
| -rw-r--r-- | ucb/source/ucp/odma/odma_provider.cxx | 5 |
3 files changed, 11 insertions, 6 deletions
diff --git a/ucb/source/ucp/gio/gio_provider.cxx b/ucb/source/ucp/gio/gio_provider.cxx index 14bdbd089a0d..62e8d986fd20 100644 --- a/ucb/source/ucp/gio/gio_provider.cxx +++ b/ucb/source/ucp/gio/gio_provider.cxx @@ -94,8 +94,10 @@ XTYPEPROVIDER_IMPL_3( ContentProvider, com::sun::star::ucb::XContentProvider ); XSERVICEINFO_IMPL_1( ContentProvider, - "com.sun.star.comp.GIOContentProvider", - "com.sun.star.ucb.GIOContentProvider" ); + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( + "com.sun.star.comp.GIOContentProvider" )), + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( + "com.sun.star.ucb.GIOContentProvider" )) ); ONE_INSTANCE_SERVICE_FACTORY_IMPL( ContentProvider ); diff --git a/ucb/source/ucp/gvfs/gvfs_provider.cxx b/ucb/source/ucp/gvfs/gvfs_provider.cxx index c34cbe77283c..7552a20a82de 100644 --- a/ucb/source/ucp/gvfs/gvfs_provider.cxx +++ b/ucb/source/ucp/gvfs/gvfs_provider.cxx @@ -84,8 +84,10 @@ XTYPEPROVIDER_IMPL_3( ContentProvider, //========================================================================= XSERVICEINFO_IMPL_1( ContentProvider, - "com.sun.star.comp.GnomeVFSContentProvider", - "com.sun.star.ucb.GnomeVFSContentProvider" ); + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( + "com.sun.star.comp.GnomeVFSContentProvider" )), + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( + "com.sun.star.ucb.GnomeVFSContentProvider" )) ); //========================================================================= // // Service factory implementation. diff --git a/ucb/source/ucp/odma/odma_provider.cxx b/ucb/source/ucp/odma/odma_provider.cxx index 702851f49efd..da09d117de8e 100644 --- a/ucb/source/ucp/odma/odma_provider.cxx +++ b/ucb/source/ucp/odma/odma_provider.cxx @@ -149,8 +149,9 @@ XTYPEPROVIDER_IMPL_3( ContentProvider, // @@@ Adjust implementation name. Keep the prefix "com.sun.star.comp."! // @@@ Adjust service name. XSERVICEINFO_IMPL_1( ContentProvider, - "com.sun.star.comp.odma.ContentProvider", - ODMA_CONTENT_PROVIDER_SERVICE_NAME ); + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( + "com.sun.star.comp.odma.ContentProvider" )), + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(ODMA_CONTENT_PROVIDER_SERVICE_NAME) ) ); //========================================================================= // |