Kaydet (Commit) 7a581b97 authored tarafından Noel Grandin's avatar Noel Grandin

remove unused BorderWindowStyle enum value

Change-Id: I05ae398b75bbafe9b144a90e6735cf7d5e532ce4
Reviewed-on: https://gerrit.libreoffice.org/64097
Tested-by: Jenkins
Reviewed-by: 's avatarNoel Grandin <noel.grandin@collabora.co.uk>
üst dac1ff8b
...@@ -10410,8 +10410,6 @@ uui/source/iahndl-errorhandler.cxx:148 ...@@ -10410,8 +10410,6 @@ uui/source/iahndl-errorhandler.cxx:148
enum Source SOURCE_SVX enum Source SOURCE_SVX
uui/source/iahndl-errorhandler.cxx:148 uui/source/iahndl-errorhandler.cxx:148
enum Source SOURCE_UUI enum Source SOURCE_UUI
vcl/inc/brdwin.hxx:35
enum BorderWindowStyle Border
vcl/inc/headless/svpgdi.hxx:74 vcl/inc/headless/svpgdi.hxx:74
enum PaintMode Over enum PaintMode Over
vcl/inc/headless/svpinst.hxx:65 vcl/inc/headless/svpinst.hxx:65
......
...@@ -32,13 +32,12 @@ enum class DrawButtonFlags; ...@@ -32,13 +32,12 @@ enum class DrawButtonFlags;
enum class BorderWindowStyle { enum class BorderWindowStyle {
NONE = 0x0000, NONE = 0x0000,
Overlap = 0x0001, Overlap = 0x0001,
Border = 0x0002,
Float = 0x0004, Float = 0x0004,
Frame = 0x0008, Frame = 0x0008,
App = 0x0010 App = 0x0010
}; };
namespace o3tl { 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 { enum class BorderWindowHitTest {
......
...@@ -468,7 +468,7 @@ void Dialog::ImplInit( vcl::Window* pParent, WinBits nStyle, InitFlag eFlag ) ...@@ -468,7 +468,7 @@ void Dialog::ImplInit( vcl::Window* pParent, WinBits nStyle, InitFlag eFlag )
} }
else else
{ {
VclPtrInstance<ImplBorderWindow> pBorderWin( pParent, nStyle, BorderWindowStyle::Overlap | BorderWindowStyle::Border ); VclPtrInstance<ImplBorderWindow> pBorderWin( pParent, nStyle, BorderWindowStyle::Overlap );
SystemWindow::ImplInit( pBorderWin, nStyle & ~WB_BORDER, nullptr ); SystemWindow::ImplInit( pBorderWin, nStyle & ~WB_BORDER, nullptr );
pBorderWin->mpWindowImpl->mpClientWindow = this; pBorderWin->mpWindowImpl->mpClientWindow = this;
pBorderWin->GetBorder( mpWindowImpl->mnLeftBorder, mpWindowImpl->mnTopBorder, mpWindowImpl->mnRightBorder, mpWindowImpl->mnBottomBorder ); pBorderWin->GetBorder( mpWindowImpl->mnLeftBorder, mpWindowImpl->mnTopBorder, mpWindowImpl->mnRightBorder, mpWindowImpl->mnBottomBorder );
......
...@@ -94,7 +94,7 @@ void FloatingWindow::ImplInit( vcl::Window* pParent, WinBits nStyle ) ...@@ -94,7 +94,7 @@ void FloatingWindow::ImplInit( vcl::Window* pParent, WinBits nStyle )
else else
{ {
VclPtr<ImplBorderWindow> pBorderWin; VclPtr<ImplBorderWindow> pBorderWin;
BorderWindowStyle nBorderStyle = BorderWindowStyle::Border | BorderWindowStyle::Float; BorderWindowStyle nBorderStyle = BorderWindowStyle::Float;
if (nStyle & WB_OWNERDRAWDECORATION) if (nStyle & WB_OWNERDRAWDECORATION)
nBorderStyle |= BorderWindowStyle::Frame; nBorderStyle |= BorderWindowStyle::Frame;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment