diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2021-09-23 10:21:42 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2021-09-23 13:02:34 +0200 |
| commit | 238b6cf0ff0d66d57bea9e8dc38d93caf4563124 (patch) | |
| tree | 6504750a282bec508979d588eee8e47ed6f4599e /vcl/source/window | |
| parent | e6c1205e3e041407e875301de08a90989353cf63 (diff) | |
WB_DEFAULTWIN should be sufficient to flag that no icon is required
Change-Id: Ibb5d8331d5d47e2b5c163c2797b2e7b5cee4b285
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122517
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'vcl/source/window')
| -rw-r--r-- | vcl/source/window/brdwin.cxx | 2 | ||||
| -rw-r--r-- | vcl/source/window/window.cxx | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/vcl/source/window/brdwin.cxx b/vcl/source/window/brdwin.cxx index 7cd7bb4eaaf1..95d508ce3597 100644 --- a/vcl/source/window/brdwin.cxx +++ b/vcl/source/window/brdwin.cxx @@ -1499,7 +1499,7 @@ void ImplBorderWindow::ImplInit( vcl::Window* pParent, { // remove all unwanted WindowBits WinBits nOrgStyle = nStyle; - WinBits nTestStyle = (WB_MOVEABLE | WB_SIZEABLE | WB_CLOSEABLE | WB_STANDALONE | WB_DIALOGCONTROL | WB_NODIALOGCONTROL | WB_SYSTEMFLOATWIN | WB_INTROWIN | WB_DEFAULTWIN | WB_TOOLTIPWIN | WB_NOSHADOW | WB_OWNERDRAWDECORATION | WB_SYSTEMCHILDWINDOW | WB_POPUP | WB_NOICON); + WinBits nTestStyle = (WB_MOVEABLE | WB_SIZEABLE | WB_CLOSEABLE | WB_STANDALONE | WB_DIALOGCONTROL | WB_NODIALOGCONTROL | WB_SYSTEMFLOATWIN | WB_INTROWIN | WB_DEFAULTWIN | WB_TOOLTIPWIN | WB_NOSHADOW | WB_OWNERDRAWDECORATION | WB_SYSTEMCHILDWINDOW | WB_POPUP); if ( nTypeStyle & BorderWindowStyle::App ) nTestStyle |= WB_APP; nStyle &= nTestStyle; diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx index e6ed7b3cf8b2..32f3231622fb 100644 --- a/vcl/source/window/window.cxx +++ b/vcl/source/window/window.cxx @@ -1032,7 +1032,11 @@ void Window::ImplInit( vcl::Window* pParent, WinBits nStyle, SystemParentData* p break; } - if( nStyle & WB_NOICON ) + // tdf#144624 for the DefaultWindow, which is never visible, don't + // create an icon for it so construction of a DefaultWindow cannot + // trigger creation of a VirtualDevice which itself requires a + // DefaultWindow to exist + if( nStyle & WB_DEFAULTWIN ) nFrameStyle |= SalFrameStyleFlags::NOICON; SalFrame* pParentFrame = nullptr; |