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

[Caolán McNamara (via logerrit)]

 sw/qa/uitest/writer_tests3/hyperlinkdialog.py |    8 ++++----
 vcl/source/window/builder.cxx                 |    2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 8453bc55a4d6c58033559097bfd7c52379725a2f
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Tue Jan 12 11:28:50 2021 +0000
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Wed Jan 13 20:27:22 2021 +0100

    Related: tdf#133718 use mnenonics from vertical tabcontrol labels
    
    Change-Id: Ic27bcaa1c6ca370abc6b1e44eac91c5e6eb41ca7
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109167
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sw/qa/uitest/writer_tests3/hyperlinkdialog.py b/sw/qa/uitest/writer_tests3/hyperlinkdialog.py
index e2b40f9e9005..235f1468ab0f 100644
--- a/sw/qa/uitest/writer_tests3/hyperlinkdialog.py
+++ b/sw/qa/uitest/writer_tests3/hyperlinkdialog.py
@@ -29,19 +29,19 @@ class HyperlinkDialog(UITestCase):
         self.assertEqual(get_state_as_dict(xtab)["PageCount"], "4")
 
         xtab.executeAction("SELECT", mkPropertyValues({"POS": "0"}))
-        self.assertEqual(get_state_as_dict(xtab)["CurrPageTitel"], "_Internet")
+        self.assertEqual(get_state_as_dict(xtab)["CurrPageTitel"], "~Internet")
         self.assertEqual(get_state_as_dict(xtab)["CurrPagePos"], "0")
 
         xtab.executeAction("SELECT", mkPropertyValues({"POS": "1"}))
-        self.assertEqual(get_state_as_dict(xtab)["CurrPageTitel"], "_Mail")
+        self.assertEqual(get_state_as_dict(xtab)["CurrPageTitel"], "~Mail")
         self.assertEqual(get_state_as_dict(xtab)["CurrPagePos"], "1")
 
         xtab.executeAction("SELECT", mkPropertyValues({"POS": "2"}))
-        self.assertEqual(get_state_as_dict(xtab)["CurrPageTitel"], "_Document")
+        self.assertEqual(get_state_as_dict(xtab)["CurrPageTitel"], "~Document")
         self.assertEqual(get_state_as_dict(xtab)["CurrPagePos"], "2")
 
         xtab.executeAction("SELECT", mkPropertyValues({"POS": "3"}))
-        self.assertEqual(get_state_as_dict(xtab)["CurrPageTitel"], "_New Document")
+        self.assertEqual(get_state_as_dict(xtab)["CurrPageTitel"], "~New Document")
         self.assertEqual(get_state_as_dict(xtab)["CurrPagePos"], "3")
 
         xcancel = xDialog.getChild("cancel")
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index 9ea07cdb5ee3..3335296e8128 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -2793,7 +2793,7 @@ void VclBuilder::handleTabChild(vcl::Window *pParent, xmlreader::XmlReader &read
         }
         else
         {
-            OUString sLabel(aFind->second);
+            OUString sLabel(BuilderUtils::convertMnemonicMarkup(aFind->second));
             OUString sIconName(extractIconName(aProperties));
             OUString sTooltip(extractTooltipText(aProperties));
             pVerticalTabControl->InsertPage(sIDs.front(), sLabel, FixedImage::loadThemeImage(sIconName), sTooltip,