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

loplugin:stringadd (clang-cl)

Browse Source 
Change-Id: Icf2894f77c90aa4620910d621249947bad4be8b7
Reviewed-on: https://gerrit.libreoffice.org/82269
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
This commit is contained in:
Stephan Bergmann
2019-11-08 10:15:04 +01:00
parent 83579e8018
commit 05bec2bc26
5 changed files with 12 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
connectivity/source/inc/ado/Aolewrap.hxx
View File

@@ -167,8 +167,7 @@ namespace connectivity
if (FAILED(pInterface->get_Item(OLEVariant(sStr), &pT))) if (FAILED(pInterface->get_Item(OLEVariant(sStr), &pT)))
{ {
#if OSL_DEBUG_LEVEL > 0 #if OSL_DEBUG_LEVEL > 0
OString sTemp("Unknown Item: "); OString sTemp("Unknown Item: " + OString(sStr.getStr(),sStr.getLength(),osl_getThreadTextEncoding()));
sTemp += OString(sStr.getStr(),sStr.getLength(),osl_getThreadTextEncoding());
OSL_FAIL(sTemp.getStr()); OSL_FAIL(sTemp.getStr());
#endif #endif
} }

10
extensions/source/ole/oleobjw.cxx
View File

@@ -1427,9 +1427,9 @@ uno::Any SAL_CALL IUnknownWrapper::directInvoke( const OUString& aName, const un
"DISP_E_BADVARTYPE.", nullptr); "DISP_E_BADVARTYPE.", nullptr);
break; break;
case DISP_E_EXCEPTION: case DISP_E_EXCEPTION:
message = "[automation bridge]: "; message = "[automation bridge]: "
message += OUString(o3tl::toU(excepinfo.bstrDescription), + OUString(o3tl::toU(excepinfo.bstrDescription),
::SysStringLen(excepinfo.bstrDescription)); ::SysStringLen(excepinfo.bstrDescription));
throw InvocationTargetException(message, Reference<XInterface>(), Any()); throw InvocationTargetException(message, Reference<XInterface>(), Any());
break; break;
case DISP_E_MEMBERNOTFOUND: case DISP_E_MEMBERNOTFOUND:
@@ -2049,8 +2049,8 @@ Any IUnknownWrapper::invokeWithDispIdComTlb(FuncDesc& aFuncDesc,
"DISP_E_BADVARTYPE.", nullptr); "DISP_E_BADVARTYPE.", nullptr);
break; break;
case DISP_E_EXCEPTION: case DISP_E_EXCEPTION:
message = "[automation bridge]: "; message = "[automation bridge]: "
message += OUString(o3tl::toU(excepinfo.bstrDescription), + OUString(o3tl::toU(excepinfo.bstrDescription),
::SysStringLen(excepinfo.bstrDescription)); ::SysStringLen(excepinfo.bstrDescription));
throw InvocationTargetException(message, Reference<XInterface>(), Any()); throw InvocationTargetException(message, Reference<XInterface>(), Any());

6
svtools/source/control/inettbc.cxx
View File

@@ -825,8 +825,7 @@ OUString SvtURLBox::ParseSmart( const OUString& _aText, const OUString& _aBaseUR
if( aText.startsWith("\\") && (aText.getLength() < 2 || aText[ 1 ] != '\\') ) if( aText.startsWith("\\") && (aText.getLength() < 2 || aText[ 1 ] != '\\') )
{ {
// cut to first segment // cut to first segment
OUString aTmp = INetURLObject::GetScheme( eBaseProt ); OUString aTmp = INetURLObject::GetScheme( eBaseProt ) + "/";
aTmp += "/";
aTmp += aObj.getName( 0, true, INetURLObject::DecodeMechanism::WithCharset ); aTmp += aObj.getName( 0, true, INetURLObject::DecodeMechanism::WithCharset );
aObj.SetURL( aTmp ); aObj.SetURL( aTmp );
@@ -1889,8 +1888,7 @@ OUString URLBox::ParseSmart( const OUString& _aText, const OUString& _aBaseURL )
if( aText.startsWith("\\") && (aText.getLength() < 2 || aText[ 1 ] != '\\') ) if( aText.startsWith("\\") && (aText.getLength() < 2 || aText[ 1 ] != '\\') )
{ {
// cut to first segment // cut to first segment
OUString aTmp = INetURLObject::GetScheme( eBaseProt ); OUString aTmp = INetURLObject::GetScheme( eBaseProt ) + "/";
aTmp += "/";
aTmp += aObj.getName( 0, true, INetURLObject::DecodeMechanism::WithCharset ); aTmp += aObj.getName( 0, true, INetURLObject::DecodeMechanism::WithCharset );
aObj.SetURL( aTmp ); aObj.SetURL( aTmp );

6
sw/source/uibase/dbui/dbmgr.cxx
View File

@@ -2660,8 +2660,7 @@ uno::Any GetDBunoURI(const INetURLObject &rURL, DBConnURIType& rType)
case DBConnURIType::MSJET: case DBConnURIType::MSJET:
#ifdef _WIN32 #ifdef _WIN32
{ {
OUString sDBURL("sdbc:ado:access:PROVIDER=Microsoft.Jet.OLEDB.4.0;DATA SOURCE="); OUString sDBURL("sdbc:ado:access:PROVIDER=Microsoft.Jet.OLEDB.4.0;DATA SOURCE=" + rURL.PathToFileName());
sDBURL += rURL.PathToFileName();
aURLAny <<= sDBURL; aURLAny <<= sDBURL;
} }
#endif #endif
@@ -2669,8 +2668,7 @@ uno::Any GetDBunoURI(const INetURLObject &rURL, DBConnURIType& rType)
case DBConnURIType::MSACE: case DBConnURIType::MSACE:
#ifdef _WIN32 #ifdef _WIN32
{ {
OUString sDBURL("sdbc:ado:PROVIDER=Microsoft.ACE.OLEDB.12.0;DATA SOURCE="); OUString sDBURL("sdbc:ado:PROVIDER=Microsoft.ACE.OLEDB.12.0;DATA SOURCE=" + rURL.PathToFileName());
sDBURL += rURL.PathToFileName();
aURLAny <<= sDBURL; aURLAny <<= sDBURL;
} }
#endif #endif

6
vcl/opengl/win/WinDeviceInfo.cxx
View File

@@ -649,8 +649,7 @@ void WinOpenGLDeviceInfo::GetData()
sizeof(value), sizeof(value),
nullptr)) nullptr))
{ {
OUString driverKey("System\\CurrentControlSet\\Control\\Class\\"); OUString driverKey(OUStringLiteral("System\\CurrentControlSet\\Control\\Class\\") + o3tl::toU(value));
driverKey += o3tl::toU(value);
result = RegOpenKeyExW(HKEY_LOCAL_MACHINE, o3tl::toW(driverKey.getStr()), 0, KEY_QUERY_VALUE, &key); result = RegOpenKeyExW(HKEY_LOCAL_MACHINE, o3tl::toW(driverKey.getStr()), 0, KEY_QUERY_VALUE, &key);
if (result == ERROR_SUCCESS) if (result == ERROR_SUCCESS)
{ {
@@ -737,8 +736,7 @@ void WinOpenGLDeviceInfo::GetData()
sizeof(value), sizeof(value),
nullptr)) nullptr))
{ {
OUString driverKey2("System\\CurrentControlSet\\Control\\Class\\"); OUString driverKey2(OUStringLiteral("System\\CurrentControlSet\\Control\\Class\\") + o3tl::toU(value));
driverKey2 += o3tl::toU(value);
result = RegOpenKeyExW(HKEY_LOCAL_MACHINE, o3tl::toW(driverKey2.getStr()), 0, KEY_QUERY_VALUE, &key); result = RegOpenKeyExW(HKEY_LOCAL_MACHINE, o3tl::toW(driverKey2.getStr()), 0, KEY_QUERY_VALUE, &key);
if (result == ERROR_SUCCESS) if (result == ERROR_SUCCESS)
{ {