basic/source/runtime/methods1.cxx | 2 +-
basic/source/runtime/stdobj.cxx | 2 +-
tools/source/ref/globname.cxx | 33 ++++++++-------------------------
3 files changed, 10 insertions(+), 27 deletions(-)
New commits:
commit a555aa25bd17781b2828e13ac81456a45387284d
Author: Julien Nabet <serval2...@yahoo.fr>
AuthorDate: Mon Feb 7 21:24:16 2022 +0100
Commit: Julien Nabet <serval2...@yahoo.fr>
CommitDate: Wed Feb 9 20:41:51 2022 +0100
tdf#147262: CallByName() argument names does not match that of VBA
Change-Id: I3029b98abbe3b8facf01f0e50a7efdff545c2141
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129646
Tested-by: Jenkins
Reviewed-by: Julien Nabet <serval2...@yahoo.fr>
diff --git a/basic/source/runtime/methods1.cxx
b/basic/source/runtime/methods1.cxx
index 31943cde2b80..8fbe9ff65a7f 100644
--- a/basic/source/runtime/methods1.cxx
+++ b/basic/source/runtime/methods1.cxx
@@ -122,7 +122,7 @@ void SbRtl_CallByName(StarBASIC *, SbxArray & rPar, bool)
return;
}
- // 2. parameter is ProcedureName
+ // 2. parameter is ProcName
OUString aNameStr = rPar.Get(2)->GetOUString();
// 3. parameter is CallType
diff --git a/basic/source/runtime/stdobj.cxx b/basic/source/runtime/stdobj.cxx
index 44f99349bf8d..6f38e12e03a9 100644
--- a/basic/source/runtime/stdobj.cxx
+++ b/basic/source/runtime/stdobj.cxx
@@ -141,7 +141,7 @@ constexpr Method aMethods[] = {
{ u"CallByName", SbxVARIANT, 3 | FUNCTION_,
SbRtl_CallByName },
arg(u"Object", SbxOBJECT),
- arg(u"ProcedureName", SbxSTRING),
+ arg(u"ProcName", SbxSTRING),
arg(u"CallType", SbxINTEGER),
{ u"CBool", SbxBOOL, 1 | FUNCTION_,
SbRtl_CBool },
commit 9003593c9e4b8e32dc5b0ae119cc84a14d17f53d
Author: Mike Kaganski <mike.kagan...@collabora.com>
AuthorDate: Wed Feb 9 19:07:57 2022 +0300
Commit: Mike Kaganski <mike.kagan...@collabora.com>
CommitDate: Wed Feb 9 20:41:39 2022 +0100
Simplify SvGlobalName::GetHexName
Use a single sprintf instead of ten, and don't use interim OStringBuffer
to convert to OUString in the end.
Change-Id: I5dcbec85d64af3a30b4bb64f12090e5320421013
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129734
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>
diff --git a/tools/source/ref/globname.cxx b/tools/source/ref/globname.cxx
index 7784f3fc722a..251fb6d1831e 100644
--- a/tools/source/ref/globname.cxx
+++ b/tools/source/ref/globname.cxx
@@ -21,7 +21,6 @@
#include <string.h>
#include <comphelper/mimeconfighelper.hxx>
-#include <rtl/strbuf.hxx>
#include <rtl/character.hxx>
#include <tools/stream.hxx>
@@ -153,30 +152,14 @@ bool SvGlobalName::MakeId( const OUString & rIdStr )
OUString SvGlobalName::GetHexName() const
{
- OStringBuffer aHexBuffer(36);
-
- char buf[ 10 ];
- sprintf( buf, "%8.8" SAL_PRIXUINT32, m_aData.Data1 );
- aHexBuffer.append(buf);
- aHexBuffer.append('-');
- sprintf( buf, "%4.4X", m_aData.Data2 );
- aHexBuffer.append(buf);
- aHexBuffer.append('-');
- sprintf( buf, "%4.4X", m_aData.Data3 );
- aHexBuffer.append(buf);
- aHexBuffer.append('-');
- for( int i = 0; i < 2; i++ )
- {
- sprintf( buf, "%2.2x", m_aData.Data4[ i ] );
- aHexBuffer.append(buf);
- }
- aHexBuffer.append('-');
- for( int i = 2; i < 8; i++ )
- {
- sprintf( buf, "%2.2x", m_aData.Data4[ i ] );
- aHexBuffer.append(buf);
- }
- return OStringToOUString(aHexBuffer.makeStringAndClear(),
RTL_TEXTENCODING_ASCII_US);
+ char buf[ 37 ];
+ int n = sprintf(buf,
+ "%8.8" SAL_PRIXUINT32
"-%4.4X-%4.4X-%2.2x%2.2x-%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x",
+ m_aData.Data1, m_aData.Data2, m_aData.Data3,
+ m_aData.Data4[0], m_aData.Data4[1], m_aData.Data4[2],
m_aData.Data4[3],
+ m_aData.Data4[4], m_aData.Data4[5], m_aData.Data4[6],
m_aData.Data4[7]);
+ assert(n == 36);
+ return OUString::createFromAscii(std::string_view(buf, n));
}
css::uno::Sequence < sal_Int8 > SvGlobalName::GetByteSequence() const
