summaryrefslogtreecommitdiff
path: root/oox
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2022-10-11 10:45:40 +0100
committerCaolán McNamara <caolanm@redhat.com>2022-10-12 09:52:15 +0200
commit06423ddc61a378894c91a6a23fb31afb1701d8f2 (patch)
treedeb6ad0b2212885c263b58849652e87cb2e0cb06 /oox
parent56b8703d6f759326f7ac1a84ca0e6d1c9b40aad7 (diff)
crashtesting: exception during dtor
Change-Id: I9874778ba79540cfde32bf59c3a63ebb72889dc7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/141215 Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'oox')
-rw-r--r--oox/source/core/xmlfilterbase.cxx6
-rw-r--r--oox/source/export/chartexport.cxx3
2 files changed, 9 insertions, 0 deletions
diff --git a/oox/source/core/xmlfilterbase.cxx b/oox/source/core/xmlfilterbase.cxx
index e0e8b099ea5e..c2911a756047 100644
--- a/oox/source/core/xmlfilterbase.cxx
+++ b/oox/source/core/xmlfilterbase.cxx
@@ -697,6 +697,8 @@ writeCoreProperties( XmlFilterBase& rSelf, const Reference< XDocumentProperties
}
pCoreProps->endElementNS( XML_cp, XML_coreProperties );
+
+ pCoreProps->endDocument();
}
static void
@@ -819,6 +821,8 @@ writeAppProperties( XmlFilterBase& rSelf, const Reference< XDocumentProperties >
}
pAppProps->endElement( XML_Properties );
+
+ pAppProps->endDocument();
}
static void
@@ -937,6 +941,8 @@ writeCustomProperties( XmlFilterBase& rSelf, const Reference< XDocumentPropertie
++nIndex;
}
pAppProps->endElement( XML_Properties );
+
+ pAppProps->endDocument();
}
void XmlFilterBase::exportDocumentProperties( const Reference< XDocumentProperties >& xProperties, bool bSecurityOptOpenReadOnly )
diff --git a/oox/source/export/chartexport.cxx b/oox/source/export/chartexport.cxx
index 6bdede718f05..b60e84590ae9 100644
--- a/oox/source/export/chartexport.cxx
+++ b/oox/source/export/chartexport.cxx
@@ -874,6 +874,8 @@ void ChartExport::WriteChartObj( const Reference< XShape >& xShape, sal_Int32 nI
SetFS( pChart );
ExportContent();
+ SetFS( pFS );
+ pChart->endDocument();
}
void ChartExport::InitRangeSegmentationProperties( const Reference< chart2::XChartDocument > & xChartDoc )
@@ -1115,6 +1117,7 @@ void ChartExport::exportAdditionalShapes( const Reference< css::chart::XChartDoc
pDrawing->endElement(FSNS(XML_cdr, XML_relSizeAnchor));
}
pDrawing->endElement(FSNS(XML_c, XML_userShapes));
+ pDrawing->endDocument();
}
}
catch (const uno::Exception&)