diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-10-06 20:48:02 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2018-10-07 19:43:51 +0200 |
| commit | 08d4100a81396c2c35f074efc41ee89c795e3ab6 (patch) | |
| tree | 96e642faccde33ef5fe9dc9866d1d665de38b53d /reportdesign/source/ui/inc | |
| parent | 4b713fb40833ace1543d3645d429fe9a202dbfc8 (diff) | |
weld OPageNumberDialog
Change-Id: I074dade23767e48bc1e0e311629ed4c0b55c1a00
Reviewed-on: https://gerrit.libreoffice.org/61480
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'reportdesign/source/ui/inc')
| -rw-r--r-- | reportdesign/source/ui/inc/PageNumber.hxx | 33 |
1 files changed, 12 insertions, 21 deletions
diff --git a/reportdesign/source/ui/inc/PageNumber.hxx b/reportdesign/source/ui/inc/PageNumber.hxx index 1bfe03dfcaad..8a5150698e2d 100644 --- a/reportdesign/source/ui/inc/PageNumber.hxx +++ b/reportdesign/source/ui/inc/PageNumber.hxx @@ -19,14 +19,9 @@ #ifndef INCLUDED_REPORTDESIGN_SOURCE_UI_INC_PAGENUMBER_HXX #define INCLUDED_REPORTDESIGN_SOURCE_UI_INC_PAGENUMBER_HXX -#include <vcl/dialog.hxx> -#include <vcl/fixed.hxx> -#include <vcl/lstbox.hxx> -#include <vcl/field.hxx> -#include <vcl/button.hxx> +#include <vcl/weld.hxx> #include <com/sun/star/report/XReportDefinition.hpp> - namespace rptui { class OReportController; @@ -35,30 +30,26 @@ class OReportController; |* Groups and Sorting dialog |* \************************************************************************/ -class OPageNumberDialog : public ModalDialog +class OPageNumberDialog : public weld::GenericDialogController { - VclPtr<RadioButton> m_pPageN; - VclPtr<RadioButton> m_pPageNofM; - - VclPtr<RadioButton> m_pTopPage; - VclPtr<RadioButton> m_pBottomPage; - VclPtr<ListBox> m_pAlignmentLst; - - VclPtr<CheckBox> m_pShowNumberOnFirstPage; - ::rptui::OReportController* m_pController; css::uno::Reference< css::report::XReportDefinition> m_xHoldAlive; + std::unique_ptr<weld::RadioButton> m_xPageN; + std::unique_ptr<weld::RadioButton> m_xPageNofM; + std::unique_ptr<weld::RadioButton> m_xTopPage; + std::unique_ptr<weld::RadioButton> m_xBottomPage; + std::unique_ptr<weld::ComboBox> m_xAlignmentLst; + std::unique_ptr<weld::CheckButton> m_xShowNumberOnFirstPage; OPageNumberDialog(const OPageNumberDialog&) = delete; void operator =(const OPageNumberDialog&) = delete; public: - OPageNumberDialog( vcl::Window* pParent - ,const css::uno::Reference< css::report::XReportDefinition>& _xHoldAlive - ,::rptui::OReportController* _pController); + OPageNumberDialog(weld::Window* pParent, + const css::uno::Reference< css::report::XReportDefinition>& _xHoldAlive, + ::rptui::OReportController* _pController); virtual ~OPageNumberDialog() override; - virtual void dispose() override; - virtual short Execute() override; + void execute(); }; } // namespace rptui |