svl/source/misc/documentlockfile.cxx | 2 +-
svl/source/misc/lockfilecommon.cxx | 2 +-
svl/source/misc/sharecontrolfile.cxx | 2 +-
svl/source/numbers/zforlist.cxx | 8 +++++---
svl/source/numbers/zformat.cxx | 8 ++++----
ucb/source/core/ucb.cxx | 2 +-
ucb/source/ucp/cmis/cmis_content.cxx | 2 +-
ucb/source/ucp/cmis/cmis_url.cxx | 2 +-
ucb/source/ucp/webdav-curl/CurlUri.cxx | 2 +-
9 files changed, 16 insertions(+), 14 deletions(-)
New commits:
commit 8388b834c547d39ceff68b0e247ec164e9fc505d
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Mon Jun 20 16:53:45 2022 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Mon Jun 20 20:52:45 2022 +0200
elide some makeStringAndClear() calls
Change-Id: Id7116fac8a6f65db18ff93384c5faf2f6481f6fd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/136186
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/svl/source/misc/documentlockfile.cxx
b/svl/source/misc/documentlockfile.cxx
index 09d67a9e5533..0ba862f33098 100644
--- a/svl/source/misc/documentlockfile.cxx
+++ b/svl/source/misc/documentlockfile.cxx
@@ -189,7 +189,7 @@ void DocumentLockFile::WriteEntryToStream( const
LockFileEntry& aEntry, const un
aBuffer.append( ';' );
}
- OString aStringData( OUStringToOString( aBuffer.makeStringAndClear(),
RTL_TEXTENCODING_UTF8 ) );
+ OString aStringData( OUStringToOString( aBuffer, RTL_TEXTENCODING_UTF8 ) );
uno::Sequence< sal_Int8 > aData( reinterpret_cast<sal_Int8 const
*>(aStringData.getStr()), aStringData.getLength() );
xOutput->writeBytes( aData );
}
diff --git a/svl/source/misc/lockfilecommon.cxx
b/svl/source/misc/lockfilecommon.cxx
index 982ce7ce02da..dc8b26d455f1 100644
--- a/svl/source/misc/lockfilecommon.cxx
+++ b/svl/source/misc/lockfilecommon.cxx
@@ -164,7 +164,7 @@ OUString LockFileCommon::ParseName( const uno::Sequence<
sal_Int8 >& aBuffer, sa
}
}
- return OStringToOUString( aResult.makeStringAndClear(),
RTL_TEXTENCODING_UTF8 );
+ return OStringToOUString( aResult, RTL_TEXTENCODING_UTF8 );
}
diff --git a/svl/source/misc/sharecontrolfile.cxx
b/svl/source/misc/sharecontrolfile.cxx
index 486f280533f7..740e10eaa19c 100644
--- a/svl/source/misc/sharecontrolfile.cxx
+++ b/svl/source/misc/sharecontrolfile.cxx
@@ -201,7 +201,7 @@ void ShareControlFile::SetUsersDataAndStore( std::vector<
LockFileEntry >&& aUse
}
}
- OString aStringData( OUStringToOString( aBuffer.makeStringAndClear(),
RTL_TEXTENCODING_UTF8 ) );
+ OString aStringData( OUStringToOString( aBuffer, RTL_TEXTENCODING_UTF8 ) );
uno::Sequence< sal_Int8 > aData( reinterpret_cast<sal_Int8 const
*>(aStringData.getStr()), aStringData.getLength() );
m_xOutputStream->writeBytes( aData );
m_aUsersData = aUsersData;
diff --git a/svl/source/numbers/zforlist.cxx b/svl/source/numbers/zforlist.cxx
index 0c1e28661fb8..cc299ab37d37 100644
--- a/svl/source/numbers/zforlist.cxx
+++ b/svl/source/numbers/zforlist.cxx
@@ -1120,7 +1120,7 @@ sal_uInt32 SvNumberFormatter::ImpGenerateCL( LanguageType
eLnge )
+ "("
+ xSeq[j].formatKey
+ ") "
- + aDupes.makeStringAndClear();
+ + aDupes;
LocaleDataWrapper::outputCheckMessage(
xLocaleData->appendLocaleInfo( aMsg ));
}
}
@@ -2460,8 +2460,9 @@ void SvNumberFormatter::ImpAdjustFormatCodeDefault(
aMsg.insert(0, "SvNumberFormatter::ImpAdjustFormatCodeDefault:
");
aMsg.append("\nXML locale data FormatElement formatindex: ");
aMsg.append(static_cast<sal_Int32>(pFormatArr[nElem].Index));
- OUString aUMsg(OStringToOUString(aMsg.makeStringAndClear(),
+ OUString aUMsg(OStringToOUString(aMsg,
RTL_TEXTENCODING_ASCII_US));
+ aMsg.setLength(0);
LocaleDataWrapper::outputCheckMessage(xLocaleData->appendLocaleInfo(aUMsg));
}
}
@@ -2475,7 +2476,8 @@ void SvNumberFormatter::ImpAdjustFormatCodeDefault(
{
aMsg.insert(0, "SvNumberFormatter::ImpAdjustFormatCodeDefault: ");
aMsg.append("\nXML locale data FormatElement group of: ");
- OUString aUMsg(OStringToOUString(aMsg.makeStringAndClear(),
RTL_TEXTENCODING_ASCII_US));
+ OUString aUMsg(OStringToOUString(aMsg, RTL_TEXTENCODING_ASCII_US));
+ aMsg.setLength(0);
LocaleDataWrapper::outputCheckMessage(
xLocaleData->appendLocaleInfo(OUStringConcatenation(aUMsg +
pFormatArr[0].NameID)));
}
diff --git a/svl/source/numbers/zformat.cxx b/svl/source/numbers/zformat.cxx
index a4756f4982b1..43f26e76287c 100644
--- a/svl/source/numbers/zformat.cxx
+++ b/svl/source/numbers/zformat.cxx
@@ -4533,7 +4533,7 @@ bool SvNumberformat::ImpDecimalFill( OUStringBuffer&
sStr, // number string
OUStringBuffer sNum;
ImpGetOutputStandard(rNumber, sNum);
sNum.stripStart('-');
- sStr.insert(k, sNum.makeStringAndClear());
+ sStr.insert(k, sNum);
break;
}
default:
@@ -4693,7 +4693,7 @@ bool SvNumberformat::ImpNumberFillWithThousands(
OUStringBuffer& sBuff, // numb
OUStringBuffer sNum;
ImpGetOutputStandard(rNumber, sNum);
sNum.stripStart('-');
- sBuff.insert(k, sNum.makeStringAndClear());
+ sBuff.insert(k, sNum);
break;
}
default:
@@ -4829,7 +4829,7 @@ bool SvNumberformat::ImpNumberFill( OUStringBuffer&
sBuff, // number string
bFoundNumber = true;
ImpGetOutputStandard(rNumber, sNum);
sNum.stripStart('-');
- sBuff.insert(k, sNum.makeStringAndClear());
+ sBuff.insert(k, sNum);
}
break;
case NF_SYMBOLTYPE_FRAC_FDIV: // Do Nothing
@@ -5184,7 +5184,7 @@ static void lcl_insertLCID( OUStringBuffer& rFormatStr,
sal_uInt32 nLCID, sal_In
}
aLCIDString.insert( 0, "[$-" );
aLCIDString.append( "]" );
- rFormatStr.insert( nPosInsertLCID, aLCIDString.makeStringAndClear() );
+ rFormatStr.insert( nPosInsertLCID, aLCIDString );
}
/** Increment nAlphabetID for CJK numerals
commit 98cd8e89e681463c909ff10d403fba540868e2f2
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Mon Jun 20 16:52:08 2022 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Mon Jun 20 20:52:30 2022 +0200
elide some makeStringAndClear() calls
Change-Id: Id1657c6b9399780c81e8fbf0ff0a71371a66600f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/136185
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/ucb/source/core/ucb.cxx b/ucb/source/core/ucb.cxx
index 4e41e8cff567..4782118488ca 100644
--- a/ucb/source/core/ucb.cxx
+++ b/ucb/source/core/ucb.cxx
@@ -834,7 +834,7 @@ bool UniversalContentBroker::getContentProviderData(
OSL_VERIFY(
createContentProviderData(
- aElemBuffer.makeStringAndClear(), xHierNameAccess,
+ aElemBuffer, xHierNameAccess,
aInfo));
rListToFill.push_back( aInfo );
diff --git a/ucb/source/ucp/cmis/cmis_content.cxx
b/ucb/source/ucp/cmis/cmis_content.cxx
index 64a4605adf02..e51a452fb7e3 100644
--- a/ucb/source/ucp/cmis/cmis_content.cxx
+++ b/ucb/source/ucp/cmis/cmis_content.cxx
@@ -217,7 +217,7 @@ namespace
[](const util::DateTime& rValue) -> std::string {
OUStringBuffer aBuffer;
::sax::Converter::convertDateTime( aBuffer, rValue,
nullptr );
- return OUSTR_TO_STDSTR( aBuffer.makeStringAndClear( ) );
+ return OUSTR_TO_STDSTR( aBuffer );
});
type = libcmis::PropertyType::DateTime;
}
diff --git a/ucb/source/ucp/cmis/cmis_url.cxx b/ucb/source/ucp/cmis/cmis_url.cxx
index eefe32fcb832..86fde73b94bb 100644
--- a/ucb/source/ucp/cmis/cmis_url.cxx
+++ b/ucb/source/ucp/cmis/cmis_url.cxx
@@ -95,7 +95,7 @@ namespace cmis
}
}
while ( nPos != -1 );
- sUrl += sEncodedPath.makeStringAndClear();
+ sUrl += sEncodedPath;
} else if ( !m_sId.isEmpty( ) )
{
sUrl += "#" + rtl::Uri::encode( m_sId,
diff --git a/ucb/source/ucp/webdav-curl/CurlUri.cxx
b/ucb/source/ucp/webdav-curl/CurlUri.cxx
index 4dba6ac221b7..570c7000f204 100644
--- a/ucb/source/ucp/webdav-curl/CurlUri.cxx
+++ b/ucb/source/ucp/webdav-curl/CurlUri.cxx
@@ -221,7 +221,7 @@ void CurlUri::AppendPath(::std::u16string_view const rPath)
path.append("/");
}
path.append(rPath);
- OString const utf8Path(OUStringToOString(path.makeStringAndClear(),
RTL_TEXTENCODING_UTF8));
+ OString const utf8Path(OUStringToOString(path, RTL_TEXTENCODING_UTF8));
auto uc = curl_url_set(m_pUrl.get(), CURLUPART_PATH, utf8Path.getStr(), 0);
if (uc != CURLUE_OK)
{
