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

[Jan Holesovsky]

 vcl/source/control/edit.cxx |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 0394b69cf02075f9ab599c3d5b783b597f256ff5
Author: Jan Holesovsky <kendy at collabora.com>
Date:   Tue May 26 11:20:43 2015 +0200

    Revert "rendercontext: Fix borderwindow rendering when called from class Edit."
    
    This is not necessary for double-buffering anyway (since
    891304bb0ad3af9d8d73f947f25477abf57485a4), and breaks the non-double-buffered
    case.
    
    This reverts commit 1926cfb9386269b81b6ca62bdc64591f2c403d03.

diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx
index 2c82672..e3079819 100644
--- a/vcl/source/control/edit.cxx
+++ b/vcl/source/control/edit.cxx
@@ -1078,16 +1078,16 @@ void Edit::ImplPaintBorder(vcl::RenderContext& rRenderContext, long nXStart, lon
                     aClipRgn.Move(aBorderOffs.X(), aBorderOffs.Y());
                 }
 
-                vcl::Region oldRgn(rRenderContext.GetClipRegion());
-                rRenderContext.SetClipRegion(aClipRgn);
+                vcl::Region oldRgn(pBorder->GetClipRegion());
+                pBorder->SetClipRegion(aClipRgn);
 
-                pBorder->Paint(rRenderContext, Rectangle());
+                pBorder->Paint(*pBorder, Rectangle()); // FIXME
 
-                rRenderContext.SetClipRegion(oldRgn);
+                pBorder->SetClipRegion(oldRgn);
             }
             else
             {
-                pBorder->Paint(rRenderContext, Rectangle());
+                pBorder->Paint(*pBorder, Rectangle()); // FIXME
             }
         }
     }