cui/source/tabpages/paragrph.cxx | 2 +- include/vcl/builder.hxx | 1 + 2 files changed, 2 insertions(+), 1 deletion(-)
New commits: commit 6ea2cc95f5996213c370dff61a36fb667dd6771e Author: Caolán McNamara <[email protected]> Date: Sat Jun 8 14:43:27 2013 +0100 Resolves: fdo#65536 check if builder is NULL Change-Id: Ieabd56d6da06b480ade662a55aebd35d0769f2ea diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx index 29949ae..e17f61c 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 d699d50..13aba58 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);
_______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
