diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2021-02-28 20:44:34 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2021-03-01 10:07:33 +0100 |
| commit | d260df3a3f54f5187644545ab15f7c29b78e1d54 (patch) | |
| tree | 8ac560a5b277743c9a7a218fa490784f9088fd59 | |
| parent | b6d7a8929d77ef67bbeb584cb0283d5a4f82ebbb (diff) | |
no need to warn if syswin contents were relocated before layout
and the window is now empty at layout time
Change-Id: I7c5e907034d509f23589f1a8ac7056a5035918f6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111720
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
| -rw-r--r-- | vcl/source/window/syswin.cxx | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/vcl/source/window/syswin.cxx b/vcl/source/window/syswin.cxx index 9f5ba0c4edd8..3ba8e96ce44e 100644 --- a/vcl/source/window/syswin.cxx +++ b/vcl/source/window/syswin.cxx @@ -1041,13 +1041,12 @@ void SystemWindow::setPosSizeOnContainee(Size aSize, Window &rBox) IMPL_LINK_NOARG( SystemWindow, ImplHandleLayoutTimerHdl, Timer*, void ) { + Window *pBox = GetWindow(GetWindowType::FirstChild); if (!isLayoutEnabled()) { - SAL_WARN("vcl.layout", "SystemWindow has become non-layout because extra children have been added directly to it."); + SAL_WARN_IF(pBox, "vcl.layout", "SystemWindow has become non-layout because extra children have been added directly to it."); return; } - - Window *pBox = GetWindow(GetWindowType::FirstChild); assert(pBox); setPosSizeOnContainee(GetSizePixel(), *pBox); } |