mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

a few more candidates for errMatrixSize

Browse Source 
Change-Id: Ia3ea04d15ce73526e87dfb5670eedff983daa40e
This commit is contained in:
Eike Rathke
2016-03-07 19:30:30 +01:00
parent 36483fde78
commit 25d8652796
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sc/source/core/tool/interpr3.cxx
View File

@@ -3775,7 +3775,7 @@ void ScInterpreter::GetSortArray( sal_uInt8 nParamCount, vector<double>& rSortAr
{ {
GetNumberSequenceArray( nParamCount, rSortArray, bConvertTextInArray ); GetNumberSequenceArray( nParamCount, rSortArray, bConvertTextInArray );
if (rSortArray.size() > MAX_ANZ_DOUBLE_FOR_SORT) if (rSortArray.size() > MAX_ANZ_DOUBLE_FOR_SORT)
SetError( errStackOverflow); SetError( errMatrixSize);
else if ( rSortArray.empty() ) else if ( rSortArray.empty() )
{ {
if ( bAllowEmptyArray ) if ( bAllowEmptyArray )

4
sc/source/core/tool/interpr5.cxx
View File

@@ -331,7 +331,7 @@ ScMatrixRef ScInterpreter::GetNewMat(SCSIZE nC, SCSIZE nR, bool bEmpty)
pMat->GetDimensions( nCols, nRows); pMat->GetDimensions( nCols, nRows);
if ( nCols != nC || nRows != nR ) if ( nCols != nC || nRows != nR )
{ // arbitray limit of elements exceeded { // arbitray limit of elements exceeded
SetError( errStackOverflow); SetError( errMatrixSize);
pMat.reset(); pMat.reset();
} }
return pMat; return pMat;
@@ -2994,7 +2994,7 @@ void ScInterpreter::CalculateTrendGrowth(bool _bGrowth)
ScMatrixRef pCopyY = pMatY->CloneIfConst(); ScMatrixRef pCopyY = pMatY->CloneIfConst();
if (!pCopyX || !pCopyY) if (!pCopyX || !pCopyY)
{ {
PushError(errStackOverflow); PushError(errMatrixSize);
return; return;
} }
pMatX = pCopyX; pMatX = pCopyX;