From db686815b41c52598f0952613ff8c6be34b2f0e0 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Tue, 2 Aug 2016 16:05:53 +0100 Subject: fftester: guard against no drawing object property set Change-Id: I51736459f9f098d9d793bff3b9a1a403962e099d --- .../qa/cppunittests/rtftok/data/fail/nopropertyset-1.rtf | Bin 0 -> 99 bytes writerfilter/source/rtftok/rtfdispatchvalue.cxx | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 writerfilter/qa/cppunittests/rtftok/data/fail/nopropertyset-1.rtf (limited to 'writerfilter') 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 Binary files /dev/null and b/writerfilter/qa/cppunittests/rtftok/data/fail/nopropertyset-1.rtf differ diff --git a/writerfilter/source/rtftok/rtfdispatchvalue.cxx b/writerfilter/source/rtftok/rtfdispatchvalue.cxx index d4a3720332c5..efd71cba54c0 100644 --- a/writerfilter/source/rtftok/rtfdispatchvalue.cxx +++ b/writerfilter/source/rtftok/rtfdispatchvalue.cxx @@ -1241,7 +1241,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 >aPointSequenceSequence = { -- cgit