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

[Caolán McNamara (via logerrit)]

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

New commits:
commit 7e25c7c6fb0574ca6ebd4abc403104fe89f28074
Author:     Caolán McNamara <caol...@redhat.com>
AuthorDate: Mon Nov 25 12:47:28 2019 +0000
Commit:     Caolán McNamara <caol...@redhat.com>
CommitDate: Wed Nov 27 13:32:51 2019 +0100

    tdf#126043 don't bother converting to OUString
    
    Change-Id: I179354659e4ee118138b994c7848c1dda39317bb
    Reviewed-on: https://gerrit.libreoffice.org/83678
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caol...@redhat.com>
    Tested-by: Caolán McNamara <caol...@redhat.com>
    (cherry picked from commit f54a8c6aafac53902b144f5125665644e9a50497)
    Reviewed-on: https://gerrit.libreoffice.org/83865

diff --git a/cui/source/customize/SvxNotebookbarConfigPage.cxx 
b/cui/source/customize/SvxNotebookbarConfigPage.cxx
index db450f5e78c4..70c9c5e10510 100644
--- a/cui/source/customize/SvxNotebookbarConfigPage.cxx
+++ b/cui/source/customize/SvxNotebookbarConfigPage.cxx
@@ -318,10 +318,10 @@ void 
SvxNotebookbarConfigPage::searchNodeandAttribute(std::vector<NotebookbarEnt
         if (pNodePtr->type == XML_ELEMENT_NODE)
         {
             const char* cNodeName = reinterpret_cast<const 
char*>(pNodePtr->name);
-            OUString sNodeName = charToString(cNodeName);
-            OUString sSecondVal;
-            if (sNodeName == "object")
+            if (strcmp(cNodeName, "object") == 0)
             {
+                OUString sSecondVal;
+
                 xmlChar* UriValue = xmlGetProp(pNodePtr, 
reinterpret_cast<const xmlChar*>("id"));
                 const char* cUIItemID = reinterpret_cast<const 
char*>(UriValue);
                 OUString sUIItemId = charToString(cUIItemID);
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits