[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - cui/source

Caolán McNamara (via logerrit) logerrit at kemper.freedesktop.org
Tue Nov 26 20:21:42 UTC 2019


 cui/source/customize/SvxNotebookbarConfigPage.cxx |    7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

New commits:
commit 196b62a9730ef6c57215058a2ab2d7f6782f4768
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Mon Nov 25 10:38:42 2019 +0000
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Tue Nov 26 21:20:40 2019 +0100

    use a better conversion to OUString
    
    Change-Id: I4a133c054700f72770380214cc794a691edac54e
    Reviewed-on: https://gerrit.libreoffice.org/83741
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/cui/source/customize/SvxNotebookbarConfigPage.cxx b/cui/source/customize/SvxNotebookbarConfigPage.cxx
index 77ea904249f4..d49abb3eb951 100644
--- a/cui/source/customize/SvxNotebookbarConfigPage.cxx
+++ b/cui/source/customize/SvxNotebookbarConfigPage.cxx
@@ -65,12 +65,7 @@ static bool isCategoryAvailable(const OUString& sClassId, const OUString& sUIIte
 
 static OUString charToString(const char* cString)
 {
-    OUStringBuffer aString;
-    for (std::size_t i = 0; i < strlen(cString); i++)
-    {
-        aString.append(cString[i]);
-    }
-    return aString.makeStringAndClear();
+    return OUString(cString, strlen(cString), RTL_TEXTENCODING_UTF8);
 }
 
 static OUString getFileName(const OUString& aFileName)


More information about the Libreoffice-commits mailing list