sc/source/core/tool/interpr5.cxx | 2 +- sc/source/core/tool/scmatrix.cxx | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-)
New commits: commit f5c48e690fefbc2bd970485c480d7d07f1936ab9 Author: Markus Mohrhard <markus.mohrh...@collabora.co.uk> Date: Mon Dec 22 16:53:44 2014 +0100 fix a few problems with my matrix commit Change-Id: I6e3fdf4bd26c952a59ad130dc6e5c9d1f3ff5f07 diff --git a/sc/source/core/tool/interpr5.cxx b/sc/source/core/tool/interpr5.cxx index 533aafb..2cf8098 100644 --- a/sc/source/core/tool/interpr5.cxx +++ b/sc/source/core/tool/interpr5.cxx @@ -1280,7 +1280,7 @@ void ScInterpreter::CalculateAddSub(bool _bSub) } SCSIZE nC, nR; pMat->GetDimensions(nC, nR); - ScMatrixRef pResMat = GetNewMat(nC, nR); + ScMatrixRef pResMat = GetNewMat(nC, nR, true); if (pResMat) { svl::SharedString aString = mrStrPool.intern(ScGlobal::GetRscString(STR_NO_VALUE)); diff --git a/sc/source/core/tool/scmatrix.cxx b/sc/source/core/tool/scmatrix.cxx index cb7701f..c352ecb 100644 --- a/sc/source/core/tool/scmatrix.cxx +++ b/sc/source/core/tool/scmatrix.cxx @@ -2029,7 +2029,7 @@ template<typename T> void ScMatrixImpl::ApplyOperation(T aOp, ScMatrixImpl& rMat) { MatrixOpWrapper<T> aFunc(rMat.maMat, aOp); - rMat.maMat.walk(aFunc); + maMat.walk(aFunc); } #if DEBUG_MATRIX @@ -2505,12 +2505,12 @@ public: double operator()(double nVal) const { - return mnVal - nVal; + return nVal - mnVal; } double operator()(bool bVal) const { - return mnVal - (double)bVal; + return (double)bVal - mnVal; } svl::SharedString operator()(const svl::SharedString&) const _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits