summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2014-01-28 20:00:06 +0100
committerStephan Bergmann <sbergman@redhat.com>2014-01-28 20:26:22 +0100
commit48fc43550abb5fa62abef5b3fc977e24d0ab56f0 (patch)
tree76bb60e34fdd40a057fb8b9bbd6d05bd48767fbd
parent6f607b53857a67375f9da1d7d0fb0893545188c8 (diff)
bool improvements
Change-Id: Ic29ea184cb40f6f49313ac2ff1abb4a37246d5bd
-rw-r--r--stoc/source/inspect/introspection.cxx6
-rw-r--r--stoc/source/javavm/javavm.cxx2
-rw-r--r--stoc/source/proxy_factory/proxyfac.cxx2
3 files changed, 5 insertions, 5 deletions
diff --git a/stoc/source/inspect/introspection.cxx b/stoc/source/inspect/introspection.cxx
index 2ca6beb1e8a9..7cd15a7f0eed 100644
--- a/stoc/source/inspect/introspection.cxx
+++ b/stoc/source/inspect/introspection.cxx
@@ -1471,12 +1471,12 @@ struct hashIntrospectionAccessCache_Impl
{
if( rObj1.xPropInfo != rObj2.xPropInfo
|| rObj1.xImplClass != rObj2.xImplClass )
- return sal_False;
+ return false;
sal_Int32 nCount1 = rObj1.aIdlClasses.getLength();
sal_Int32 nCount2 = rObj2.aIdlClasses.getLength();
if( nCount1 != nCount2 )
- return sal_False;
+ return false;
const Reference<XIdlClass>* pRefs1 = rObj1.aIdlClasses.getConstArray();
const Reference<XIdlClass>* pRefs2 = rObj2.aIdlClasses.getConstArray();
@@ -1525,7 +1525,7 @@ struct TypeProviderAccessCache_Impl
const hashTypeProviderKey_Impl & rObj2 ) const
{
if( rObj1.xPropInfo != rObj2.xPropInfo )
- return sal_False;
+ return false;
bool bEqual = false;
sal_Int32 nLen1 = rObj1.maImpIdSeq.getLength();
diff --git a/stoc/source/javavm/javavm.cxx b/stoc/source/javavm/javavm.cxx
index f1af2524762d..d3fbc33042bd 100644
--- a/stoc/source/javavm/javavm.cxx
+++ b/stoc/source/javavm/javavm.cxx
@@ -855,7 +855,7 @@ JavaVirtualMachine::getJavaVM(css::uno::Sequence< sal_Int8 > const & rProcessId)
case JFW_E_RUNNING_JVM:
{
//This service should make sure that we do not start java twice.
- OSL_ASSERT(0);
+ OSL_ASSERT(false);
break;
}
case JFW_E_NEED_RESTART:
diff --git a/stoc/source/proxy_factory/proxyfac.cxx b/stoc/source/proxy_factory/proxyfac.cxx
index d4cb32738611..ef76460ed462 100644
--- a/stoc/source/proxy_factory/proxyfac.cxx
+++ b/stoc/source/proxy_factory/proxyfac.cxx
@@ -160,7 +160,7 @@ UnoInterfaceReference FactoryImpl::binuno_queryInterface(
m_uno2cpp.get() );
uno_any_destruct( exc, 0 );
::cppu::throwException( cpp_exc );
- OSL_ASSERT( 0 ); // way of no return
+ OSL_ASSERT( false ); // way of no return
return UnoInterfaceReference(); // for dummy
}
}