Clean up redundant explicit OUString(...) ctors

Change-Id: Ieb5d4a1d669e0472ec08704c618a9d9c1d30b77f

configmgr/source/broadcaster.cxx

@@ -193,7 +193,7 @@ void Broadcaster::send() {
     }
     if (exception.hasValue()) {
         throw css::lang::WrappedTargetRuntimeException(
-            (OUString("configmgr exceptions during listener notification") +
+            ("configmgr exceptions during listener notification" +
              messages.makeStringAndClear()),
             css::uno::Reference< css::uno::XInterface >(),
             exception);

configmgr/source/childaccess.cxx

@@ -166,8 +166,7 @@ void ChildAccess::setParent(css::uno::Reference< css::uno::XInterface > const &)
     osl::MutexGuard g(*lock_);
     checkLocalizedPropertyAccess();
     throw css::lang::NoSupportException(
-        OUString("setParent"),
-        static_cast< cppu::OWeakObject * >(this));
+        "setParent", static_cast< cppu::OWeakObject * >(this));
 }
 
 sal_Int64 ChildAccess::getSomething(

configmgr/source/configurationprovider.cxx

@@ -52,7 +52,6 @@
 #include "osl/mutex.hxx"
 #include "sal/types.h"
 #include "rtl/ref.hxx"
-#include "rtl/ustring.h"
 #include "rtl/ustring.hxx"
 
 #include <i18nlangtag/languagetag.hxx>
@@ -73,8 +72,8 @@ char const updateAccessServiceName[] =
 
 void badNodePath() {
     throw css::uno::Exception(
-        OUString("com.sun.star.configuration.ConfigurationProvider expects a"
-                " single, non-empty, string nodepath argument"),
+        ("com.sun.star.configuration.ConfigurationProvider expects a single,"
+         " non-empty, string nodepath argument"),
         0);
 }
 
@@ -198,8 +197,8 @@ Service::createInstanceWithArguments(
             break;
         } else {
             throw css::uno::Exception(
-                OUString("com.sun.star.configuration.ConfigurationProvider"
-                        " expects NamedValue or PropertyValue arguments"),
+                ("com.sun.star.configuration.ConfigurationProvider expects"
+                 " NamedValue or PropertyValue arguments"),
                 0);
         }
         // For backwards compatibility, allow "nodepath" and "Locale" in any
@@ -215,9 +214,8 @@ Service::createInstanceWithArguments(
                 locale.isEmpty())
             {
                 throw css::uno::Exception(
-                    OUString("com.sun.star.configuration.ConfigurationProvider"
-                            " expects at most one, non-empty, string Locale"
-                            " argument"),
+                    ("com.sun.star.configuration.ConfigurationProvider expects"
+                     " at most one, non-empty, string Locale argument"),
                     0);
             }
         }
@@ -228,27 +226,24 @@ Service::createInstanceWithArguments(
     // For backwards compatibility, allow a nodepath that misses the leading
     // slash:
     if (nodepath[0] != '/') {
-        nodepath = OUString("/") + nodepath;
+        nodepath = "/" + nodepath;
     }
     if (locale.isEmpty()) {
         //TODO: should the Access use the dynamically changing locale_ instead?
         locale = locale_;
         if (locale.isEmpty()) {
-            locale = OUString("en-US");
+            locale = "en-US";
         }
     }
     bool update;
-    if ( ServiceSpecifier == accessServiceName )
-    {
+    if (ServiceSpecifier == accessServiceName) {
         update = false;
-    } else if ( ServiceSpecifier == updateAccessServiceName )
-    {
+    } else if (ServiceSpecifier == updateAccessServiceName) {
         update = true;
     } else {
         throw css::uno::Exception(
-            (OUString("com.sun.star.configuration.ConfigurationProvider does not"
-                    " support service ") +
-             ServiceSpecifier),
+            ("com.sun.star.configuration.ConfigurationProvider does not support"
+             " service " + ServiceSpecifier),
             static_cast< cppu::OWeakObject * >(this));
     }
     osl::MutexGuard guard(*lock_);
@@ -257,9 +252,8 @@ Service::createInstanceWithArguments(
         new RootAccess(components, nodepath, locale, update));
     if (root->isValue()) {
         throw css::uno::Exception(
-            (OUString("com.sun.star.configuration.ConfigurationProvider: there is"
-                    " a leaf value at nodepath ") +
-             nodepath),
+            ("com.sun.star.configuration.ConfigurationProvider: there is a leaf"
+             " value at nodepath " + nodepath),
             static_cast< cppu::OWeakObject * >(this));
     }
     components.addRootAccess(root);
@@ -270,8 +264,8 @@ css::uno::Sequence< OUString > Service::getAvailableServiceNames()
     throw (css::uno::RuntimeException)
 {
     css::uno::Sequence< OUString > names(2);
-    names[0] = OUString(RTL_CONSTASCII_USTRINGPARAM(accessServiceName));
-    names[1] = OUString(RTL_CONSTASCII_USTRINGPARAM(updateAccessServiceName));
+    names[0] = accessServiceName;
+    names[1] = updateAccessServiceName;
     return names;
 }
 
@@ -417,9 +411,8 @@ Factory::createInstanceWithArgumentsAndContext(
                 value = v2.Value;
             } else {
                 throw css::uno::Exception(
-                    OUString("com.sun.star.configuration.ConfigurationProvider"
-                            " factory expects NamedValue or PropertyValue"
-                            " arguments"),
+                    ("com.sun.star.configuration.ConfigurationProvider factory"
+                     " expects NamedValue or PropertyValue arguments"),
                     0);
             }
             // For backwards compatibility, allow "Locale" and (ignored)
@@ -429,15 +422,15 @@ Factory::createInstanceWithArgumentsAndContext(
                     locale.isEmpty())
                 {
                     throw css::uno::Exception(
-                        OUString("com.sun.star.configuration."
-                                "ConfigurationProvider factory expects at most"
-                                " one, non-empty, string Locale argument"),
+                        ("com.sun.star.configuration.ConfigurationProvider"
+                         " factory expects at most one, non-empty, string"
+                         " Locale argument"),
                         0);
                 }
             } else if (!name.equalsIgnoreAsciiCase("enableasync")) {
                 throw css::uno::Exception(
-                    OUString("com.sun.star.configuration.ConfigurationProvider"
-                            " factory: unknown argument ") + name,
+                    ("com.sun.star.configuration.ConfigurationProvider factory:"
+                     " unknown argument " + name),
                     0);
             }
         }
@@ -450,8 +443,7 @@ Factory::createInstanceWithArgumentsAndContext(
 css::uno::Reference< css::uno::XInterface > createDefault(
     css::uno::Reference< css::uno::XComponentContext > const & context)
 {
-    return static_cast< cppu::OWeakObject * >(
-        new Service(context, OUString()));
+    return static_cast< cppu::OWeakObject * >(new Service(context, ""));
 }
 
 OUString getImplementationName() {

configmgr/source/data.cxx

@@ -132,7 +132,7 @@ sal_Int32 Data::parseSegment(
     }
     if (templateName != 0) {
         if (i - index == 1 && path[index] == '*') {
-            *templateName = OUString();
+            *templateName = "";
         } else {
             *templateName = path.copy(index, i - index);
         }
@@ -159,8 +159,7 @@ OUString Data::fullTemplateName(
 {
     if (component.indexOf(':') != -1 || name.indexOf(':') != -1) {
         throw css::uno::RuntimeException(
-            (OUString("bad component/name pair containing colon ") +
-             component + OUString("/") +
+            ("bad component/name pair containing colon " + component + "/" +
              name),
             css::uno::Reference< css::uno::XInterface >());
     }
@@ -203,8 +202,7 @@ rtl::Reference< Node > Data::resolvePathRepresentation(
 {
     if (pathRepresentation.isEmpty() || pathRepresentation[0] != '/') {
         throw css::uno::RuntimeException(
-            (OUString("bad path ") +
-             pathRepresentation),
+            "bad path " + pathRepresentation,
             css::uno::Reference< css::uno::XInterface >());
     }
     if (path != 0) {
@@ -226,8 +224,7 @@ rtl::Reference< Node > Data::resolvePathRepresentation(
     if (n == -1 || setElement)
     {
         throw css::uno::RuntimeException(
-            (OUString("bad path ") +
-             pathRepresentation),
+            "bad path " + pathRepresentation,
             css::uno::Reference< css::uno::XInterface >());
     }
     NodeMap const & components = getComponents();
@@ -251,8 +248,7 @@ rtl::Reference< Node > Data::resolvePathRepresentation(
             pathRepresentation[n++] != '/')
         {
             throw css::uno::RuntimeException(
-                (OUString("bad path ") +
-                 pathRepresentation),
+                "bad path " + pathRepresentation,
                 css::uno::Reference< css::uno::XInterface >());
         }
         // for backwards compatibility, ignore a final slash
@@ -266,13 +262,12 @@ rtl::Reference< Node > Data::resolvePathRepresentation(
             return p;
         }
         parent = p;
-        templateName = OUString();
+        templateName = "";
         n = parseSegment(
             pathRepresentation, n, &seg, &setElement, &templateName);
         if (n == -1) {
             throw css::uno::RuntimeException(
-                (OUString("bad path ") +
-                 pathRepresentation),
+                "bad path " + pathRepresentation,
                 css::uno::Reference< css::uno::XInterface >());
         }
         // For backwards compatibility, allow set members to be accessed with
@@ -283,8 +278,7 @@ rtl::Reference< Node > Data::resolvePathRepresentation(
             case Node::KIND_LOCALIZED_PROPERTY:
                 if (!templateName.isEmpty()) {
                     throw css::uno::RuntimeException(
-                        (OUString("bad path ") +
-                         pathRepresentation),
+                        "bad path " + pathRepresentation,
                     css::uno::Reference< css::uno::XInterface >());
                 }
                 break;
@@ -294,23 +288,20 @@ rtl::Reference< Node > Data::resolvePathRepresentation(
                         templateName))
                 {
                     throw css::uno::RuntimeException(
-                        (OUString("bad path ") +
-                         pathRepresentation),
+                        "bad path " + pathRepresentation,
                     css::uno::Reference< css::uno::XInterface >());
                 }
                 break;
             default:
                 throw css::uno::RuntimeException(
-                    (OUString("bad path ") +
-                     pathRepresentation),
+                    "bad path " + pathRepresentation,
                     css::uno::Reference< css::uno::XInterface >());
             }
             if (!templateName.isEmpty() && p != 0) {
                 assert(!p->getTemplateName().isEmpty());
                 if (!equalTemplateNames(templateName, p->getTemplateName())) {
                     throw css::uno::RuntimeException(
-                        (OUString("bad path ") +
-                         pathRepresentation),
+                        "bad path " + pathRepresentation,
                         css::uno::Reference< css::uno::XInterface >());
                 }
             }
@@ -338,8 +329,7 @@ Additions * Data::addExtensionXcuAdditions(
                 url, rtl::Reference< ExtensionXcu >())).first);
     if (i->second.is()) {
         throw css::uno::RuntimeException(
-            (OUString("already added extension xcu ") +
-             url),
+            "already added extension xcu " + url,
             css::uno::Reference< css::uno::XInterface >());
     }
     i->second = item;

configmgr/source/node.cxx

@@ -37,8 +37,7 @@ namespace configmgr {
 NodeMap & Node::getMembers() {
     assert(false);
     throw css::uno::RuntimeException(
-        OUString("this cannot happen"),
-        css::uno::Reference< css::uno::XInterface >());
+        "this cannot happen", css::uno::Reference< css::uno::XInterface >());
 }
 
 OUString Node::getTemplateName() const {

configmgr/source/partial.cxx

@@ -55,8 +55,7 @@ bool parseSegment(
         }
     }
     throw css::uno::RuntimeException(
-        OUString("bad path ") + path,
-        css::uno::Reference< css::uno::XInterface >());
+        "bad path " + path, css::uno::Reference< css::uno::XInterface >());
 }
 
 }

configmgr/source/propertynode.cxx

@@ -61,7 +61,7 @@ css::uno::Any PropertyNode::getValue(Components & components) {
         if (val.IsPresent) {
             value_ = val.Value; //TODO: check value type
         }
-        externalDescriptor_ = OUString(); // must not throw
+        externalDescriptor_ = ""; // must not throw
     }
     SAL_WARN_IF(
         !(value_.hasValue() || nillable_), "configmgr",
@@ -72,7 +72,7 @@ css::uno::Any PropertyNode::getValue(Components & components) {
 void PropertyNode::setValue(int layer, css::uno::Any const & value) {
     setLayer(layer);
     value_ = value;
-    externalDescriptor_ = OUString();
+    externalDescriptor_ = "";
 }
 
 void PropertyNode::setExternal(int layer, OUString const & descriptor) {

configmgr/source/rootaccess.cxx

@@ -128,8 +128,7 @@ void RootAccess::addChangesListener(
         checkLocalizedPropertyAccess();
         if (!aListener.is()) {
             throw css::uno::RuntimeException(
-                OUString("null listener"),
-                static_cast< cppu::OWeakObject * >(this));
+                "null listener", static_cast< cppu::OWeakObject * >(this));
         }
         if (!isDisposed()) {
             changesListeners_.insert(aListener);
@@ -226,9 +225,7 @@ rtl::Reference< Node > RootAccess::getNode() {
             pathRepresentation_, &canonic, &path_, &finalizedLayer);
         if (!node_.is()) {
             throw css::uno::RuntimeException(
-                (OUString("cannot find ") +
-                 pathRepresentation_),
-                0);
+                "cannot find " + pathRepresentation_, 0);
                 // RootAccess::queryInterface indirectly calls
                 // RootAccess::getNode, so if this RootAccess were passed out in
                 // RuntimeException.Context, client code that called
@@ -273,11 +270,9 @@ void RootAccess::addSupportedServiceNames(
     std::vector< OUString > * services)
 {
     assert(services != 0);
-    services->push_back(
-        OUString("com.sun.star.configuration.AccessRootElement"));
+    services->push_back("com.sun.star.configuration.AccessRootElement");
     if (update_) {
-        services->push_back(
-            OUString("com.sun.star.configuration.UpdateRootElement"));
+        services->push_back("com.sun.star.configuration.UpdateRootElement");
     }
 }
 

configmgr/source/type.cxx

@@ -61,7 +61,7 @@ Type elementType(Type type) {
     default:
         assert(false);
         throw css::uno::RuntimeException(
-            OUString("this cannot happen"),
+            "this cannot happen",
             css::uno::Reference< css::uno::XInterface >());
     }
 }
@@ -102,7 +102,7 @@ css::uno::Type mapType(Type type) {
     default:
         assert(false);
         throw css::uno::RuntimeException(
-            OUString("this cannot happen"),
+            "this cannot happen",
             css::uno::Reference< css::uno::XInterface >());
     }
 }

configmgr/source/valueparser.cxx

@@ -171,8 +171,7 @@ template< typename T > css::uno::Any parseSingleValue(
     T val;
     if (!parseValue(text, &val)) {
         throw css::uno::RuntimeException(
-            OUString("invalid value"),
-            css::uno::Reference< css::uno::XInterface >());
+            "invalid value", css::uno::Reference< css::uno::XInterface >());
     }
     return css::uno::makeAny(val);
 }
@@ -196,7 +195,7 @@ template< typename T > css::uno::Any parseListValue(
                     xmlreader::Span(t.begin, i == -1 ? t.length : i), &val))
             {
                 throw css::uno::RuntimeException(
-                    OUString("invalid value"),
+                    "invalid value",
                     css::uno::Reference< css::uno::XInterface >());
             }
             seq.push_back(val);
@@ -216,7 +215,7 @@ css::uno::Any parseValue(
     switch (type) {
     case TYPE_ANY:
         throw css::uno::RuntimeException(
-            OUString("invalid value of type any"),
+            "invalid value of type any",
             css::uno::Reference< css::uno::XInterface >());
     case TYPE_BOOLEAN:
         return parseSingleValue< sal_Bool >(text);
@@ -250,7 +249,7 @@ css::uno::Any parseValue(
     default:
         assert(false);
         throw css::uno::RuntimeException(
-            OUString("this cannot happen"),
+            "this cannot happen",
             css::uno::Reference< css::uno::XInterface >());
     }
 }
@@ -333,8 +332,7 @@ bool ValueParser::startElement(
                 pad_.add(RTL_CONSTASCII_STRINGPARAM("\xEF\xBF\xBF"));
             } else {
                 throw css::uno::RuntimeException(
-                    (OUString("bad unicode scalar attribute in ") +
-                     reader.getUrl()),
+                    "bad unicode scalar attribute in " + reader.getUrl(),
                     css::uno::Reference< css::uno::XInterface >());
             }
             state_ = State(state_ + 1);
@@ -345,9 +343,7 @@ bool ValueParser::startElement(
         break;
     }
     throw css::uno::RuntimeException(
-        (OUString("bad member <") +
-         name.convertFromUtf8() +
-         OUString("> in ") + reader.getUrl()),
+        "bad member <" + name.convertFromUtf8() + "> in " + reader.getUrl(),
         css::uno::Reference< css::uno::XInterface >());
 }
 

configmgr/source/writemodfile.cxx

@@ -69,7 +69,7 @@ OString convertToUtf8(
              RTL_UNICODETOTEXT_FLAGS_INVALID_ERROR)))
     {
         throw css::uno::RuntimeException(
-            OUString("cannot convert to UTF-8"),
+            "cannot convert to UTF-8",
             css::uno::Reference< css::uno::XInterface >());
     }
     return s;
@@ -110,8 +110,7 @@ void writeData(oslFileHandle handle, char const * begin, sal_Int32 length) {
         n != static_cast< sal_uInt32 >(length))
     {
         throw css::uno::RuntimeException(
-            OUString("write failure"),
-            css::uno::Reference< css::uno::XInterface >());
+            "write failure", css::uno::Reference< css::uno::XInterface >());
     }
 }
 
@@ -500,8 +499,7 @@ void writeModifications(
     } else {
         assert(node.is());
         OUString pathRep(
-            parentPathRepresentation +
-            OUString("/") +
+            parentPathRepresentation + "/" +
             Data::createSegment(node->getTemplateName(), nodeName));
         for (Modifications::Node::Children::const_iterator i(
                  modifications.children.begin());
@@ -534,8 +532,7 @@ void writeModFile(
         return;
     default:
         throw css::uno::RuntimeException(
-            (OUString("cannot create directory ") +
-             dir),
+            "cannot create directory " + dir,
             css::uno::Reference< css::uno::XInterface >());
     }
     TempFile tmp;
@@ -550,8 +547,7 @@ void writeModFile(
         return;
     default:
         throw css::uno::RuntimeException(
-            (OUString("cannot create temporary file in ") +
-             dir),
+            "cannot create temporary file in " + dir,
             css::uno::Reference< css::uno::XInterface >());
     }
     writeData(
@@ -569,8 +565,7 @@ void writeModFile(
          j != data.modifications.getRoot().children.end(); ++j)
     {
         writeModifications(
-            components, tmp.handle, OUString(), rtl::Reference< Node >(),
-            j->first,
+            components, tmp.handle, "", rtl::Reference< Node >(), j->first,
             Data::findNode(Data::NO_LAYER, data.getComponents(), j->first),
             j->second);
     }
@@ -579,14 +574,12 @@ void writeModFile(
     tmp.closed = true;
     if (e != osl_File_E_None) {
         throw css::uno::RuntimeException(
-            (OUString("cannot close ") +
-             tmp.url),
+            "cannot close " + tmp.url,
             css::uno::Reference< css::uno::XInterface >());
     }
     if (osl::File::move(tmp.url, url) != osl::FileBase::E_None) {
         throw css::uno::RuntimeException(
-            (OUString("cannot move ") +
-             tmp.url),
+            "cannot move " + tmp.url,
             css::uno::Reference< css::uno::XInterface >());
     }
     tmp.handle = 0;

configmgr/source/xcdparser.cxx

@@ -96,15 +96,13 @@ bool XcdParser::startElement(
                 }
                 if (!attrFile.is()) {
                     throw css::uno::RuntimeException(
-                        (OUString("no dependency file attribute in ") +
-                         reader.getUrl()),
+                        "no dependency file attribute in " + reader.getUrl(),
                         css::uno::Reference< css::uno::XInterface >());
                 }
                 dependencyFile_ = attrFile.convertFromUtf8();
                 if (dependencyFile_.isEmpty()) {
                     throw css::uno::RuntimeException(
-                        (OUString("bad dependency file attribute in ") +
-                         reader.getUrl()),
+                        "bad dependency file attribute in " + reader.getUrl(),
                         css::uno::Reference< css::uno::XInterface >());
                 }
             }
@@ -117,7 +115,7 @@ bool XcdParser::startElement(
                 return false;
             }
             state_ = STATE_DEPENDENCY;
-            dependencyFile_ = OUString();
+            dependencyFile_ = "";
             return true;
         }
         state_ = STATE_COMPONENTS;
@@ -145,9 +143,7 @@ bool XcdParser::startElement(
         break;
     }
     throw css::uno::RuntimeException(
-        (OUString("bad member <") +
-         name.convertFromUtf8() +
-         OUString("> in ") + reader.getUrl()),
+        "bad member <" + name.convertFromUtf8() + "> in " + reader.getUrl(),
         css::uno::Reference< css::uno::XInterface >());
 }
 

configmgr/source/xcsparser.cxx

@@ -169,8 +169,7 @@ bool XcsParser::startElement(
                 assert(elements_.empty());
                 elements_.push(
                     Element(
-                        new GroupNode(
-                            valueParser_.getLayer(), false, OUString()),
+                        new GroupNode(valueParser_.getLayer(), false, ""),
                         componentName_));
                 return true;
             }
@@ -253,9 +252,7 @@ bool XcsParser::startElement(
         }
     }
     throw css::uno::RuntimeException(
-        (OUString("bad member <") +
-         name.convertFromUtf8() +
-         OUString("> in ") + reader.getUrl()),
+        "bad member <" + name.convertFromUtf8() + "> in " + reader.getUrl(),
         css::uno::Reference< css::uno::XInterface >());
 }
 
@@ -298,7 +295,7 @@ void XcsParser::endElement(xmlreader::XmlReader const & reader) {
                 default:
                     assert(false);
                     throw css::uno::RuntimeException(
-                        OUString("this cannot happen"),
+                        "this cannot happen",
                         css::uno::Reference< css::uno::XInterface >());
                 }
             } else {
@@ -306,10 +303,7 @@ void XcsParser::endElement(xmlreader::XmlReader const & reader) {
                         NodeMap::value_type(top.name, top.node)).second)
                 {
                     throw css::uno::RuntimeException(
-                        (OUString("duplicate ") +
-                         top.name +
-                         OUString(" in ") +
-                         reader.getUrl()),
+                        "duplicate " + top.name + " in " + reader.getUrl(),
                         css::uno::Reference< css::uno::XInterface >());
                 }
             }
@@ -326,8 +320,7 @@ void XcsParser::endElement(xmlreader::XmlReader const & reader) {
             break;
         case STATE_TEMPLATES_DONE:
             throw css::uno::RuntimeException(
-                (OUString("no component element in ") +
-                 reader.getUrl()),
+                "no component element in " + reader.getUrl(),
                 css::uno::Reference< css::uno::XInterface >());
         case STATE_COMPONENT_DONE:
             break;
@@ -357,8 +350,7 @@ void XcsParser::handleComponentSchema(xmlreader::XmlReader & reader) {
         {
             if (hasPackage) {
                 throw css::uno::RuntimeException(
-                    (OUString("multiple component-schema package attributes"
-                            " in ") +
+                    ("multiple component-schema package attributes in " +
                      reader.getUrl()),
                     css::uno::Reference< css::uno::XInterface >());
             }
@@ -370,7 +362,7 @@ void XcsParser::handleComponentSchema(xmlreader::XmlReader & reader) {
         {
             if (hasName) {
                 throw css::uno::RuntimeException(
-                    (OUString("multiple component-schema name attributes in ") +
+                    ("multiple component-schema name attributes in " +
                      reader.getUrl()),
                     css::uno::Reference< css::uno::XInterface >());
             }
@@ -381,14 +373,12 @@ void XcsParser::handleComponentSchema(xmlreader::XmlReader & reader) {
     }
     if (!hasPackage) {
         throw css::uno::RuntimeException(
-            (OUString("no component-schema package attribute in ") +
-             reader.getUrl()),
+            "no component-schema package attribute in " + reader.getUrl(),
             css::uno::Reference< css::uno::XInterface >());
     }
     if (!hasName) {
         throw css::uno::RuntimeException(
-            (OUString("no component-schema name attribute in ") +
-             reader.getUrl()),
+            "no component-schema name attribute in " + reader.getUrl(),
             css::uno::Reference< css::uno::XInterface >());
     }
     componentName_ = xmlreader::Span(buf.getStr(), buf.getLength()).
@@ -423,8 +413,7 @@ void XcsParser::handleNodeRef(xmlreader::XmlReader & reader) {
     }
     if (!hasName) {
         throw css::uno::RuntimeException(
-            (OUString("no node-ref name attribute in ") +
-             reader.getUrl()),
+            "no node-ref name attribute in " + reader.getUrl(),
             css::uno::Reference< css::uno::XInterface >());
     }
     rtl::Reference< Node > tmpl(
@@ -436,9 +425,7 @@ void XcsParser::handleNodeRef(xmlreader::XmlReader & reader) {
         //TODO: this can erroneously happen as long as import/uses attributes
         // are not correctly processed
         throw css::uno::RuntimeException(
-            (OUString("unknown node-ref ") +
-             name + OUString(" in ") +
-             reader.getUrl()),
+            "unknown node-ref " + name + " in " + reader.getUrl(),
             css::uno::Reference< css::uno::XInterface >());
     }
     rtl::Reference< Node > node(tmpl->clone(false));
@@ -478,14 +465,12 @@ void XcsParser::handleProp(xmlreader::XmlReader & reader) {
     }
     if (!hasName) {
         throw css::uno::RuntimeException(
-            (OUString("no prop name attribute in ") +
-             reader.getUrl()),
+            "no prop name attribute in " + reader.getUrl(),
             css::uno::Reference< css::uno::XInterface >());
     }
     if (valueParser_.type_ == TYPE_ERROR) {
         throw css::uno::RuntimeException(
-            (OUString("no prop type attribute in ") +
-             reader.getUrl()),
+            "no prop type attribute in " + reader.getUrl(),
             css::uno::Reference< css::uno::XInterface >());
     }
     elements_.push(
@@ -517,8 +502,7 @@ void XcsParser::handlePropValue(
             attrSeparator = reader.getAttributeValue(false);
             if (attrSeparator.length == 0) {
                 throw css::uno::RuntimeException(
-                    (OUString("bad oor:separator attribute in ") +
-                     reader.getUrl()),
+                    "bad oor:separator attribute in " + reader.getUrl(),
                     css::uno::Reference< css::uno::XInterface >());
             }
         }
@@ -549,8 +533,7 @@ void XcsParser::handleGroup(xmlreader::XmlReader & reader, bool isTemplate) {
     }
     if (!hasName) {
         throw css::uno::RuntimeException(
-            (OUString("no group name attribute in ") +
-             reader.getUrl()),
+            "no group name attribute in " + reader.getUrl(),
             css::uno::Reference< css::uno::XInterface >());
     }
     if (isTemplate) {
@@ -592,8 +575,7 @@ void XcsParser::handleSet(xmlreader::XmlReader & reader, bool isTemplate) {
     }
     if (!hasName) {
         throw css::uno::RuntimeException(
-            (OUString("no set name attribute in ") +
-             reader.getUrl()),
+            "no set name attribute in " + reader.getUrl(),
             css::uno::Reference< css::uno::XInterface >());
     }
     if (isTemplate) {
@@ -632,7 +614,7 @@ void XcsParser::handleSetItem(xmlreader::XmlReader & reader, SetNode * set) {
     }
     set->getAdditionalTemplateNames().push_back(
         xmldata::parseTemplateReference(component, hasNodeType, nodeType, 0));
-    elements_.push(Element(rtl::Reference< Node >(), OUString()));
+    elements_.push(Element(rtl::Reference< Node >(), ""));
 }
 
 }