sc/source/core/tool/scmatrix.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
New commits: commit 10030e14c5aa8f7edf5ee1ba3c574527112c2f16 Author: Tor Lillqvist <t...@collabora.com> Date: Thu Dec 11 23:29:16 2014 +0200 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) diff --git a/sc/source/core/tool/scmatrix.cxx b/sc/source/core/tool/scmatrix.cxx index b111ddf..bf2f163 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: _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits