Skip to content

C
core
Kaydet (Commit) 4284cdcc authored tarafından Dennis Francis's avatar Dennis Francis
Dosyalara gözat
Seçenekler

Type check the tokens before reuse 

If the exisiting token is of wrong type, create and use a fresh new
token instead.

Change-Id: I348b0972306497dfe7eae0655c9b93d5830cb740
üst 1f9d91af
Hide whitespace changes
Inline Side-by-side
Showing with 23 additions and 2 deletions
sc/source/core/tool/formulagroup.cxx
Dosyayı görüntüle @ 4284cdcc
......@@ -206,13 +206,26 @@ public:
if ( !pTargetTok )
aCode2.AddString(rPool.intern(OUString(pStr)));
else
pTargetTok->SetString(rPool.intern(OUString(pStr)));
{
if ( pTargetTok->GetType() == formula::svString )
pTargetTok->SetString(rPool.intern(OUString(pStr)));
else
{
formula::FormulaStringToken* pStrTok = new formula::FormulaStringToken(rPool.intern(OUString(pStr)));
aCode2.ReplaceToken(nTokIdx, pStrTok, formula::FormulaTokenArray::CODE_ONLY);
}
}
}
else if (rtl::math::isNan(fVal))
{
// Value of NaN represents an empty cell.
if ( !pTargetTok )
aCode2.AddToken(ScEmptyCellToken(false, false));
else if ( pTargetTok->GetType() != formula::svEmptyCell )
{
ScEmptyCellToken* pEmptyTok = new ScEmptyCellToken(false, false);
aCode2.ReplaceToken(nTokIdx, pEmptyTok, formula::FormulaTokenArray::CODE_ONLY);
}
}
else
{
......@@ -220,7 +233,15 @@ public:
if ( !pTargetTok )
aCode2.AddDouble(fVal);
else
pTargetTok->GetDoubleAsReference() = fVal;
{
if ( pTargetTok->GetType() == formula::svDouble )
pTargetTok->GetDoubleAsReference() = fVal;
else
{
formula::FormulaDoubleToken* pDoubleTok = new formula::FormulaDoubleToken( fVal );
aCode2.ReplaceToken(nTokIdx, pDoubleTok, formula::FormulaTokenArray::CODE_ONLY);
}
}
}
}
break;
......
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