[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sc/source

Winfried Donkers winfrieddonkers at libreoffice.org
Fri Feb 14 22:38:52 CET 2014


 sc/source/core/data/funcdesc.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 50a2ddc88f7b9f48fecd562ca0f4bd76c79f0cc3
Author: Winfried Donkers <winfrieddonkers at libreoffice.org>
Date:   Fri Feb 14 17:54:20 2014 +0100

    fdo#73800 fix incorrect separator in function description in Calc
    
    Depending on locale, the function description with arguments did
    show incorrect separator(s) for functions with PAIRED_VAR_ARGS.
    
    Reviewed-on: https://gerrit.libreoffice.org/8052
    Reviewed-by: Kohei Yoshida <libreoffice at kohei.us>
    Tested-by: Kohei Yoshida <libreoffice at kohei.us>
    (cherry picked from commit f38aa72c1d8f9e535d2b5cefbb2af7f6f37b81a8)
    
    Conflicts:
    	sc/source/core/data/funcdesc.cxx
    
    Change-Id: Ie493a77285360a099e5b07e8360ecb5c6c6c1aec
    Reviewed-on: https://gerrit.libreoffice.org/8057
    Tested-by: Kohei Yoshida <libreoffice at kohei.us>
    Reviewed-by: Kohei Yoshida <libreoffice at kohei.us>

diff --git a/sc/source/core/data/funcdesc.cxx b/sc/source/core/data/funcdesc.cxx
index 66c3234..efabf41 100644
--- a/sc/source/core/data/funcdesc.cxx
+++ b/sc/source/core/data/funcdesc.cxx
@@ -190,14 +190,14 @@ OUString ScFuncDesc::GetParamList() const
 
             aSig.append(*(ppDefArgNames[nFix]));
             aSig.append('1');
-            aSig.appendAscii( ", " );
+            aSig.append(sep);
             aSig.append(*(ppDefArgNames[nFix+1]));
             aSig.append('1');
             aSig.append(sep);
             aSig.appendAscii( " " );
             aSig.append(*(ppDefArgNames[nFix]));
             aSig.append('2');
-            aSig.appendAscii( ", " );
+            aSig.append(sep);
             aSig.append(*(ppDefArgNames[nFix+1]));
             aSig.append('2');
             aSig.append(sep);


More information about the Libreoffice-commits mailing list