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

[Libreoffice Gerrit user]

 compilerplugins/clang/unusedenumconstants.writeonly.results |    2 --
 vcl/inc/brdwin.hxx                                          |    3 +--
 vcl/source/window/dialog.cxx                                |    2 +-
 vcl/source/window/floatwin.cxx                              |    2 +-
 4 files changed, 3 insertions(+), 6 deletions(-)

New commits:
commit 7a581b977e7972ed893b49cbdbc6b69176f7c71b
Author:     Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Mon Nov 26 14:33:21 2018 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Tue Nov 27 14:42:22 2018 +0100

    remove unused BorderWindowStyle enum value
    
    Change-Id: I05ae398b75bbafe9b144a90e6735cf7d5e532ce4
    Reviewed-on: https://gerrit.libreoffice.org/64097
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/compilerplugins/clang/unusedenumconstants.writeonly.results b/compilerplugins/clang/unusedenumconstants.writeonly.results
index 27d446c21c76..ee5b2d40244f 100644
--- a/compilerplugins/clang/unusedenumconstants.writeonly.results
+++ b/compilerplugins/clang/unusedenumconstants.writeonly.results
@@ -10410,8 +10410,6 @@ uui/source/iahndl-errorhandler.cxx:148
     enum Source SOURCE_SVX
 uui/source/iahndl-errorhandler.cxx:148
     enum Source SOURCE_UUI
-vcl/inc/brdwin.hxx:35
-    enum BorderWindowStyle Border
 vcl/inc/headless/svpgdi.hxx:74
     enum PaintMode Over
 vcl/inc/headless/svpinst.hxx:65
diff --git a/vcl/inc/brdwin.hxx b/vcl/inc/brdwin.hxx
index 431b839aadce..6a7fbcc2cada 100644
--- a/vcl/inc/brdwin.hxx
+++ b/vcl/inc/brdwin.hxx
@@ -32,13 +32,12 @@ enum class DrawButtonFlags;
 enum class BorderWindowStyle {
     NONE             = 0x0000,
     Overlap          = 0x0001,
-    Border           = 0x0002,
     Float            = 0x0004,
     Frame            = 0x0008,
     App              = 0x0010
 };
 namespace o3tl {
-    template<> struct typed_flags<BorderWindowStyle> : is_typed_flags<BorderWindowStyle, 0x001f> {};
+    template<> struct typed_flags<BorderWindowStyle> : is_typed_flags<BorderWindowStyle, 0x001d> {};
 };
 
 enum class BorderWindowHitTest {
diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx
index e59deb0b685a..dc19e56c5738 100644
--- a/vcl/source/window/dialog.cxx
+++ b/vcl/source/window/dialog.cxx
@@ -468,7 +468,7 @@ void Dialog::ImplInit( vcl::Window* pParent, WinBits nStyle, InitFlag eFlag )
     }
     else
     {
-        VclPtrInstance<ImplBorderWindow> pBorderWin( pParent, nStyle, BorderWindowStyle::Overlap | BorderWindowStyle::Border );
+        VclPtrInstance<ImplBorderWindow> pBorderWin( pParent, nStyle, BorderWindowStyle::Overlap );
         SystemWindow::ImplInit( pBorderWin, nStyle & ~WB_BORDER, nullptr );
         pBorderWin->mpWindowImpl->mpClientWindow = this;
         pBorderWin->GetBorder( mpWindowImpl->mnLeftBorder, mpWindowImpl->mnTopBorder, mpWindowImpl->mnRightBorder, mpWindowImpl->mnBottomBorder );
diff --git a/vcl/source/window/floatwin.cxx b/vcl/source/window/floatwin.cxx
index 77aca029ca29..91482016b557 100644
--- a/vcl/source/window/floatwin.cxx
+++ b/vcl/source/window/floatwin.cxx
@@ -94,7 +94,7 @@ void FloatingWindow::ImplInit( vcl::Window* pParent, WinBits nStyle )
         else
         {
             VclPtr<ImplBorderWindow> pBorderWin;
-            BorderWindowStyle nBorderStyle = BorderWindowStyle::Border | BorderWindowStyle::Float;
+            BorderWindowStyle nBorderStyle = BorderWindowStyle::Float;
 
             if (nStyle & WB_OWNERDRAWDECORATION)
                 nBorderStyle |= BorderWindowStyle::Frame;