diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2022-02-09 19:07:57 +0300 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2022-02-09 20:41:39 +0100 |
| commit | 9003593c9e4b8e32dc5b0ae119cc84a14d17f53d (patch) | |
| tree | 2e02d8c23e68aae7bfc4eea65ea6ff089ef7ad0f /tools | |
| parent | 80d00b3eec3a7811c0139afe0ea749cc319ce7b9 (diff) | |
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.kaganski@collabora.com>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/source/ref/globname.cxx | 33 |
1 files changed, 8 insertions, 25 deletions
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 |