From 3d236177be255b2027a997bfc12fe0833ca9a2f7 Mon Sep 17 00:00:00 2001 From: Mike Kaganski Date: Tue, 11 Oct 2022 10:23:28 +0300 Subject: Deduplicate O(U)StringConcatenation And use an overloaded helper function with a better (?) unified name to show that the result is not an O(U)String. Change-Id: I8956338b05d02bf46a6185828130ea8ef145d46b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/141203 Tested-by: Jenkins Reviewed-by: Mike Kaganski --- ucb/source/ucp/hierarchy/hierarchyuri.cxx | 2 +- ucb/source/ucp/webdav-curl/CurlSession.cxx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'ucb') diff --git a/ucb/source/ucp/hierarchy/hierarchyuri.cxx b/ucb/source/ucp/hierarchy/hierarchyuri.cxx index 618a640229c5..052bcd628d34 100644 --- a/ucb/source/ucp/hierarchy/hierarchyuri.cxx +++ b/ucb/source/ucp/hierarchy/hierarchyuri.cxx @@ -92,7 +92,7 @@ void HierarchyUri::init() const m_aUri = m_aUri.replaceAt( HIERARCHY_URL_SCHEME.getLength() + 2, 0, - rtl::OUStringConcatenation("/" + DEFAULT_DATA_SOURCE_SERVICE + "/") ); + rtl::Concat2View("/" + DEFAULT_DATA_SOURCE_SERVICE + "/") ); m_aService = DEFAULT_DATA_SOURCE_SERVICE; nPos diff --git a/ucb/source/ucp/webdav-curl/CurlSession.cxx b/ucb/source/ucp/webdav-curl/CurlSession.cxx index 415a21703dab..25804dbacc4f 100644 --- a/ucb/source/ucp/webdav-curl/CurlSession.cxx +++ b/ucb/source/ucp/webdav-curl/CurlSession.cxx @@ -302,7 +302,7 @@ static int debug_callback(CURL* handle, curl_infotype type, char* data, size_t s sal_Int32 const len(SAL_N_ELEMENTS("Authorization: ") - 1); tmp = tmp.replaceAt( start + len, end - start - len, - OStringConcatenation(OString::number(end - start - len) + " bytes redacted")); + Concat2View(OString::number(end - start - len) + " bytes redacted")); } SAL_INFO("ucb.ucp.webdav.curl", "CURLINFO_HEADER_OUT: " << handle << ": " << tmp); return 0; -- cgit