[Libreoffice-commits] core.git: vcl/source

[Caolán McNamara (via logerrit)]

 vcl/source/window/syswin.cxx |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

New commits:
commit d260df3a3f54f5187644545ab15f7c29b78e1d54
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Sun Feb 28 20:44:34 2021 +0000
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Mon Mar 1 10:07:33 2021 +0100

    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 at redhat.com>

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);
 }