sal/qa/osl/file/osl_File.cxx | 24 ++++---- sal/qa/osl/process/osl_Thread.cxx | 12 ++-- sal/qa/rtl/ostring/rtl_str.cxx | 4 - xmlhelp/source/cxxhelp/provider/urlparameter.cxx | 64 +++++++++++------------ 4 files changed, 52 insertions(+), 52 deletions(-)
New commits: commit 9bccf92aba991366952261e51183455efa67da13 Author: Stephan Bergmann <[email protected]> AuthorDate: Wed Nov 29 14:40:14 2023 +0100 Commit: Stephan Bergmann <[email protected]> CommitDate: Wed Nov 29 19:38:09 2023 +0100 Extended loplugin:ostr: sal Change-Id: Ieca8096e2af9615fa4c34557a47bc13ee5c23936 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160105 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <[email protected]> diff --git a/sal/qa/osl/file/osl_File.cxx b/sal/qa/osl/file/osl_File.cxx index be4a88178275..6b0c50dfafd8 100644 --- a/sal/qa/osl/file/osl_File.cxx +++ b/sal/qa/osl/file/osl_File.cxx @@ -45,37 +45,37 @@ static OString errorToString(const osl::FileBase::RC _nError) OString sResult; switch (_nError) { case osl::FileBase::E_None: - sResult = "Success"; + sResult = "Success"_ostr; break; case osl::FileBase::E_PERM: - sResult = "Operation not permitted"; + sResult = "Operation not permitted"_ostr; break; case osl::FileBase::E_NOENT: - sResult = "No such file or directory"; + sResult = "No such file or directory"_ostr; break; case osl::FileBase::E_EXIST: - sResult = "Already Exist"; + sResult = "Already Exist"_ostr; break; case osl::FileBase::E_ACCES: - sResult = "Permission denied"; + sResult = "Permission denied"_ostr; break; case osl::FileBase::E_INVAL: - sResult = "The format of the parameters was not valid"; + sResult = "The format of the parameters was not valid"_ostr; break; case osl::FileBase::E_NOTDIR: - sResult = "Not a directory"; + sResult = "Not a directory"_ostr; break; case osl::FileBase::E_ISDIR: - sResult = "Is a directory"; + sResult = "Is a directory"_ostr; break; case osl::FileBase::E_BADF: - sResult = "Bad file"; + sResult = "Bad file"_ostr; break; case osl::FileBase::E_NOTEMPTY: - sResult = "The directory is not empty"; + sResult = "The directory is not empty"_ostr; break; default: - sResult = "Unknown Error"; + sResult = "Unknown Error"_ostr; break; } return sResult; @@ -4361,7 +4361,7 @@ namespace osl_Directory bool b6 = _aVolumeInfo.getRAMDiskFlag(); OString sAttr; - if (b1) sAttr = "Remote"; + if (b1) sAttr = "Remote"_ostr; if (b2) sAttr += " Removeable"; if (b3) sAttr += " CDROM"; if (b4) sAttr += " Floppy"; diff --git a/sal/qa/osl/process/osl_Thread.cxx b/sal/qa/osl/process/osl_Thread.cxx index 389894bbcd8a..0cb0e773dbe6 100644 --- a/sal/qa/osl/process/osl_Thread.cxx +++ b/sal/qa/osl/process/osl_Thread.cxx @@ -948,26 +948,26 @@ namespace osl_Thread switch (_aPriority) { case osl_Thread_PriorityHighest: - sPrioStr = "Highest"; + sPrioStr = "Highest"_ostr; break; case osl_Thread_PriorityAboveNormal: - sPrioStr = "AboveNormal"; + sPrioStr = "AboveNormal"_ostr; break; case osl_Thread_PriorityNormal: - sPrioStr = "Normal"; + sPrioStr = "Normal"_ostr; break; case osl_Thread_PriorityBelowNormal: - sPrioStr = "BelowNormal"; + sPrioStr = "BelowNormal"_ostr; break; case osl_Thread_PriorityLowest: - sPrioStr = "Lowest"; + sPrioStr = "Lowest"_ostr; break; default: - sPrioStr = "unknown"; + sPrioStr = "unknown"_ostr; } return sPrioStr; } diff --git a/sal/qa/rtl/ostring/rtl_str.cxx b/sal/qa/rtl/ostring/rtl_str.cxx index c4e13ff619a9..834559f7cfb0 100644 --- a/sal/qa/rtl/ostring/rtl_str.cxx +++ b/sal/qa/rtl/ostring/rtl_str.cxx @@ -394,11 +394,11 @@ namespace rtl_str sal_Int32 nIndex = rtl_str_lastIndexOfStr( aStr1.getStr(), aSearchStr.getStr() ); CPPUNIT_ASSERT_EQUAL_MESSAGE("index is wrong.", sal_Int32(15), nIndex); - /* OString */ aSearchStr = "Line"; + /* OString */ aSearchStr = "Line"_ostr; /* sal_Int32 */ nIndex = rtl_str_lastIndexOfStr( aStr1.getStr(), aSearchStr.getStr() ); CPPUNIT_ASSERT_EQUAL_MESSAGE("index is wrong.", sal_Int32(0), nIndex); - /* OString */ aSearchStr = ""; + /* OString */ aSearchStr = ""_ostr; /* sal_Int32 */ nIndex = rtl_str_lastIndexOfStr( aStr1.getStr(), aSearchStr.getStr() ); CPPUNIT_ASSERT_EQUAL_MESSAGE("index is wrong.", sal_Int32(-1), nIndex); } commit 692a116c27ea24d3245d38fe5063d8f84c07f7f2 Author: Stephan Bergmann <[email protected]> AuthorDate: Wed Nov 29 14:36:42 2023 +0100 Commit: Stephan Bergmann <[email protected]> CommitDate: Wed Nov 29 19:37:57 2023 +0100 Extended loplugin:ostr: xmlhelp Change-Id: Ic8247396b1cd2152cdac6e3728d1828bea6f452c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160094 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <[email protected]> diff --git a/xmlhelp/source/cxxhelp/provider/urlparameter.cxx b/xmlhelp/source/cxxhelp/provider/urlparameter.cxx index 345693b2e7c8..c242c74add2d 100644 --- a/xmlhelp/source/cxxhelp/provider/urlparameter.cxx +++ b/xmlhelp/source/cxxhelp/provider/urlparameter.cxx @@ -720,60 +720,60 @@ InputStreamTransformer::InputStreamTransformer( URLParameter* urlParam, OString parString[46]; int last = 0; - parString[last++] = "Program"; + parString[last++] = "Program"_ostr; OString aPureProgramm( urlParam->getByName( "Program" ) ); parString[last++] = "'" + aPureProgramm + "'"; - parString[last++] = "Database"; + parString[last++] = "Database"_ostr; parString[last++] = "'" + urlParam->getByName( "DatabasePar" ) + "'"; - parString[last++] = "Id"; + parString[last++] = "Id"_ostr; parString[last++] = "'" + urlParam->getByName( "Id" ) + "'"; - parString[last++] = "Path"; + parString[last++] = "Path"_ostr; OString aPath( urlParam->getByName( "Path" ) ); parString[last++] = "'" + aPath + "'"; OString aPureLanguage = urlParam->getByName( "Language" ); - parString[last++] = "Language"; + parString[last++] = "Language"_ostr; parString[last++] = "'" + aPureLanguage + "'"; - parString[last++] = "System"; + parString[last++] = "System"_ostr; parString[last++] = "'" + urlParam->getByName( "System" ) + "'"; - parString[last++] = "productname"; + parString[last++] = "productname"_ostr; parString[last++] = "'" + OUStringToOString( pDatabases->getProductName(), RTL_TEXTENCODING_UTF8 ) + "'"; - parString[last++] = "productversion"; + parString[last++] = "productversion"_ostr; parString[last++] = "'" + OUStringToOString( pDatabases->getProductVersion(), RTL_TEXTENCODING_UTF8 ) + "'"; - parString[last++] = "imgtheme"; + parString[last++] = "imgtheme"_ostr; parString[last++] = "'" + pDatabases->getImageTheme() + "'"; - parString[last++] = "hp"; + parString[last++] = "hp"_ostr; parString[last++] = "'" + urlParam->getByName( "HelpPrefix" ) + "'"; if( !parString[last-1].isEmpty() ) { - parString[last++] = "sm"; - parString[last++] = "'vnd.sun.star.help%3A%2F%2F'"; - parString[last++] = "qm"; - parString[last++] = "'%3F'"; - parString[last++] = "es"; - parString[last++] = "'%3D'"; - parString[last++] = "am"; - parString[last++] = "'%26'"; - parString[last++] = "cl"; - parString[last++] = "'%3A'"; - parString[last++] = "sl"; - parString[last++] = "'%2F'"; - parString[last++] = "hm"; - parString[last++] = "'%23'"; - parString[last++] = "cs"; - parString[last++] = "'css'"; - - parString[last++] = "vendorname"; + parString[last++] = "sm"_ostr; + parString[last++] = "'vnd.sun.star.help%3A%2F%2F'"_ostr; + parString[last++] = "qm"_ostr; + parString[last++] = "'%3F'"_ostr; + parString[last++] = "es"_ostr; + parString[last++] = "'%3D'"_ostr; + parString[last++] = "am"_ostr; + parString[last++] = "'%26'"_ostr; + parString[last++] = "cl"_ostr; + parString[last++] = "'%3A'"_ostr; + parString[last++] = "sl"_ostr; + parString[last++] = "'%2F'"_ostr; + parString[last++] = "hm"_ostr; + parString[last++] = "'%23'"_ostr; + parString[last++] = "cs"_ostr; + parString[last++] = "'css'"_ostr; + + parString[last++] = "vendorname"_ostr; parString[last++] = "''"_ostr; - parString[last++] = "vendorversion"; + parString[last++] = "vendorversion"_ostr; parString[last++] = "''"_ostr; - parString[last++] = "vendorshort"; + parString[last++] = "vendorshort"_ostr; parString[last++] = "''"_ostr; } @@ -808,7 +808,7 @@ InputStreamTransformer::InputStreamTransformer( URLParameter* urlParam, OUString aOUExpandedExtensionPath = Databases::expandURL( aExtensionRegistryPath, xContext ); OString aExpandedExtensionPath = OUStringToOString( aOUExpandedExtensionPath, osl_getThreadTextEncoding() ); - parString[last++] = "ExtensionPath"; + parString[last++] = "ExtensionPath"_ostr; parString[last++] = "'" + aExpandedExtensionPath + "'"; // ExtensionId @@ -817,7 +817,7 @@ InputStreamTransformer::InputStreamTransformer( URLParameter* urlParam, if( iSlash != -1 ) aPureExtensionId = aPath.copy( 0, iSlash ); - parString[last++] = "ExtensionId"; + parString[last++] = "ExtensionId"_ostr; parString[last++] = "'" + aPureExtensionId + "'"; }
