[Libreoffice-commits] core.git: vcl/source

[Caolán McNamara (via logerrit)]

 vcl/source/window/builder.cxx |   11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

New commits:
commit 3148503b2f32fa7cbdbddf61523af576e36e4ef5
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Fri Feb 12 11:43:31 2021 +0000
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Fri Feb 12 17:20:27 2021 +0100

    don't split menu ids at ':'
    
    Change-Id: I2453b1867ffe5b9a2fe6659f2893911ba2fa5543
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110820
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index bca2a7ae9cba..2717007b0318 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -3289,11 +3289,14 @@ void VclBuilder::handleMenuObject(Menu *pParent, xmlreader::XmlReader &reader)
         {
             name = reader.getAttributeValue(false);
             sID = OString(name.begin, name.length);
-            sal_Int32 nDelim = sID.indexOf(':');
-            if (nDelim != -1)
+            if (m_bLegacy)
             {
-                sCustomProperty = OUString::fromUtf8(sID.subView(nDelim+1));
-                sID = sID.copy(0, nDelim);
+                sal_Int32 nDelim = sID.indexOf(':');
+                if (nDelim != -1)
+                {
+                    sCustomProperty = OUString::fromUtf8(sID.subView(nDelim+1));
+                    sID = sID.copy(0, nDelim);
+                }
             }
         }
     }