diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2017-04-11 18:28:43 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2017-04-11 18:28:43 +0200 |
| commit | 16f29aa720c3f1a27f1ee6898630b10b897899c8 (patch) | |
| tree | 3b1ec32664380b1c623c3d7b7396388544caf2f3 | |
| parent | 15c98f1740708ad7c05753ea28d5ad8ed4430e02 (diff) | |
sal_Bool -> bool
Change-Id: Iec70d6726e36af607a0a5b5a0f6dc86d05322435
| -rw-r--r-- | cui/source/options/optjava.cxx | 6 | ||||
| -rw-r--r-- | include/jvmfwk/framework.hxx | 6 | ||||
| -rw-r--r-- | jvmfwk/source/framework.cxx | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx index 51f8b37b98e5..4dda48d41627 100644 --- a/cui/source/options/optjava.cxx +++ b/cui/source/options/optjava.cxx @@ -323,7 +323,7 @@ IMPL_LINK_NOARG(SvxJavaOptionsPage, ParameterHdl_Impl, Button*, void) if ( !areListsEqual( aParameterList, m_pParamDlg->GetParameters() ) ) { aParameterList = m_pParamDlg->GetParameters(); - sal_Bool bRunning = false; + bool bRunning = false; javaFrameworkError eErr = jfw_isVMRunning( &bRunning ); DBG_ASSERT( JFW_E_NONE == eErr, "SvxJavaOptionsPage::ParameterHdl_Impl(): error in jfw_isVMRunning" ); @@ -368,7 +368,7 @@ IMPL_LINK_NOARG(SvxJavaOptionsPage, ClassPathHdl_Impl, Button*, void) if ( m_pPathDlg->GetClassPath() != sClassPath ) { sClassPath = m_pPathDlg->GetClassPath(); - sal_Bool bRunning = false; + bool bRunning = false; javaFrameworkError eErr = jfw_isVMRunning( &bRunning ); DBG_ASSERT( JFW_E_NONE == eErr, "SvxJavaOptionsPage::ParameterHdl_Impl(): error in jfw_isVMRunning" ); @@ -683,7 +683,7 @@ bool SvxJavaOptionsPage::FillItemSet( SfxItemSet* /*rCoreSet*/ ) { if (!pSelectedJava || !jfw_areEqualJavaInfo( pInfo, pSelectedJava.get() ) ) { - sal_Bool bRunning = false; + bool bRunning = false; eErr = jfw_isVMRunning( &bRunning ); DBG_ASSERT( JFW_E_NONE == eErr, "SvxJavaOptionsPage::FillItemSet(): error in jfw_isVMRunning" ); diff --git a/include/jvmfwk/framework.hxx b/include/jvmfwk/framework.hxx index 139cda024766..e941b9a9f2fc 100644 --- a/include/jvmfwk/framework.hxx +++ b/include/jvmfwk/framework.hxx @@ -296,14 +296,14 @@ JVMFWK_DLLPUBLIC bool jfw_areEqualJavaInfo( that the changed setting may not be effective immediately.</p> @param bRunning - [out] sal_True - a VM is running. <br/> - sal_False - no VM is running. + [out] true - a VM is running. <br/> + false - no VM is running. @return JFW_E_NONE function ran successfully.<br/> JFW_E_INVALID_ARG the parameter <code>bRunning</code> was NULL. */ -JVMFWK_DLLPUBLIC javaFrameworkError jfw_isVMRunning(sal_Bool *bRunning); +JVMFWK_DLLPUBLIC javaFrameworkError jfw_isVMRunning(bool *bRunning); /** detects a suitable JRE and configures the framework to use it. diff --git a/jvmfwk/source/framework.cxx b/jvmfwk/source/framework.cxx index a0208180dc30..8447d320aae6 100644 --- a/jvmfwk/source/framework.cxx +++ b/jvmfwk/source/framework.cxx @@ -684,7 +684,7 @@ javaFrameworkError jfw_getSelectedJRE(std::unique_ptr<JavaInfo> *ppInfo) return errcode; } -javaFrameworkError jfw_isVMRunning(sal_Bool *bRunning) +javaFrameworkError jfw_isVMRunning(bool *bRunning) { osl::MutexGuard guard(jfw::FwkMutex::get()); if (bRunning == nullptr) |