diff options
author | Caolán McNamara <caolanm@redhat.com> | 2013-09-18 10:51:53 +0100 |
---|---|---|
committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2013-09-25 08:10:40 +0000 |
commit | 09351f513e750fc1d7a72a1ce0680a927140bbde (patch) | |
tree | 96fd0b8d26c23074a7e1adef30db9fcfa3b00b23 | |
parent | 2aaed92d30f630343676d531a98082598202e85a (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/5993
Reviewed-by: Eike Rathke <erack@redhat.com>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
Tested-by: Norbert Thiebaud <nthiebaud@gmail.com>
-rw-r--r-- | include/vcl/builder.hxx | 1 | ||||
-rw-r--r-- | sfx2/source/appl/sfxhelp.cxx | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/include/vcl/builder.hxx b/include/vcl/builder.hxx index 508377d46c98..611c51914cab 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 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) |