Kaydet (Commit) 266aab73 authored tarafından Eike Rathke's avatar Eike Rathke

Resolves: tdf#113898 create JumpMatrix for svExternalDoubleRef scalar values

Change-Id: I45d2a1e573a7e4923aaaf5b69f3c4b39215aacc2
Reviewed-on: https://gerrit.libreoffice.org/63778Reviewed-by: 's avatarEike Rathke <erack@redhat.com>
Tested-by: Jenkins
üst 85acc270
......@@ -1527,7 +1527,7 @@ bool ScInterpreter::ConvertMatrixParameters()
case svExternalDoubleRef:
{
formula::ParamClass eType = ScParameterClassification::GetParameterType( pCur, nParams - i);
if (eType == formula::ParamClass::Array)
if (eType == formula::ParamClass::Value || eType == formula::ParamClass::Array)
{
sal_uInt16 nFileId = p->GetIndex();
OUString aTabName = p->GetString().getString();
......@@ -1543,6 +1543,15 @@ bool ScInterpreter::ConvertMatrixParameters()
ScMatrixRef pMat = pTemp->GetMatrix();
if (pMat)
{
if (eType == formula::ParamClass::Value)
{ // only if single value expected
SCSIZE nC, nR;
pMat->GetDimensions( nC, nR);
if (nJumpCols < nC)
nJumpCols = nC;
if (nJumpRows < nR)
nJumpRows = nR;
}
formula::FormulaToken* pNew = new ScMatrixToken( pMat);
pNew->IncRef();
pStack[ sp - i ] = pNew;
......
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