Kaydet (Commit) 65191cda authored tarafından Stephan Bergmann's avatar Stephan Bergmann

bool improvements

Change-Id: I757e19313576d2c3d13af1cb720f182f0de91613
üst 5de65dc2
......@@ -41,7 +41,7 @@ namespace cppu_threadpool {
struct EqualThreadId
{
sal_Int32 operator () ( const ::rtl::ByteSequence &a , const ::rtl::ByteSequence &b ) const
bool operator () ( const ::rtl::ByteSequence &a , const ::rtl::ByteSequence &b ) const
{
return a == b;
}
......
......@@ -63,7 +63,7 @@ public:
// returns true if the stop condition is set
bool isStopped() const
{ return sal_True == const_cast <Download *> (this)->m_aCondition.check(); };
{ return const_cast <Download *> (this)->m_aCondition.check(); };
protected:
......
......@@ -473,7 +473,7 @@ UpdateCheckThread::run()
try {
while( sal_True == schedule() )
while( schedule() )
{
/* Use cases:
* a) manual check requested from auto check thread - "last check" should not be checked (one time)
......@@ -1572,7 +1572,7 @@ bool
UpdateCheck::isDialogShowing() const
{
osl::MutexGuard aGuard(m_aMutex);
return sal_True == m_aUpdateHandler.is() && m_aUpdateHandler->isVisible();
return m_aUpdateHandler.is() && m_aUpdateHandler->isVisible();
};
//------------------------------------------------------------------------------
......
......@@ -107,7 +107,7 @@ class Gate : public IGate
m_aPassage.set();
// Check if operation was successful!
// Check returns false if condition isn't set => m_bClosed will be true then => we must return false; opening failed
m_bClosed = ( m_aPassage.check() == sal_False );
m_bClosed = !m_aPassage.check();
}
/*-****************************************************************************************************//**
......@@ -130,7 +130,7 @@ class Gate : public IGate
m_aPassage.reset();
// Check if operation was successful!
// Check returns false if condition was reseted => m_bClosed will be true then => we can return true; closing ok
m_bClosed = ( m_aPassage.check() == sal_False );
m_bClosed = !m_aPassage.check();
}
/*-****************************************************************************************************//**
......@@ -156,7 +156,7 @@ class Gate : public IGate
m_aPassage.set();
// Check state of condition.
// If condition is set check() returns true => m_bGapOpen will be true too => we can use it as return value.
m_bGapOpen = ( m_aPassage.check() == sal_True );
m_bGapOpen = m_aPassage.check();
}
/*-****************************************************************************************************//**
......
......@@ -360,7 +360,7 @@ javaPluginError jfw_plugin_getJavaInfoByPath(
return JFW_PLUGIN_E_INVALID_ARG;
rtl::Reference<VendorBase> aVendorInfo = getJREInfoByPath(ouPath);
if (aVendorInfo.is() == sal_False)
if (!aVendorInfo.is())
return JFW_PLUGIN_E_NO_JRE;
//Check if the detected JRE matches the version requirements
......
......@@ -130,7 +130,7 @@ javaFrameworkError SAL_CALL jfw_findAllJREs(JavaInfo ***pparInfo, sal_Int32 *pSi
arModules[cModule].load(library.sPath);
osl::Module & pluginLib = arModules[cModule];
if (pluginLib.is() == sal_False)
if (!pluginLib.is())
{
OString msg = OUStringToOString(
library.sPath, osl_getThreadTextEncoding());
......@@ -504,7 +504,7 @@ javaFrameworkError SAL_CALL jfw_findAndSelectJRE(JavaInfo **pInfo)
#ifndef DISABLE_DYNLOADING
arModules[cModule].load(library.sPath);
osl::Module & pluginLib = arModules[cModule];
if (pluginLib.is() == sal_False)
if (!pluginLib.is())
return JFW_E_NO_PLUGIN;
jfw_plugin_getAllJavaInfos_ptr getAllJavaFunc =
......@@ -588,7 +588,7 @@ javaFrameworkError SAL_CALL jfw_findAndSelectJRE(JavaInfo **pInfo)
aVendorSettings.getVersionInformation(library.sVendor);
#ifndef DISABLE_DYNLOADING
osl::Module pluginLib(library.sPath);
if (pluginLib.is() == sal_False)
if (!pluginLib.is())
return JFW_E_NO_PLUGIN;
//Check if the current plugin can detect JREs at the location
// of the paths added by jfw_setJRELocations or jfw_addJRELocation
......@@ -815,7 +815,7 @@ javaFrameworkError SAL_CALL jfw_getJavaInfoByPath(
#ifndef DISABLE_DYNLOADING
arModules[cModule].load(library.sPath);
osl::Module & pluginLib = arModules[cModule];
if (pluginLib.is() == sal_False)
if (!pluginLib.is())
{
OString msg = OUStringToOString(
library.sPath, osl_getThreadTextEncoding());
......
......@@ -319,7 +319,7 @@ OUString VendorSettings::getPluginLibrary(const OUString& sVendor)
{
OUString sName = OUString(UNO_JAVA_JFW_PARAMETER) + OUString::number(i);
OUString sValue;
if (Bootstrap::get()->getFrom(sName, sValue) == sal_True)
if (Bootstrap::get()->getFrom(sName, sValue))
{
OString sParam =
OUStringToOString(sValue, osl_getThreadTextEncoding());
......@@ -352,7 +352,7 @@ OString BootParams::getClasspath()
OUString sCP;
if (Bootstrap::get()->getFrom(
OUString(UNO_JAVA_JFW_CLASSPATH),
sCP) == sal_True)
sCP))
{
sClassPath = OUStringToOString(sCP, osl_getThreadTextEncoding());
#if OSL_DEBUG_LEVEL >=2
......@@ -364,7 +364,7 @@ OString BootParams::getClasspath()
OUString sEnvCP;
if (Bootstrap::get()->getFrom(
OUString(UNO_JAVA_JFW_ENV_CLASSPATH),
sEnvCP) == sal_True)
sEnvCP))
{
char * pCp = getenv("CLASSPATH");
if (pCp)
......@@ -386,7 +386,7 @@ OUString BootParams::getVendorSettings()
OUString sVendor;
OUString sName(
UNO_JAVA_JFW_VENDOR_SETTINGS);
if (Bootstrap::get()->getFrom(sName ,sVendor) == sal_True)
if (Bootstrap::get()->getFrom(sName ,sVendor))
{
//check the value of the bootstrap variable
jfw::FileStatus s = checkFileURL(sVendor);
......@@ -510,21 +510,21 @@ JFW_MODE getMode()
OUString sValue;
const rtl::Bootstrap * aBoot = Bootstrap::get();
OUString sJREHome(UNO_JAVA_JFW_JREHOME);
if (aBoot->getFrom(sJREHome, sValue) == sal_False)
if (!aBoot->getFrom(sJREHome, sValue))
{
OUString sEnvJRE(UNO_JAVA_JFW_ENV_JREHOME);
if (aBoot->getFrom(sEnvJRE, sValue) == sal_False)
if (!aBoot->getFrom(sEnvJRE, sValue))
{
OUString sClasspath(UNO_JAVA_JFW_CLASSPATH);
if (aBoot->getFrom(sClasspath, sValue) == sal_False)
if (!aBoot->getFrom(sClasspath, sValue))
{
OUString sEnvClasspath(UNO_JAVA_JFW_ENV_CLASSPATH);
if (aBoot->getFrom(sEnvClasspath, sValue) == sal_False)
if (!aBoot->getFrom(sEnvClasspath, sValue))
{
OUString sParams = OUString(
UNO_JAVA_JFW_PARAMETER) +
OUString::number(1);
if (aBoot->getFrom(sParams, sValue) == sal_False)
if (!aBoot->getFrom(sParams, sValue))
{
bDirectMode = false;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment