From 98cd8e89e681463c909ff10d403fba540868e2f2 Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel.grandin@collabora.co.uk>
Date: Mon, 20 Jun 2022 16:52:08 +0200
Subject: elide some makeStringAndClear() calls

Change-Id: Id1657c6b9399780c81e8fbf0ff0a71371a66600f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/136185
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
---
 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 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'ucb')

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)
     {
-- 
cgit v1.2.3