Skip to content

C
core
Kaydet (Commit) 6ea2cc95 authored tarafından Caolán McNamara's avatar Caolán McNamara
Dosyalara gözat
Seçenekler

Resolves: fdo#65536 check if builder is NULL 

Change-Id: Ieabd56d6da06b480ade662a55aebd35d0769f2ea
üst fb4601a6
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 1 deletion
cui/source/tabpages/paragrph.cxx
Dosyayı görüntüle @ 6ea2cc95
...@@ -646,7 +646,7 @@ namespace ...@@ -646,7 +646,7 @@ namespace
pChild = pChild->GetWindow(WINDOW_NEXT)) pChild = pChild->GetWindow(WINDOW_NEXT))
{ {
VclBuilderContainer *pPeer = dynamic_cast<VclBuilderContainer*>(pChild); VclBuilderContainer *pPeer = dynamic_cast<VclBuilderContainer*>(pChild);
if (pPeer != pPage) if (pPeer != pPage && pPeer->hasBuilder())
{ {
Window *pOtherGrid = pPeer->get<Window>("maingrid"); Window *pOtherGrid = pPeer->get<Window>("maingrid");
Window *pOurGrid = pPage->get<Window>("maingrid"); Window *pOurGrid = pPage->get<Window>("maingrid");
......
include/vcl/builder.hxx
Dosyayı görüntüle @ 6ea2cc95
...@@ -381,6 +381,7 @@ public: ...@@ -381,6 +381,7 @@ public:
VclBuilderContainer(); VclBuilderContainer();
virtual ~VclBuilderContainer(); virtual ~VclBuilderContainer();
static OUString getUIRootDir(); static OUString getUIRootDir();
bool hasBuilder() const { return m_pUIBuilder != NULL; }
template <typename T> T* get(T*& ret, OString sID) template <typename T> T* get(T*& ret, OString sID)
{ {
return m_pUIBuilder->get<T>(ret, sID); return m_pUIBuilder->get<T>(ret, sID);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment