jvmfwk/source/elements.cxx | 20 ++++++++++----------
jvmfwk/source/framework.cxx | 2 +-
jvmfwk/source/fwkbase.cxx | 22 +++++++++++-----------
jvmfwk/source/fwkutil.cxx | 2 +-
linguistic/qa/restprotocol.cxx | 4 ++--
5 files changed, 25 insertions(+), 25 deletions(-)
New commits:
commit cdb5f9595f2eb6a4d5f28c19380bcacc6d2b550b
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Sun Nov 19 20:41:28 2023 +0100
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Mon Nov 20 07:26:38 2023 +0100
Extended loplugin:ostr: jvmfwk
Change-Id: Ibb17d89a5ed618b4d5e6be9ac9ee89e2751c3ed7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159696
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/jvmfwk/source/elements.cxx b/jvmfwk/source/elements.cxx
index 57b500c56d56..d47af20f2e4b 100644
--- a/jvmfwk/source/elements.cxx
+++ b/jvmfwk/source/elements.cxx
@@ -55,14 +55,14 @@ static OString getElement(OString const & docPath,
if (doc == nullptr)
throw FrameworkException(
JFW_E_ERROR,
- "[Java framework] Error in function getElement (elements.cxx)");
+ "[Java framework] Error in function getElement
(elements.cxx)"_ostr);
jfw::CXPathContextPtr context(xmlXPathNewContext(doc));
if (xmlXPathRegisterNs(context, reinterpret_cast<xmlChar const *>("jf"),
reinterpret_cast<xmlChar const *>(NS_JAVA_FRAMEWORK)) == -1)
throw FrameworkException(
JFW_E_ERROR,
- "[Java framework] Error in function getElement (elements.cxx)");
+ "[Java framework] Error in function getElement
(elements.cxx)"_ostr);
CXPathObjectPtr pathObj = xmlXPathEvalExpression(pathExpression, context);
OString sValue;
@@ -70,7 +70,7 @@ static OString getElement(OString const & docPath,
{
throw FrameworkException(
JFW_E_ERROR,
- "[Java framework] Error in function getElement (elements.cxx)");
+ "[Java framework] Error in function getElement
(elements.cxx)"_ostr);
}
sValue = reinterpret_cast<char*>(pathObj->nodesetval->nodeTab[0]->content);
return sValue;
@@ -85,7 +85,7 @@ OString getElementUpdated()
void createSettingsStructure(xmlDoc * document, bool * bNeedsSave)
{
OString sExcMsg("[Java framework] Error in function
createSettingsStructure "
- "(elements.cxx).");
+ "(elements.cxx)."_ostr);
xmlNode * root = xmlDocGetRootElement(document);
if (root == nullptr)
throw FrameworkException(JFW_E_ERROR, sExcMsg);
@@ -171,7 +171,7 @@ NodeJava::NodeJava(Layer layer):
if (getMode() == JFW_MODE_DIRECT)
throw FrameworkException(
JFW_E_DIRECT_MODE,
- "[Java framework] Trying to access settings files in direct
mode.");
+ "[Java framework] Trying to access settings files in direct
mode."_ostr);
}
@@ -190,7 +190,7 @@ void NodeJava::load()
if (s == FILE_INVALID)
throw FrameworkException(
JFW_E_ERROR,
- "[Java framework] Invalid file for shared Java settings.");
+ "[Java framework] Invalid file for shared Java
settings."_ostr);
else if (s == FILE_DOES_NOT_EXIST)
//Writing shared data is not supported yet.
return;
@@ -352,7 +352,7 @@ bool NodeJava::prepareSettingsDocument() const
{
OString sExcMsg(
"[Java framework] Error in function prepareSettingsDocument"
- " (elements.cxx).");
+ " (elements.cxx)."_ostr);
if (!createSettingsDocument())
{
return false;
@@ -376,7 +376,7 @@ bool NodeJava::prepareSettingsDocument() const
void NodeJava::write() const
{
OString sExcMsg("[Java framework] Error in function
NodeJava::writeSettings "
- "(elements.cxx).");
+ "(elements.cxx)."_ostr);
CXmlDocPtr docUser;
CXPathContextPtr contextUser;
CXPathObjectPtr pathObj;
@@ -628,7 +628,7 @@ bool NodeJava::createSettingsDocument() const
}
//make sure there is a user directory
OString sExcMsg("[Java framework] Error in function createSettingsDocument
"
- "(elements.cxx).");
+ "(elements.cxx)."_ostr);
// check if javasettings.xml already exist
if (FILE_OK == checkSettingsFileStatus(sURL))
return true;
@@ -681,7 +681,7 @@ CNodeJavaInfo::CNodeJavaInfo() :
void CNodeJavaInfo::loadFromNode(xmlDoc * pDoc, xmlNode * pJavaInfo)
{
OString sExcMsg("[Java framework] Error in function
NodeJavaInfo::loadFromNode "
- "(elements.cxx).");
+ "(elements.cxx)."_ostr);
OSL_ASSERT(pJavaInfo && pDoc);
if (pJavaInfo->children == nullptr)
diff --git a/jvmfwk/source/framework.cxx b/jvmfwk/source/framework.cxx
index cfeca1f72904..0e74420e398f 100644
--- a/jvmfwk/source/framework.cxx
+++ b/jvmfwk/source/framework.cxx
@@ -512,7 +512,7 @@ javaFrameworkError
jfw_getSelectedJRE(std::unique_ptr<JavaInfo> *ppInfo)
"[Java framework] The JRE specified by the bootstrap "
"variable UNO_JAVA_JFW_JREHOME or
UNO_JAVA_JFW_ENV_JREHOME "
" could not be recognized. Check the values and make sure
that you "
- "use a plug-in library that can recognize that JRE.");
+ "use a plug-in library that can recognize that JRE."_ostr);
return JFW_E_NONE;
}
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());
}
diff --git a/jvmfwk/source/fwkutil.cxx b/jvmfwk/source/fwkutil.cxx
index 89cb2e5415cb..0c3c8f4beb3d 100644
--- a/jvmfwk/source/fwkutil.cxx
+++ b/jvmfwk/source/fwkutil.cxx
@@ -150,7 +150,7 @@ OUString getLibraryLocation()
reinterpret_cast< oslGenericFunction >(getLibraryLocation),
libraryFileUrl))
throw FrameworkException(JFW_E_ERROR,
- "[Java framework] Error in function getLibraryLocation
(fwkutil.cxx).");
+ "[Java framework] Error in function getLibraryLocation
(fwkutil.cxx)."_ostr);
return getDirFromFile(libraryFileUrl);
}
commit 042a87dbd1172ea81b7d2df1f890684687e25f56
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Sun Nov 19 20:40:43 2023 +0100
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Mon Nov 20 07:26:24 2023 +0100
Extended loplugin:ostr: linguistic
Change-Id: I74b95a853a142da3e2df5b974a13d991f13d28eb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159694
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/linguistic/qa/restprotocol.cxx b/linguistic/qa/restprotocol.cxx
index c189228e6635..d5783d0a90a3 100644
--- a/linguistic/qa/restprotocol.cxx
+++ b/linguistic/qa/restprotocol.cxx
@@ -83,7 +83,7 @@ public:
"{\"check-positions\":[{\"offset\":15,\"length\":6,\"errorcode\":4711,\"type\":"
"\"orth\","
"\"severity\":1,\"proposals\":[\"Entwurf\",\"Entw\u00fcrfe\"]},"
-
"{\"offset\":22,\"length\":3,\"errorcode\":8221,\"type\":\"orth\",\"severity\":1}]}");
+
"{\"offset\":22,\"length\":3,\"errorcode\":8221,\"type\":\"orth\",\"severity\":1}]}"_ostr);
m_aStreamSocket.write(aResponse.getStr(), aResponse.getLength());
m_aStreamSocket.close();
@@ -93,7 +93,7 @@ public:
{
OString aResponse("HTTP/1.1 404 Not Found\r\n"
"Connection: Closed\r\n"
- "\r\n");
+ "\r\n"_ostr);
m_aStreamSocket.write(aResponse.getStr(), aResponse.getLength());
m_aStreamSocket.close();
