Skip to content

C
core
Kaydet (Commit) 0f8174da authored tarafından Kohei Yoshida's avatar Kohei Yoshida
Dosyalara gözat
Seçenekler

Bail out early. 

Change-Id: Id2dcaebd8213704c777f77bf7fb735a9788d68bd
üst 5df31d1c
Show whitespace changes
Inline Side-by-side
Showing with 7 additions and 2 deletions
sc/source/core/tool/interpr1.cxx
Dosyayı görüntüle @ 0f8174da
...@@ -940,8 +940,13 @@ sc::RangeMatrix ScInterpreter::CompareMat( sc::CompareOptions* pOptions ) ...@@ -940,8 +940,13 @@ sc::RangeMatrix ScInterpreter::CompareMat( sc::CompareOptions* pOptions )
} }
sc::RangeMatrix aRes; sc::RangeMatrix aRes;
if( !nGlobalError )
if (nGlobalError)
{ {
nCurFmtType = nFuncFmtType = NUMBERFORMAT_LOGICAL;
return aRes;
}
if (aMat[0].mpMat && aMat[1].mpMat) if (aMat[0].mpMat && aMat[1].mpMat)
{ {
SCSIZE nC0, nC1; SCSIZE nC0, nC1;
...@@ -1003,7 +1008,7 @@ sc::RangeMatrix ScInterpreter::CompareMat( sc::CompareOptions* pOptions ) ...@@ -1003,7 +1008,7 @@ sc::RangeMatrix ScInterpreter::CompareMat( sc::CompareOptions* pOptions )
ScMatrix& rResMat = *aRes.mpMat; ScMatrix& rResMat = *aRes.mpMat;
rMat.CompareMatrix(rResMat, aComp, i, pOptions); rMat.CompareMatrix(rResMat, aComp, i, pOptions);
} }
}
nCurFmtType = nFuncFmtType = NUMBERFORMAT_LOGICAL; nCurFmtType = nFuncFmtType = NUMBERFORMAT_LOGICAL;
return aRes; return aRes;
} }
......
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