diff options
| author | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2020-03-25 14:08:14 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2020-05-10 21:50:55 +0200 |
| commit | 61a35560cb412d7ab0e3d0574eec4a790e3b9dfd (patch) | |
| tree | dfcd65eca9d1be1eebdbccabf2318c7f9c045bac /vcl | |
| parent | 2b8e09b12cdcc2254b86f80ec3b0691c7548e1f2 (diff) | |
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@cib.de>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93867
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Andras Timar <andras.timar@collabora.com>
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/window/window2.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vcl/source/window/window2.cxx b/vcl/source/window/window2.cxx index 8092b1a12aba..5539fb3b8463 100644 --- a/vcl/source/window/window2.cxx +++ b/vcl/source/window/window2.cxx @@ -1354,8 +1354,8 @@ void Window::queue_resize(StateChangedType eReason) if (VclPtr<vcl::Window> pParent = GetParentWithLOKNotifier()) { Size aSize = GetSizePixel(); - if (aSize.getWidth() > 0 && aSize.getHeight() > 0 && - !pParent->IsInInitShow()) + if (aSize.getWidth() > 0 && aSize.getHeight() > 0 && GetParentDialog() + && !pParent->IsInInitShow()) LogicInvalidate(nullptr); } } |