[Libreoffice-commits] .: Branch 'libreoffice-3-5' - configmgr/source

[Stephan Bergmann]

 configmgr/source/components.cxx |   10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

New commits:
commit 90e2949099586e98619561dc781cc4deb8fc1ef0
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Thu Mar 15 16:38:40 2012 +0100

    Adapt prev 4f78696117ebe4f729880b5d9bfc2f5817b73543 to 3.5 rtl::OUString

diff --git a/configmgr/source/components.cxx b/configmgr/source/components.cxx
index a341d84..80741ae 100644
--- a/configmgr/source/components.cxx
+++ b/configmgr/source/components.cxx
@@ -845,7 +845,8 @@ void Components::parseXcsXcuIniLayer(
     rtl::Bootstrap ini(url);
     if (ini.getHandle() != 0)
     {
-        rtl::OUStringBuffer prefix("${.override:");
+        rtl::OUStringBuffer prefix;
+        prefix.appendAscii(RTL_CONSTASCII_STRINGPARAM("${.override:"));
         for (sal_Int32 i = 0; i != url.getLength(); ++i) {
             sal_Unicode c = url[i];
             switch (c) {
@@ -859,13 +860,16 @@ void Components::parseXcsXcuIniLayer(
             }
         }
         prefix.append(':');
-        rtl::OUString urls(prefix.toString() + rtl::OUString("SCHEMA}"));
+        rtl::OUString urls(
+            prefix.toString()
+            + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SCHEMA}")));
         rtl::Bootstrap::expandMacros(urls);
         if (!urls.isEmpty())
         {
             parseFileList(layer, &parseXcsFile, urls, ini, false);
         }
-        urls = prefix.makeStringAndClear() + rtl::OUString("DATA}");
+        urls = prefix.makeStringAndClear()
+            + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DATA}"));
         rtl::Bootstrap::expandMacros(urls);
         if (!urls.isEmpty())
         {