summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2013-06-08 14:43:27 +0100
committerCaolán McNamara <caolanm@redhat.com>2013-06-08 14:43:27 +0100
commit6ea2cc95f5996213c370dff61a36fb667dd6771e (patch)
tree518ba454ba6044431355e90b4001a91337b40aca
parentfb4601a65fe35eccce33508acb2b138cdaa98877 (diff)
Resolves: fdo#65536 check if builder is NULL
Change-Id: Ieabd56d6da06b480ade662a55aebd35d0769f2ea
-rw-r--r--cui/source/tabpages/paragrph.cxx2
-rw-r--r--include/vcl/builder.hxx1
2 files changed, 2 insertions, 1 deletions
diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx
index 29949aec17d7..e17f61cb175e 100644
--- a/cui/source/tabpages/paragrph.cxx
+++ b/cui/source/tabpages/paragrph.cxx
@@ -646,7 +646,7 @@ namespace
pChild = pChild->GetWindow(WINDOW_NEXT))
{
VclBuilderContainer *pPeer = dynamic_cast<VclBuilderContainer*>(pChild);
- if (pPeer != pPage)
+ if (pPeer != pPage && pPeer->hasBuilder())
{
Window *pOtherGrid = pPeer->get<Window>("maingrid");
Window *pOurGrid = pPage->get<Window>("maingrid");
diff --git a/include/vcl/builder.hxx b/include/vcl/builder.hxx
index d699d504278d..13aba5836799 100644
--- a/include/vcl/builder.hxx
+++ b/include/vcl/builder.hxx
@@ -381,6 +381,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);