TabPage no longer needs to inherit from VclBuilderContainer

Change-Id: Iaab26ade1109daf732e58a2f3741cc43243e374c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102023
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>

2 files changed, 10 insertions, 2 deletions

diff --git a/extensions/source/bibliography/general.cxx b/extensions/source/bibliography/general.cxx
index ec09f8c2bac4..ea4f8d059e39 100644
--- a/extensions/source/bibliography/general.cxx
+++ b/extensions/source/bibliography/general.cxx
@@ -166,11 +166,16 @@ void BibPosListener::disposing(const lang::EventObject& /*Source*/)
 }
 
 BibGeneralPage::BibGeneralPage(vcl::Window* pParent, BibDataManager* pMan):
-    TabPage(pParent, "GeneralPage", "modules/sbibliography/ui/generalpage.ui"),
+    TabPage(pParent),
     BibShortCutHandler( this ),
     mxBibGeneralPageFocusListener(new BibGeneralPageFocusListener(this)),
     pDatMan(pMan)
 {
+    m_pUIBuilder.reset(new VclBuilder(this, AllSettings::GetUIRootDir(), "modules/sbibliography/ui/generalpage.ui", "GeneralPage"));
+    set_hexpand(true);
+    set_vexpand(true);
+    set_expand(true);
+
     get(pIdentifierFT, "shortname");
     get(pAuthTypeFT, "authtype");
     get(pGrid, "grid");
@@ -388,6 +393,7 @@ void BibGeneralPage::dispose()
     pCustom5FT.clear();
     for (auto & a: aFixedTexts) a.clear();
     mxBibGeneralPageFocusListener.clear();
+    disposeBuilder();
     TabPage::dispose();
 }
 
diff --git a/extensions/source/bibliography/general.hxx b/extensions/source/bibliography/general.hxx
index 8c95e6dad42f..8a5ac2127c16 100644
--- a/extensions/source/bibliography/general.hxx
+++ b/extensions/source/bibliography/general.hxx
@@ -51,7 +51,9 @@ public:
 
 };
 
-class BibGeneralPage : public TabPage, public BibShortCutHandler
+class BibGeneralPage : public TabPage
+                     , public VclBuilderContainer
+                     , public BibShortCutHandler
 {
     VclPtr<VclGrid>            pGrid;
     VclPtr<VclScrolledWindow>  pScrolledWindow;