[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - formula/source

[Eike Rathke]

 formula/source/core/api/token.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 64c599e06badd7225f86025ee552db812b0ae78b
Author: Eike Rathke <erack at redhat.com>
Date:   Tue Jan 5 22:05:46 2016 +0100

    for new'ed FormulaToken use FormulaTokenArray::Add()
    
    ... instead of AddToken() that just clones it again.
    
    Change-Id: I99b02b0924d0a0c070435501f8ecd45f030e9c2c
    (cherry picked from commit c3d2313eca8fdab9eb3b4c9a49fd14e255feb2c0)

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