diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2019-08-22 09:15:51 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2019-08-23 16:28:12 +0200 |
| commit | 693d9ff29e7838bafcad5faa7a4e7355807c54cb (patch) | |
| tree | dc343d9002fb6dd0abda2875fbff233f6111eda9 /vcl/source/control | |
| parent | 61f75f05adb171064d9ba17b4684069de36fa11a (diff) | |
weld SwMailMergeWizard
Change-Id: I03a7fd1f7676792387155db986d710a001887c8d
Reviewed-on: https://gerrit.libreoffice.org/77977
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'vcl/source/control')
| -rw-r--r-- | vcl/source/control/wizardmachine.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/vcl/source/control/wizardmachine.cxx b/vcl/source/control/wizardmachine.cxx index 8f291ce40c38..8082df6ab39a 100644 --- a/vcl/source/control/wizardmachine.cxx +++ b/vcl/source/control/wizardmachine.cxx @@ -688,11 +688,11 @@ namespace vcl : AssistantController(pParent, "vcl/ui/wizard.ui", "Wizard") , m_nCurState(0) , m_pFirstPage(nullptr) - , m_xFinish(m_xAssistant->weld_widget_for_response(static_cast<int>(WizardButtonFlags::FINISH))) - , m_xCancel(m_xAssistant->weld_widget_for_response(static_cast<int>(WizardButtonFlags::CANCEL))) - , m_xNextPage(m_xAssistant->weld_widget_for_response(static_cast<int>(WizardButtonFlags::NEXT))) - , m_xPrevPage(m_xAssistant->weld_widget_for_response(static_cast<int>(WizardButtonFlags::PREVIOUS))) - , m_xHelp(m_xAssistant->weld_widget_for_response(static_cast<int>(WizardButtonFlags::HELP))) + , m_xFinish(m_xAssistant->weld_widget_for_response(RET_OK)) + , m_xCancel(m_xAssistant->weld_widget_for_response(RET_CANCEL)) + , m_xNextPage(m_xAssistant->weld_widget_for_response(RET_YES)) + , m_xPrevPage(m_xAssistant->weld_widget_for_response(RET_NO)) + , m_xHelp(m_xAssistant->weld_widget_for_response(RET_HELP)) , m_pImpl(new WizardMachineImplData) { implConstruct(nButtonFlags); @@ -892,7 +892,7 @@ namespace vcl bool WizardMachine::onFinish() { - return Finish(static_cast<int>(WizardButtonFlags::FINISH)); + return Finish(RET_OK); } IMPL_LINK_NOARG(WizardMachine, OnFinish, weld::Button&, void) @@ -909,7 +909,7 @@ namespace vcl IMPL_LINK_NOARG(WizardMachine, OnCancel, weld::Button&, void) { - m_xAssistant->response(static_cast<int>(WizardButtonFlags::CANCEL)); + m_xAssistant->response(RET_CANCEL); } WizardMachine::WizardState WizardMachine::determineNextState( WizardState _nCurrentState ) const |