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/app | |
| 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/app')
| -rw-r--r-- | vcl/source/app/svapp.cxx | 4 | ||||
| -rw-r--r-- | vcl/source/app/svdata.cxx | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx index 515c97ff93ba..66c030dd5501 100644 --- a/vcl/source/app/svapp.cxx +++ b/vcl/source/app/svapp.cxx @@ -1066,9 +1066,9 @@ vcl::Window* Application::GetFocusWindow() return ImplGetSVData()->mpWinData->mpFocusWin; } -OutputDevice* Application::GetDefaultDevice(bool bUseIcon) +OutputDevice* Application::GetDefaultDevice() { - return ImplGetDefaultWindow(bUseIcon)->GetOutDev(); + return ImplGetDefaultWindow()->GetOutDev(); } vcl::Window* Application::GetFirstTopLevelWindow() diff --git a/vcl/source/app/svdata.cxx b/vcl/source/app/svdata.cxx index c8b0c150297a..f91e1fe67fa9 100644 --- a/vcl/source/app/svdata.cxx +++ b/vcl/source/app/svdata.cxx @@ -206,17 +206,17 @@ basegfx::SystemDependentDataManager& ImplGetSystemDependentDataManager() } /// Returns either the application window, or the default GL context window -vcl::Window* ImplGetDefaultWindow(bool bUseIcon) +vcl::Window* ImplGetDefaultWindow() { ImplSVData* pSVData = ImplGetSVData(); if (pSVData->maFrameData.mpAppWin) return pSVData->maFrameData.mpAppWin; else - return ImplGetDefaultContextWindow(bUseIcon); + return ImplGetDefaultContextWindow(); } /// returns the default window created to hold the persistent VCL GL context. -vcl::Window *ImplGetDefaultContextWindow(bool bUseIcon) +vcl::Window *ImplGetDefaultContextWindow() { ImplSVData* pSVData = ImplGetSVData(); @@ -231,7 +231,7 @@ vcl::Window *ImplGetDefaultContextWindow(bool bUseIcon) { SAL_INFO( "vcl", "ImplGetDefaultWindow(): No AppWindow" ); - pSVData->mpDefaultWin = VclPtr<WorkWindow>::Create( nullptr, bUseIcon ? WB_DEFAULTWIN : WB_DEFAULTWIN | WB_NOICON ); + pSVData->mpDefaultWin = VclPtr<WorkWindow>::Create(nullptr, WB_DEFAULTWIN); pSVData->mpDefaultWin->SetText( "VCL ImplGetDefaultWindow" ); } catch (const css::uno::Exception&) |