diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-05-31 14:44:42 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2017-05-31 14:46:19 +0100 |
| commit | c30c3331722498955773a4919b6a91a662684992 (patch) | |
| tree | 666d69e50c2d97f82f7e7276935cd29e9f0c371f /svtools | |
| parent | 6c6d3efdd5dcb81e6536899896358f054563c7eb (diff) | |
macro warning dialog grew an extra Cancel button
since...
commit bcad173faaffd3a3c1e6737d94d2108cf590338d
Date: Wed Feb 8 11:12:00 2017 +0200
Reapply "create ErrorHandlerFlags scoped enum for error handling flags""
This effectively reverts commit 32cae6a2eaa41568888df9c8fc5605debd8d704a.
Change-Id: Ice41023bc741af46db3018bbb0eb08b4a339987e
(cherry picked from commit 963137415bcdf3e7a26ce5d258302f4e39e294db)
Diffstat (limited to 'svtools')
| -rw-r--r-- | svtools/source/misc/ehdl.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/svtools/source/misc/ehdl.cxx b/svtools/source/misc/ehdl.cxx index 8ee0afb640ae..856f4f59a86a 100644 --- a/svtools/source/misc/ehdl.cxx +++ b/svtools/source/misc/ehdl.cxx @@ -53,15 +53,15 @@ static DialogMask aWndFunc( // determine necessary WinBits from the flags WinBits eBits=0; - if ( nFlags & (DialogMask::ButtonsCancel | DialogMask::ButtonsRetry) ) + if ( (nFlags & (DialogMask::ButtonsCancel | DialogMask::ButtonsRetry)) == (DialogMask::ButtonsCancel | DialogMask::ButtonsRetry)) eBits = WB_RETRY_CANCEL; - else if ( nFlags & DialogMask::ButtonsOkCancel ) + else if ( (nFlags & DialogMask::ButtonsOkCancel) == DialogMask::ButtonsOkCancel ) eBits = WB_OK_CANCEL; - else if ( nFlags & DialogMask::ButtonsOk ) + else if ( (nFlags & DialogMask::ButtonsOk) == DialogMask::ButtonsOk ) eBits = WB_OK; - else if ( nFlags & DialogMask::ButtonsYesNoCancel ) + else if ( (nFlags & DialogMask::ButtonsYesNoCancel) == DialogMask::ButtonsYesNoCancel ) eBits = WB_YES_NO_CANCEL; - else if ( nFlags & DialogMask::ButtonsYesNo ) + else if ( (nFlags & DialogMask::ButtonsYesNo) == DialogMask::ButtonsYesNo ) eBits = WB_YES_NO; switch(nFlags & DialogMask(0x0f00)) |