[Libreoffice-commits] core.git: svtools/source

[Caolán McNamara]

 svtools/source/misc/ehdl.cxx |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 963137415bcdf3e7a26ce5d258302f4e39e294db
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed May 31 14:44:42 2017 +0100

    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

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))