[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - writerfilter/qa writerfilter/source

[Caolán McNamara]

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

New commits:
commit f9b830d7cd47c61cff3162fd396d81f29d205ce9
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
    
    (cherry picked from commit db686815b41c52598f0952613ff8c6be34b2f0e0)
    
    Change-Id: I51736459f9f098d9d793bff3b9a1a403962e099d
    Reviewed-on: https://gerrit.libreoffice.org/27801
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>

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/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 69e4324..d51dd1d 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 =
                 {