diff options
| author | Tomaž Vajngerl <quikee@gmail.com> | 2013-11-23 21:26:05 +0100 |
|---|---|---|
| committer | Tomaž Vajngerl <quikee@gmail.com> | 2013-12-08 11:26:54 +0100 |
| commit | 079887848b3dc835050176d92c552009c770b641 (patch) | |
| tree | 604808483950fd13f3abc39d417f4a281f2393a2 /sc | |
| parent | b9edc19c2a858b0b164aff746568c690558f9d99 (diff) | |
Fix detection of force intercept in XLS 97/2000/XP format.
NaN value indicates if the force intercept is enabled or not.
Change-Id: I51d33a6e04a4b5832f241e7ae7ee6d2fbb32ea9b
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/filter/excel/xichart.cxx | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/sc/source/filter/excel/xichart.cxx b/sc/source/filter/excel/xichart.cxx index 5fc57832295e..34c53434a588 100644 --- a/sc/source/filter/excel/xichart.cxx +++ b/sc/source/filter/excel/xichart.cxx @@ -195,13 +195,6 @@ void lclConvertTimeInterval( Any& rInterval, sal_uInt16 nValue, bool bAuto, sal_ rInterval <<= cssc::TimeInterval( nValue, lclGetApiTimeUnit( nTimeUnit ) ); } -bool lcl_IsForceIntercept(double intercept) -{ - sal_math_Double* pIntercept = reinterpret_cast<sal_math_Double*>(&intercept); - return (pIntercept->w32_parts.msw != 0xFFFFFFFF || - pIntercept->w32_parts.lsw != 0xFFFFFFFF); -} - } // namespace // Common ===================================================================== @@ -1658,7 +1651,7 @@ Reference< XRegressionCurve > XclImpChSerTrendLine::CreateRegressionCurve() cons aPropSet.SetProperty(EXC_CHPROP_EXTRAPOLATE_FORWARD, maData.mfForecastFor); aPropSet.SetProperty(EXC_CHPROP_EXTRAPOLATE_BACKWARD, maData.mfForecastBack); - sal_Bool bForceIntercept = lcl_IsForceIntercept(maData.mfIntercept); + sal_Bool bForceIntercept = !rtl::math::isNan(maData.mfIntercept); aPropSet.SetProperty(EXC_CHPROP_FORCE_INTERCEPT, bForceIntercept); if (bForceIntercept) { |