[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - sc/source

[Caolán McNamara]

 sc/source/filter/xml/xmlcelli.cxx |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit c52efdf90592235e73f2d4c6e8579fb980c537c3
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Mar 26 13:44:31 2018 +0100

    forcepoint #34 survive missing autostyles
    
    Change-Id: I742816297659d614e836a8d5e8965b1c55154719
    Reviewed-on: https://gerrit.libreoffice.org/51891
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>

diff --git a/sc/source/filter/xml/xmlcelli.cxx b/sc/source/filter/xml/xmlcelli.cxx
index 0148dc965026..59fe6237d371 100644
--- a/sc/source/filter/xml/xmlcelli.cxx
+++ b/sc/source/filter/xml/xmlcelli.cxx
@@ -360,6 +360,8 @@ void ScXMLTableRowCellContext::PushFormat(sal_Int32 nBegin, sal_Int32 nEnd, cons
     sal_Int32 nEntryCount = xMapper->GetEntryCount();
 
     SvXMLStylesContext* pAutoStyles = GetImport().GetAutoStyles();
+    if (!pAutoStyles)
+        return;
 
     // Style name for text span corresponds with the name of an automatic style.
     const XMLPropStyleContext* pStyle = dynamic_cast<const XMLPropStyleContext*>(