[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - xmloff/source

[Caolán McNamara]

 xmloff/source/text/txtparae.cxx |    3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 8acf0a2157082a05fe912e849d3607d30eea2516
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Dec 1 21:15:00 2016 +0000

    Resolves: tdf#104812 crash on exporting odp
    
    was crashtesting: a gadzillion failures on export to odp
    
    e.g. fdo35235-1.odp
    
    (cherry picked from commit f1c08d6503442ec257aa8535dfbe3743c743e4a0)
    (cherry picked from commit 09b856289c44c0fe792082b681d48cf5ee70d808)
    
    Change-Id: I259cdc9ed073be2ad7d5208cd943d4f193f09c16
    Reviewed-on: https://gerrit.libreoffice.org/32275
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Tamás Zolnai <tamas.zolnai at collabora.com>

diff --git a/xmloff/source/text/txtparae.cxx b/xmloff/source/text/txtparae.cxx
index 3ff7615..481d474 100644
--- a/xmloff/source/text/txtparae.cxx
+++ b/xmloff/source/text/txtparae.cxx
@@ -1640,6 +1640,9 @@ void XMLTextParagraphExport::exportText(
         GetExport().GetShapeExport(); // make sure the graphics styles family
                                       // is added
     Reference < XEnumerationAccess > xEA( rText, UNO_QUERY );
+    if( ! xEA.is() )
+        return;
+
     Reference < XEnumeration > xParaEnum(xEA->createEnumeration());
     Reference < XPropertySet > xPropertySet( rText, UNO_QUERY );
     Reference < XTextSection > xBaseSection;