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>

1 files changed, 20 insertions, 38 deletions

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<awt::Size>(m_xHoldAlive,PROPERTY_PAPERSIZE);
-            switch ( m_pAlignmentLst->GetSelectedEntryPos() )
+            switch (m_xAlignmentLst->get_active())
             {
                 case 0: // left
                     nPosX = getStyleProperty<sal_Int32>(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<beans::PropertyValue> 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