connectivity/source/drivers/macab/MacabRecords.cxx | 2 +-
vcl/source/opengl/OpenGLHelper.cxx | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
New commits:
commit c820bf8baf989814b888253525fe3f307592ba85
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Mon Oct 21 08:35:50 2019 +0200
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Mon Oct 21 11:43:37 2019 +0200
loplugin:stringadd (macOS)
Change-Id: Ic9c23fcda4c798c1ca2de5a010da292d56b10e8b
Reviewed-on: https://gerrit.libreoffice.org/81201
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/connectivity/source/drivers/macab/MacabRecords.cxx
b/connectivity/source/drivers/macab/MacabRecords.cxx
index fa9ba34b86ef..4b7220e56723 100644
--- a/connectivity/source/drivers/macab/MacabRecords.cxx
+++ b/connectivity/source/drivers/macab/MacabRecords.cxx
@@ -456,7 +456,7 @@ MacabHeader *MacabRecords::createHeaderForRecordType(const
CFArrayRef _records,
else
{
// Couldn't find a required property...
- OSL_FAIL(OString(OString("MacabRecords::createHeaderForRecordType:
could not find required property: ") +
+ OSL_FAIL(OString("MacabRecords::createHeaderForRecordType: could
not find required property: " +
OUStringToOString(CFStringToOUString(requiredProperties[i]),
RTL_TEXTENCODING_ASCII_US)).getStr());
}
}
diff --git a/vcl/source/opengl/OpenGLHelper.cxx
b/vcl/source/opengl/OpenGLHelper.cxx
index 6a4234da3c19..c02f142bef26 100644
--- a/vcl/source/opengl/OpenGLHelper.cxx
+++ b/vcl/source/opengl/OpenGLHelper.cxx
@@ -213,9 +213,9 @@ namespace
OUStringToOString(aInfo.GetDriverVersion(), RTL_TEXTENCODING_UTF8)
+
OString::number(aInfo.GetWindowsVersion());
#else
- return OString(reinterpret_cast<const char*>(glGetString(GL_VENDOR))) +
- OString(reinterpret_cast<const char*>(glGetString(GL_RENDERER))) +
- OString(reinterpret_cast<const char*>(glGetString(GL_VERSION)));
+ return rtl::OStringView(reinterpret_cast<const
char*>(glGetString(GL_VENDOR))) +
+ reinterpret_cast<const char*>(glGetString(GL_RENDERER)) +
+ reinterpret_cast<const char*>(glGetString(GL_VERSION));
#endif
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
