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

[Caolán McNamara (via logerrit)]

 sfx2/source/appl/sfxhelp.cxx |   16 ----------------
 1 file changed, 16 deletions(-)

New commits:
commit b19af2a63fc58d4f6d965e9229aed19e8fb86607
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Sat Oct 5 20:16:56 2019 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Tue Oct 29 12:17:33 2019 +0100

    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 at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

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;
                         }
                     }
                 }