diff options
| author | Kohei Yoshida <kohei.yoshida@gmail.com> | 2013-02-13 17:45:26 -0500 |
|---|---|---|
| committer | Kohei Yoshida <kohei.yoshida@gmail.com> | 2013-02-13 18:03:10 -0500 |
| commit | 603262b7d19da53eeb7235f6fa460777825c0ddf (patch) | |
| tree | 9e73c5cfa1bc647424e2406fe7f49d6aadfb8ead | |
| parent | 623253418b3fc18a8122ea1f71e86628208000ff (diff) | |
sal_Bool to bool.
Change-Id: I2599e12a9072a0ea34c62a9fd7982dd4630c329f
| -rw-r--r-- | sc/inc/subtotal.hxx | 9 | ||||
| -rw-r--r-- | sc/source/core/tool/subtotal.cxx | 14 |
2 files changed, 10 insertions, 13 deletions
diff --git a/sc/inc/subtotal.hxx b/sc/inc/subtotal.hxx index 443286806038..379bf10e7f0b 100644 --- a/sc/inc/subtotal.hxx +++ b/sc/inc/subtotal.hxx @@ -25,10 +25,9 @@ class SubTotal { public: - - static sal_Bool SafePlus( double& fVal1, double fVal2); - static sal_Bool SafeMult( double& fVal1, double fVal2); - static sal_Bool SafeDiv( double& fVal1, double fVal2); + static bool SafePlus( double& fVal1, double fVal2); + static bool SafeMult( double& fVal1, double fVal2); + static bool SafeDiv( double& fVal1, double fVal2); }; @@ -37,7 +36,7 @@ struct ScFunctionData // to calculate single functions ScSubTotalFunc eFunc; double nVal; long nCount; - sal_Bool bError; + bool bError; ScFunctionData( ScSubTotalFunc eFn ) : eFunc(eFn), nVal(0.0), nCount(0), bError(false) {} diff --git a/sc/source/core/tool/subtotal.cxx b/sc/source/core/tool/subtotal.cxx index 659369db1b39..b5d253992a4d 100644 --- a/sc/source/core/tool/subtotal.cxx +++ b/sc/source/core/tool/subtotal.cxx @@ -20,11 +20,9 @@ #include "subtotal.hxx" #include "interpre.hxx" -// ----------------------------------------------------------------------- - -sal_Bool SubTotal::SafePlus(double& fVal1, double fVal2) +bool SubTotal::SafePlus(double& fVal1, double fVal2) { - sal_Bool bOk = sal_True; + bool bOk = true; SAL_MATH_FPEXCEPTIONS_OFF(); fVal1 += fVal2; if (!::rtl::math::isFinite(fVal1)) @@ -39,9 +37,9 @@ sal_Bool SubTotal::SafePlus(double& fVal1, double fVal2) } -sal_Bool SubTotal::SafeMult(double& fVal1, double fVal2) +bool SubTotal::SafeMult(double& fVal1, double fVal2) { - sal_Bool bOk = sal_True; + bool bOk = true; SAL_MATH_FPEXCEPTIONS_OFF(); fVal1 *= fVal2; if (!::rtl::math::isFinite(fVal1)) @@ -53,9 +51,9 @@ sal_Bool SubTotal::SafeMult(double& fVal1, double fVal2) } -sal_Bool SubTotal::SafeDiv(double& fVal1, double fVal2) +bool SubTotal::SafeDiv(double& fVal1, double fVal2) { - sal_Bool bOk = sal_True; + bool bOk = true; SAL_MATH_FPEXCEPTIONS_OFF(); fVal1 /= fVal2; if (!::rtl::math::isFinite(fVal1)) |