download.lst | 4 ++-- sc/source/filter/excel/excrecds.cxx | 7 ++----- 2 files changed, 4 insertions(+), 7 deletions(-)
New commits: commit 49b93a65ae39f86b8d3f85e6f98a2f91a1a5cb18 Author: Noel Grandin <[email protected]> AuthorDate: Tue Nov 25 15:09:39 2025 +0200 Commit: Xisco Fauli <[email protected]> CommitDate: Fri Nov 28 22:06:01 2025 +0100 update to officeotron-0.8.4.jar This reveals a problem with our export of the "dateCompatibility" attribute. We actually only want to write that out when targeting Word 2007, otherwise we want to use the more normal "date1904" attribute. Change-Id: I972bc7298ecf5026a76d109535a91c0c2544d08a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/194522 Reviewed-by: Noel Grandin <[email protected]> Code-Style: Noel Grandin <[email protected]> Tested-by: Jenkins CollaboraOffice <[email protected]> Tested-by: Noel Grandin <[email protected]> (cherry picked from commit efebbf0107c57a2c3c73251085b90d7e6c06d3b0) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/194787 Tested-by: Jenkins Reviewed-by: Xisco Fauli <[email protected]> diff --git a/download.lst b/download.lst index bffcaf57ecc8..cba2933bf49c 100644 --- a/download.lst +++ b/download.lst @@ -534,8 +534,8 @@ ODFVALIDATOR_JAR := odfvalidator-0.9.0-RC2-SNAPSHOT-jar-with-dependencies-2726ab # three static lines # so that git cherry-pick # will not run into conflicts -OFFICEOTRON_SHA256SUM := f2443f27561af52324eee03a1892d9f569adc8db9e7bca55614898bc2a13a770 -OFFICEOTRON_JAR := 8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar +OFFICEOTRON_SHA256SUM := 567b9579510969e34085ed30995d87b27a11584f03711d7fc9b7ec2e1cea36c5 +OFFICEOTRON_JAR := officeotron-0.8.4.jar # three static lines # so that git cherry-pick # will not run into conflicts diff --git a/sc/source/filter/excel/excrecds.cxx b/sc/source/filter/excel/excrecds.cxx index b47c7ada1834..7c9023dee0ca 100644 --- a/sc/source/filter/excel/excrecds.cxx +++ b/sc/source/filter/excel/excrecds.cxx @@ -267,14 +267,11 @@ sal_uInt16 Exc1904::GetNum() const void Exc1904::SaveXml( XclExpXmlStream& rStrm ) { - bool bISOIEC = ( rStrm.getVersion() == oox::core::ISOIEC_29500_2008 ); - - if( bISOIEC ) + if( rStrm.getVersion() == oox::core::ECMA_376_1ST_EDITION ) // Word 2007 Compat { rStrm.WriteAttributes(XML_dateCompatibility, ToPsz(bDateCompatibility)); } - - if( !bISOIEC || bDateCompatibility ) + else { rStrm.WriteAttributes(XML_date1904, ToPsz(bVal)); }
