summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2019-06-23 16:09:24 +0100
committerAdolfo Jayme Barrientos <fitojb@ubuntu.com>2019-06-25 09:23:22 +0200
commit1c6bac6e003e9f280a29cc83974bdfb3d06b24a9 (patch)
treef7e8adb50dccff2d4e7dc880528ebd4be8170d88 /vcl
parent1914932e2fd0598508823464765f3b1ac31236a1 (diff)
Resolves: tdf#125168 label mnemonic appearing in database url
Change-Id: I39531ae2a656c16c7355d73b76cb918d3535f7b0 Reviewed-on: https://gerrit.libreoffice.org/74604 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
Diffstat (limited to 'vcl')
-rw-r--r--vcl/source/app/salvtables.cxx5
-rw-r--r--vcl/unx/gtk3/gtk3gtkinst.cxx5
2 files changed, 10 insertions, 0 deletions
diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx
index afb51ee80791..88e1b1da61e1 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.cxx
@@ -556,6 +556,11 @@ public:
virtual void help_hierarchy_foreach(const std::function<bool(const OString&)>& func) override;
+ virtual OUString strip_mnemonic(const OUString &rLabel) const override
+ {
+ return rLabel.replaceFirst("~", "");
+ }
+
SystemWindow* getSystemWindow()
{
return m_xWidget->GetSystemWindow();
diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx
index 5123db7c9f2e..9831762f4a43 100644
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -1668,6 +1668,11 @@ public:
}
virtual void help_hierarchy_foreach(const std::function<bool(const OString&)>& func) override;
+
+ virtual OUString strip_mnemonic(const OUString &rLabel) const override
+ {
+ return rLabel.replaceFirst("_", "");
+ }
};
namespace