diff options
| author | Eike Rathke <erack@redhat.com> | 2021-01-06 15:02:05 +0100 |
|---|---|---|
| committer | Xisco Fauli <xiscofauli@libreoffice.org> | 2021-01-07 10:52:28 +0100 |
| commit | 428244a88ab01c68a8dec4d39eff3c0ece69b784 (patch) | |
| tree | 76f6a392b4c788337157ce8036cd4833cff646b7 /sw | |
| parent | 8c7266b084fe95460c1e8b5e27bb4464ca1cc20a (diff) | |
Resolves: tdf#139126 DBL_MAX is a valid value, just not for Writer
Restore the old side effect behaviour where
"1.79769313486232E+308" was not converted back to DBL_MAX, Writer
doesn't check cell value after import for this "special value",
*cough*.
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108875
Tested-by: Jenkins
Reviewed-by: Eike Rathke <erack@redhat.com>
(cherry picked from commit 0e37ded8d4aea25e5d9f7325fba0597f509147bc)
Conflicts:
sw/source/filter/xml/xmltbli.cxx
Change-Id: I31cf598d5f91d1f727d5f1f0e936a3505ea1b9e0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108900
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/filter/xml/xmltbli.cxx | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sw/source/filter/xml/xmltbli.cxx b/sw/source/filter/xml/xmltbli.cxx index 5a95befacf47..de540a39e17a 100644 --- a/sw/source/filter/xml/xmltbli.cxx +++ b/sw/source/filter/xml/xmltbli.cxx @@ -498,8 +498,10 @@ SwXMLTableCellContext_Impl::SwXMLTableCellContext_Impl( break; case XML_TOK_TABLE_VALUE: { + // Writer wrongly uses DBL_MAX to flag error but fails to + // check for it after import, so check that here, tdf#139126. double fTmp; - if (::sax::Converter::convertDouble(fTmp, rValue)) + if (::sax::Converter::convertDouble(fTmp, rValue) && fTmp < DBL_MAX) { m_fValue = fTmp; m_bHasValue = true; |