commit e36ca8d3c69d0c08ad28ceea278b05a0af81e102
author Stephan Bergmann <sbergman@redhat.com> Thu Jun 25 08:52:08 2015 +0200
committer Stephan Bergmann <sbergman@redhat.com> Thu Jun 25 09:03:33 2015 +0200
tree b3bbd141439a5116a95a699dab21b4a40f7c813e
parent 0af7e2afe1b04e32888a825eb2f3c72015aa3f7f

Do not forget to actually set newStr to an empty string

(cherry picked from commit f7a7a9dd84d1cd8b49d59e1fb1853ea7e9f40edf)
Conflicts:
	sal/qa/rtl/strings/test_strings_replace.cxx
	sal/rtl/ustring.cxx

Change-Id: I745b09d8a248f08afdd3387f4cfcf69d71ec3c39

sal/qa/rtl/strings/test_strings_replace.cxx

diff --git a/sal/qa/rtl/strings/test_strings_replace.cxx b/sal/qa/rtl/strings/test_strings_replace.cxx
index 2065078..38c15e6 100644
--- a/sal/qa/rtl/strings/test_strings_replace.cxx
+++ b/sal/qa/rtl/strings/test_strings_replace.cxx
@@ -186,6 +186,9 @@ void Test::ustringReplaceFirstAsciiL() {
                 rtl::OUString("other"), &n)));
        CPPUNIT_ASSERT_EQUAL(sal_Int32(-1), n);
    }

    CPPUNIT_ASSERT_EQUAL(
        rtl::OUString(), rtl::OUString("xa").replaceFirst("xa", OUString()));
}

void Test::ustringReplaceFirstAsciiLAsciiL() {
@@ -225,6 +228,9 @@ void Test::ustringReplaceFirstAsciiLAsciiL() {
             replaceFirst("bar", "other", &n)));
        CPPUNIT_ASSERT_EQUAL(sal_Int32(-1), n);
    }

    CPPUNIT_ASSERT_EQUAL(
        rtl::OUString(), rtl::OUString("xa").replaceFirst("xa", ""));
}

void Test::ustringReplaceAll() {
@@ -265,6 +271,9 @@ void Test::ustringReplaceAllAsciiL() {
        rtl::OUString("xaa").replaceAll(
            "xa",
            rtl::OUString("xx")));

    CPPUNIT_ASSERT_EQUAL(
        rtl::OUString(), rtl::OUString("xa").replaceAll("xa", OUString()));
}

void Test::ustringReplaceAllAsciiLAsciiL() {
@@ -282,6 +291,9 @@ void Test::ustringReplaceAllAsciiLAsciiL() {
        rtl::OUString("xxa"),
        (rtl::OUString("xaa").
         replaceAll("xa", "xx")));

    CPPUNIT_ASSERT_EQUAL(
        rtl::OUString(), rtl::OUString("xa").replaceAll("xa", ""));
}

}

sal/rtl/ustring.cxx

diff --git a/sal/rtl/ustring.cxx b/sal/rtl/ustring.cxx
index 3c9c8b7..940113d 100644
--- a/sal/rtl/ustring.cxx
+++ b/sal/rtl/ustring.cxx
@@ -1154,8 +1154,8 @@ void rtl_uString_newReplaceFirstAsciiL(
        }
        sal_Int32 n = str->length - fromLength + to->length;
        rtl_uString_acquire(str); // in case *newStr == str
        rtl_uString_new_WithLength(newStr, n);
        if (n != 0) {
            rtl_uString_new_WithLength(newStr, n);
            (*newStr)->length = n;
            assert(i >= 0 && i < str->length);
            memcpy(
@@ -1197,8 +1197,8 @@ void rtl_uString_newReplaceFirstAsciiLAsciiL(
        }
        sal_Int32 n = str->length - fromLength + toLength;
        rtl_uString_acquire(str); // in case *newStr == str
        rtl_uString_new_WithLength(newStr, n);
        if (n != 0) {
            rtl_uString_new_WithLength(newStr, n);
            (*newStr)->length = n;
            assert(i >= 0 && i < str->length);
            memcpy(