diff options
| -rw-r--r-- | connectivity/source/drivers/macab/MacabRecords.cxx | 2 | ||||
| -rw-r--r-- | vcl/source/opengl/OpenGLHelper.cxx | 6 |
2 files changed, 4 insertions, 4 deletions
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 } |