summaryrefslogtreecommitdiff
path: root/cppuhelper
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2014-02-16 20:57:55 +0100
committerStephan Bergmann <sbergman@redhat.com>2014-02-17 17:55:18 +0100
commit7f902e1697d077dd4a32846ff85f6134a556d528 (patch)
tree4af1cdaf3edf03680641be6af0b512181a658739 /cppuhelper
parent34a44156b3983849749d82b90d82b84aeb538aae (diff)
cppuhelper: sal_Bool -> bool
Change-Id: I6e0e6c1e4880a652ea4d8f0cccf9d8103c2cbbef
Diffstat (limited to 'cppuhelper')
-rw-r--r--cppuhelper/source/component.cxx4
-rw-r--r--cppuhelper/source/factory.cxx26
-rw-r--r--cppuhelper/source/implbase.cxx2
-rw-r--r--cppuhelper/source/implementationentry.cxx4
-rw-r--r--cppuhelper/source/interfacecontainer.cxx2
-rw-r--r--cppuhelper/source/propshlp.cxx4
6 files changed, 21 insertions, 21 deletions
diff --git a/cppuhelper/source/component.cxx b/cppuhelper/source/component.cxx
index c178e986fcc7..6d13d89355a6 100644
--- a/cppuhelper/source/component.cxx
+++ b/cppuhelper/source/component.cxx
@@ -148,14 +148,14 @@ void OComponentHelper::dispose()
// Guard dispose against multible threading
// Remark: It is an error to call dispose more than once
- sal_Bool bDoDispose = sal_False;
+ bool bDoDispose = false;
{
MutexGuard aGuard( rBHelper.rMutex );
if( !rBHelper.bDisposed && !rBHelper.bInDispose )
{
// only one call go into this section
rBHelper.bInDispose = sal_True;
- bDoDispose = sal_True;
+ bDoDispose = true;
}
}
diff --git a/cppuhelper/source/factory.cxx b/cppuhelper/source/factory.cxx
index b0b7e7bd9ea6..85a231880a2b 100644
--- a/cppuhelper/source/factory.cxx
+++ b/cppuhelper/source/factory.cxx
@@ -275,7 +275,7 @@ public:
ComponentInstantiation pCreateFunction_,
ComponentFactoryFunc fptr,
const Sequence< OUString > * pServiceNames_,
- sal_Bool bOneInstance_ = sal_False )
+ bool bOneInstance_ = false )
SAL_THROW(())
: OComponentHelper( aMutex )
, OSingleFactoryHelper( rServiceManager, rImplementationName_, pCreateFunction_, fptr, pServiceNames_ )
@@ -322,11 +322,11 @@ public:
private:
Reference<XInterface > xTheInstance;
- sal_Bool bOneInstance;
+ bool bOneInstance;
protected:
// needed for implementing XUnloadingPreference in inheriting classes
- sal_Bool isOneInstance() {return bOneInstance;}
- sal_Bool isInstance() {return xTheInstance.is();}
+ bool isOneInstance() {return bOneInstance;}
+ bool isInstance() {return xTheInstance.is();}
};
@@ -494,7 +494,7 @@ public:
const Reference<XMultiServiceFactory > & rServiceManager,
const OUString & rImplementationName_,
const Reference<XRegistryKey > & xImplementationKey_,
- sal_Bool bOneInstance_ = sal_False ) SAL_THROW(())
+ bool bOneInstance_ = false ) SAL_THROW(())
: OFactoryComponentHelper(
rServiceManager, rImplementationName_, 0, 0, 0, bOneInstance_ ),
OPropertySetHelper( OComponentHelper::rBHelper ),
@@ -868,10 +868,10 @@ Sequence< OUString > ORegistryFactoryHelper::getSupportedServiceNames(void)
sal_Bool SAL_CALL ORegistryFactoryHelper::releaseOnNotification() throw(::com::sun::star::uno::RuntimeException)
{
- sal_Bool retVal= sal_True;
+ bool retVal= true;
if( isOneInstance() && isInstance())
{
- retVal= sal_False;
+ retVal= false;
}
else if( ! isOneInstance())
{
@@ -986,7 +986,7 @@ Reference<XSingleServiceFactory > SAL_CALL createSingleFactory(
SAL_THROW(())
{
return new OFactoryComponentHelper(
- rServiceManager, rImplementationName, pCreateFunction, 0, &rServiceNames, sal_False );
+ rServiceManager, rImplementationName, pCreateFunction, 0, &rServiceNames, false );
}
// global function
@@ -1008,7 +1008,7 @@ Reference<XSingleServiceFactory > SAL_CALL createOneInstanceFactory(
SAL_THROW(())
{
return new OFactoryComponentHelper(
- rServiceManager, rImplementationName, pCreateFunction, 0, &rServiceNames, sal_True );
+ rServiceManager, rImplementationName, pCreateFunction, 0, &rServiceNames, true );
}
// global function
@@ -1019,7 +1019,7 @@ Reference<XSingleServiceFactory > SAL_CALL createSingleRegistryFactory(
SAL_THROW(())
{
return new ORegistryFactoryHelper(
- rServiceManager, rImplementationName, rImplementationKey, sal_False );
+ rServiceManager, rImplementationName, rImplementationKey, false );
}
// global function
@@ -1030,7 +1030,7 @@ Reference<XSingleServiceFactory > SAL_CALL createOneInstanceRegistryFactory(
SAL_THROW(())
{
return new ORegistryFactoryHelper(
- rServiceManager, rImplementationName, rImplementationKey, sal_True );
+ rServiceManager, rImplementationName, rImplementationKey, true );
}
//##################################################################################################
@@ -1042,7 +1042,7 @@ Reference< lang::XSingleComponentFactory > SAL_CALL createSingleComponentFactory
SAL_THROW(())
{
return new OFactoryComponentHelper(
- Reference< XMultiServiceFactory >(), rImplementationName, 0, fptr, &rServiceNames, sal_False );
+ Reference< XMultiServiceFactory >(), rImplementationName, 0, fptr, &rServiceNames, false );
}
Reference< lang::XSingleComponentFactory > SAL_CALL createOneInstanceComponentFactory(
@@ -1053,7 +1053,7 @@ Reference< lang::XSingleComponentFactory > SAL_CALL createOneInstanceComponentFa
SAL_THROW(())
{
return new OFactoryComponentHelper(
- Reference< XMultiServiceFactory >(), rImplementationName, 0, fptr, &rServiceNames, sal_True );
+ Reference< XMultiServiceFactory >(), rImplementationName, 0, fptr, &rServiceNames, true );
}
}
diff --git a/cppuhelper/source/implbase.cxx b/cppuhelper/source/implbase.cxx
index a4e46c6b7ad0..983622ca5bfd 100644
--- a/cppuhelper/source/implbase.cxx
+++ b/cppuhelper/source/implbase.cxx
@@ -157,7 +157,7 @@ Sequence< sal_Int8 > ClassData::getImplementationId() SAL_THROW(())
}
//--------------------------------------------------------------------------------------------------
-static inline sal_Bool td_equals(
+static inline bool td_equals(
typelib_TypeDescription * pTD, typelib_TypeDescriptionReference * pType )
SAL_THROW(())
{
diff --git a/cppuhelper/source/implementationentry.cxx b/cppuhelper/source/implementationentry.cxx
index aa587fc59d29..6b10eaca41f5 100644
--- a/cppuhelper/source/implementationentry.cxx
+++ b/cppuhelper/source/implementationentry.cxx
@@ -31,7 +31,7 @@ sal_Bool component_writeInfoHelper(
SAL_UNUSED_PARAMETER void *, void * pRegistryKey,
ImplementationEntry const * entries)
{
- sal_Bool bRet = sal_False;
+ bool bRet = false;
try
{
if( pRegistryKey )
@@ -47,7 +47,7 @@ sal_Bool component_writeInfoHelper(
for ( sal_Int32 nPos = 0 ; nPos < seq.getLength(); nPos ++ )
xNewKey->createKey( pArray[nPos] );
}
- bRet = sal_True;
+ bRet = true;
}
}
catch ( InvalidRegistryException & )
diff --git a/cppuhelper/source/interfacecontainer.cxx b/cppuhelper/source/interfacecontainer.cxx
index 69b74628dd4c..fb59703ca42d 100644
--- a/cppuhelper/source/interfacecontainer.cxx
+++ b/cppuhelper/source/interfacecontainer.cxx
@@ -95,7 +95,7 @@ OInterfaceIteratorHelper::OInterfaceIteratorHelper( OInterfaceContainerHelper &
OInterfaceIteratorHelper::~OInterfaceIteratorHelper() SAL_THROW(())
{
- sal_Bool bShared;
+ bool bShared;
{
MutexGuard aGuard( rCont.rMutex );
// bResetInUse protect the iterator against recursion
diff --git a/cppuhelper/source/propshlp.cxx b/cppuhelper/source/propshlp.cxx
index f0e35f0ff6aa..5992c4b3edfe 100644
--- a/cppuhelper/source/propshlp.cxx
+++ b/cppuhelper/source/propshlp.cxx
@@ -465,7 +465,7 @@ void OPropertySetHelper::setDependentFastPropertyValue( sal_Int32 i_handle, cons
// to change their value.
Any aConverted, aOld;
- sal_Bool bChanged = convertFastPropertyValue( aConverted, aOld, i_handle, i_value );
+ bool bChanged = convertFastPropertyValue( aConverted, aOld, i_handle, i_value );
if ( !bChanged )
return;
@@ -524,7 +524,7 @@ void OPropertySetHelper::setFastPropertyValue( sal_Int32 nHandle, const Any& rVa
Any aOldVal;
// Will the property change?
- sal_Bool bChanged;
+ bool bChanged;
{
MutexGuard aGuard( rBHelper.rMutex );
bChanged = convertFastPropertyValue( aConvertedVal, aOldVal, nHandle, rValue );