diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2012-08-23 12:10:56 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2012-09-28 08:48:38 +0100 |
| commit | bc1a1a025e7f31145a5f50d2f8c81248c8dad309 (patch) | |
| tree | 1b6cd7d6d26a487b865b044bcc05d632161a19a5 /vcl | |
| parent | 13dde575a9e03f1d1fbfbb40514c142a6e2f2909 (diff) | |
recognize and silently handle placeholders
Change-Id: I6e825a1feff04bac3696c3e46a16d187cf048638
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/window/builder.cxx | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx index 7b42362d2687..5f01dc4380e8 100644 --- a/vcl/source/window/builder.cxx +++ b/vcl/source/window/builder.cxx @@ -339,6 +339,8 @@ bool VclBuilder::extractModel(const rtl::OString &id, stringmap &rMap) Window *VclBuilder::makeObject(Window *pParent, const rtl::OString &name, const rtl::OString &id, stringmap &rMap) { + bool bIsPlaceHolder = name.isEmpty(); + if (pParent && pParent->GetType() == WINDOW_TABCONTROL) { //We have to add a page @@ -352,8 +354,6 @@ Window *VclBuilder::makeObject(Window *pParent, const rtl::OString &name, const pTabControl->InsertPage(nNewPageId, rtl::OUString()); pTabControl->SetCurPageId(nNewPageId); - bool bIsPlaceHolder = name.isEmpty(); - if (!bIsPlaceHolder) { TabPage* pPage = new TabPage(pTabControl); @@ -369,6 +369,9 @@ Window *VclBuilder::makeObject(Window *pParent, const rtl::OString &name, const } } + if (bIsPlaceHolder) + return NULL; + Window *pWindow = NULL; if (name.equalsL(RTL_CONSTASCII_STRINGPARAM("GtkDialog"))) pWindow = new Dialog(pParent, WB_SIZEMOVE|WB_3DLOOK|WB_CLOSEABLE); |