yyyyy

Change-Id: I9a947beefd2dfe21da8239e841ea3fb416bd1548

5 files changed, 14 insertions, 20 deletions

diff --git a/stoc/source/corereflection/crefl.cxx b/stoc/source/corereflection/crefl.cxx
index 83707ead3ed6..b97d03e38a43 100644
--- a/stoc/source/corereflection/crefl.cxx
+++ b/stoc/source/corereflection/crefl.cxx
@@ -64,8 +64,8 @@ IdlReflectionServiceImpl::IdlReflectionServiceImpl(
     , _xMgr( xContext->getServiceManager(), UNO_QUERY )
     , _aElements( CACHE_SIZE )
 {
-    xContext->getValueByName( OUString(
-        "/singletons/com.sun.star.reflection.theTypeDescriptionManager") ) >>= _xTDMgr;
+    xContext->getValueByName(
+        "/singletons/com.sun.star.reflection.theTypeDescriptionManager" ) >>= _xTDMgr;
     OSL_ENSURE( _xTDMgr.is(), "### cannot get singleton \"TypeDescriptionManager\" from context!" );
 }
 
diff --git a/stoc/source/javaloader/javaloader.cxx b/stoc/source/javaloader/javaloader.cxx
index 7b80dbd492e7..684d96761db3 100644
--- a/stoc/source/javaloader/javaloader.cxx
+++ b/stoc/source/javaloader/javaloader.cxx
@@ -138,9 +138,8 @@ const css::uno::Reference<XImplementationLoader> & JavaComponentLoader::getJavaL
         // get a java vm, where we can create a loader
         css::uno::Reference<XJavaVM> javaVM_xJavaVM(
             m_xComponentContext->getValueByName(
-                OUString(
-                             "/singletons/"
-                             "com.sun.star.java.theJavaVirtualMachine")),
+                             ("/singletons/"
+                              "com.sun.star.java.theJavaVirtualMachine")),
             UNO_QUERY_THROW);
 
         // Use the special protocol of XJavaVM.getJavaVM:  If the passed in
diff --git a/stoc/source/javavm/javavm.cxx b/stoc/source/javavm/javavm.cxx
index c3ec2516c932..9d1571186a47 100644
--- a/stoc/source/javavm/javavm.cxx
+++ b/stoc/source/javavm/javavm.cxx
@@ -279,7 +279,7 @@ void getINetPropsFromConfig(stoc_javavm::JVM * pjvm,
     css::uno::Reference<css::registry::XSimpleRegistry> xConfRegistry_simple(xConfRegistry, css::uno::UNO_QUERY);
     if(!xConfRegistry_simple.is()) throw css::uno::RuntimeException("javavm.cxx: couldn't get ConfigurationRegistry", 0);
 
-    xConfRegistry_simple->open(OUString("org.openoffice.Inet"), sal_True, sal_False);
+    xConfRegistry_simple->open("org.openoffice.Inet", sal_True, sal_False);
     css::uno::Reference<css::registry::XRegistryKey> xRegistryRootKey = xConfRegistry_simple->getRootKey();
 
 //  if ooInetProxyType is not 0 then read the settings
@@ -373,7 +373,7 @@ void getDefaultLocaleFromConfig(
         throw css::uno::RuntimeException(
             OUString("javavm.cxx: couldn't get ConfigurationRegistry"), 0);
 
-    xConfRegistry_simple->open(OUString("org.openoffice.Setup"), sal_True, sal_False);
+    xConfRegistry_simple->open("org.openoffice.Setup", sal_True, sal_False);
     css::uno::Reference<css::registry::XRegistryKey> xRegistryRootKey = xConfRegistry_simple->getRootKey();
 
     // read locale
@@ -429,7 +429,7 @@ void getJavaPropsFromSafetySettings(
             OUString("javavm.cxx: couldn't get ConfigurationRegistry"), 0);
 
     xConfRegistry_simple->open(
-        OUString("org.openoffice.Office.Java"),
+        "org.openoffice.Office.Java",
         sal_True, sal_False);
     css::uno::Reference<css::registry::XRegistryKey> xRegistryRootKey =
         xConfRegistry_simple->getRootKey();
@@ -455,7 +455,7 @@ void getJavaPropsFromSafetySettings(
             pjvm->pushProp(sProperty);
         }
         css::uno::Reference<css::registry::XRegistryKey> key_CheckSecurity= xRegistryRootKey->openKey(
-            OUString("VirtualMachine/Security"));
+            "VirtualMachine/Security");
         if( key_CheckSecurity.is())
         {
             bool val = (bool) key_CheckSecurity->getLongValue();
@@ -1531,8 +1531,7 @@ void JavaVirtualMachine::setUpUnoVirtualMachine(JNIEnv * environment) {
     css::uno::Reference< css::util::XMacroExpander > exp = css::util::theMacroExpander::get(m_xContext);
     OUString baseUrl;
     try {
-        baseUrl = exp->expandMacros(
-            OUString("$URE_INTERNAL_JAVA_DIR/"));
+        baseUrl = exp->expandMacros("$URE_INTERNAL_JAVA_DIR/");
     } catch (css::lang::IllegalArgumentException &) {
         throw css::uno::RuntimeException(
             OUString("css::lang::IllegalArgumentException"),
@@ -1540,8 +1539,7 @@ void JavaVirtualMachine::setUpUnoVirtualMachine(JNIEnv * environment) {
     }
     OUString classPath;
     try {
-        classPath = exp->expandMacros(
-            OUString("$URE_INTERNAL_JAVA_CLASSPATH"));
+        classPath = exp->expandMacros("$URE_INTERNAL_JAVA_CLASSPATH");
     } catch (css::lang::IllegalArgumentException &) {}
     jclass class_URLClassLoader = environment->FindClass(
         "java/net/URLClassLoader");
diff --git a/stoc/source/security/access_controller.cxx b/stoc/source/security/access_controller.cxx
index f6ebf38d80fe..72eea5142258 100644
--- a/stoc/source/security/access_controller.cxx
+++ b/stoc/source/security/access_controller.cxx
@@ -265,7 +265,7 @@ static inline Reference< security::XAccessControlContext > getDynamicRestriction
 {
     if (xContext.is())
     {
-        Any acc(xContext->getValueByName(OUString(s_acRestriction)));
+        Any acc(xContext->getValueByName(s_acRestriction));
         if (typelib_TypeClass_INTERFACE == acc.pType->eTypeClass)
         {
             // avoid ref-counting
diff --git a/stoc/source/servicemanager/servicemanager.cxx b/stoc/source/servicemanager/servicemanager.cxx
index 4d10bd44e99d..73c9ec1ab526 100644
--- a/stoc/source/servicemanager/servicemanager.cxx
+++ b/stoc/source/servicemanager/servicemanager.cxx
@@ -883,8 +883,7 @@ Reference< XInterface > OServiceManager::createInstanceWithContext(
     if (xProps.is())
     {
         Reference< XComponentContext > xDefContext;
-        xProps->getPropertyValue(
-            OUString("DefaultContext") ) >>= xDefContext;
+        xProps->getPropertyValue( "DefaultContext" ) >>= xDefContext;
         OSL_ENSURE(
             xContext == xDefContext,
             "### default context of service manager singleton differs from context holding it!" );
@@ -947,8 +946,7 @@ Reference< XInterface > OServiceManager::createInstanceWithArgumentsAndContext(
     if (xProps.is())
     {
         Reference< XComponentContext > xDefContext;
-        xProps->getPropertyValue(
-            OUString("DefaultContext") ) >>= xDefContext;
+        xProps->getPropertyValue( "DefaultContext" ) >>= xDefContext;
         OSL_ENSURE(
             xContext == xDefContext,
             "### default context of service manager singleton differs from context holding it!" );
@@ -1501,8 +1499,7 @@ void ORegistryServiceManager::fillAllNamesFromRegistry( HashSet_OWString & rSet
 
     try
     {
-        Reference<XRegistryKey > xServicesKey = xRootKey->openKey(
-            OUString("SERVICES") );
+        Reference<XRegistryKey > xServicesKey = xRootKey->openKey( "SERVICES" );
         // root + /Services + /
         if( xServicesKey.is() )
         {