stoc: Use appropriate OUString functions on string constants

Change-Id: If8c20c8a0958016c14007406244fc8ab9a742933

9 files changed, 51 insertions, 56 deletions

diff --git a/stoc/source/corereflection/crefl.cxx b/stoc/source/corereflection/crefl.cxx
index 87c4e8633f23..23089fb9f7cb 100644
--- a/stoc/source/corereflection/crefl.cxx
+++ b/stoc/source/corereflection/crefl.cxx
@@ -44,13 +44,12 @@ namespace stoc_corefl
 
 static const sal_Int32 CACHE_SIZE = 256;
 
-#define SERVICENAME "com.sun.star.reflection.CoreReflection"
 #define IMPLNAME    "com.sun.star.comp.stoc.CoreReflection"
 
 static Sequence< OUString > core_getSupportedServiceNames()
 {
     Sequence< OUString > seqNames(1);
-    seqNames.getArray()[0] = OUString( SERVICENAME );
+    seqNames.getArray()[0] = "com.sun.star.reflection.CoreReflection";
     return seqNames;
 }
 
diff --git a/stoc/source/invocation/invocation.cxx b/stoc/source/invocation/invocation.cxx
index 8f0a543b7817..a928f5bd684b 100644
--- a/stoc/source/invocation/invocation.cxx
+++ b/stoc/source/invocation/invocation.cxx
@@ -523,8 +523,7 @@ Any Invocation_Impl::getValue( const OUString& PropertyName )
     {
     }
 
-    throw UnknownPropertyException(
-        OUString("cannot get value ") + PropertyName );
+    throw UnknownPropertyException( "cannot get value " + PropertyName );
 }
 
 
@@ -621,7 +620,7 @@ Any Invocation_Impl::invoke( const OUString& FunctionName, const Sequence<Any>&
         if (nFParamsLen != InParams.getLength())
         {
             throw IllegalArgumentException(
-                OUString("incorrect number of parameters passed invoking function ") + FunctionName,
+                "incorrect number of parameters passed invoking function " + FunctionName,
                 (OWeakObject *) this, (sal_Int16) 1 );
         }
 
diff --git a/stoc/source/invocation_adapterfactory/iafactory.cxx b/stoc/source/invocation_adapterfactory/iafactory.cxx
index c35cca4e3bf7..c3bdf2f8dcc5 100644
--- a/stoc/source/invocation_adapterfactory/iafactory.cxx
+++ b/stoc/source/invocation_adapterfactory/iafactory.cxx
@@ -48,7 +48,6 @@
 #include <com/sun/star/reflection/InvocationTargetException.hpp>
 #include <com/sun/star/uno/RuntimeException.hpp>
 
-#define SERVICENAME "com.sun.star.script.InvocationAdapterFactory"
 #define IMPLNAME    "com.sun.star.comp.stoc.InvocationAdapterFactory"
 
 
@@ -63,8 +62,7 @@ namespace stoc_invadp
 static Sequence< OUString > invadp_getSupportedServiceNames()
 {
     Sequence< OUString > seqNames(1);
-    seqNames.getArray()[0] =
-        OUString(SERVICENAME);
+    seqNames.getArray()[0] = "com.sun.star.script.InvocationAdapterFactory";
     return seqNames;
 }
 
diff --git a/stoc/source/security/access_controller.cxx b/stoc/source/security/access_controller.cxx
index 71b54df142ef..4fc3de1955a8 100644
--- a/stoc/source/security/access_controller.cxx
+++ b/stoc/source/security/access_controller.cxx
@@ -945,7 +945,7 @@ Sequence< OUString > AccessController::getSupportedServiceNames()
     throw (RuntimeException, std::exception)
 {
     Sequence< OUString > aSNS( 1 );
-    aSNS[0] = OUString(SERVICE_NAME);
+    aSNS[0] = SERVICE_NAME;
     return aSNS;
 }
 
diff --git a/stoc/source/security/file_policy.cxx b/stoc/source/security/file_policy.cxx
index 90ddd78ec1eb..b26806f544eb 100644
--- a/stoc/source/security/file_policy.cxx
+++ b/stoc/source/security/file_policy.cxx
@@ -510,7 +510,7 @@ Sequence< OUString > FilePolicy::getSupportedServiceNames()
     throw (RuntimeException, std::exception)
 {
     Sequence< OUString > aSNS( 1 );
-    aSNS[0] = OUString("com.sun.star.security.Policy");
+    aSNS[0] = "com.sun.star.security.Policy";
     return aSNS;
 }
 
diff --git a/stoc/source/servicemanager/servicemanager.cxx b/stoc/source/servicemanager/servicemanager.cxx
index ca2ab6aa51c3..9641332ef71c 100644
--- a/stoc/source/servicemanager/servicemanager.cxx
+++ b/stoc/source/servicemanager/servicemanager.cxx
@@ -776,7 +776,7 @@ void OServiceManager::setPropertyValue(
     else
     {
         throw UnknownPropertyException(
-            OUString("unknown property ") + PropertyName,
+            "unknown property " + PropertyName,
             (OWeakObject *)this );
     }
 }
@@ -1238,8 +1238,8 @@ void OServiceManager::remove( const Any & Element )
         if (iFind == m_ImplementationNameMap.end())
         {
             throw NoSuchElementException(
-                OUString("element is not in: ")
-                + implName, static_cast< OWeakObject * >(this) );
+                "element is not in: " + implName,
+                static_cast< OWeakObject * >(this) );
         }
         xEle = iFind->second;
     }
diff --git a/stoc/source/simpleregistry/simpleregistry.cxx b/stoc/source/simpleregistry/simpleregistry.cxx
index 56f4daccab22..3a038f371b37 100644
--- a/stoc/source/simpleregistry/simpleregistry.cxx
+++ b/stoc/source/simpleregistry/simpleregistry.cxx
@@ -272,8 +272,8 @@ css::registry::RegistryKeyType Key::getKeyType(OUString const & rKeyName)
     RegError err = key_.getKeyType(rKeyName, &type);
     if (err != REG_NO_ERROR) {
         throw css::registry::InvalidRegistryException(
-            (OUString("com.sun.star.registry.SimpleRegistry key getKeyType:"
-                      " underlying RegistryKey::getKeyType() = ") +
+            ("com.sun.star.registry.SimpleRegistry key getKeyType:"
+             " underlying RegistryKey::getKeyType() = " +
              OUString::number(err)),
             static_cast< OWeakObject * >(this));
     }
@@ -303,7 +303,7 @@ css::registry::RegistryValueType Key::getValueType()
         break;
     default:
         throw css::registry::InvalidRegistryException(
-            (OUString("com.sun.star.registry.SimpleRegistry key getValueType:"
+            (("com.sun.star.registry.SimpleRegistry key getValueType:"
                       " underlying RegistryKey::getValueInfo() = ") +
              OUString::number(err)),
             static_cast< OWeakObject * >(this));
@@ -348,7 +348,7 @@ sal_Int32 Key::getLongValue() throw (
             static_cast< OWeakObject * >(this));
     default:
         throw css::registry::InvalidRegistryException(
-            (OUString("com.sun.star.registry.SimpleRegistry key getLongValue:"
+            (("com.sun.star.registry.SimpleRegistry key getLongValue:"
                       " underlying RegistryKey::getValue() = ") +
              OUString::number(err)),
             static_cast< OWeakObject * >(this));
@@ -364,7 +364,7 @@ void Key::setLongValue(sal_Int32 value)
         OUString(), RG_VALUETYPE_LONG, &value, sizeof (sal_Int32));
     if (err != REG_NO_ERROR) {
         throw css::registry::InvalidRegistryException(
-            (OUString("com.sun.star.registry.SimpleRegistry key setLongValue:"
+            (("com.sun.star.registry.SimpleRegistry key setLongValue:"
                       " underlying RegistryKey::setValue() = ") +
              OUString::number(err)),
             static_cast< OWeakObject * >(this));
@@ -391,7 +391,7 @@ css::uno::Sequence< sal_Int32 > Key::getLongListValue() throw (
             static_cast< OWeakObject * >(this));
     default:
         throw css::registry::InvalidRegistryException(
-            (OUString("com.sun.star.registry.SimpleRegistry key getLongListValue:"
+            (("com.sun.star.registry.SimpleRegistry key getLongListValue:"
                       " underlying RegistryKey::getLongListValue() = ") +
              OUString::number(err)),
             static_cast< OWeakObject * >(this));
@@ -423,7 +423,7 @@ void Key::setLongListValue(css::uno::Sequence< sal_Int32 > const & seqValue)
         static_cast< sal_uInt32 >(list.size()));
     if (err != REG_NO_ERROR) {
         throw css::registry::InvalidRegistryException(
-            (OUString("com.sun.star.registry.SimpleRegistry key setLongListValue:"
+            (("com.sun.star.registry.SimpleRegistry key setLongListValue:"
                       " underlying RegistryKey::setLongListValue() = ") +
              OUString::number(err)),
             static_cast< OWeakObject * >(this));
@@ -440,14 +440,14 @@ OUString Key::getAsciiValue() throw (
     RegError err = key_.getValueInfo(OUString(), &type, &size);
     if (err != REG_NO_ERROR) {
         throw css::registry::InvalidRegistryException(
-            (OUString("com.sun.star.registry.SimpleRegistry key getAsciiValue:"
+            (("com.sun.star.registry.SimpleRegistry key getAsciiValue:"
                       " underlying RegistryKey::getValueInfo() = ") +
              OUString::number(err)),
             static_cast< OWeakObject * >(this));
     }
     if (type != RG_VALUETYPE_STRING) {
         throw css::registry::InvalidValueException(
-            (OUString("com.sun.star.registry.SimpleRegistry key getAsciiValue:"
+            (("com.sun.star.registry.SimpleRegistry key getAsciiValue:"
                       " underlying RegistryKey type = ") +
              OUString::number(type)),
             static_cast< OWeakObject * >(this));
@@ -470,7 +470,7 @@ OUString Key::getAsciiValue() throw (
     err = key_.getValue(OUString(), &list[0]);
     if (err != REG_NO_ERROR) {
         throw css::registry::InvalidRegistryException(
-            (OUString("com.sun.star.registry.SimpleRegistry key getAsciiValue:"
+            (("com.sun.star.registry.SimpleRegistry key getAsciiValue:"
                       " underlying RegistryKey::getValue() = ") +
              OUString::number(err)),
             static_cast< OWeakObject * >(this));
@@ -519,7 +519,7 @@ void Key::setAsciiValue(OUString const & value)
         // +1 for terminating null (error in underlying registry.cxx)
     if (err != REG_NO_ERROR) {
         throw css::registry::InvalidRegistryException(
-            (OUString("com.sun.star.registry.SimpleRegistry key setAsciiValue:"
+            (("com.sun.star.registry.SimpleRegistry key setAsciiValue:"
                       " underlying RegistryKey::setValue() = ") +
              OUString::number(err)),
             static_cast< OWeakObject * >(this));
@@ -546,7 +546,7 @@ css::uno::Sequence< OUString > Key::getAsciiListValue() throw (
             static_cast< OWeakObject * >(this));
     default:
         throw css::registry::InvalidRegistryException(
-            (OUString("com.sun.star.registry.SimpleRegistry key"
+            (("com.sun.star.registry.SimpleRegistry key"
                       " getAsciiListValue: underlying"
                       " RegistryKey::getStringListValue() = ") +
              OUString::number(err)),
@@ -612,7 +612,7 @@ void Key::setAsciiListValue(
         static_cast< sal_uInt32 >(list2.size()));
     if (err != REG_NO_ERROR) {
         throw css::registry::InvalidRegistryException(
-            (OUString("com.sun.star.registry.SimpleRegistry key"
+            (("com.sun.star.registry.SimpleRegistry key"
                       " setAsciiListValue: underlying"
                       " RegistryKey::setStringListValue() = ") +
              OUString::number(err)),
@@ -630,14 +630,14 @@ OUString Key::getStringValue() throw (
     RegError err = key_.getValueInfo(OUString(), &type, &size);
     if (err != REG_NO_ERROR) {
         throw css::registry::InvalidRegistryException(
-            (OUString("com.sun.star.registry.SimpleRegistry key getStringValue:"
+            (("com.sun.star.registry.SimpleRegistry key getStringValue:"
                       " underlying RegistryKey::getValueInfo() = ") +
              OUString::number(err)),
             static_cast< OWeakObject * >(this));
     }
     if (type != RG_VALUETYPE_UNICODE) {
         throw css::registry::InvalidValueException(
-            (OUString("com.sun.star.registry.SimpleRegistry key getStringValue:"
+            (("com.sun.star.registry.SimpleRegistry key getStringValue:"
                       " underlying RegistryKey type = ") +
              OUString::number(type)),
             static_cast< OWeakObject * >(this));
@@ -661,7 +661,7 @@ OUString Key::getStringValue() throw (
     err = key_.getValue(OUString(), &list[0]);
     if (err != REG_NO_ERROR) {
         throw css::registry::InvalidRegistryException(
-            (OUString("com.sun.star.registry.SimpleRegistry key getStringValue:"
+            (("com.sun.star.registry.SimpleRegistry key getStringValue:"
                       " underlying RegistryKey::getValue() = ") +
              OUString::number(err)),
             static_cast< OWeakObject * >(this));
@@ -687,7 +687,7 @@ void Key::setStringValue(OUString const & value)
         // +1 for terminating null (error in underlying registry.cxx)
     if (err != REG_NO_ERROR) {
         throw css::registry::InvalidRegistryException(
-            (OUString("com.sun.star.registry.SimpleRegistry key setStringValue:"
+            (("com.sun.star.registry.SimpleRegistry key setStringValue:"
                       " underlying RegistryKey::setValue() = ") +
              OUString::number(err)),
             static_cast< OWeakObject * >(this));
@@ -714,7 +714,7 @@ css::uno::Sequence< OUString > Key::getStringListValue() throw (
             static_cast< OWeakObject * >(this));
     default:
         throw css::registry::InvalidRegistryException(
-            (OUString("com.sun.star.registry.SimpleRegistry key"
+            (("com.sun.star.registry.SimpleRegistry key"
                       " getStringListValue: underlying"
                       " RegistryKey::getUnicodeListValue() = ") +
              OUString::number(err)),
@@ -749,7 +749,7 @@ void Key::setStringListValue(
         static_cast< sal_uInt32 >(list.size()));
     if (err != REG_NO_ERROR) {
         throw css::registry::InvalidRegistryException(
-            (OUString("com.sun.star.registry.SimpleRegistry key"
+            (("com.sun.star.registry.SimpleRegistry key"
                       " setStringListValue: underlying"
                       " RegistryKey::setUnicodeListValue() = ") +
              OUString::number(err)),
@@ -768,14 +768,14 @@ css::uno::Sequence< sal_Int8 > Key::getBinaryValue()
     RegError err = key_.getValueInfo(OUString(), &type, &size);
     if (err != REG_NO_ERROR) {
         throw css::registry::InvalidRegistryException(
-            (OUString("com.sun.star.registry.SimpleRegistry key getBinaryValue:"
+            (("com.sun.star.registry.SimpleRegistry key getBinaryValue:"
                       " underlying RegistryKey::getValueInfo() = ") +
              OUString::number(err)),
             static_cast< OWeakObject * >(this));
     }
     if (type != RG_VALUETYPE_BINARY) {
         throw css::registry::InvalidValueException(
-            (OUString("com.sun.star.registry.SimpleRegistry key getBinaryValue:"
+            (("com.sun.star.registry.SimpleRegistry key getBinaryValue:"
                       " underlying RegistryKey type = ") +
              OUString::number(type)),
             static_cast< OWeakObject * >(this));
@@ -790,7 +790,7 @@ css::uno::Sequence< sal_Int8 > Key::getBinaryValue()
     err = key_.getValue(OUString(), value.getArray());
     if (err != REG_NO_ERROR) {
         throw css::registry::InvalidRegistryException(
-            (OUString("com.sun.star.registry.SimpleRegistry key getBinaryValue:"
+            (("com.sun.star.registry.SimpleRegistry key getBinaryValue:"
                       " underlying RegistryKey::getValue() = ") +
              OUString::number(err)),
             static_cast< OWeakObject * >(this));
@@ -808,7 +808,7 @@ void Key::setBinaryValue(css::uno::Sequence< sal_Int8 > const & value)
         static_cast< sal_uInt32 >(value.getLength()));
     if (err != REG_NO_ERROR) {
         throw css::registry::InvalidRegistryException(
-            (OUString("com.sun.star.registry.SimpleRegistry key setBinaryValue:"
+            (("com.sun.star.registry.SimpleRegistry key setBinaryValue:"
                       " underlying RegistryKey::setValue() = ") +
              OUString::number(err)),
             static_cast< OWeakObject * >(this));
@@ -829,7 +829,7 @@ css::uno::Reference< css::registry::XRegistryKey > Key::openKey(
         return css::uno::Reference< css::registry::XRegistryKey >();
     default:
         throw css::registry::InvalidRegistryException(
-            (OUString("com.sun.star.registry.SimpleRegistry key openKey:"
+            (("com.sun.star.registry.SimpleRegistry key openKey:"
                       " underlying RegistryKey::openKey() = ") +
              OUString::number(err)),
             static_cast< OWeakObject * >(this));
@@ -850,7 +850,7 @@ css::uno::Reference< css::registry::XRegistryKey > Key::createKey(
         return css::uno::Reference< css::registry::XRegistryKey >();
     default:
         throw css::registry::InvalidRegistryException(
-            (OUString("com.sun.star.registry.SimpleRegistry key createKey:"
+            (("com.sun.star.registry.SimpleRegistry key createKey:"
                       " underlying RegistryKey::createKey() = ") +
              OUString::number(err)),
             static_cast< OWeakObject * >(this));
@@ -864,7 +864,7 @@ void Key::closeKey()
     RegError err = key_.closeKey();
     if (err != REG_NO_ERROR) {
         throw css::registry::InvalidRegistryException(
-            (OUString("com.sun.star.registry.SimpleRegistry key closeKey:"
+            (("com.sun.star.registry.SimpleRegistry key closeKey:"
                       " underlying RegistryKey::closeKey() = ") +
              OUString::number(err)),
             static_cast< OWeakObject * >(this));
@@ -878,7 +878,7 @@ void Key::deleteKey(OUString const & rKeyName)
     RegError err = key_.deleteKey(rKeyName);
     if (err != REG_NO_ERROR) {
         throw css::registry::InvalidRegistryException(
-            (OUString("com.sun.star.registry.SimpleRegistry key deleteKey:"
+            (("com.sun.star.registry.SimpleRegistry key deleteKey:"
                       " underlying RegistryKey::deleteKey() = ") +
              OUString::number(err)),
             static_cast< OWeakObject * >(this));
@@ -894,7 +894,7 @@ Key::openKeys()
     RegError err = key_.openSubKeys(OUString(), list);
     if (err != REG_NO_ERROR) {
         throw css::registry::InvalidRegistryException(
-            (OUString("com.sun.star.registry.SimpleRegistry key openKeys:"
+            (("com.sun.star.registry.SimpleRegistry key openKeys:"
                       " underlying RegistryKey::openSubKeys() = ") +
              OUString::number(err)),
             static_cast< OWeakObject * >(this));
@@ -923,7 +923,7 @@ css::uno::Sequence< OUString > Key::getKeyNames()
     RegError err = key_.getKeyNames(OUString(), list);
     if (err != REG_NO_ERROR) {
         throw css::registry::InvalidRegistryException(
-            (OUString("com.sun.star.registry.SimpleRegistry key getKeyNames:"
+            (("com.sun.star.registry.SimpleRegistry key getKeyNames:"
                       " underlying RegistryKey::getKeyNames() = ") +
              OUString::number(err)),
             static_cast< OWeakObject * >(this));
@@ -954,7 +954,7 @@ sal_Bool Key::createLink(
     case REG_INVALID_KEY:
     case REG_DETECT_RECURSION:
         throw css::registry::InvalidRegistryException(
-            (OUString("com.sun.star.registry.SimpleRegistry key createLink:"
+            (("com.sun.star.registry.SimpleRegistry key createLink:"
                       " underlying RegistryKey::createLink() = ") +
              OUString::number(err)),
             static_cast< OWeakObject * >(this));
@@ -970,7 +970,7 @@ void Key::deleteLink(OUString const & rLinkName)
     RegError err = key_.deleteLink(rLinkName);
     if (err != REG_NO_ERROR) {
         throw css::registry::InvalidRegistryException(
-            (OUString("com.sun.star.registry.SimpleRegistry key deleteLink:"
+            (("com.sun.star.registry.SimpleRegistry key deleteLink:"
                       " underlying RegistryKey::deleteLink() = ") +
              OUString::number(err)),
             static_cast< OWeakObject * >(this));
@@ -985,7 +985,7 @@ OUString Key::getLinkTarget(OUString const & rLinkName)
     RegError err = key_.getLinkTarget(rLinkName, target);
     if (err != REG_NO_ERROR) {
         throw css::registry::InvalidRegistryException(
-            (OUString("com.sun.star.registry.SimpleRegistry key getLinkTarget:"
+            (("com.sun.star.registry.SimpleRegistry key getLinkTarget:"
                       " underlying RegistryKey::getLinkTarget() = ") +
              OUString::number(err)),
             static_cast< OWeakObject * >(this));
@@ -1001,7 +1001,7 @@ OUString Key::getResolvedName(OUString const & aKeyName)
     RegError err = key_.getResolvedKeyName(aKeyName, true, resolved);
     if (err != REG_NO_ERROR) {
         throw css::registry::InvalidRegistryException(
-            (OUString("com.sun.star.registry.SimpleRegistry key getResolvedName:"
+            (("com.sun.star.registry.SimpleRegistry key getResolvedName:"
                       " underlying RegistryKey::getResolvedName() = ") +
              OUString::number(err)),
             static_cast< OWeakObject * >(this));
@@ -1027,9 +1027,9 @@ void SimpleRegistry::open(
     }
     if (err != REG_NO_ERROR) {
         throw css::registry::InvalidRegistryException(
-            (OUString("com.sun.star.registry.SimpleRegistry.open(") +
+            ("com.sun.star.registry.SimpleRegistry.open(" +
              rURL +
-             OUString("): underlying Registry::open/create() = ") +
+             "): underlying Registry::open/create() = " +
              OUString::number(err)),
             static_cast< OWeakObject * >(this));
     }
@@ -1047,7 +1047,7 @@ void SimpleRegistry::close()
     RegError err = registry_.close();
     if (err != REG_NO_ERROR) {
         throw css::registry::InvalidRegistryException(
-            (OUString("com.sun.star.registry.SimpleRegistry.close:"
+            (("com.sun.star.registry.SimpleRegistry.close:"
                       " underlying Registry::close() = ") +
              OUString::number(err)),
             static_cast< OWeakObject * >(this));
@@ -1061,7 +1061,7 @@ void SimpleRegistry::destroy()
     RegError err = registry_.destroy(OUString());
     if (err != REG_NO_ERROR) {
         throw css::registry::InvalidRegistryException(
-            (OUString("com.sun.star.registry.SimpleRegistry.destroy:"
+            (("com.sun.star.registry.SimpleRegistry.destroy:"
                       " underlying Registry::destroy() = ") +
              OUString::number(err)),
             static_cast< OWeakObject * >(this));
@@ -1076,7 +1076,7 @@ css::uno::Reference< css::registry::XRegistryKey > SimpleRegistry::getRootKey()
     RegError err = registry_.openRootKey(root);
     if (err != REG_NO_ERROR) {
         throw css::registry::InvalidRegistryException(
-            (OUString("com.sun.star.registry.SimpleRegistry.getRootKey:"
+            (("com.sun.star.registry.SimpleRegistry.getRootKey:"
                       " underlying Registry::getRootKey() = ") +
              OUString::number(err)),
             static_cast< OWeakObject * >(this));
@@ -1114,7 +1114,7 @@ void SimpleRegistry::mergeKey(
             static_cast< cppu::OWeakObject * >(this));
     default:
         throw css::registry::InvalidRegistryException(
-            (OUString("com.sun.star.registry.SimpleRegistry.mergeKey:"
+            (("com.sun.star.registry.SimpleRegistry.mergeKey:"
                       " underlying Registry::getRootKey/mergeKey() = ") +
              OUString::number(err)),
             static_cast< OWeakObject * >(this));
diff --git a/stoc/source/typeconv/convert.cxx b/stoc/source/typeconv/convert.cxx
index 6e10a0ca72ab..182c030e62be 100644
--- a/stoc/source/typeconv/convert.cxx
+++ b/stoc/source/typeconv/convert.cxx
@@ -50,7 +50,7 @@ using namespace css::script;
 using namespace css::registry;
 using namespace cppu;
 using namespace osl;
-#define SERVICENAME "com.sun.star.script.Converter"
+
 #define IMPLNAME    "com.sun.star.comp.stoc.TypeConverter"
 
 namespace stoc_services
@@ -58,7 +58,7 @@ namespace stoc_services
 Sequence< OUString > tcv_getSupportedServiceNames()
 {
     Sequence< OUString > seqNames(1);
-    seqNames.getArray()[0] = OUString(SERVICENAME);
+    seqNames.getArray()[0] = "com.sun.star.script.Converter";
     return seqNames;
 }
 
diff --git a/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTexpand.cxx b/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTexpand.cxx
index e31509501e39..777651a6ea9a 100644
--- a/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTexpand.cxx
+++ b/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTexpand.cxx
@@ -230,8 +230,7 @@ OUString getImplementationName() {
 
 css::uno::Sequence< OUString > getSupportedServiceNames() {
     css::uno::Sequence< OUString > s(1);
-    s[0] = OUString(
-            "com.sun.star.uri.UriSchemeParser_vndDOTsunDOTstarDOTexpand");
+    s[0] = "com.sun.star.uri.UriSchemeParser_vndDOTsunDOTstarDOTexpand";
     return s;
 }