sal_Bool -> bool
Change-Id: Iec70d6726e36af607a0a5b5a0f6dc86d05322435
diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx
index 51f8b37..4dda48d 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 139cda0..e941b9a 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 a020818..8447d32 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)
