sw/source/core/layout/paintfrm.cxx | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 7ede9572e86a907f7cce8debba732d07b6b45923
Author: Caolán McNamara <caol...@redhat.com>
Date: Wed Apr 15 11:11:03 2015 +0100
fix crash on re-export of fdo39974-1.odt to odt
(cherry picked from commit c2c22d26db03949771d5a0bb4f8abf6d2dc850ea)
sw: DrawFillAttributes: move check for empty rPaintRegion
Tweak c2c22d26db03949771d5a0bb4f8abf6d2dc850ea a bit: if the paint
region is empty, nothing should be painted.
(cherry picked from commit dc6a6475bcc7625a648e840de97ebd7a1ab03270)
Change-Id: Ib4246987a3665f655ad44339ade0350b074c3266
Reviewed-on: https://gerrit.libreoffice.org/15329
Tested-by: Caolán McNamara <caol...@redhat.com>
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/sw/source/core/layout/paintfrm.cxx
b/sw/source/core/layout/paintfrm.cxx
index 5557de3..7c395fb 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -1858,7 +1858,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()))
{
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
