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

for new'ed FormulaToken use FormulaTokenArray::Add()

Browse Source 
... instead of AddToken() that just clones it again.

Change-Id: I99b02b0924d0a0c070435501f8ecd45f030e9c2c
This commit is contained in:
Eike Rathke
2016-01-05 22:05:46 +01:00
parent 2851683d8a
commit c3d2313eca
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
formula/source/core/api/token.cxx
View File

@@ -1513,7 +1513,7 @@ FormulaTokenArray * FormulaTokenArray::RewriteMissing( const MissingConvention &
{ {
FormulaToken *pToken = new FormulaToken( svByte, FormulaToken *pToken = new FormulaToken( svByte,
( pCur->GetOpCode() == ocCeil ? ocCeil_Math : ocFloor_Math ) ); ( pCur->GetOpCode() == ocCeil ? ocCeil_Math : ocFloor_Math ) );
pNewArr->AddToken( *pToken ); pNewArr->Add( pToken );
} }
else if (pCur->GetOpCode() == ocWeeknumOOo && else if (pCur->GetOpCode() == ocWeeknumOOo &&
rConv.getConvention() == MissingConvention::FORMULA_MISSING_CONVENTION_ODFF) rConv.getConvention() == MissingConvention::FORMULA_MISSING_CONVENTION_ODFF)
@@ -1529,7 +1529,7 @@ FormulaTokenArray * FormulaTokenArray::RewriteMissing( const MissingConvention &
* formula/source/core/resource/core_resource.src * formula/source/core/resource/core_resource.src
* SC_OPCODE_WEEKNUM_OOO */ * SC_OPCODE_WEEKNUM_OOO */
FormulaToken *pToken = new FormulaByteToken( ocIsoWeeknum, pCur->GetByte(), pCur->IsInForceArray()); FormulaToken *pToken = new FormulaByteToken( ocIsoWeeknum, pCur->GetByte(), pCur->IsInForceArray());
pNewArr->AddToken( *pToken ); pNewArr->Add( pToken );
} }
else else
pNewArr->AddToken( *pCur ); pNewArr->AddToken( *pCur );