summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEike Rathke <erack@redhat.com>2021-01-06 15:02:05 +0100
committerEike Rathke <erack@redhat.com>2021-01-07 00:32:43 +0100
commit0e37ded8d4aea25e5d9f7325fba0597f509147bc (patch)
treee7b73affe720785e081256a52efd22d03ec58dc8
parente0f1b5bd94550835c639efda4e4c9a801c78dbe9 (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*. Change-Id: I31cf598d5f91d1f727d5f1f0e936a3505ea1b9e0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108875 Tested-by: Jenkins Reviewed-by: Eike Rathke <erack@redhat.com>
-rw-r--r--sw/source/filter/xml/xmltbli.cxx4
1 files changed, 3 insertions, 1 deletions
diff --git a/sw/source/filter/xml/xmltbli.cxx b/sw/source/filter/xml/xmltbli.cxx
index 263fe55c188c..061ea32d63e5 100644
--- a/sw/source/filter/xml/xmltbli.cxx
+++ b/sw/source/filter/xml/xmltbli.cxx
@@ -396,8 +396,10 @@ SwXMLTableCellContext_Impl::SwXMLTableCellContext_Impl(
break;
case XML_ELEMENT(OFFICE, XML_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, aIter.toView()))
+ if (::sax::Converter::convertDouble(fTmp, aIter.toView()) && fTmp < DBL_MAX)
{
m_fValue = fTmp;
m_bHasValue = true;