diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2019-10-05 20:16:56 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2019-10-29 12:17:33 +0100 |
| commit | b19af2a63fc58d4f6d965e9229aed19e8fb86607 (patch) | |
| tree | eadc4d78c3c23dac4b955ed27cc63f42f284167f /sfx2/source/appl/sfxhelp.cxx | |
| parent | a47f3584b274f66d43a3f372a5cae4b736133d9a (diff) | |
this help case doesn't arise anymore
Change-Id: I844f3b310e74652e3b310053a1254e06045c4506
Reviewed-on: https://gerrit.libreoffice.org/80334
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sfx2/source/appl/sfxhelp.cxx')
| -rw-r--r-- | sfx2/source/appl/sfxhelp.cxx | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx index 2c1f5e823cbd..c4c1735f6418 100644 --- a/sfx2/source/appl/sfxhelp.cxx +++ b/sfx2/source/appl/sfxhelp.cxx @@ -69,7 +69,6 @@ #include <unotools/securityoptions.hxx> #include <rtl/uri.hxx> #include <vcl/commandinfoprovider.hxx> -#include <vcl/dialog.hxx> #include <vcl/keycod.hxx> #include <vcl/settings.hxx> #include <vcl/waitobj.hxx> @@ -1057,7 +1056,6 @@ bool SfxHelp::Start_Impl(const OUString& rURL, const vcl::Window* pWindow, const { // no help found -> try with parent help id. vcl::Window* pParent = pWindow->GetParent(); - bool bTriedTabPage = false; while ( pParent ) { OString aHelpId = pParent->GetHelpId(); @@ -1074,20 +1072,6 @@ bool SfxHelp::Start_Impl(const OUString& rURL, const vcl::Window* pWindow, const { // create help url of start page ( helpid == 0 -> start page) aHelpURL = CreateHelpURL( OUString(), aHelpModuleName ); - - } - else if (pParent->IsDialog() && !bTriedTabPage) - { - //During help fallback, before we ask a dialog for its help - //see if it has a TabControl and ask the active tab of - //that for help - bTriedTabPage = true; - Dialog *pDialog = static_cast<Dialog*>(pParent); - TabControl *pCtrl = pDialog->hasBuilder() ? pDialog->get<TabControl>("tabcontrol") : nullptr; - TabPage* pTabPage = pCtrl ? pCtrl->GetTabPage(pCtrl->GetCurPageId()) : nullptr; - vcl::Window *pTabChild = pTabPage ? pTabPage->GetWindow(GetWindowType::FirstChild) : nullptr; - if (pTabChild) - pParent = pTabChild; } } } |