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

[Caolán McNamara (via logerrit)]

 sc/source/ui/app/inputwin.cxx |   10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

New commits:
commit 37081085fa989aa2fd07a7a0d063295819e185a0
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Sat Oct 24 20:52:29 2020 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Sun Oct 25 15:56:44 2020 +0100

    tdf#137713 GetEditView must be called unconditionally in Paint
    
    Change-Id: I9593b263c71ff2a169754ff272198965f4e0e277
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104758
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx
index 5d9012827d70..799a66ed9dba 100644
--- a/sc/source/ui/app/inputwin.cxx
+++ b/sc/source/ui/app/inputwin.cxx
@@ -1219,11 +1219,15 @@ void ScTextWnd::Paint( vcl::RenderContext& rRenderContext, const tools::Rectangl
     Color aBgColor = rStyleSettings.GetWindowColor();
     rRenderContext.SetBackground(aBgColor);
 
-    if (mbInvalidate)
+    // tdf#137713 we rely on GetEditView creating it if it doesn't already exist so
+    // GetEditView() must be called unconditionally
+    if (EditView* pView = GetEditView())
     {
-        if (EditView* pView = GetEditView())
+        if (mbInvalidate)
+        {
             pView->Invalidate();
-        mbInvalidate = false;
+            mbInvalidate = false;
+        }
     }
 
     WeldEditView::Paint(rRenderContext, rRect);