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

[Noel Grandin]

 vcl/source/window/paint.cxx |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

New commits:
commit a38110216c895e876ab1b4697da74f559d06a3cb
Author: Noel Grandin <noel at peralex.com>
Date:   Wed Dec 2 13:07:36 2015 +0200

    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.

diff --git a/vcl/source/window/paint.cxx b/vcl/source/window/paint.cxx
index c1722d2..6402639 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;
 }