summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorMichael Stahl <mst@openoffice.org>2010-08-27 12:26:50 +0200
committerMichael Stahl <mst@openoffice.org>2010-08-27 12:26:50 +0200
commit5835ba13b9ca4e5386b8a7f9b3c86262f54016fb (patch)
treef5d0f7339ba5023fc6213b0ed036cdf710809d55 /sw
parentcaefe9e5f6df6c51d000afc940d2e2eb983471d6 (diff)
dba33h: #i112652#: SwXCell::getValue(): do not filter out NaN
Diffstat (limited to 'sw')
-rw-r--r--sw/source/core/unocore/unotbl.cxx9
1 files changed, 3 insertions, 6 deletions
diff --git a/sw/source/core/unocore/unotbl.cxx b/sw/source/core/unocore/unotbl.cxx
index b7098710802b..fdc382ad99d9 100644
--- a/sw/source/core/unocore/unotbl.cxx
+++ b/sw/source/core/unocore/unotbl.cxx
@@ -1009,12 +1009,9 @@ void SwXCell::setFormula(const OUString& rFormula) throw( uno::RuntimeException
double SwXCell::getValue(void) throw( uno::RuntimeException )
{
vos::OGuard aGuard(Application::GetSolarMutex());
- double fRet = lcl_getValue( *this );
- //lcl_getValue was changed thus it can return nan values,
- //so I make this additional nan check here to not change the behaviour
- //but maybe it would even be more correct to just return nan here? ... todo?
- if( ::rtl::math::isNan( fRet ) )
- fRet = 0.0;
+
+ double const fRet = lcl_getValue( *this );
+ // #i112652# a table cell may contain NaN as a value, do not filter that
return fRet;
}
/*-- 11.12.98 10:56:26---------------------------------------------------