diff options
Diffstat (limited to 'basic')
| -rw-r--r-- | basic/qa/basic_coverage/test_string_replace.vb | 6 | ||||
| -rw-r--r-- | basic/source/runtime/methods.cxx | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/basic/qa/basic_coverage/test_string_replace.vb b/basic/qa/basic_coverage/test_string_replace.vb index 99eafdba6b14..e2e9ce35962b 100644 --- a/basic/qa/basic_coverage/test_string_replace.vb +++ b/basic/qa/basic_coverage/test_string_replace.vb @@ -23,6 +23,12 @@ Function verify_stringReplace() As String retStr = Replace("АБВабв", "б", "*") TestLog_ASSERT retStr, "А*Ва*в", "case-insensitive non-ASCII: " & retStr + ' tdf#141045 - different length of search and replace string. It is important + ' that the search string starts with the original string in order to test the error. + ' Without the fix in place, the string index calculations result in a crash. + retStr = Replace("a", "abc", "ab") + TestLog_ASSERT retStr, "a", "different length of search and replace string: " & retStr + result = result & Chr$(10) & "Tests passed: " & passCount & Chr$(10) & "Tests failed: " & failCount & Chr$(10) verify_stringReplace = result End Function diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx index 2e2311078a67..0276a41c1b17 100644 --- a/basic/source/runtime/methods.cxx +++ b/basic/source/runtime/methods.cxx @@ -1289,7 +1289,7 @@ void SbRtl_Replace(StarBASIC *, SbxArray & rPar, bool) const css::lang::Locale& rLocale = Application::GetSettings().GetUILanguageTag().getLocale(); css::uno::Reference < i18n::XCharacterClassification > xCharClass = vcl::unohelper::CreateCharacterClassification(); aSrcStr = xCharClass->toUpper(aSrcStr, 0, aSrcStr.getLength(), rLocale); - aFindStr = xCharClass->toUpper(aFindStr, 0, aSrcStr.getLength(), rLocale); + aFindStr = xCharClass->toUpper(aFindStr, 0, aFindStr.getLength(), rLocale); } // Note: the result starts from lStartPos, removing everything to the left. See i#94895. |