diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-01-28 20:01:36 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-01-28 20:26:26 +0100 |
| commit | 471cbb05226c2fd3f92c63f3e6a7087a73ee8f6f (patch) | |
| tree | a58a0a3fd43580b99d08eb3640475b9fc691a14f /jvmfwk/source | |
| parent | 62736c5fb8b68b25d7605a59437bf555902b3d96 (diff) | |
bool improvements
Change-Id: I418611622b4b47ed5a4fa2ab99afb25371b186f6
Diffstat (limited to 'jvmfwk/source')
| -rw-r--r-- | jvmfwk/source/elements.cxx | 2 | ||||
| -rw-r--r-- | jvmfwk/source/framework.cxx | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/jvmfwk/source/elements.cxx b/jvmfwk/source/elements.cxx index db5c3e24bd22..9fdab7a70811 100644 --- a/jvmfwk/source/elements.cxx +++ b/jvmfwk/source/elements.cxx @@ -1074,7 +1074,7 @@ void MergedSettings::merge(const NodeJava & share, const NodeJava & user) else if (share.getEnabled()) m_bEnabled = * share.getEnabled(); else - m_bEnabled = sal_True; + m_bEnabled = true; if (user.getUserClassPath()) m_sClassPath = * user.getUserClassPath(); diff --git a/jvmfwk/source/framework.cxx b/jvmfwk/source/framework.cxx index 38109892a23d..f0b9d692b172 100644 --- a/jvmfwk/source/framework.cxx +++ b/jvmfwk/source/framework.cxx @@ -371,7 +371,7 @@ javaFrameworkError SAL_CALL jfw_startVM( "-Djava.class.path=" + jfw::BootParams::getClasspath(); } else - OSL_ASSERT(0); + OSL_ASSERT(false); pInfo = aInfo.pInfo; } assert(pInfo != NULL); @@ -884,7 +884,7 @@ javaFrameworkError SAL_CALL jfw_getJavaInfoByPath( {// plugin does not recognize this path as belonging to JRE continue; } - OSL_ASSERT(0); + OSL_ASSERT(false); } if (*ppInfo == NULL && errcode != JFW_E_FAILED_VERSION) errcode = JFW_E_NOT_RECOGNIZED; |