vcl/source/app/salvtables.cxx | 8 --------
vcl/unx/gtk3/gtk3gtkinst.cxx | 8 --------
2 files changed, 16 deletions(-)
New commits:
commit f52d015b04779b8aaa3e353cbd9d0d5da3e73a16
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Fri Aug 16 08:21:01 2019 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Fri Aug 16 22:32:19 2019 +0200
get_current_page_help_id is now tried first already
Change-Id: Id7f5d2c4bcfaba68afc83d471151e1daabf1a830
Reviewed-on: https://gerrit.libreoffice.org/77558
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx
index 90481eaf0c7e..a5a8dc8c1592 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.cxx
@@ -5590,14 +5590,6 @@ void SalInstanceWidget::help_hierarchy_foreach(const
std::function<bool(const OS
vcl::Window* pParent = m_xWidget;
while ((pParent = pParent->GetParent()))
{
- if (m_pBuilder && pParent->IsDialog())
- {
- // tdf#122355 before trying dialog help, check to see if there is
a notebook
- // called tabcontrol, and try the help for the current page of
that first
- OString sPageHelpId(m_pBuilder->get_current_page_help_id());
- if (!sPageHelpId.isEmpty() && func(sPageHelpId))
- return;
- }
if (func(pParent->GetHelpId()))
return;
}
diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx
index aa831c1bfbb9..97069acbb568 100644
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -10919,14 +10919,6 @@ void GtkInstanceWidget::help_hierarchy_foreach(const
std::function<bool(const OS
GtkWidget* pParent = m_pWidget;
while ((pParent = gtk_widget_get_parent(pParent)))
{
- // tdf#122355 before trying dialog help, check to see if there is a
notebook
- // called tabcontrol, and try the help for the current page of that
first
- if (m_pBuilder && GTK_IS_DIALOG(pParent))
- {
- OString sPageHelpId(m_pBuilder->get_current_page_help_id());
- if (!sPageHelpId.isEmpty() && func(sPageHelpId))
- return;
- }
if (func(::get_help_id(pParent)))
return;
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
