include/vcl/builder.hxx | 1 +
sfx2/source/appl/sfxhelp.cxx | 3 ++-
2 files changed, 3 insertions(+), 1 deletion(-)
New commits:
commit 09351f513e750fc1d7a72a1ce0680a927140bbde
Author: Caolán McNamara <caol...@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/5993
Reviewed-by: Eike Rathke <er...@redhat.com>
Reviewed-by: Miklos Vajna <vmik...@collabora.co.uk>
Reviewed-by: Norbert Thiebaud <nthieb...@gmail.com>
Tested-by: Norbert Thiebaud <nthieb...@gmail.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)
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
