Skip to content

C
core
Kaydet (Commit) f5c48e69 authored tarafından Markus Mohrhard's avatar Markus Mohrhard Kaydeden (comit) Markus Mohrhard
Dosyalara gözat
Seçenekler

fix a few problems with my matrix commit 

Change-Id: I6e3fdf4bd26c952a59ad130dc6e5c9d1f3ff5f07
üst 1a27c648
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
sc/source/core/tool/interpr5.cxx
Dosyayı görüntüle @ f5c48e69
...@@ -1280,7 +1280,7 @@ void ScInterpreter::CalculateAddSub(bool _bSub) ...@@ -1280,7 +1280,7 @@ void ScInterpreter::CalculateAddSub(bool _bSub)
} }
SCSIZE nC, nR; SCSIZE nC, nR;
pMat->GetDimensions(nC, nR); pMat->GetDimensions(nC, nR);
ScMatrixRef pResMat = GetNewMat(nC, nR); ScMatrixRef pResMat = GetNewMat(nC, nR, true);
if (pResMat) if (pResMat)
{ {
svl::SharedString aString = mrStrPool.intern(ScGlobal::GetRscString(STR_NO_VALUE)); svl::SharedString aString = mrStrPool.intern(ScGlobal::GetRscString(STR_NO_VALUE));
......
sc/source/core/tool/scmatrix.cxx
Dosyayı görüntüle @ f5c48e69
...@@ -2029,7 +2029,7 @@ template<typename T> ...@@ -2029,7 +2029,7 @@ template<typename T>
void ScMatrixImpl::ApplyOperation(T aOp, ScMatrixImpl& rMat) void ScMatrixImpl::ApplyOperation(T aOp, ScMatrixImpl& rMat)
{ {
MatrixOpWrapper<T> aFunc(rMat.maMat, aOp); MatrixOpWrapper<T> aFunc(rMat.maMat, aOp);
rMat.maMat.walk(aFunc); maMat.walk(aFunc);
} }
#if DEBUG_MATRIX #if DEBUG_MATRIX
...@@ -2505,12 +2505,12 @@ public: ...@@ -2505,12 +2505,12 @@ public:
double operator()(double nVal) const double operator()(double nVal) const
{ {
return mnVal - nVal; return nVal - mnVal;
} }
double operator()(bool bVal) const double operator()(bool bVal) const
{ {
return mnVal - (double)bVal; return (double)bVal - mnVal;
} }
svl::SharedString operator()(const svl::SharedString&) const svl::SharedString operator()(const svl::SharedString&) const
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment