summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-12-02 13:07:36 +0200
committerNoel Grandin <noel@peralex.com>2015-12-02 13:11:29 +0200
commita38110216c895e876ab1b4697da74f559d06a3cb (patch)
tree50ab877db788b16544b652ae32afbcbf900a8293
parent831492f3d50f3d131f458f4ec0e5e802b612923f (diff)
Revert "small optimisation in paint"
This reverts commit 7e9bdfe60784d49ab7d6ffe8df256834d39e1234. Seems to be causing problems for people using 'ssh -X'. I suspect that it has something to do with PaintHelper's destructor.
-rw-r--r--vcl/source/window/paint.cxx5
1 files changed, 2 insertions, 3 deletions
diff --git a/vcl/source/window/paint.cxx b/vcl/source/window/paint.cxx
index c1722d270b0a..6402639c6f47 100644
--- a/vcl/source/window/paint.cxx
+++ b/vcl/source/window/paint.cxx
@@ -601,11 +601,10 @@ void Window::ImplCallPaint(const vcl::Region* pRegion, sal_uInt16 nPaintFlags)
nPaintFlags = mpWindowImpl->mnPaintFlags & ~(IMPL_PAINT_PAINT);
+ PaintHelper aHelper(this, nPaintFlags);
+
if (mpWindowImpl->mnPaintFlags & IMPL_PAINT_PAINT)
- {
- PaintHelper aHelper(this, nPaintFlags);
aHelper.DoPaint(pRegion);
- }
else
mpWindowImpl->mnPaintFlags = 0;
}