diff options
Diffstat (limited to 'stoc')
| -rw-r--r-- | stoc/source/invocation_adapterfactory/iafactory.cxx | 4 | ||||
| -rw-r--r-- | stoc/source/javavm/javavm.cxx | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/stoc/source/invocation_adapterfactory/iafactory.cxx b/stoc/source/invocation_adapterfactory/iafactory.cxx index 447264c589a3..102fdebf10d6 100644 --- a/stoc/source/invocation_adapterfactory/iafactory.cxx +++ b/stoc/source/invocation_adapterfactory/iafactory.cxx @@ -285,8 +285,8 @@ bool AdapterImpl::coerce_assign( } else { - bool succ = (sal_False != ::uno_type_assignData( - pDest, pType, ret.pData, ret.pType, 0, 0, 0 )); + bool succ = ::uno_type_assignData( + pDest, pType, ret.pData, ret.pType, 0, 0, 0 ); ::uno_any_destruct( &ret, 0 ); OSL_ENSURE( succ, "### conversion succeeded, but assignment failed!?" ); diff --git a/stoc/source/javavm/javavm.cxx b/stoc/source/javavm/javavm.cxx index dc35b20bc18b..46571c113fb6 100644 --- a/stoc/source/javavm/javavm.cxx +++ b/stoc/source/javavm/javavm.cxx @@ -819,7 +819,7 @@ JavaVirtualMachine::getJavaVM(css::uno::Sequence< sal_Int8 > const & rProcessId) sal_Bool bExist = sal_False; if (JFW_E_NONE == jfw_existJRE(pJavaInfo, &bExist)) { - if (bExist == sal_False + if (!bExist && ! (pJavaInfo->nRequirements & JFW_REQUIRE_NEEDRESTART)) { info.clear(); |