diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2015-04-15 11:11:03 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-04-15 16:21:31 +0000 |
| commit | 6d1699d707a2be510a0021dbce124d27356819ad (patch) | |
| tree | 3d4e1d899f871260cd5bcc153c219b1c39499764 | |
| parent | 8e8631e631ec55b7baf61e449225e63bd1b001df (diff) | |
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 <caolanm@redhat.com>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit 7ede9572e86a907f7cce8debba732d07b6b45923)
Reviewed-on: https://gerrit.libreoffice.org/15330
Reviewed-by: Michael Stahl <mstahl@redhat.com>
| -rw-r--r-- | sw/source/core/layout/paintfrm.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx index 5557de34a48f..7c395fbc4b39 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())) { |