[Libreoffice-commits] core.git: dbaccess/source svl/source tools/source vcl/source
Noel Grandin (via logerrit)
logerrit at kemper.freedesktop.org
Thu Apr 22 09:51:34 UTC 2021
dbaccess/source/core/api/OptimisticSet.cxx | 2 +-
svl/source/numbers/zforlist.cxx | 4 ++--
tools/source/fsys/urlobj.cxx | 6 +++---
vcl/source/window/window.cxx | 4 ++--
4 files changed, 8 insertions(+), 8 deletions(-)
New commits:
commit c5ea059a1def974d798a6218c5cc6cffcb3a00ab
Author: Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Wed Apr 21 18:15:57 2021 +0200
Commit: Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Thu Apr 22 11:50:56 2021 +0200
no need to create a temporary when appending to OUStringBuffer
Change-Id: If31ac18f08618f805d82c0e49179e3ae9afb124f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114466
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/dbaccess/source/core/api/OptimisticSet.cxx b/dbaccess/source/core/api/OptimisticSet.cxx
index ee05bd49d968..4cec7ed6839b 100644
--- a/dbaccess/source/core/api/OptimisticSet.cxx
+++ b/dbaccess/source/core/api/OptimisticSet.cxx
@@ -211,7 +211,7 @@ void OptimisticSet::updateRow(const ORowSetRow& _rInsertRow ,const ORowSetRow& _
" SET " + elem.second.toString());
OUStringBuffer& rCondition = aKeyConditions[elem.first];
if ( !rCondition.isEmpty() )
- sSql.append(" WHERE ").append( rCondition.toString() );
+ sSql.append(" WHERE ").append( rCondition );
executeUpdate(_rInsertRow ,_rOriginalRow,sSql.makeStringAndClear(),elem.first);
}
diff --git a/svl/source/numbers/zforlist.cxx b/svl/source/numbers/zforlist.cxx
index f1c45e04bec2..b5283a8373ee 100644
--- a/svl/source/numbers/zforlist.cxx
+++ b/svl/source/numbers/zforlist.cxx
@@ -3212,13 +3212,13 @@ OUString SvNumberFormatter::GenerateFormat(sal_uInt32 nIndex,
if (insertBrackets)
{
sTmpStr.append('(');
- sTmpStr.append(sString.toString());
+ sTmpStr.append(sString);
sTmpStr.append(')');
}
else
{
sTmpStr.append('-');
- sTmpStr.append(sString.toString());
+ sTmpStr.append(sString);
}
sString = sTmpStr;
}
diff --git a/tools/source/fsys/urlobj.cxx b/tools/source/fsys/urlobj.cxx
index d52edb1d2f2a..eef92021aa2a 100644
--- a/tools/source/fsys/urlobj.cxx
+++ b/tools/source/fsys/urlobj.cxx
@@ -3526,7 +3526,7 @@ INetURLObject::getAbbreviated(
if (pSuffixEnd != pBegin)
aResult.append("...");
aResult.append(aSegment);
- aResult.append(aTrailer.toString());
+ aResult.append(aTrailer);
aResult.append(aRest);
if (rStringWidth->
queryStringWidth(aResult.makeStringAndClear())
@@ -3566,7 +3566,7 @@ INetURLObject::getAbbreviated(
aResult.append(aSegment);
if (pPrefixBegin != pEnd)
aResult.append("...");
- aResult.append(aTrailer.toString());
+ aResult.append(aTrailer);
aResult.append(aRest);
if (rStringWidth->
queryStringWidth(aResult.makeStringAndClear())
@@ -3589,7 +3589,7 @@ INetURLObject::getAbbreviated(
{
if (pPrefixBegin != pBegin || pSuffixEnd != pEnd)
aBuffer.append("...");
- aBuffer.append(aTrailer.toString());
+ aBuffer.append(aTrailer);
}
}
if (!bSegment)
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index 08b07aadbd17..a7aeb0c7f9c3 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -295,7 +295,7 @@ void Window::dispose()
aTempStr.append("Window (");
aTempStr.append(lcl_createWindowInfo(this));
aTempStr.append(") with live SystemWindows destroyed: ");
- aTempStr.append(aErrorStr.toString());
+ aTempStr.append(aErrorStr);
OSL_FAIL(aTempStr.getStr());
// abort in debug builds, must be fixed!
Application::Abort(OStringToOUString(
@@ -319,7 +319,7 @@ void Window::dispose()
OStringBuffer aTempStr( "Window (" );
aTempStr.append(lcl_createWindowInfo(this));
aTempStr.append(") with live SystemWindows destroyed: ");
- aTempStr.append(aErrorStr.toString());
+ aTempStr.append(aErrorStr);
OSL_FAIL( aTempStr.getStr() );
Application::Abort(OStringToOUString(aTempStr.makeStringAndClear(), RTL_TEXTENCODING_UTF8)); // abort in debug builds, this must be fixed!
}
More information about the Libreoffice-commits
mailing list