[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - vcl/source

[Samuel Mehrbrodt (via logerrit)]

 vcl/source/window/window2.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit dc78bbbdbe5aa3a7304607876231e01f17878eab
Author:     Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
AuthorDate: Wed Mar 25 14:08:14 2020 +0100
Commit:     Xisco Faulí <xiscofauli at libreoffice.org>
CommitDate: Wed Mar 25 17:48:57 2020 +0100

    tdf#131280 Fix endless invalidation loop on documents with form controls
    
    Restores a condition which was removed in 8de98e61fbc96bf523b3dec7e1e52eb7e2d7693e
    
    Change-Id: I68a9f8a362d2ded9975e7c73e2a0533aa5ad9e94
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91053
    Tested-by: Jenkins
    Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
    (cherry picked from commit 4af18ebae9d74b43fcd114d5fa5b145586651bc2)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90957
    Reviewed-by: Xisco Faulí <xiscofauli at libreoffice.org>

diff --git a/vcl/source/window/window2.cxx b/vcl/source/window/window2.cxx
index 6f32ea52eafd..9183ded20184 100644
--- a/vcl/source/window/window2.cxx
+++ b/vcl/source/window/window2.cxx
@@ -1335,7 +1335,7 @@ void Window::queue_resize(StateChangedType eReason)
 
     if (VclPtr<vcl::Window> pParent = GetParentWithLOKNotifier())
     {
-        if (!pParent->IsInInitShow())
+        if (GetParentDialog() && !pParent->IsInInitShow())
             LogicInvalidate(nullptr);
     }
 }