diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-10-03 16:09:50 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2018-10-03 21:04:07 +0200 |
| commit | cf8d6f6f3651d4dfa2244f981061fc6ec2e2f353 (patch) | |
| tree | ff7e94feea5b48b447a325cda6fc2e2416f52b43 | |
| parent | ca8558a28d1dc271cd2f10362e5e0f7d218149cb (diff) | |
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@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
| -rw-r--r-- | include/sfx2/tabdlg.hxx | 3 | ||||
| -rw-r--r-- | sfx2/source/dialog/tabdlg.cxx | 2 |
2 files changed, 3 insertions, 2 deletions
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")) |