mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

loplugin:stringadd (macOS)

Browse Source 
Change-Id: Ic9c23fcda4c798c1ca2de5a010da292d56b10e8b
Reviewed-on: https://gerrit.libreoffice.org/81201
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
This commit is contained in:
Stephan Bergmann
2019-10-21 08:35:50 +02:00
parent 7e4358a0ca
commit c820bf8baf
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
connectivity/source/drivers/macab/MacabRecords.cxx
View File

@@ -456,7 +456,7 @@ MacabHeader *MacabRecords::createHeaderForRecordType(const CFArrayRef _records,
else else
{ {
// Couldn't find a required property... // 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()); OUStringToOString(CFStringToOUString(requiredProperties[i]), RTL_TEXTENCODING_ASCII_US)).getStr());
} }
} }

6
vcl/source/opengl/OpenGLHelper.cxx
View File

@@ -213,9 +213,9 @@ namespace
OUStringToOString(aInfo.GetDriverVersion(), RTL_TEXTENCODING_UTF8) + OUStringToOString(aInfo.GetDriverVersion(), RTL_TEXTENCODING_UTF8) +
OString::number(aInfo.GetWindowsVersion()); OString::number(aInfo.GetWindowsVersion());
#else #else
return OString(reinterpret_cast<const char*>(glGetString(GL_VENDOR))) + return rtl::OStringView(reinterpret_cast<const char*>(glGetString(GL_VENDOR))) +
OString(reinterpret_cast<const char*>(glGetString(GL_RENDERER))) + reinterpret_cast<const char*>(glGetString(GL_RENDERER)) +
OString(reinterpret_cast<const char*>(glGetString(GL_VERSION))); reinterpret_cast<const char*>(glGetString(GL_VERSION));
#endif #endif
} }