diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2023-11-19 20:41:28 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2023-11-20 07:26:38 +0100 |
| commit | cdb5f9595f2eb6a4d5f28c19380bcacc6d2b550b (patch) | |
| tree | d93579abe7e4e9b6b4d083fd0702b28525becb0a /jvmfwk/source/fwkbase.cxx | |
| parent | 042a87dbd1172ea81b7d2df1f890684687e25f56 (diff) | |
Extended loplugin:ostr: jvmfwk
Change-Id: Ibb17d89a5ed618b4d5e6be9ac9ee89e2751c3ed7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159696
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'jvmfwk/source/fwkbase.cxx')
| -rw-r--r-- | jvmfwk/source/fwkbase.cxx | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/jvmfwk/source/fwkbase.cxx b/jvmfwk/source/fwkbase.cxx index 29ba07c3ae84..8275359cebc8 100644 --- a/jvmfwk/source/fwkbase.cxx +++ b/jvmfwk/source/fwkbase.cxx @@ -62,7 +62,7 @@ OString getVendorSettingsPath(OUString const & sURL) & sSystemPathSettings.pData) != osl_File_E_None) throw FrameworkException( JFW_E_ERROR, - "[Java framework] Error in function getVendorSettingsPath (fwkbase.cxx) "); + "[Java framework] Error in function getVendorSettingsPath (fwkbase.cxx) "_ostr); OString osSystemPathSettings = OUStringToOString(sSystemPathSettings, PathEncoding()); return osSystemPathSettings; } @@ -97,7 +97,7 @@ VendorSettings::VendorSettings() if (sSettingsPath.isEmpty()) { OString sMsg("[Java framework] A vendor settings file was not specified." - "Check the bootstrap parameter " UNO_JAVA_JFW_VENDOR_SETTINGS "."); + "Check the bootstrap parameter " UNO_JAVA_JFW_VENDOR_SETTINGS "."_ostr); SAL_WARN( "jfw", sMsg ); throw FrameworkException(JFW_E_CONFIGURATION, sMsg); } @@ -117,7 +117,7 @@ VendorSettings::VendorSettings() reinterpret_cast<xmlChar const *>(NS_JAVA_FRAMEWORK)); if (res == -1) throw FrameworkException(JFW_E_ERROR, - "[Java framework] Error in constructor VendorSettings::VendorSettings() (fwkbase.cxx)"); + "[Java framework] Error in constructor VendorSettings::VendorSettings() (fwkbase.cxx)"_ostr); } VersionInfo VendorSettings::getVersionInformation(std::u16string_view sVendor) const @@ -288,7 +288,7 @@ OUString BootParams::getVendorSettings() throw FrameworkException( JFW_E_CONFIGURATION, "[Java framework] Invalid value for bootstrap variable: " - UNO_JAVA_JFW_VENDOR_SETTINGS); + UNO_JAVA_JFW_VENDOR_SETTINGS ""_ostr); sVendor = sAbsoluteUrl; s = checkFileURL(sVendor); if (s == jfw::FILE_INVALID || s == jfw::FILE_DOES_NOT_EXIST) @@ -296,7 +296,7 @@ OUString BootParams::getVendorSettings() throw FrameworkException( JFW_E_CONFIGURATION, "[Java framework] Invalid value for bootstrap variable: " - UNO_JAVA_JFW_VENDOR_SETTINGS); + UNO_JAVA_JFW_VENDOR_SETTINGS ""_ostr); } } SAL_INFO( @@ -322,7 +322,7 @@ OUString BootParams::getJREHome() UNO_JAVA_JFW_JREHOME" and " UNO_JAVA_JFW_ENV_JREHOME" are set. However only one of them can be set." "Check bootstrap parameters: environment variables, command line " - "arguments, rc/ini files for executable and java framework library."); + "arguments, rc/ini files for executable and java framework library."_ostr); } else if (bEnvJRE) { @@ -333,7 +333,7 @@ OUString BootParams::getJREHome() JFW_E_CONFIGURATION, "[Java framework] Both bootstrap parameter " UNO_JAVA_JFW_ENV_JREHOME" is set, but the environment variable " - "JAVA_HOME is not set."); + "JAVA_HOME is not set."_ostr); } std::string_view osJRE(pJRE); OUString usJRE = OStringToOUString(osJRE, osl_getThreadTextEncoding()); @@ -341,7 +341,7 @@ OUString BootParams::getJREHome() throw FrameworkException( JFW_E_ERROR, "[Java framework] Error in function BootParams::getJREHome() " - "(fwkbase.cxx)."); + "(fwkbase.cxx)."_ostr); SAL_INFO( "jfw.level2", "Using bootstrap parameter " UNO_JAVA_JFW_ENV_JREHOME @@ -353,7 +353,7 @@ OUString BootParams::getJREHome() JFW_E_CONFIGURATION, "[Java framework] The bootstrap parameter " UNO_JAVA_JFW_ENV_JREHOME" or " UNO_JAVA_JFW_JREHOME - " must be set in direct mode."); + " must be set in direct mode."_ostr); } SAL_INFO_IF( @@ -466,7 +466,7 @@ OString makeClassPathOption(std::u16string_view sUserClassPath) sPaths = OUStringToOString(sBufCP, PathEncoding()); if (sPaths.isEmpty()) { - return ""; + return ""_ostr; } OString sOptionClassPath = "-Djava.class.path=" + sPaths; @@ -492,7 +492,7 @@ OString getSettingsPath( const OUString & sURL) & sPath.pData) != osl_File_E_None) throw FrameworkException( JFW_E_ERROR, - "[Java framework] Error in function ::getSettingsPath (fwkbase.cxx)."); + "[Java framework] Error in function ::getSettingsPath (fwkbase.cxx)."_ostr); return OUStringToOString(sPath, PathEncoding()); } |