[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - sc/source

[Libreoffice Gerrit user]

 sc/source/filter/xml/xmlexprt.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit f9f0c64be932e290a556e58ab9feea4a5d655f9d
Author:     Julien Nabet <serval2412 at yahoo.fr>
AuthorDate: Sun Dec 30 00:20:33 2018 +0100
Commit:     Markus Mohrhard <markus.mohrhard at googlemail.com>
CommitDate: Mon Dec 31 21:48:08 2018 +0100

    tdf#114919: fix ods export in ODF 1.2 strict
    
    See Valgrind trace here:
    https://bugs.documentfoundation.org/attachment.cgi?id=147891
    which contains bt
    
    Due to a8b7c72425aabae87bfd2e141aa06f06319ae11c
    "
    add error to office:value-type for calc cells and fdo#51810
    For cached value import we need the information which cells are error
    cells. For ODF 1.2 extended we therefore export now calcext:office-value
    with the additional value "error".
    "
    
    Change-Id: I13547ecc7ef8c1c4e1a236229d3b19d51f12470b
    Reviewed-on: https://gerrit.libreoffice.org/65728
    Tested-by: Jenkins
    Reviewed-by: Julien Nabet <serval2412 at yahoo.fr>
    (cherry picked from commit 5534bfef6426128af2147de995224d7cdf43a2bf)
    Reviewed-on: https://gerrit.libreoffice.org/65737
    Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>

diff --git a/sc/source/filter/xml/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxx
index 6f4109e4f5f7..2d7b2f4fbc45 100644
--- a/sc/source/filter/xml/xmlexprt.cxx
+++ b/sc/source/filter/xml/xmlexprt.cxx
@@ -3248,7 +3248,7 @@ void ScXMLExport::WriteCell(ScMyCell& aCell, sal_Int32 nEqualCellCount)
                         {
                             GetNumberFormatAttributesExportHelper()->SetNumberFormatAttributes(
                                     aCell.nNumberFormat, pDoc->GetValue(aCell.maCellAddress));
-                            if( getDefaultVersion() >= SvtSaveOptions::ODFVER_012 )
+                            if( getDefaultVersion() > SvtSaveOptions::ODFVER_012 )
                             {
                                 GetNumberFormatAttributesExportHelper()->SetNumberFormatAttributes(
                                         aCell.nNumberFormat, pDoc->GetValue(aCell.maCellAddress), false, XML_NAMESPACE_CALC_EXT, false );