connectivity/source/drivers/dbase/DTable.cxx | 4 ++-- connectivity/source/drivers/firebird/PreparedStatement.cxx | 2 +- connectivity/source/drivers/postgresql/pq_tools.cxx | 4 ++-- cppu/source/uno/lbenv.cxx | 12 ++++++++---- cui/source/dialogs/FontFeaturesDialog.cxx | 3 +-- drawinglayer/source/dumper/XShapeDumper.cxx | 4 ++-- editeng/source/editeng/editeng.cxx | 2 +- 7 files changed, 17 insertions(+), 14 deletions(-)
New commits: commit 80a900838e46056a9b8886791a490cda0b6254e6 Author: Noel Grandin <[email protected]> AuthorDate: Thu Jul 21 09:20:38 2022 +0200 Commit: Noel Grandin <[email protected]> CommitDate: Thu Jul 21 11:24:10 2022 +0200 elide some makeStringAndClear() calls Change-Id: Ifd8de0042b843de0766a370fb19b9f7791974612 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137284 Tested-by: Jenkins Reviewed-by: Noel Grandin <[email protected]> diff --git a/connectivity/source/drivers/dbase/DTable.cxx b/connectivity/source/drivers/dbase/DTable.cxx index e68eda511346..df8269383953 100644 --- a/connectivity/source/drivers/dbase/DTable.cxx +++ b/connectivity/source/drivers/dbase/DTable.cxx @@ -2683,7 +2683,7 @@ bool ODbaseTable::ReadMemo(std::size_t nBlockNo, ORowSetValue& aVariable) } while (!bReady && !m_pMemoStream->eof()); - aVariable = OStringToOUString(aBStr.makeStringAndClear(), + aVariable = OStringToOUString(aBStr, m_eEncoding); } break; @@ -2717,7 +2717,7 @@ bool ODbaseTable::ReadMemo(std::size_t nBlockNo, ORowSetValue& aVariable) //pad it out with ' ' to expected length on short read sal_Int32 nRequested = sal::static_int_cast<sal_Int32>(nLength); comphelper::string::padToLength(aBuffer, nRequested, ' '); - aVariable = OStringToOUString(aBuffer.makeStringAndClear(), m_eEncoding); + aVariable = OStringToOUString(aBuffer, m_eEncoding); } // if ( bIsText ) else { diff --git a/connectivity/source/drivers/firebird/PreparedStatement.cxx b/connectivity/source/drivers/firebird/PreparedStatement.cxx index 816c38d5c7e3..fe30054ebda3 100644 --- a/connectivity/source/drivers/firebird/PreparedStatement.cxx +++ b/connectivity/source/drivers/firebird/PreparedStatement.cxx @@ -382,7 +382,7 @@ sal_Int64 toNumericWithoutDecimalPlace(const OUString& sSource) sBuffer.append(sNumber.subView(0, nDotIndex)); } sBuffer.append(sNumber.subView(nDotIndex + 1)); - return sBuffer.makeStringAndClear().toInt64(); + return o3tl::toInt64(sBuffer); } } diff --git a/connectivity/source/drivers/postgresql/pq_tools.cxx b/connectivity/source/drivers/postgresql/pq_tools.cxx index eb90c24ce424..94f032f8c128 100644 --- a/connectivity/source/drivers/postgresql/pq_tools.cxx +++ b/connectivity/source/drivers/postgresql/pq_tools.cxx @@ -125,7 +125,7 @@ void bufferEscapeConstant( OUStringBuffer & buf, std::u16string_view value, Conn strbuf.setLength( len ); // Previously here RTL_TEXTENCODING_ASCII_US; as we set the PostgreSQL client_encoding to UTF8, // we get UTF8 here, too. I'm not sure why it worked well before... - buf.append( OStringToOUString( strbuf.makeStringAndClear(), RTL_TEXTENCODING_UTF8 ) ); + buf.append( OStringToOUString( strbuf, RTL_TEXTENCODING_UTF8 ) ); } static void ibufferQuoteConstant( OUStringBuffer & buf, std::u16string_view value, ConnectionSettings *settings ) @@ -890,7 +890,7 @@ css::uno::Sequence< sal_Int32 > string2intarray( const OUString & str ) digits.append(OUString(&c, 1)); c = str.iterateCodePoints(&start); } while ( c ); - vec.push_back( digits.makeStringAndClear().toInt32() ); + vec.push_back( o3tl::toInt32(digits) ); do { if(!iswspace(c)) diff --git a/cppu/source/uno/lbenv.cxx b/cppu/source/uno/lbenv.cxx index dd29951a6276..3e0152c969a1 100644 --- a/cppu/source/uno/lbenv.cxx +++ b/cppu/source/uno/lbenv.cxx @@ -699,7 +699,8 @@ extern "C" void SAL_CALL uno_dumpEnvironment( "###########################################", pFilter ); buf.append( "environment: " ); buf.append( pEnv->pTypeName ); - writeLine( stream, buf.makeStringAndClear(), pFilter ); + writeLine( stream, buf, pFilter ); + buf.setLength(0); writeLine( stream, "NO INTERFACE INFORMATION AVAILABLE!", pFilter ); return; } @@ -708,7 +709,8 @@ extern "C" void SAL_CALL uno_dumpEnvironment( "######################################", pFilter ); buf.append( "environment dump: " ); buf.append( pEnv->pTypeName ); - writeLine( stream, buf.makeStringAndClear(), pFilter ); + writeLine( stream, buf, pFilter ); + buf.setLength(0); uno_DefaultEnvironment * that = reinterpret_cast< uno_DefaultEnvironment * >(pEnv); @@ -727,7 +729,8 @@ extern "C" void SAL_CALL uno_dumpEnvironment( buf.append( "; oid=\"" ); buf.append( pOEntry->oid ); buf.append( '\"' ); - writeLine( stream, buf.makeStringAndClear(), pFilter ); + writeLine( stream, buf, pFilter ); + buf.setLength(0); for ( std::size_t nPos = 0; nPos < pOEntry->aInterfaces.size(); ++nPos ) @@ -758,7 +761,8 @@ extern "C" void SAL_CALL uno_dumpEnvironment( buf.append( " (ptr not found in map!)" ); } } - writeLine( stream, buf.makeStringAndClear(), pFilter ); + writeLine( stream, buf, pFilter ); + buf.setLength(0); } } if (! ptr2obj.empty()) diff --git a/cui/source/dialogs/FontFeaturesDialog.cxx b/cui/source/dialogs/FontFeaturesDialog.cxx index a129191b3721..0d5d512bf053 100644 --- a/cui/source/dialogs/FontFeaturesDialog.cxx +++ b/cui/source/dialogs/FontFeaturesDialog.cxx @@ -213,8 +213,7 @@ OUString FontFeaturesDialog::createFontNameWithFeatures() } sResultFontName = vcl::font::trimFontNameFeatures(m_sFontName); if (!sNameSuffix.isEmpty()) - sResultFontName - += OUStringChar(vcl::font::FeaturePrefix) + sNameSuffix.makeStringAndClear(); + sResultFontName += OUStringChar(vcl::font::FeaturePrefix) + sNameSuffix; return sResultFontName; } diff --git a/drawinglayer/source/dumper/XShapeDumper.cxx b/drawinglayer/source/dumper/XShapeDumper.cxx index d0e2cf97a1f5..cf0da17e4398 100644 --- a/drawinglayer/source/dumper/XShapeDumper.cxx +++ b/drawinglayer/source/dumper/XShapeDumper.cxx @@ -1956,7 +1956,7 @@ OUString XShapeDumper::dump(const uno::Reference<drawing::XShapes>& xPageShapes, (void)xmlTextWriterEndDocument( xmlWriter ); xmlFreeTextWriter( xmlWriter ); - return OUString::fromUtf8(aString.makeStringAndClear()); + return OUString::fromUtf8(aString); } OUString XShapeDumper::dump(const uno::Reference<drawing::XShape>& xPageShapes, bool bDumpInteropProperties) @@ -1980,7 +1980,7 @@ OUString XShapeDumper::dump(const uno::Reference<drawing::XShape>& xPageShapes, (void)xmlTextWriterEndDocument( xmlWriter ); xmlFreeTextWriter( xmlWriter ); - return OUString::fromUtf8(aString.makeStringAndClear()); + return OUString::fromUtf8(aString); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/editeng/source/editeng/editeng.cxx b/editeng/source/editeng/editeng.cxx index 1b8b446c3a15..db4ae5db4491 100644 --- a/editeng/source/editeng/editeng.cxx +++ b/editeng/source/editeng/editeng.cxx @@ -1080,7 +1080,7 @@ bool EditEngine::PostKeyEvent( const KeyEvent& rKeyEvent, EditView* pEditView, v aInfo.append(bDebugPaint ? "On" : "Off"); std::unique_ptr<weld::MessageDialog> xInfoBox(Application::CreateMessageDialog(pEditView->GetWindow()->GetFrameWeld(), VclMessageType::Info, VclButtonsType::Ok, - OStringToOUString(aInfo.makeStringAndClear(), RTL_TEXTENCODING_ASCII_US))); + OStringToOUString(aInfo, RTL_TEXTENCODING_ASCII_US))); xInfoBox->run(); }
