diff options
| author | Eike Rathke <erack@redhat.com> | 2016-08-25 12:53:48 +0200 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2016-08-25 15:51:52 +0200 |
| commit | f26a37e4ad0b74c04b6c19c43c1ad209e6f92756 (patch) | |
| tree | 442a1d92da8fd8401df3c9ad2298864d07d240ac | |
| parent | 035fc620b833a853a5ef84a7a05298be8d91a24c (diff) | |
use PushWithoutError() when fishing from and pushing to the stack
... so no unnecessary copy is created.
Change-Id: I0fbd31c0b6faf8691405a53884d8740f80d7ad4e
| -rw-r--r-- | sc/source/core/tool/interpr1.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx index 85f443fa56c4..3d35f6c1ea88 100644 --- a/sc/source/core/tool/interpr1.cxx +++ b/sc/source/core/tool/interpr1.cxx @@ -6645,7 +6645,7 @@ void ScInterpreter::ScSubTotal() { // We must fish the 1st parameter deep from the stack! And push it on top. const FormulaToken* p = pStack[ sp - nParamCount ]; - PushTempToken( *p ); /* TODO: use FormulaTokenRef instead */ + PushWithoutError( *p ); sal_Int32 nFunc = GetInt32(); mnSubTotalFlags |= SUBTOTAL_IGN_NESTED_ST_AG | SUBTOTAL_IGN_FILTERED; if (nFunc > 100) @@ -6692,11 +6692,11 @@ void ScInterpreter::ScAggregate() { // fish the 1st parameter from the stack and push it on top. const FormulaToken* p = pStack[ sp - nParamCount ]; - PushTempToken( *p ); /* TODO: use FormulaTokenRef instead */ + PushWithoutError( *p ); sal_Int32 nFunc = GetInt32(); // fish the 2nd parameter from the stack and push it on top. const FormulaToken* p2 = pStack[ sp - ( nParamCount - 1 ) ]; - PushTempToken( *p2 ); /* TODO: use FormulaTokenRef instead */ + PushWithoutError( *p2 ); sal_Int32 nOption = GetInt32(); if ( nGlobalError || nFunc < 1 || nFunc > 19 ) |