summaryrefslogtreecommitdiff
path: root/ucb/source/core
diff options
context:
space:
mode:
authorTor Lillqvist <tml@iki.fi>2012-03-28 11:22:52 +0300
committerTor Lillqvist <tml@iki.fi>2012-03-29 09:49:43 +0300
commit0487871af64c83ecfc9d424f64357655b44aa923 (patch)
tree5bbba817e65afc78fa7165caece807654a0ecfdb /ucb/source/core
parent29e0cf9fe6f2ec084d78bfd37f30875ba9d3068d (diff)
Revert "Initial experiments with static linking of (some) ..."
Thist idea caused too intrusive changes to the code of call sites, I think. Will do it another way that leaves call sites as is. This reverts commit 25d114eec4d451acdda1ddff4c8ed9d47ba6275f.
Diffstat (limited to 'ucb/source/core')
-rw-r--r--ucb/source/core/provprox.cxx6
-rw-r--r--ucb/source/core/ucb.cxx6
-rw-r--r--ucb/source/core/ucbprops.cxx6
-rw-r--r--ucb/source/core/ucbstore.cxx6
4 files changed, 16 insertions, 8 deletions
diff --git a/ucb/source/core/provprox.cxx b/ucb/source/core/provprox.cxx
index 1ba4384354fe..c73fe311e54b 100644
--- a/ucb/source/core/provprox.cxx
+++ b/ucb/source/core/provprox.cxx
@@ -87,8 +87,10 @@ XTYPEPROVIDER_IMPL_3( UcbContentProviderProxyFactory,
//=========================================================================
XSERVICEINFO_IMPL_1( UcbContentProviderProxyFactory,
- "com.sun.star.comp.ucb.UcbContentProviderProxyFactory",
- PROVIDER_FACTORY_SERVICE_NAME );
+ OUString(RTL_CONSTASCII_USTRINGPARAM(
+ "com.sun.star.comp.ucb.UcbContentProviderProxyFactory" )),
+ OUString(RTL_CONSTASCII_USTRINGPARAM(
+ PROVIDER_FACTORY_SERVICE_NAME )) );
//=========================================================================
//
diff --git a/ucb/source/core/ucb.cxx b/ucb/source/core/ucb.cxx
index e65322c660b7..cbe7b2ba7669 100644
--- a/ucb/source/core/ucb.cxx
+++ b/ucb/source/core/ucb.cxx
@@ -347,8 +347,10 @@ void SAL_CALL UniversalContentBroker::removeEventListener(
//=========================================================================
XSERVICEINFO_IMPL_1( UniversalContentBroker,
- "com.sun.star.comp.ucb.UniversalContentBroker",
- UCB_SERVICE_NAME );
+ OUString(RTL_CONSTASCII_USTRINGPARAM(
+ "com.sun.star.comp.ucb.UniversalContentBroker" )),
+ OUString(RTL_CONSTASCII_USTRINGPARAM(
+ UCB_SERVICE_NAME )) );
//=========================================================================
//
diff --git a/ucb/source/core/ucbprops.cxx b/ucb/source/core/ucbprops.cxx
index 0f4125974001..c778bf91b88a 100644
--- a/ucb/source/core/ucbprops.cxx
+++ b/ucb/source/core/ucbprops.cxx
@@ -357,8 +357,10 @@ XTYPEPROVIDER_IMPL_3( UcbPropertiesManager,
//=========================================================================
XSERVICEINFO_IMPL_1( UcbPropertiesManager,
- "com.sun.star.comp.ucb.UcbPropertiesManager",
- PROPERTIES_MANAGER_SERVICE_NAME );
+ OUString(RTL_CONSTASCII_USTRINGPARAM(
+ "com.sun.star.comp.ucb.UcbPropertiesManager" )),
+ OUString(RTL_CONSTASCII_USTRINGPARAM(
+ PROPERTIES_MANAGER_SERVICE_NAME )) );
//=========================================================================
//
diff --git a/ucb/source/core/ucbstore.cxx b/ucb/source/core/ucbstore.cxx
index 5b7e26095822..38b498095507 100644
--- a/ucb/source/core/ucbstore.cxx
+++ b/ucb/source/core/ucbstore.cxx
@@ -244,8 +244,10 @@ XTYPEPROVIDER_IMPL_4( UcbStore,
//=========================================================================
XSERVICEINFO_IMPL_1( UcbStore,
- "com.sun.star.comp.ucb.UcbStore",
- STORE_SERVICE_NAME );
+ OUString(RTL_CONSTASCII_USTRINGPARAM(
+ "com.sun.star.comp.ucb.UcbStore" )),
+ OUString(RTL_CONSTASCII_USTRINGPARAM(
+ STORE_SERVICE_NAME )) );
//=========================================================================
//