summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTamás Zolnai <tamas.zolnai@collabora.com>2019-08-13 14:27:05 +0200
committerXisco Faulí <xiscofauli@libreoffice.org>2019-08-14 11:53:06 +0200
commit0f7eb072fdc2d5b4ee1690597dafc475a611f007 (patch)
tree71ac0d21c79e85874b2b46c38a4e0ff60ec4748a
parent80805539f6bd9b5f6229682aa187de705cb83de9 (diff)
Writer: Saving a damaged file as DOCX crashes
Change-Id: I42de376c69d0b1caa0a03622506d1bf6385ca57e Reviewed-on: https://gerrit.libreoffice.org/77412 Tested-by: Jenkins Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com> (cherry picked from commit de8415ff5a730465258cd5f0ab7c0d989ba5518d) Reviewed-on: https://gerrit.libreoffice.org/77444 Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org>
-rw-r--r--sw/source/filter/ww8/docxsdrexport.cxx19
1 files changed, 11 insertions, 8 deletions
diff --git a/sw/source/filter/ww8/docxsdrexport.cxx b/sw/source/filter/ww8/docxsdrexport.cxx
index 84943a518cac..9369552b0bfd 100644
--- a/sw/source/filter/ww8/docxsdrexport.cxx
+++ b/sw/source/filter/ww8/docxsdrexport.cxx
@@ -1422,14 +1422,17 @@ void DocxSdrExport::writeDMLTextFrame(ww8::Frame const* pParentFrame, int nAncho
// We need to init padding to 0, if it's not set.
// In LO the default is 0 and so ins attributes are not set when padding is 0
// but in MSO the default is 254 / 127, so we need to set 0 padding explicitly
- if (!m_pImpl->getBodyPrAttrList()->hasAttribute(XML_lIns))
- m_pImpl->getBodyPrAttrList()->add(XML_lIns, OString::number(0));
- if (!m_pImpl->getBodyPrAttrList()->hasAttribute(XML_tIns))
- m_pImpl->getBodyPrAttrList()->add(XML_tIns, OString::number(0));
- if (!m_pImpl->getBodyPrAttrList()->hasAttribute(XML_rIns))
- m_pImpl->getBodyPrAttrList()->add(XML_rIns, OString::number(0));
- if (!m_pImpl->getBodyPrAttrList()->hasAttribute(XML_bIns))
- m_pImpl->getBodyPrAttrList()->add(XML_bIns, OString::number(0));
+ if (m_pImpl->getBodyPrAttrList())
+ {
+ if (!m_pImpl->getBodyPrAttrList()->hasAttribute(XML_lIns))
+ m_pImpl->getBodyPrAttrList()->add(XML_lIns, OString::number(0));
+ if (!m_pImpl->getBodyPrAttrList()->hasAttribute(XML_tIns))
+ m_pImpl->getBodyPrAttrList()->add(XML_tIns, OString::number(0));
+ if (!m_pImpl->getBodyPrAttrList()->hasAttribute(XML_rIns))
+ m_pImpl->getBodyPrAttrList()->add(XML_rIns, OString::number(0));
+ if (!m_pImpl->getBodyPrAttrList()->hasAttribute(XML_bIns))
+ m_pImpl->getBodyPrAttrList()->add(XML_bIns, OString::number(0));
+ }
sax_fastparser::XFastAttributeListRef xBodyPrAttrList(m_pImpl->getBodyPrAttrList());
m_pImpl->setBodyPrAttrList(nullptr);