include/sfx2/tabdlg.hxx | 3 ++-
sfx2/source/dialog/tabdlg.cxx | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
New commits:
commit cf8d6f6f3651d4dfa2244f981061fc6ec2e2f353
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Wed Oct 3 16:09:50 2018 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Wed Oct 3 21:04:07 2018 +0200
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 <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/include/sfx2/tabdlg.hxx b/include/sfx2/tabdlg.hxx
index 5342dd089173..802ef9bdb33b 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>
@@ -232,7 +233,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 889fab6b5a13..9251b7f77825 100644
--- a/sfx2/source/dialog/tabdlg.cxx
+++ b/sfx2/source/dialog/tabdlg.cxx
@@ -1463,7 +1463,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"))
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
