[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - include/sfx2 sfx2/source

[Libreoffice Gerrit user]

 include/sfx2/tabdlg.hxx       |    3 ++-
 sfx2/source/dialog/tabdlg.cxx |    2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 4947deeaee3c94b022930fbf69ac839121133c09
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Wed Oct 3 16:09:50 2018 +0100
Commit:     Miklos Vajna <vmiklos at collabora.co.uk>
CommitDate: Wed Oct 31 10:24:36 2018 +0100

    Resolves: tdf#117784 inherit SfxTabDialogController from SfxDialogController
    
    Change-Id: I6b7ce81093ec402954aa5a2f4b266827fe85a88f
    Reviewed-on: https://gerrit.libreoffice.org/61314
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>
    Reviewed-on: https://gerrit.libreoffice.org/61327
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>

diff --git a/include/sfx2/tabdlg.hxx b/include/sfx2/tabdlg.hxx
index adc120068153..2a73fa84d09e 100644
--- a/include/sfx2/tabdlg.hxx
+++ b/include/sfx2/tabdlg.hxx
@@ -22,6 +22,7 @@
 #include <memory>
 #include <sal/config.h>
 #include <sfx2/dllapi.h>
+#include <sfx2/basedlgs.hxx>
 #include <sal/types.h>
 #include <vcl/button.hxx>
 #include <vcl/layout.hxx>
@@ -224,7 +225,7 @@ public:
     virtual bool selectPageByUIXMLDescription(const OString& rUIXMLDescription) override;
 };
 
-class SFX2_DLLPUBLIC SfxTabDialogController : public weld::GenericDialogController
+class SFX2_DLLPUBLIC SfxTabDialogController : public SfxDialogController
 {
 protected:
     std::unique_ptr<weld::Notebook> m_xTabCtrl;
diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx
index aa1db8c9c3a5..c73fb613140e 100644
--- a/sfx2/source/dialog/tabdlg.cxx
+++ b/sfx2/source/dialog/tabdlg.cxx
@@ -1457,7 +1457,7 @@ SfxTabDialogController::SfxTabDialogController
                                   // can be NULL, when Pages are onDemand
     bool bEditFmt                 // when yes -> additional Button for standard
 )
-    : GenericDialogController(pParent, rUIXMLDescription, rID)
+    : SfxDialogController(pParent, rUIXMLDescription, rID)
     , m_xTabCtrl(m_xBuilder->weld_notebook("tabcontrol"))
     , m_xOKBtn(m_xBuilder->weld_button("ok"))
     , m_xApplyBtn(m_xBuilder->weld_button("apply"))