diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2013-09-18 10:51:53 +0100 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2013-09-18 10:58:51 +0000 |
| commit | 52bd2f21fe6b4388948643514bca05a7b4f87849 (patch) | |
| tree | e8267610a6fe63f43045dbe3f03b6dfe5c014411 /sfx2 | |
| parent | 0f002a14ecdc445deb2bc8d4cc6fbe4b724ac7f6 (diff) | |
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@redhat.com>
Tested-by: Eike Rathke <erack@redhat.com>
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/appl/sfxhelp.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx index cd0676159005..b30f1a15b3a7 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) |