[Libreoffice-commits] core.git: compilerplugins/clang include/vcl svtools/source

[Caolán McNamara]

 compilerplugins/clang/unusedenumconstants.writeonly.results |    4 ----
 include/vcl/errinf.hxx                                      |    2 --
 svtools/source/misc/ehdl.cxx                                |    4 ----
 3 files changed, 10 deletions(-)

New commits:
commit 5e85f475eea463e6d5572d24d61e85d24084bd4e
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Feb 21 21:29:07 2018 +0000

    drop unused button mask enum
    
    Change-Id: Id94c6ecdfc642888eea8c13e55d38326b2d7ad12
    Reviewed-on: https://gerrit.libreoffice.org/50145
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/compilerplugins/clang/unusedenumconstants.writeonly.results b/compilerplugins/clang/unusedenumconstants.writeonly.results
index 5658a30b5efa..d817a7801fef 100644
--- a/compilerplugins/clang/unusedenumconstants.writeonly.results
+++ b/compilerplugins/clang/unusedenumconstants.writeonly.results
@@ -3302,12 +3302,8 @@ include/tools/datetime.hxx:34
     enum DateTime::DateTimeInitSystem SYSTEM
 include/tools/datetime.hxx:39
     enum DateTime::DateTimeInitEmpty EMPTY
-include/tools/errinf.hxx:44
-    enum ErrorHandlerFlags ButtonsOkCancel
 include/tools/errinf.hxx:47
     enum ErrorHandlerFlags ButtonsYesNo
-include/tools/errinf.hxx:48
-    enum ErrorHandlerFlags ButtonsYesNoCancel
 include/tools/inetmsg.hxx:66
     enum InetMessageMime VERSION
 include/tools/inetmsg.hxx:67
diff --git a/include/vcl/errinf.hxx b/include/vcl/errinf.hxx
index bc8c01a13e05..f4edc53d46fd 100644
--- a/include/vcl/errinf.hxx
+++ b/include/vcl/errinf.hxx
@@ -78,11 +78,9 @@ enum class DialogMask
     ButtonsOk               = 0x0001,
     ButtonsCancel           = 0x0002,
     ButtonsRetry            = 0x0004,
-    ButtonsOkCancel         = 0x0003,
     ButtonsNo               = 0x0008,
     ButtonsYes              = 0x0010,
     ButtonsYesNo            = 0x0018,
-    ButtonsYesNoCancel      = 0x001a,
 
     ButtonDefaultsOk        = 0x0100,
     ButtonDefaultsCancel    = 0x0200,
diff --git a/svtools/source/misc/ehdl.cxx b/svtools/source/misc/ehdl.cxx
index 6c2406f57ae8..dfd28ac168d6 100644
--- a/svtools/source/misc/ehdl.cxx
+++ b/svtools/source/misc/ehdl.cxx
@@ -55,12 +55,8 @@ static DialogMask aWndFunc(
     MessBoxStyle eBits = MessBoxStyle::NONE;
     if ( (nFlags & (DialogMask::ButtonsCancel | DialogMask::ButtonsRetry)) == (DialogMask::ButtonsCancel | DialogMask::ButtonsRetry))
         eBits = MessBoxStyle::RetryCancel;
-    else if ( (nFlags & DialogMask::ButtonsOkCancel) == DialogMask::ButtonsOkCancel )
-        eBits = MessBoxStyle::OkCancel;
     else if ( (nFlags & DialogMask::ButtonsOk) == DialogMask::ButtonsOk )
         eBits = MessBoxStyle::Ok;
-    else if ( (nFlags & DialogMask::ButtonsYesNoCancel) == DialogMask::ButtonsYesNoCancel )
-        eBits = MessBoxStyle::YesNoCancel;
     else if ( (nFlags & DialogMask::ButtonsYesNo) == DialogMask::ButtonsYesNo )
         eBits = MessBoxStyle::YesNo;