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.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.cxx')
| -rw-r--r-- | uui/source/iahndl.cxx | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/uui/source/iahndl.cxx b/uui/source/iahndl.cxx index c1049894d200..b42e5625ba70 100644 --- a/uui/source/iahndl.cxx +++ b/uui/source/iahndl.cxx @@ -973,7 +973,7 @@ UUIInteractionHelper::getInteractionHandler() namespace { -ErrorHandlerFlags +DialogMask executeMessageBox( vcl::Window * pParent, OUString const & rTitle, @@ -985,23 +985,23 @@ executeMessageBox( ScopedVclPtrInstance< MessBox > xBox(pParent, nButtonMask, rTitle, rMessage); sal_uInt16 aMessResult = xBox->Execute(); - 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); } @@ -1258,19 +1258,19 @@ UUIInteractionHelper::handleBrokenPackageRequest( switch ( executeMessageBox( getParentProperty(), title, aMessage, nButtonMask ) ) { - case ErrorHandlerFlags::ButtonsOk: + case DialogMask::ButtonsOk: OSL_ENSURE( xAbort.is(), "unexpected situation" ); if (xAbort.is()) xAbort->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(); |