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

[Caolán McNamara (via logerrit)]

 framework/source/uielement/edittoolbarcontroller.cxx |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit 2ded9c20f56aa23ac50c894bab6e001fc3cc0d5d
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Fri Aug 21 14:26:46 2020 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Fri Aug 21 19:32:53 2020 +0200

    Resolves: tdf#135965 blank helpids for EditControl children
    
    so the helpid of the EditControl itself is chosen and LibreLogo's
    help can be shown with F1
    
    Change-Id: I02cf0921dc96533f00149f8fdb4d41b62644ed32
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101144
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/framework/source/uielement/edittoolbarcontroller.cxx b/framework/source/uielement/edittoolbarcontroller.cxx
index 152b0336347c..3bbb3f9755cc 100644
--- a/framework/source/uielement/edittoolbarcontroller.cxx
+++ b/framework/source/uielement/edittoolbarcontroller.cxx
@@ -66,6 +66,10 @@ EditControl::EditControl(vcl::Window* pParent, EditToolbarController* pEditToolb
     , m_xWidget(m_xBuilder->weld_entry("entry"))
     , m_pEditToolbarController(pEditToolbarController)
 {
+    OString sEmpty;
+    m_xWidget->set_help_id(sEmpty);
+    m_xContainer->set_help_id(sEmpty);
+
     InitControlBase(m_xWidget.get());
 
     m_xWidget->connect_focus_in(LINK(this, EditControl, FocusInHdl));