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

Jan-Marek Glogowski (via logerrit) logerrit at kemper.freedesktop.org
Fri Jun 21 13:55:43 UTC 2019


 vcl/source/outdev/gradient.cxx |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit d25e5069176ab53cdc917e3501a81e9546ec46f7
Author:     Jan-Marek Glogowski <glogow at fbihome.de>
AuthorDate: Fri Jun 21 13:29:35 2019 +0200
Commit:     Jan-Marek Glogowski <glogow at fbihome.de>
CommitDate: Fri Jun 21 15:54:15 2019 +0200

    tdf#125777 restore old RenderContext before return
    
    Regression from commit 710f3c63af2d ("tdf#125670 just check gradient
    clipping on drawing")
    
    Change-Id: I6acf23675414983bd07639703f43aa934c0a48ed
    Reviewed-on: https://gerrit.libreoffice.org/74502
    Tested-by: Jenkins
    Reviewed-by: Jan-Marek Glogowski <glogow at fbihome.de>

diff --git a/vcl/source/outdev/gradient.cxx b/vcl/source/outdev/gradient.cxx
index d356355889d1..3e50a016cc46 100644
--- a/vcl/source/outdev/gradient.cxx
+++ b/vcl/source/outdev/gradient.cxx
@@ -101,8 +101,11 @@ void OutputDevice::DrawGradient( const tools::PolyPolygon& rPolyPoly,
                 if( mbInitClipRegion )
                     InitClipRegion();
 
-                if ( mbOutputClipped )
+                if (mbOutputClipped)
+                {
+                    Pop();
                     return;
+                }
 
                 // try to draw gradient natively
                 bDrawn = mpGraphics->DrawGradient( aClixPolyPoly, aGradient );


More information about the Libreoffice-commits mailing list