diff options
| author | Markus Mohrhard <markus.mohrhard@collabora.co.uk> | 2014-12-22 16:53:44 +0100 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2014-12-22 16:56:30 +0100 |
| commit | f5c48e690fefbc2bd970485c480d7d07f1936ab9 (patch) | |
| tree | 3a0ab94fa77c0d1618628f444027646247a2d45e /sc | |
| parent | 1a27c648c8a72bc69c5f5a56e9398f6e5980b387 (diff) | |
fix a few problems with my matrix commit
Change-Id: I6e3fdf4bd26c952a59ad130dc6e5c9d1f3ff5f07
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/core/tool/interpr5.cxx | 2 | ||||
| -rw-r--r-- | sc/source/core/tool/scmatrix.cxx | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sc/source/core/tool/interpr5.cxx b/sc/source/core/tool/interpr5.cxx index 533aafbb51be..2cf80982c40a 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 cb7701fdd311..c352ecb34ff9 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 |