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

Caolán McNamara caolanm at redhat.com
Wed Apr 15 03:15:39 PDT 2015


 sw/source/core/layout/paintfrm.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit c2c22d26db03949771d5a0bb4f8abf6d2dc850ea
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Apr 15 11:11:03 2015 +0100

    fix crash on re-export of fdo39974-1.odt to odt
    
    Change-Id: Ib4246987a3665f655ad44339ade0350b074c3266

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


More information about the Libreoffice-commits mailing list