diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-10-23 10:38:03 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2018-10-24 11:55:01 +0200 |
| commit | f8e06f7b77a6286d2c41bbc76f06a768c76cd87a (patch) | |
| tree | 0aa5836b7dcdba477f0dfca47b24a5f9aa8bd952 /reportdesign | |
| parent | b85ff98383942360901b8242cf77366782400426 (diff) | |
weld AdvancedSettingsDialog
make run virtual and fold executes into it, so GenericUnoDialog
can call run on tabdialogs to do the right thing, and allows
Start_Impl to be private again
Change-Id: Ic457edfbdc7457f4c49d4e8ad679903f38ad9b42
Reviewed-on: https://gerrit.libreoffice.org/62227
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'reportdesign')
| -rw-r--r-- | reportdesign/source/ui/dlg/DateTime.cxx | 4 | ||||
| -rw-r--r-- | reportdesign/source/ui/inc/DateTime.hxx | 2 | ||||
| -rw-r--r-- | reportdesign/source/ui/misc/UITools.cxx | 2 | ||||
| -rw-r--r-- | reportdesign/source/ui/report/ReportController.cxx | 6 |
4 files changed, 7 insertions, 7 deletions
diff --git a/reportdesign/source/ui/dlg/DateTime.cxx b/reportdesign/source/ui/dlg/DateTime.cxx index 3b4af89387d8..5b04a35d7870 100644 --- a/reportdesign/source/ui/dlg/DateTime.cxx +++ b/reportdesign/source/ui/dlg/DateTime.cxx @@ -92,9 +92,9 @@ void ODateTimeDialog::InsertEntry(sal_Int16 _nNumberFormatId) } } -short ODateTimeDialog::execute() +short ODateTimeDialog::run() { - short nRet = m_xDialog->run(); + short nRet = GenericDialogController::run(); if (nRet == RET_OK && (m_xDate->get_active() || m_xTime->get_active())) { try diff --git a/reportdesign/source/ui/inc/DateTime.hxx b/reportdesign/source/ui/inc/DateTime.hxx index 9d31be427b30..2f7a1eaca881 100644 --- a/reportdesign/source/ui/inc/DateTime.hxx +++ b/reportdesign/source/ui/inc/DateTime.hxx @@ -73,7 +73,7 @@ public: ODateTimeDialog(weld::Window* pParent, const css::uno::Reference< css::report::XSection>& _xHoldAlive, ::rptui::OReportController* _pController); - short execute(); + virtual short run() override; }; } // namespace rptui diff --git a/reportdesign/source/ui/misc/UITools.cxx b/reportdesign/source/ui/misc/UITools.cxx index 4065942f34bd..73b905528185 100644 --- a/reportdesign/source/ui/misc/UITools.cxx +++ b/reportdesign/source/ui/misc/UITools.cxx @@ -714,7 +714,7 @@ bool openCharDialog( const uno::Reference<report::XReportControlFormat >& _rxRep uno::Reference< report::XShape > xShape( _rxReportControlFormat, uno::UNO_QUERY ); if ( xShape.is() ) aDlg.RemoveTabPage("background"); - bSuccess = aDlg.execute() == RET_OK; + bSuccess = aDlg.run() == RET_OK; if ( bSuccess ) { lcl_itemsToCharProperties( lcl_getReportControlFont( _rxReportControlFormat,WESTERN ), diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx index e1b9978633ac..0cd2014bda84 100644 --- a/reportdesign/source/ui/report/ReportController.cxx +++ b/reportdesign/source/ui/report/ReportController.cxx @@ -1555,7 +1555,7 @@ void OReportController::Execute(sal_uInt16 _nId, const Sequence< PropertyValue > if ( !aArgs.getLength() ) { ODateTimeDialog aDlg(getFrameWeld(), getDesignView()->getCurrentSection(), this); - aDlg.execute(); + aDlg.run(); } else createDateTime(aArgs); @@ -1567,7 +1567,7 @@ void OReportController::Execute(sal_uInt16 _nId, const Sequence< PropertyValue > if ( !aArgs.getLength() ) { OPageNumberDialog aDlg(getFrameWeld(), m_xReportDefinition, this); - aDlg.execute(); + aDlg.run(); } else createPageNumber(aArgs); @@ -2427,7 +2427,7 @@ void OReportController::openPageDialog(const uno::Reference<report::XSection>& _ getFrameWeld(), pDescriptor.get(),_xSection.is() ? OUString("BackgroundDialog") : OUString("PageDialog")); - if (aDlg.execute() == RET_OK) + if (aDlg.run() == RET_OK) { // ItemSet->UNO |