diff options
author | Caolán McNamara <caolanm@redhat.com> | 2017-10-04 12:07:20 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2017-10-17 09:55:31 +0200 |
commit | 9b8828174dca6971d2490844b4c6cab2b9d57b8d (patch) | |
tree | 330a27fa71ad84986ff4c6d88b961efd2b4fa777 /vcl/source/window/builder.cxx | |
parent | 493a7e9932b09ddafd31f443ef2dc03d85f4b12b (diff) |
turn implicit container explicit in buildable notebooks
as in interim measure for SfxTabDialogs we throw
away the TabPage if its not suitable for reuse
Change-Id: Ic5776ca3d2a8cb6bf41f33df01b211f81c62a842
Reviewed-on: https://gerrit.libreoffice.org/43134
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'vcl/source/window/builder.cxx')
-rw-r--r-- | vcl/source/window/builder.cxx | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx index 5d955f7e3c4a..58e229f51624 100644 --- a/vcl/source/window/builder.cxx +++ b/vcl/source/window/builder.cxx @@ -1146,7 +1146,7 @@ VclPtr<vcl::Window> VclBuilder::makeObject(vcl::Window *pParent, const OString & sal_uInt16 nNewPageId = nNewPageCount; pTabControl->InsertPage(nNewPageId, OUString()); pTabControl->SetCurPageId(nNewPageId); - + SAL_WARN_IF(bIsPlaceHolder, "vcl.layout", "we should have no placeholders for tabpages"); if (!bIsPlaceHolder) { VclPtrInstance<TabPage> pPage(pTabControl); @@ -1159,13 +1159,7 @@ VclPtr<vcl::Window> VclBuilder::makeObject(vcl::Window *pParent, const OString & m_aChildren.emplace_back(sTabPageId, pPage, false); pPage->SetHelpId(m_sHelpRoot + sTabPageId); - //And give the page one container as a child to make it a layout enabled - //tab page - VclPtrInstance<VclBin> pContainer(pPage); - pContainer->Show(); - m_aChildren.emplace_back(OString(), pContainer, false); - pContainer->SetHelpId(m_sHelpRoot + sTabPageId + OString("-bin")); - pParent = pContainer; + pParent = pPage; pTabControl->SetTabPage(nNewPageId, pPage); } |