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

[Michael Stahl]

 sw/source/core/layout/paintfrm.cxx |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit dc6a6475bcc7625a648e840de97ebd7a1ab03270
Author: Michael Stahl <mstahl at redhat.com>
Date:   Wed Apr 15 13:27:24 2015 +0200

    sw: DrawFillAttributes: move check for empty rPaintRegion
    
    Tweak c2c22d26db03949771d5a0bb4f8abf6d2dc850ea a bit: if the paint
    region is empty, nothing should be painted.
    
    Change-Id: If88b8153f701b1f21cfd2300f0af532f5c718cdf

diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx
index e8909c1..292730f 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -1867,7 +1867,8 @@ bool DrawFillAttributes(
             rPaintRegion.GetOrigin().Right(),
             rPaintRegion.GetOrigin().Bottom());
 
-        if(!aPaintRange.isEmpty() &&
+        if (!aPaintRange.isEmpty() &&
+            !rPaintRegion.empty() &&
             !basegfx::fTools::equalZero(aPaintRange.getWidth()) &&
             !basegfx::fTools::equalZero(aPaintRange.getHeight()))
         {
@@ -1916,7 +1917,7 @@ bool DrawFillAttributes(
                     pPrimitives(&rSequence);
                 drawinglayer::primitive2d::Primitive2DSequence primitives;
                 // tdf#86578 the awful lcl_SubtractFlys hack
-                if (rPaintRegion.size() > 1 || (!rPaintRegion.empty() && rPaintRegion[0] != rPaintRegion.GetOrigin()))
+                if (rPaintRegion.size() > 1 || rPaintRegion[0] != rPaintRegion.GetOrigin())
                 {
                     tools::PolyPolygon tempRegion;
                     for (size_t i = 0; i < rPaintRegion.size(); ++i)