diff options
| -rwxr-xr-x | sw/qa/core/data/odt/fail/forcepoint-dtor-1.odt | bin | 0 -> 220389 bytes | |||
| -rw-r--r-- | sw/source/filter/xml/xmlimp.cxx | 5 |
2 files changed, 5 insertions, 0 deletions
diff --git a/sw/qa/core/data/odt/fail/forcepoint-dtor-1.odt b/sw/qa/core/data/odt/fail/forcepoint-dtor-1.odt Binary files differnew file mode 100755 index 000000000000..6442200cdeda --- /dev/null +++ b/sw/qa/core/data/odt/fail/forcepoint-dtor-1.odt diff --git a/sw/source/filter/xml/xmlimp.cxx b/sw/source/filter/xml/xmlimp.cxx index 1a4988339d5a..8def02edd002 100644 --- a/sw/source/filter/xml/xmlimp.cxx +++ b/sw/source/filter/xml/xmlimp.cxx @@ -431,6 +431,11 @@ SwXMLImport::SwXMLImport( SwXMLImport::~SwXMLImport() throw () { + if (HasShapeImport()) + { + SAL_WARN("sw", "endDocument skipped, dropping shapes now to avoid dangling SvTextShapeImportHelper pointing to this"); + ClearShapeImport(); + } delete m_pDocElemTokenMap; delete m_pTableElemTokenMap; delete m_pTableCellAttrTokenMap; |