diff options
| author | Chris Sherlock <chris.sherlock79@gmail.com> | 2017-04-17 09:37:31 +1000 |
|---|---|---|
| committer | Chris Sherlock <chris.sherlock79@gmail.com> | 2017-04-25 23:27:56 +0200 |
| commit | 41f5c11c3b5f5b57f480dd809b850fe563b53691 (patch) | |
| tree | df139718c1c5249de728e697b6aea74152874fe0 /uui/source/iahndl-errorhandler.cxx | |
| parent | c67a0d0f7ddd8ababa3197d86998979c1ce725d0 (diff) | |
vcl: change ErrorHandlerFlags to DialogMask
Change-Id: I1959ac97f679d8d719f851f9869962b39a20ded9
Reviewed-on: https://gerrit.libreoffice.org/36841
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Chris Sherlock <chris.sherlock79@gmail.com>
Diffstat (limited to 'uui/source/iahndl-errorhandler.cxx')
| -rw-r--r-- | uui/source/iahndl-errorhandler.cxx | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/uui/source/iahndl-errorhandler.cxx b/uui/source/iahndl-errorhandler.cxx index d9a3d2ab8c6c..3e90c6ebdb36 100644 --- a/uui/source/iahndl-errorhandler.cxx +++ b/uui/source/iahndl-errorhandler.cxx @@ -40,7 +40,7 @@ using namespace com::sun::star; namespace { -ErrorHandlerFlags +DialogMask executeErrorDialog( vcl::Window * pParent, task::InteractionClassification eClassification, @@ -105,23 +105,23 @@ executeErrorDialog( xBox.disposeAndClear(); - ErrorHandlerFlags aResult = ErrorHandlerFlags::NONE; + DialogMask aResult = DialogMask::NONE; switch( aMessResult ) { case RET_OK: - aResult = ErrorHandlerFlags::ButtonsOk; + aResult = DialogMask::ButtonsOk; break; case RET_CANCEL: - aResult = ErrorHandlerFlags::ButtonsCancel; + aResult = DialogMask::ButtonsCancel; break; case RET_YES: - aResult = ErrorHandlerFlags::ButtonsYes; + aResult = DialogMask::ButtonsYes; break; case RET_NO: - aResult = ErrorHandlerFlags::ButtonsNo; + aResult = DialogMask::ButtonsNo; break; case RET_RETRY: - aResult = ErrorHandlerFlags::ButtonsRetry; + aResult = DialogMask::ButtonsRetry; break; default: assert(false); } @@ -259,12 +259,12 @@ UUIInteractionHelper::handleErrorHandlerRequest( } } - ErrorHandlerFlags nResult = executeErrorDialog( + DialogMask nResult = executeErrorDialog( getParentProperty(), eClassification, aContext, aMessage, nButtonMask ); switch (nResult) { - case ErrorHandlerFlags::ButtonsOk: + case DialogMask::ButtonsOk: OSL_ENSURE(xApprove.is() || xAbort.is(), "unexpected situation"); if (xApprove.is()) xApprove->select(); @@ -272,25 +272,25 @@ UUIInteractionHelper::handleErrorHandlerRequest( xAbort->select(); break; - case ErrorHandlerFlags::ButtonsCancel: + case DialogMask::ButtonsCancel: OSL_ENSURE(xAbort.is(), "unexpected situation"); if (xAbort.is()) xAbort->select(); break; - case ErrorHandlerFlags::ButtonsRetry: + case DialogMask::ButtonsRetry: OSL_ENSURE(xRetry.is(), "unexpected situation"); if (xRetry.is()) xRetry->select(); break; - case ErrorHandlerFlags::ButtonsNo: + case DialogMask::ButtonsNo: OSL_ENSURE(xDisapprove.is(), "unexpected situation"); if (xDisapprove.is()) xDisapprove->select(); break; - case ErrorHandlerFlags::ButtonsYes: + case DialogMask::ButtonsYes: OSL_ENSURE(xApprove.is(), "unexpected situation"); if (xApprove.is()) xApprove->select(); |