summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2016-08-02 16:05:53 +0100
committerAndras Timar <andras.timar@collabora.com>2016-08-15 10:25:50 +0200
commit039c12b1aac8bad8a2578dd889c5ec44aac19e5c (patch)
tree52241530c39c90b6cd498bd008870a7d862fa7ab
parentf9f9cb968200c01903f077c043c9e199971f1919 (diff)
fftester: guard against no drawing object property set
(cherry picked from commit db686815b41c52598f0952613ff8c6be34b2f0e0) Change-Id: I51736459f9f098d9d793bff3b9a1a403962e099d Reviewed-on: https://gerrit.libreoffice.org/27801 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> (cherry picked from commit f9b830d7cd47c61cff3162fd396d81f29d205ce9)
-rw-r--r--writerfilter/qa/cppunittests/rtftok/data/fail/nopropertyset-1.rtfbin0 -> 99 bytes
-rw-r--r--writerfilter/source/rtftok/rtfdocumentimpl.cxx2
2 files changed, 1 insertions, 1 deletions
diff --git a/writerfilter/qa/cppunittests/rtftok/data/fail/nopropertyset-1.rtf b/writerfilter/qa/cppunittests/rtftok/data/fail/nopropertyset-1.rtf
new file mode 100644
index 000000000000..59c3630a7197
--- /dev/null
+++ b/writerfilter/qa/cppunittests/rtftok/data/fail/nopropertyset-1.rtf
Binary files differ
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 9a15afc77096..2576ab744076 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -4803,7 +4803,7 @@ RTFError RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword, int nParam)
{
rDrawingObject.aPolyLinePoints.back().Y = convertTwipToMm100(nParam);
rDrawingObject.nPolyLineCount--;
- if (rDrawingObject.nPolyLineCount == 0)
+ if (rDrawingObject.nPolyLineCount == 0 && rDrawingObject.xPropertySet.is())
{
uno::Sequence< uno::Sequence<awt::Point> >aPointSequenceSequence =
{