summaryrefslogtreecommitdiff
path: root/sc
diff options
context:
space:
mode:
authorTor Lillqvist <tml@collabora.com>2014-12-11 23:29:16 +0200
committerStephan Bergmann <sbergman@redhat.com>2015-01-19 12:10:14 +0100
commit10030e14c5aa8f7edf5ee1ba3c574527112c2f16 (patch)
tree01436e39f5efaf9141d46d345fdcadaf8aadf452 /sc
parentd2952c7ad52b3ca7425beec7516ee8130ea683d5 (diff)
WaE: implicit conversion (IntegralToFloating) from bool to 'const double'
Kohei says it is intentional, i.e. 1.0 or 0.0 should be passed, so say so explicitly to avoid warning. Change-Id: Ieff79d35f2b0770ea9de02b83d117ac90009f7d5 (cherry picked from commit a0b54683d9ee8987e80cf81746aa147d53bf661a)
Diffstat (limited to 'sc')
-rw-r--r--sc/source/core/tool/scmatrix.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/sc/source/core/tool/scmatrix.cxx b/sc/source/core/tool/scmatrix.cxx
index b111ddf2d652..bf2f1632b6d2 100644
--- a/sc/source/core/tool/scmatrix.cxx
+++ b/sc/source/core/tool/scmatrix.cxx
@@ -1477,7 +1477,7 @@ class CompareMatrixToNumericFunc : std::unary_function<MatrixImplType::element_b
{
double fVal = sc::CompareEmptyToNumericFunc(mfRightValue);
bool bRes = evaluate(fVal, mrComp.meOp);
- maResValues.resize(maResValues.size() + nSize, bRes);
+ maResValues.resize(maResValues.size() + nSize, bRes ? 1.0 : 0.0);
}
public: