summaryrefslogtreecommitdiff
path: root/jvmfwk
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2016-04-20 17:17:38 +0200
committerStephan Bergmann <sbergman@redhat.com>2016-04-20 17:25:43 +0200
commitf43b89b7ed9f24bfe34d1337ed92fad3633e49de (patch)
treecc9c731c2022f79ac710cc559af24b7da063d61e /jvmfwk
parentb347e5da870d8a4fa8e6e093165fea7dc21dae79 (diff)
loplugin:salbool: Automatic rewrite of sal_False/True
Change-Id: I65fdd933e2a3973053359024d8d9c733f79a6477
Diffstat (limited to 'jvmfwk')
-rw-r--r--jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx4
-rw-r--r--jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx8
-rw-r--r--jvmfwk/source/elements.cxx6
-rw-r--r--jvmfwk/source/framework.cxx4
4 files changed, 11 insertions, 11 deletions
diff --git a/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx b/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx
index 9daf5740f1ba..5f8be77189ba 100644
--- a/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx
+++ b/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx
@@ -51,7 +51,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
fprintf(stdout, HELP_TEXT);// default
return 0;
}
- sal_Bool bEnabled = sal_False;
+ sal_Bool bEnabled = false;
javaFrameworkError errcode = jfw_getEnabled( & bEnabled);
if (errcode == JFW_E_NONE && !bEnabled)
{
@@ -81,7 +81,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
else
{
//check if the JRE was not uninstalled
- sal_Bool bExist = sal_False;
+ sal_Bool bExist = false;
errcode = jfw_existJRE(pInfo.info, &bExist);
if (errcode == JFW_E_NONE)
{
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
index a3db87f687ad..16e8ff1abd9c 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
@@ -878,11 +878,11 @@ javaPluginError jfw_plugin_existJRE(const JavaInfo *pInfo, sal_Bool *exist)
::osl::File::RC rc_item = ::osl::DirectoryItem::get(sLocation, item);
if (::osl::File::E_None == rc_item)
{
- *exist = sal_True;
+ *exist = true;
}
else if (::osl::File::E_NOENT == rc_item)
{
- *exist = sal_False;
+ *exist = false;
}
else
{
@@ -901,13 +901,13 @@ javaPluginError jfw_plugin_existJRE(const JavaInfo *pInfo, sal_Bool *exist)
::osl::File::RC rc_itemRt = ::osl::DirectoryItem::get(sRuntimeLib, itemRt);
if (::osl::File::E_None == rc_itemRt)
{
- *exist = sal_True;
+ *exist = true;
JFW_TRACE2("Java runtime library exist: " << sRuntimeLib);
}
else if (::osl::File::E_NOENT == rc_itemRt)
{
- *exist = sal_False;
+ *exist = false;
JFW_TRACE2("Java runtime library does not exist: " << sRuntimeLib);
}
else
diff --git a/jvmfwk/source/elements.cxx b/jvmfwk/source/elements.cxx
index 639e935b723f..2d33aa4b60ee 100644
--- a/jvmfwk/source/elements.cxx
+++ b/jvmfwk/source/elements.cxx
@@ -278,9 +278,9 @@ void NodeJava::load()
CXmlCharPtr sEnabled( xmlNodeListGetString(
docUser, cur->children, 1));
if (xmlStrcmp(sEnabled, reinterpret_cast<xmlChar const *>("true")) == 0)
- m_enabled = boost::optional<sal_Bool>(sal_True);
+ m_enabled = boost::optional<sal_Bool>(true);
else if (xmlStrcmp(sEnabled, reinterpret_cast<xmlChar const *>("false")) == 0)
- m_enabled = boost::optional<sal_Bool>(sal_False);
+ m_enabled = boost::optional<sal_Bool>(false);
}
}
else if (xmlStrcmp(cur->name, reinterpret_cast<xmlChar const *>("userClassPath")) == 0)
@@ -464,7 +464,7 @@ void NodeJava::write() const
reinterpret_cast<xmlChar const *>("nil"),
reinterpret_cast<xmlChar const *>("false"));
- if (m_enabled == boost::optional<sal_Bool>(sal_True))
+ if (m_enabled == boost::optional<sal_Bool>(true))
xmlNodeSetContent(nodeEnabled,reinterpret_cast<xmlChar const *>("true"));
else
xmlNodeSetContent(nodeEnabled,reinterpret_cast<xmlChar const *>("false"));
diff --git a/jvmfwk/source/framework.cxx b/jvmfwk/source/framework.cxx
index 88658a18175f..bc53abd98ee1 100644
--- a/jvmfwk/source/framework.cxx
+++ b/jvmfwk/source/framework.cxx
@@ -702,9 +702,9 @@ javaFrameworkError jfw_isVMRunning(sal_Bool *bRunning)
if (bRunning == nullptr)
return JFW_E_INVALID_ARG;
if (g_pJavaVM == nullptr)
- *bRunning = sal_False;
+ *bRunning = false;
else
- *bRunning = sal_True;
+ *bRunning = true;
return JFW_E_NONE;
}