[Libreoffice-commits] core.git: writerfilter/qa writerfilter/source

[Caolán McNamara]

 writerfilter/qa/cppunittests/rtftok/data/fail/nopropertyset-1.rtf |binary
 writerfilter/source/rtftok/rtfdispatchvalue.cxx                   |    2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)

New commits:
commit db686815b41c52598f0952613ff8c6be34b2f0e0
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Aug 2 16:05:53 2016 +0100

    fftester: guard against no drawing object property set
    
    Change-Id: I51736459f9f098d9d793bff3b9a1a403962e099d

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 0000000..59c3630
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 d4a3720..efd71cb 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 =
                 {