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>

3 files changed, 20 insertions, 22 deletions

diff --git a/vcl/source/control/tabctrl.cxx b/vcl/source/control/tabctrl.cxx
index bcc767b62ce8..27686b17b9e8 100644
--- a/vcl/source/control/tabctrl.cxx
+++ b/vcl/source/control/tabctrl.cxx
@@ -1891,9 +1891,6 @@ void TabControl::SetTabPage( sal_uInt16 nPageId, TabPage* pTabPage )
     {
         if ( pTabPage )
         {
-            SAL_WARN_IF( pTabPage->IsVisible() && !isLayoutEnabled(pTabPage), "vcl",
-                "TabControl::SetTabPage() - Non-Layout Enabled Page is visible" );
-
             if ( IsDefaultSize() )
                 SetTabPageSizePixel( pTabPage->GetSizePixel() );
 
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);
         }
diff --git a/vcl/uiconfig/ui/printerpropertiesdialog.ui b/vcl/uiconfig/ui/printerpropertiesdialog.ui
index a75e06278cb1..c6fe076145a2 100644
--- a/vcl/uiconfig/ui/printerpropertiesdialog.ui
+++ b/vcl/uiconfig/ui/printerpropertiesdialog.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.3 -->
+<!-- Generated with glade 3.20.0 -->
 <interface domain="vcl">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="PrinterPropertiesDialog">
@@ -62,30 +62,37 @@
             <property name="hexpand">True</property>
             <property name="vexpand">True</property>
             <child>
-              <placeholder/>
+              <object class="GtkGrid">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <child>
+                  <placeholder/>
+                </child>
+              </object>
             </child>
             <child type="tab">
-              <object class="GtkLabel" id="paper">
+              <placeholder/>
+            </child>
+            <child>
+              <object class="GtkGrid">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes" context="printerpropertiesdialog|paper">Paper</property>
+                <child>
+                  <placeholder/>
+                </child>
               </object>
               <packing>
                 <property name="position">1</property>
-                <property name="tab_fill">False</property>
               </packing>
             </child>
-            <child>
-              <placeholder/>
-            </child>
             <child type="tab">
-              <object class="GtkLabel" id="device">
+              <object class="GtkLabel" id="paper">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes" context="printerpropertiesdialog|device">Device</property>
+                <property name="label" translatable="yes" context="printerpropertiesdialog|paper">Paper</property>
               </object>
               <packing>
-                <property name="position">2</property>
+                <property name="position">1</property>
                 <property name="tab_fill">False</property>
               </packing>
             </child>