This is an automated email from the ASF dual-hosted git repository. jimjag pushed a commit to branch odf-devel in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit 8465c7433584d56923a60439b6951c87f09a5fea Author: Jim Jagielski <[email protected]> AuthorDate: Fri Oct 23 13:40:03 2026 -0400 xmloff: don't write preserved attributes in ODF namespaces in default mode --- main/sw/source/filter/xml/xmlexpit.cxx | 2 +- main/xmloff/source/style/xmlexppr.cxx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/main/sw/source/filter/xml/xmlexpit.cxx b/main/sw/source/filter/xml/xmlexpit.cxx index f5459c4d68..e954214140 100644 --- a/main/sw/source/filter/xml/xmlexpit.cxx +++ b/main/sw/source/filter/xml/xmlexpit.cxx @@ -174,7 +174,7 @@ void SvXMLExportItemMapper::exportXML( const SvXMLExport& rExport, OUStringBuffer sName; for( sal_uInt16 i=0; i < nCount; i++ ) { - if( rExport.getDefaultVersion() == SvtSaveOptions::ODFVER_012 && + if( rExport.getDefaultVersion() >= SvtSaveOptions::ODFVER_012 && SvXMLIsODFNamespace( pUnknown->GetAttrNamespace( i ) ) ) continue; OUString sPrefix( pUnknown->GetAttrPrefix( i ) ); diff --git a/main/xmloff/source/style/xmlexppr.cxx b/main/xmloff/source/style/xmlexppr.cxx index fdb6981b70..44ada8d8ed 100644 --- a/main/xmloff/source/style/xmlexppr.cxx +++ b/main/xmloff/source/style/xmlexppr.cxx @@ -995,7 +995,7 @@ void SvXMLExportPropertyMapper::_exportXML( OUStringBuffer sNameBuffer; xml::AttributeData aData; - const sal_Bool bSkipODFNamespaces( SvtSaveOptions().GetODFDefaultVersion() == SvtSaveOptions::ODFVER_012 ); + const sal_Bool bSkipODFNamespaces( SvtSaveOptions().GetODFDefaultVersion() >= SvtSaveOptions::ODFVER_012 ); for( sal_Int32 i=0; i < nCount; i++, pAttribName++ ) { xAttrContainer->getByName( *pAttribName ) >>= aData;
