From 08d4100a81396c2c35f074efc41ee89c795e3ab6 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Sat, 6 Oct 2018 20:48:02 +0100 Subject: weld OPageNumberDialog MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I074dade23767e48bc1e0e311629ed4c0b55c1a00 Reviewed-on: https://gerrit.libreoffice.org/61480 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara --- reportdesign/source/ui/dlg/PageNumber.cxx | 58 ++++++++-------------- reportdesign/source/ui/inc/PageNumber.hxx | 33 +++++------- reportdesign/source/ui/report/ReportController.cxx | 4 +- .../uiconfig/dbreport/ui/pagenumberdialog.ui | 13 +++-- 4 files changed, 42 insertions(+), 66 deletions(-) (limited to 'reportdesign') diff --git a/reportdesign/source/ui/dlg/PageNumber.cxx b/reportdesign/source/ui/dlg/PageNumber.cxx index 27fb930b1205..4821b7ac9d52 100644 --- a/reportdesign/source/ui/dlg/PageNumber.cxx +++ b/reportdesign/source/ui/dlg/PageNumber.cxx @@ -36,46 +36,30 @@ using namespace ::comphelper; // class OPageNumberDialog -OPageNumberDialog::OPageNumberDialog( vcl::Window* _pParent - ,const uno::Reference< report::XReportDefinition >& _xHoldAlive - ,OReportController* _pController) - : ModalDialog( _pParent, "PageNumberDialog" , "modules/dbreport/ui/pagenumberdialog.ui" ) - ,m_pController(_pController) - ,m_xHoldAlive(_xHoldAlive) +OPageNumberDialog::OPageNumberDialog(weld::Window* pParent, + const uno::Reference< report::XReportDefinition >& _xHoldAlive, + OReportController* _pController) + : GenericDialogController(pParent, "modules/dbreport/ui/pagenumberdialog.ui", "PageNumberDialog") + , m_pController(_pController) + , m_xHoldAlive(_xHoldAlive) + , m_xPageN(m_xBuilder->weld_radio_button("pagen")) + , m_xPageNofM(m_xBuilder->weld_radio_button("pagenofm")) + , m_xTopPage(m_xBuilder->weld_radio_button("toppage")) + , m_xBottomPage(m_xBuilder->weld_radio_button("bottompage")) + , m_xAlignmentLst(m_xBuilder->weld_combo_box("alignment")) + , m_xShowNumberOnFirstPage(m_xBuilder->weld_check_button("shownumberonfirstpage")) { - get(m_pPageN,"pagen"); - get(m_pPageNofM,"pagenofm"); - get(m_pTopPage,"toppage"); - get(m_pBottomPage,"bottompage"); - get(m_pAlignmentLst,"alignment"); - get(m_pShowNumberOnFirstPage,"shownumberonfirstpage"); - - - m_pShowNumberOnFirstPage->Hide(); - + m_xShowNumberOnFirstPage->hide(); } - OPageNumberDialog::~OPageNumberDialog() { - disposeOnce(); -} - -void OPageNumberDialog::dispose() -{ - m_pPageN.clear(); - m_pPageNofM.clear(); - m_pTopPage.clear(); - m_pBottomPage.clear(); - m_pAlignmentLst.clear(); - m_pShowNumberOnFirstPage.clear(); - ModalDialog::dispose(); } -short OPageNumberDialog::Execute() +void OPageNumberDialog::execute() { - short nRet = ModalDialog::Execute(); - if ( nRet == RET_OK ) + short nRet = m_xDialog->run(); + if (nRet == RET_OK) { try { @@ -83,7 +67,7 @@ short OPageNumberDialog::Execute() sal_Int32 nPosX = 0; sal_Int32 nPos2X = 0; awt::Size aRptSize = getStyleProperty(m_xHoldAlive,PROPERTY_PAPERSIZE); - switch ( m_pAlignmentLst->GetSelectedEntryPos() ) + switch (m_xAlignmentLst->get_active()) { case 0: // left nPosX = getStyleProperty(m_xHoldAlive,PROPERTY_LEFTMARGIN); @@ -102,23 +86,21 @@ short OPageNumberDialog::Execute() default: break; } - if ( m_pAlignmentLst->GetSelectedEntryPos() > 2 ) + if (m_xAlignmentLst->get_active() > 2) nPosX = nPos2X; uno::Sequence aValues( comphelper::InitPropertySequence({ { PROPERTY_POSITION, uno::Any(awt::Point(nPosX,0)) }, - { PROPERTY_PAGEHEADERON, uno::Any(m_pTopPage->IsChecked()) }, - { PROPERTY_STATE, uno::Any(m_pPageNofM->IsChecked()) } + { PROPERTY_PAGEHEADERON, uno::Any(m_xTopPage->get_active()) }, + { PROPERTY_STATE, uno::Any(m_xPageNofM->get_active()) } })); m_pController->executeChecked(SID_INSERT_FLD_PGNUMBER,aValues); } catch(uno::Exception&) { - nRet = RET_NO; } } - return nRet; } } // rptui 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 -#include -#include -#include -#include +#include #include - namespace rptui { class OReportController; @@ -35,30 +30,26 @@ class OReportController; |* Groups and Sorting dialog |* \************************************************************************/ -class OPageNumberDialog : public ModalDialog +class OPageNumberDialog : public weld::GenericDialogController { - VclPtr m_pPageN; - VclPtr m_pPageNofM; - - VclPtr m_pTopPage; - VclPtr m_pBottomPage; - VclPtr m_pAlignmentLst; - - VclPtr m_pShowNumberOnFirstPage; - ::rptui::OReportController* m_pController; css::uno::Reference< css::report::XReportDefinition> m_xHoldAlive; + std::unique_ptr m_xPageN; + std::unique_ptr m_xPageNofM; + std::unique_ptr m_xTopPage; + std::unique_ptr m_xBottomPage; + std::unique_ptr m_xAlignmentLst; + std::unique_ptr 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 diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx index 92c417dd5c45..1319f3be33fc 100644 --- a/reportdesign/source/ui/report/ReportController.cxx +++ b/reportdesign/source/ui/report/ReportController.cxx @@ -1565,8 +1565,8 @@ void OReportController::Execute(sal_uInt16 _nId, const Sequence< PropertyValue > { if ( !aArgs.getLength() ) { - ScopedVclPtrInstance< OPageNumberDialog > aDlg(getView(),m_xReportDefinition,this); - aDlg->Execute(); + OPageNumberDialog aDlg(getFrameWeld(), m_xReportDefinition, this); + aDlg.execute(); } else createPageNumber(aArgs); diff --git a/reportdesign/uiconfig/dbreport/ui/pagenumberdialog.ui b/reportdesign/uiconfig/dbreport/ui/pagenumberdialog.ui index a088d92519ab..f2a3c1c2f1c9 100644 --- a/reportdesign/uiconfig/dbreport/ui/pagenumberdialog.ui +++ b/reportdesign/uiconfig/dbreport/ui/pagenumberdialog.ui @@ -1,12 +1,18 @@ - + False 6 Page Numbers + True + 0 + 0 dialog + + + False @@ -104,7 +110,6 @@ 0 True True - pagenofm 0 @@ -120,7 +125,6 @@ True True 0 - True True pagen @@ -183,7 +187,6 @@ 0 True True - bottompage 0 @@ -273,10 +276,10 @@ True False - 0 _Alignment: True alignment + 0 0 -- cgit