diff options
Diffstat (limited to 'sc/source')
| -rw-r--r-- | sc/source/core/tool/interpr8.cxx | 20 |
1 files changed, 2 insertions, 18 deletions
diff --git a/sc/source/core/tool/interpr8.cxx b/sc/source/core/tool/interpr8.cxx index 58e94cfb6742..5cb33f06e6db 100644 --- a/sc/source/core/tool/interpr8.cxx +++ b/sc/source/core/tool/interpr8.cxx @@ -1396,15 +1396,7 @@ void ScInterpreter::ScConcat_MS() short nParamCount = GetByte(); //reverse order of parameter stack to simplify concatenation: - FormulaToken* p; - assert( sp >= nParamCount && " less stack elements than parameters"); - short nStackParams = std::min<short>( sp, nParamCount); - for ( short i = 0; i < short( nStackParams / 2 ); i++ ) - { - p = pStack[ sp - ( nStackParams - i ) ]; - pStack[ sp - ( nStackParams - i ) ] = pStack[ sp - 1 - i ]; - pStack[ sp - 1 - i ] = p; - } + ReverseStack( nParamCount ); size_t nRefInList = 0; while ( nParamCount-- > 0 && !nGlobalError ) @@ -1524,15 +1516,7 @@ void ScInterpreter::ScTextJoin_MS() if ( MustHaveParamCountMin( nParamCount, 3 ) ) { //reverse order of parameter stack to simplify processing - FormulaToken* p; - assert( sp >= nParamCount && " less stack elements than parameters"); - short nStackParams = std::min<short>( sp, nParamCount); - for ( short i = 0; i < short( nStackParams / 2 ); i++ ) - { - p = pStack[ sp - ( nStackParams - i ) ]; - pStack[ sp - ( nStackParams - i ) ] = pStack[ sp - 1 - i ]; - pStack[ sp - 1 - i ] = p; - } + ReverseStack( nParamCount ); // get aDelimiters and bSkipEmpty std::vector< OUString > aDelimiters; |