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

Caolán McNamara (via logerrit) logerrit at kemper.freedesktop.org
Wed Nov 27 09:00:21 UTC 2019


 cui/source/customize/SvxNotebookbarConfigPage.cxx |    6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

New commits:
commit c30dde552ad6420a655fd9f440fd68bff556d19a
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Mon Nov 25 12:45:05 2019 +0000
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Wed Nov 27 09:58:48 2019 +0100

    tdf#126043 drop intermediate OUString
    
    Change-Id: I96906737bfe0f40b8a4c0b2f88dde7cc40daeab0
    Reviewed-on: https://gerrit.libreoffice.org/83677
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>
    (cherry picked from commit df701c92f3f8071d1dd6df70898c33d99e905e7e)
    Reviewed-on: https://gerrit.libreoffice.org/83834

diff --git a/cui/source/customize/SvxNotebookbarConfigPage.cxx b/cui/source/customize/SvxNotebookbarConfigPage.cxx
index d49abb3eb951..4a26650b80e2 100644
--- a/cui/source/customize/SvxNotebookbarConfigPage.cxx
+++ b/cui/source/customize/SvxNotebookbarConfigPage.cxx
@@ -290,16 +290,14 @@ void SvxNotebookbarConfigPage::getNodeValue(xmlNode* pNodePtr, NotebookbarEntrie
             {
                 xmlChar* aValue = xmlNodeGetContent(pNodePtr);
                 const char* cVisibleValue = reinterpret_cast<const char*>(aValue);
-                OUString sVisibleValue = charToString(cVisibleValue);
-                aNodeEntries.sVisibleValue = sVisibleValue;
+                aNodeEntries.sVisibleValue = charToString(cVisibleValue);
                 xmlFree(aValue);
             }
             if (!(xmlStrcmp(UriValue, reinterpret_cast<const xmlChar*>("action_name"))))
             {
                 xmlChar* aValue = xmlNodeGetContent(pNodePtr);
                 const char* cActionName = reinterpret_cast<const char*>(aValue);
-                OUString sActionName = charToString(cActionName);
-                aNodeEntries.sActionName = sActionName;
+                aNodeEntries.sActionName = charToString(cActionName);
                 xmlFree(aValue);
             }
             xmlFree(UriValue);


More information about the Libreoffice-commits mailing list