From 64354e6479e750e4a126abfae5d3f32a1110315e Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel@peralex.com>
Date: Tue, 5 Jul 2016 08:49:48 +0200
Subject: merge BibTabPage with BibGeneralPage

Change-Id: I16a80e7e98fdd2be08b5a8ce586b709a3720e694
Reviewed-on: https://gerrit.libreoffice.org/26929
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
---
 extensions/source/bibliography/bibcont.cxx            | 5 -----
 extensions/source/bibliography/bibshortcuthandler.hxx | 6 ------
 extensions/source/bibliography/general.cxx            | 5 +++--
 extensions/source/bibliography/general.hxx            | 2 +-
 4 files changed, 4 insertions(+), 14 deletions(-)

(limited to 'extensions')

diff --git a/extensions/source/bibliography/bibcont.cxx b/extensions/source/bibliography/bibcont.cxx
index 212b601d1a7b..9b40d2324b8e 100644
--- a/extensions/source/bibliography/bibcont.cxx
+++ b/extensions/source/bibliography/bibcont.cxx
@@ -57,11 +57,6 @@ BibSplitWindow::BibSplitWindow( vcl::Window* pParent, WinBits nStyle ) : SplitWi
 {
 }
 
-BibTabPage::BibTabPage( vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription ) :
-                        TabPage( pParent, rID, rUIXMLDescription ), BibShortCutHandler( this )
-{
-}
-
 using namespace osl;
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
diff --git a/extensions/source/bibliography/bibshortcuthandler.hxx b/extensions/source/bibliography/bibshortcuthandler.hxx
index a16750b366f6..daef09c081e9 100644
--- a/extensions/source/bibliography/bibshortcuthandler.hxx
+++ b/extensions/source/bibliography/bibshortcuthandler.hxx
@@ -65,12 +65,6 @@ public:
                             BibSplitWindow( vcl::Window* pParent,WinBits nStyle = WB_3DLOOK);
 };
 
-class BibTabPage : public TabPage, public BibShortCutHandler
-{
-public:
-    BibTabPage( vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription );
-};
-
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/bibliography/general.cxx b/extensions/source/bibliography/general.cxx
index f58a7cbea8e1..38188dfd525f 100644
--- a/extensions/source/bibliography/general.cxx
+++ b/extensions/source/bibliography/general.cxx
@@ -165,7 +165,8 @@ void BibPosListener::disposing(const lang::EventObject& /*Source*/) throw( uno::
 }
 
 BibGeneralPage::BibGeneralPage(vcl::Window* pParent, BibDataManager* pMan):
-    BibTabPage(pParent, "GeneralPage", "modules/sbibliography/ui/generalpage.ui"),
+    TabPage(pParent, "GeneralPage", "modules/sbibliography/ui/generalpage.ui"),
+    BibShortCutHandler( this ),
     sErrorPrefix(BIB_RESSTR(ST_ERROR_PREFIX)),
     mxBibGeneralPageFocusListener(new BibGeneralPageFocusListener(this)),
     pDatMan(pMan)
@@ -387,7 +388,7 @@ void BibGeneralPage::dispose()
     pCustom5FT.clear();
     for (auto & a: aFixedTexts) a.clear();
     mxBibGeneralPageFocusListener.clear();
-    BibTabPage::dispose();
+    TabPage::dispose();
 }
 
 void BibGeneralPage::RemoveListeners()
diff --git a/extensions/source/bibliography/general.hxx b/extensions/source/bibliography/general.hxx
index ed2047d7823e..65fd646b0490 100644
--- a/extensions/source/bibliography/general.hxx
+++ b/extensions/source/bibliography/general.hxx
@@ -57,7 +57,7 @@ public:
 
 };
 
-class BibGeneralPage: public BibTabPage
+class BibGeneralPage : public TabPage, public BibShortCutHandler
 {
     VclPtr<VclGrid>            pGrid;
     VclPtr<VclScrolledWindow>  pScrolledWindow;
-- 
cgit