summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2020-10-24 20:52:29 +0100
committerCaolán McNamara <caolanm@redhat.com>2020-10-25 15:56:44 +0100
commit37081085fa989aa2fd07a7a0d063295819e185a0 (patch)
treea73e70aaa0f1602ab1939708963da4840c16a1cc
parent8bc98f3ef45052340de2296f8af63325e4b7d4d9 (diff)
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@redhat.com>
-rw-r--r--sc/source/ui/app/inputwin.cxx10
1 files changed, 7 insertions, 3 deletions
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);