summaryrefslogtreecommitdiff
path: root/jvmfwk
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2017-04-24 09:23:15 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2017-04-24 10:05:54 +0200
commita975225678c00272fc6e2ee2c85e6fe00a2204f1 (patch)
tree47aa7fdcd49221fd3084b9d77418b6690b7bc0e0 /jvmfwk
parent78a3a304871eb3eb861a49ed00345b54fba01114 (diff)
clang-tidy readability-simplify-boolean-expr in hwpfilter..lotuswordpro
Change-Id: I945d3fe6af5f88937b341dfc3696bf1d36344862 Reviewed-on: https://gerrit.libreoffice.org/36874 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'jvmfwk')
-rw-r--r--jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx5
-rw-r--r--jvmfwk/plugins/sunmajor/pluginlib/vendorbase.cxx9
-rw-r--r--jvmfwk/source/fwkbase.cxx4
3 files changed, 4 insertions, 14 deletions
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx b/jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx
index 9c431146c777..1750696ab018 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx
@@ -283,10 +283,7 @@ bool GnuInfo::initialize(vector<pair<OUString, OUString> > props)
break;
}
}
- if (!bLdPath)
- return false;
-
- return true;
+ return bLdPath;
}
int GnuInfo::compareVersions(const OUString&) const
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.cxx b/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.cxx
index 948c99dfe876..1f7423045bc1 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.cxx
@@ -175,10 +175,7 @@ bool VendorBase::initialize(vector<pair<OUString, OUString> > props)
break;
}
}
- if (!bLdPath)
- return false;
-
- return true;
+ return bLdPath;
}
const OUString & VendorBase::getVendor() const
@@ -228,9 +225,7 @@ bool VendorBase::supportsAccessibility() const
bool VendorBase::needsRestart() const
{
- if (!getLibraryPath().isEmpty())
- return true;
- return false;
+ return !getLibraryPath().isEmpty();
}
}
diff --git a/jvmfwk/source/fwkbase.cxx b/jvmfwk/source/fwkbase.cxx
index 27950eb11630..dbab7d4a9e7a 100644
--- a/jvmfwk/source/fwkbase.cxx
+++ b/jvmfwk/source/fwkbase.cxx
@@ -532,9 +532,7 @@ void setJavaSelected()
bool wasJavaSelectedInSameProcess()
{
//g_setJavaProcId not set means no Java selected
- if (g_bJavaSet)
- return true;
- return false;
+ return g_bJavaSet;
}