Resolves: fdo#58170 use selected tab page helpid as final fallback

Change-Id: I73a064a40476f685dbf19097115bd48c5cc0f578

1 files changed, 11 insertions, 0 deletions

diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx
index 14dcccb8704d..289903772c78 100644
--- a/cui/source/options/treeopt.cxx
+++ b/cui/source/options/treeopt.cxx
@@ -1189,6 +1189,17 @@ void OfaTreeOptionsDialog::SelectHdl_Impl()
         // then set the focus to the new page or if we are on a group set the focus to the options treebox
         pNewPage ? pNewPage->GrabFocus() : pBox->GrabFocus();
 
+    //fdo#58170 use current page's layout child HelpId, unless there isn't a
+    //current page
+    OUString sHelpId(HID_OFADLG_TREELISTBOX);
+    if (::isLayoutEnabled(pNewPage))
+    {
+        Window *pFirstChild = pNewPage->GetWindow(WINDOW_FIRSTCHILD);
+        assert(pFirstChild);
+        sHelpId = pFirstChild->GetHelpId();
+    }
+    pBox->SetHelpId(sHelpId);
+
     return;
 }