diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-08-02 16:05:53 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-08-03 13:25:22 +0000 |
| commit | f9b830d7cd47c61cff3162fd396d81f29d205ce9 (patch) | |
| tree | 6625d0e719aa9c74233bac857abb495a0c0e7cde | |
| parent | fbed48db0b09cfed8070d7644b0922c79d3d7512 (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>
| -rw-r--r-- | writerfilter/qa/cppunittests/rtftok/data/fail/nopropertyset-1.rtf | bin | 0 -> 99 bytes | |||
| -rw-r--r-- | writerfilter/source/rtftok/rtfdocumentimpl.cxx | 2 |
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 Binary files differnew file mode 100644 index 000000000000..59c3630a7197 --- /dev/null +++ b/writerfilter/qa/cppunittests/rtftok/data/fail/nopropertyset-1.rtf diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx index 69e4324bc4e6..d51dd1d46509 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx @@ -4762,7 +4762,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 = { |