[Libreoffice-commits] core.git: sc/source

[Winfried Donkers]

 sc/source/core/tool/interpr8.cxx |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 47405e009500538732926739ae4b2636c0957238
Author: Winfried Donkers <winfrieddonk...@libreoffice.org>
Date:   Fri Apr 29 07:25:23 2016 +0200

    tdf#97831 follow up improve error handling
    
    (And make code consistent with other Excel2016 functions.)
    
    Change-Id: Id46b98fd1b7e8e036b6584ef382d1ff2171edab7
    Reviewed-on: https://gerrit.libreoffice.org/24485
    Tested-by: Jenkins <c...@libreoffice.org>
    Reviewed-by: Eike Rathke <er...@redhat.com>
    Tested-by: Eike Rathke <er...@redhat.com>

diff --git a/sc/source/core/tool/interpr8.cxx b/sc/source/core/tool/interpr8.cxx
index 321929a..1235810 100644
--- a/sc/source/core/tool/interpr8.cxx
+++ b/sc/source/core/tool/interpr8.cxx
@@ -1413,7 +1413,7 @@ void ScInterpreter::ScConcat_MS()
         {
             case svString:
             case svDouble:
-                aResBuf.append( PopString().getString() );
+                aResBuf.append( GetString().getString() );
                 break;
             case svSingleRef :
             {
@@ -1541,7 +1541,7 @@ void ScInterpreter::ScTextJoin_MS()
         {
             case svString:
             case svDouble:
-                aDelimiters.push_back( PopString().getString() );
+                aDelimiters.push_back( GetString().getString() );
                 break;
             case svSingleRef :
             {
@@ -1669,7 +1669,7 @@ void ScInterpreter::ScTextJoin_MS()
                 case svString:
                 case svDouble:
                 {
-                    OUString aStr = PopString().getString();
+                    OUString aStr = GetString().getString();
                     if ( !aStr.isEmpty() || !bSkipEmpty )
                     {
                         if ( !bFirst )
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits