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

[Caolán McNamara]

 sfx2/source/appl/sfxhelp.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit d4edce3b72d585915516a0a27c4815a0d4996cfb
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
    
    Change-Id: I6001f8921f3b90283525355b0094c4377c42c663

diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx
index 6d5244b..e798da9 100644
--- a/sfx2/source/appl/sfxhelp.cxx
+++ b/sfx2/source/appl/sfxhelp.cxx
@@ -589,7 +589,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)