diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-10-03 11:48:28 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-10-03 13:22:17 +0200 |
| commit | 9572e3254bf62fb658a09577e64dc591b3a06954 (patch) | |
| tree | f2483c6b1e48e78d5e794445d2f55ab0672b0d86 | |
| parent | 692d35b89a9f6de4099d180e79aa39ded1214922 (diff) | |
WB_DOCKBORDER is dead
the only place that passes it to a window class, does so to a window
class that does not implement that style.
Change-Id: I74d705ed928b797c3456cf23a8074c62d0c12247
Reviewed-on: https://gerrit.libreoffice.org/43072
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
| -rw-r--r-- | include/tools/wintypes.hxx | 3 | ||||
| -rw-r--r-- | sfx2/source/doc/iframe.cxx | 2 | ||||
| -rw-r--r-- | vcl/source/window/dockwin.cxx | 2 |
3 files changed, 1 insertions, 6 deletions
diff --git a/include/tools/wintypes.hxx b/include/tools/wintypes.hxx index 39e23202b00f..3c53438c4384 100644 --- a/include/tools/wintypes.hxx +++ b/include/tools/wintypes.hxx @@ -213,9 +213,6 @@ WinBits const WB_SCALE = 0x08000000; WinBits const WB_LINESPACING = 0x01000000; WinBits const WB_SCROLL = 0x02000000; -// Window-Bits for DockingWindows -WinBits const WB_DOCKBORDER = 0x00001000; - // Window-Bits for SplitWindow WinBits const WB_NOSPLITDRAW = 0x01000000; diff --git a/sfx2/source/doc/iframe.cxx b/sfx2/source/doc/iframe.cxx index b6558f86672e..fb1126b157c6 100644 --- a/sfx2/source/doc/iframe.cxx +++ b/sfx2/source/doc/iframe.cxx @@ -108,7 +108,7 @@ public: }; IFrameWindow_Impl::IFrameWindow_Impl( vcl::Window *pParent, bool bHasBorder ) - : Window( pParent, WB_CLIPCHILDREN | WB_NODIALOGCONTROL | WB_DOCKBORDER ) + : Window( pParent, WB_CLIPCHILDREN | WB_NODIALOGCONTROL ) { if ( !bHasBorder ) SetBorderStyle( WindowBorderStyle::NOBORDER ); diff --git a/vcl/source/window/dockwin.cxx b/vcl/source/window/dockwin.cxx index 2e442a815e05..26a43bbde581 100644 --- a/vcl/source/window/dockwin.cxx +++ b/vcl/source/window/dockwin.cxx @@ -316,8 +316,6 @@ void DockingWindow::ImplInit( vcl::Window* pParent, WinBits nStyle ) mbDockable = (nStyle & WB_DOCKABLE) != 0; mnFloatBits = WB_BORDER | (nStyle & DOCKWIN_FLOATSTYLES); nStyle &= ~(DOCKWIN_FLOATSTYLES | WB_BORDER); - if ( nStyle & WB_DOCKBORDER ) - nStyle |= WB_BORDER; Window::ImplInit( pParent, nStyle, nullptr ); |