summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.com>2019-06-07 11:12:31 +0200
committerMiklos Vajna <vmiklos@collabora.com>2019-06-07 14:17:10 +0200
commit00dfa6dc890dbbc8140fe613599becb5e4c55486 (patch)
treeef6d6fe15b930cf6c4b8920df026dd4eb0de6c84
parente9660591f8997c7696a55731a9ae81d26a9d452a (diff)
tdf#117347 sw form controls: fix disappearing FixedText when editing TextField
This is nominally a regression from commit af11abf3626e12d2b4b7dd9d255c6c71bf84cd4b (SwViewShell::ImplEndAction: still paint directly when non-double-buffering, 2015-09-01), but that just uncovered an already existing problem introduced earlier in commit 2b26c1796d0a05f47cfb01d79ee4f69344efbbb2 (tdf#92577 sw rendercontext: paint transparent from controls conditionally, 2015-07-06). Given that the first commit (as a side-effect) solved the problem the second commit tried to solve, it's safe to just revert this. (Sadly we have no way to test incremental paints with a reasonable amount of effort, so no testcase.) Change-Id: Ia59efbf45a0cd5af3580914e1dcee74d89068f03 Reviewed-on: https://gerrit.libreoffice.org/73647 Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Tested-by: Jenkins
-rw-r--r--sw/source/core/view/viewsh.cxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx
index ae1bc40512d0..66775b933a8d 100644
--- a/sw/source/core/view/viewsh.cxx
+++ b/sw/source/core/view/viewsh.cxx
@@ -430,8 +430,8 @@ void SwViewShell::ImplEndAction( const bool bIdleEnd )
DLPostPaint2(true);
}
}
- else
- lcl_PaintTransparentFormControls(*this, aRect); // i#107365
+
+ lcl_PaintTransparentFormControls(*this, aRect); // i#107365
}
}
if( bShowCursor )