diff options
| author | Szymon Kłos <szymon.klos@collabora.com> | 2022-01-24 14:16:31 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2022-02-14 12:09:31 +0100 |
| commit | adab3534f69d1a1fb2ace6d69db93ed8d6bcecb0 (patch) | |
| tree | 12881686286a2164c9b6e3b83633457698ce0d6c /vcl | |
| parent | 03b7a7edf9838ce2a8d2187d3511ef950afc0fd1 (diff) | |
lok: use focused tab page help
When we open dialog with tab pages, help should open
website for corresponding tab.
Use focused window - but not global which can be modified
by other view in lok case.
followup for:
commit 70f2fc7a10f41204e353bd3487377983a1018b53
lok: don't use focus window to request help
Change-Id: Ib7544a91696ce2f2c8ab01e62a47d279d2c5c655
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128863
Reviewed-by: Mert Tumer <mert.tumer@collabora.com>
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129167
Tested-by: Jenkins
Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/app/salvtables.cxx | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx index 4a27f26c73ec..9eb7ff7fe665 100644 --- a/vcl/source/app/salvtables.cxx +++ b/vcl/source/app/salvtables.cxx @@ -7145,8 +7145,10 @@ void SalInstanceWindow::help() { //show help for widget with keyboard focus vcl::Window* pWidget = ImplGetSVData()->mpWinData->mpFocusWin; - if (!pWidget || comphelper::LibreOfficeKit::isActive()) + if (!pWidget) pWidget = m_xWindow; + if (comphelper::LibreOfficeKit::isActive() && m_xWindow->GetFocusedWindow()) + pWidget = m_xWindow->GetFocusedWindow().get(); OString sHelpId = pWidget->GetHelpId(); while (sHelpId.isEmpty()) { |