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

[Mike Kaganski (via logerrit)]

 basic/source/inc/rtlproto.hxx    |    1 -
 basic/source/runtime/methods.cxx |   19 +++----------------
 basic/source/runtime/stdobj.cxx  |    6 +++---
 3 files changed, 6 insertions(+), 20 deletions(-)

New commits:
commit af3316b6f6f10fe7713d5d4e761d1fd03878cb34
Author:     Mike Kaganski <mike.kagan...@collabora.com>
AuthorDate: Wed Feb 2 13:50:48 2022 +0100
Commit:     Mike Kaganski <mike.kagan...@collabora.com>
CommitDate: Wed Feb 2 18:04:17 2022 +0100

    SbRtl_Spc is exactly the same as SbRtl_Space
    
    Change-Id: I0ccbffef348fc23ef5ca090ec2112abfe333e8e2
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129332
    Tested-by: Jenkins
    Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>

diff --git a/basic/source/inc/rtlproto.hxx b/basic/source/inc/rtlproto.hxx
index cf342f337256..6296a0475b5e 100644
--- a/basic/source/inc/rtlproto.hxx
+++ b/basic/source/inc/rtlproto.hxx
@@ -201,7 +201,6 @@ extern void SbRtl_Tan(StarBASIC * pBasic, SbxArray & rPar, 
bool bWrite);
 extern void SbRtl_UCase(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
 extern void SbRtl_Val(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
 extern void SbRtl_Len(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
-extern void SbRtl_Spc(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
 extern void SbRtl_DateSerial(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
 extern void SbRtl_TimeSerial(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
 extern void SbRtl_DateValue(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx
index 8b62ba2260cd..fd0c0531168c 100644
--- a/basic/source/runtime/methods.cxx
+++ b/basic/source/runtime/methods.cxx
@@ -1422,22 +1422,9 @@ void SbRtl_Space(StarBASIC *, SbxArray & rPar, bool)
     }
     else
     {
-        OUStringBuffer aBuf;
-        string::padToLength(aBuf, rPar.Get(1)->GetLong(), ' ');
-        rPar.Get(0)->PutString(aBuf.makeStringAndClear());
-    }
-}
-
-void SbRtl_Spc(StarBASIC *, SbxArray & rPar, bool)
-{
-    if (rPar.Count() < 2)
-    {
-        StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT );
-    }
-    else
-    {
-        OUStringBuffer aBuf;
-        string::padToLength(aBuf, rPar.Get(1)->GetLong(), ' ');
+        const sal_Int32 nCount = rPar.Get(1)->GetLong();
+        OUStringBuffer aBuf(nCount);
+        string::padToLength(aBuf, nCount, ' ');
         rPar.Get(0)->PutString(aBuf.makeStringAndClear());
     }
 }
diff --git a/basic/source/runtime/stdobj.cxx b/basic/source/runtime/stdobj.cxx
index 4adda6efafec..44f99349bf8d 100644
--- a/basic/source/runtime/stdobj.cxx
+++ b/basic/source/runtime/stdobj.cxx
@@ -763,10 +763,10 @@ constexpr Method aMethods[] = {
     arg(u"Period",  SbxDOUBLE),
 
 { u"Space",                         SbxSTRING,    1 | FUNCTION_,       
SbRtl_Space                },
-    arg(u"string", SbxLONG),
+    arg(u"Number", SbxLONG),
 
-{ u"Spc",                           SbxSTRING,    1 | FUNCTION_,       
SbRtl_Spc                  },
-    arg(u"Count", SbxLONG),
+{ u"Spc",                           SbxSTRING,    1 | FUNCTION_,       
SbRtl_Space                },
+    arg(u"Number", SbxLONG),
 
 { u"Split",                         SbxOBJECT,    3 | FUNCTION_,       
SbRtl_Split                },
     arg(u"expression", SbxSTRING),