diff options
| -rw-r--r-- | oox/source/core/xmlfilterbase.cxx | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/oox/source/core/xmlfilterbase.cxx b/oox/source/core/xmlfilterbase.cxx index bf839313dbdc..5c34eade77ff 100644 --- a/oox/source/core/xmlfilterbase.cxx +++ b/oox/source/core/xmlfilterbase.cxx @@ -694,6 +694,13 @@ writeAppProperties( XmlFilterBase& rSelf, Reference< XDocumentProperties > xProp static void writeCustomProperties( XmlFilterBase& rSelf, Reference< XDocumentProperties > xProperties ) { + uno::Reference<beans::XPropertyAccess> xUserDefinedProperties( xProperties->getUserDefinedProperties(), uno::UNO_QUERY ); + Sequence< PropertyValue > aprop( xUserDefinedProperties->getPropertyValues() ); + sal_Int32 nbCustomProperties = aprop.getLength(); + // tdf#89791 : if no custom properties, no need to add docProps/custom.x + if (!nbCustomProperties) + return; + rSelf.addRelation( "http://schemas.openxmlformats.org/officeDocument/2006/relationships/custom-properties", "docProps/custom.xml" ); @@ -705,9 +712,7 @@ writeCustomProperties( XmlFilterBase& rSelf, Reference< XDocumentProperties > xP FSNS( XML_xmlns, XML_vt ), "http://schemas.openxmlformats.org/officeDocument/2006/docPropsVTypes", FSEND ); - uno::Reference<beans::XPropertyAccess> xUserDefinedProperties( xProperties->getUserDefinedProperties(), uno::UNO_QUERY ); - Sequence< PropertyValue > aprop( xUserDefinedProperties->getPropertyValues() ); - for ( sal_Int32 n = 0; n < aprop.getLength(); ++n ) + for ( sal_Int32 n = 0; n < nbCustomProperties; ++n ) { if ( !aprop[n].Name.isEmpty() ) { |