summaryrefslogtreecommitdiff
path: root/writerfilter
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2016-08-02 16:05:53 +0100
committerCaolán McNamara <caolanm@redhat.com>2016-08-02 16:08:46 +0100
commitdb686815b41c52598f0952613ff8c6be34b2f0e0 (patch)
treef86baa03d3af019458ae5c749baf7dbe712efc55 /writerfilter
parentdadd4abdadb970dd4912caaa56b7250c3a30cc9e (diff)
fftester: guard against no drawing object property set
Change-Id: I51736459f9f098d9d793bff3b9a1a403962e099d
Diffstat (limited to 'writerfilter')
-rw-r--r--writerfilter/qa/cppunittests/rtftok/data/fail/nopropertyset-1.rtfbin0 -> 99 bytes
-rw-r--r--writerfilter/source/rtftok/rtfdispatchvalue.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/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<awt::Point> >aPointSequenceSequence =
{