[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - include/vcl sfx2/source

[Caolán McNamara]

 include/vcl/builder.hxx      |    1 +
 sfx2/source/appl/sfxhelp.cxx |    3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 52bd2f21fe6b4388948643514bca05a7b4f87849
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Sep 18 10:51:53 2013 +0100

    Resolves: fdo#69440 only ask for tabcontrol in builder dialogs
    
    (cherry picked from commit d4edce3b72d585915516a0a27c4815a0d4996cfb)
    
    Change-Id: I6001f8921f3b90283525355b0094c4377c42c663
    Reviewed-on: https://gerrit.libreoffice.org/5992
    Reviewed-by: Eike Rathke <erack at redhat.com>
    Tested-by: Eike Rathke <erack at redhat.com>

diff --git a/include/vcl/builder.hxx b/include/vcl/builder.hxx
index 508377d..611c519 100644
--- a/include/vcl/builder.hxx
+++ b/include/vcl/builder.hxx
@@ -384,6 +384,7 @@ public:
     VclBuilderContainer();
     virtual ~VclBuilderContainer();
     static OUString getUIRootDir();
+    bool hasBuilder() const { return m_pUIBuilder != NULL; }
     template <typename T> T* get(T*& ret, OString sID)
     {
         return m_pUIBuilder->get<T>(ret, sID);
diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx
index cd06761..b30f1a1 100644
--- a/sfx2/source/appl/sfxhelp.cxx
+++ b/sfx2/source/appl/sfxhelp.cxx
@@ -611,7 +611,8 @@ sal_Bool SfxHelp::Start_Impl(const OUString& rURL, const Window* pWindow, const
                             //see if it has a TabControl and ask the active tab of
                             //that for help
                             bTriedTabPage = true;
-                            TabControl *pCtrl = ((Dialog*)pParent)->get<TabControl>("tabcontrol");
+                            Dialog *pDialog = ((Dialog*)pParent);
+                            TabControl *pCtrl = pDialog->hasBuilder() ? pDialog->get<TabControl>("tabcontrol") : NULL;
                             TabPage* pTabPage = pCtrl ? pCtrl->GetTabPage(pCtrl->GetCurPageId()) : NULL;
                             Window *pTabChild = pTabPage ? pTabPage->GetWindow(WINDOW_FIRSTCHILD) : NULL;
                             if (pTabChild)