diff options
| author | Noel Grandin <noel@peralex.com> | 2014-04-04 16:52:44 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2014-04-07 13:53:50 +0200 |
| commit | 1eee88dd6bf2c647aa3458d33a5f45c51c024186 (patch) | |
| tree | 597f9f91a5fb0290163cd0a5363cce5561439412 /basic/source/classes | |
| parent | 62a4722a0d23ce9adf4db0a6e8c24b878f91062a (diff) | |
basic: sal_Bool->bool
Change-Id: I1c084ca86c0b1308eb2fc1451ba34d2e702c6a7f
Diffstat (limited to 'basic/source/classes')
| -rw-r--r-- | basic/source/classes/eventatt.cxx | 2 | ||||
| -rw-r--r-- | basic/source/classes/propacc.cxx | 4 | ||||
| -rw-r--r-- | basic/source/classes/sb.cxx | 2 | ||||
| -rw-r--r-- | basic/source/classes/sbunoobj.cxx | 28 | ||||
| -rw-r--r-- | basic/source/classes/sbxmod.cxx | 13 |
5 files changed, 25 insertions, 24 deletions
diff --git a/basic/source/classes/eventatt.cxx b/basic/source/classes/eventatt.cxx index 8647e8a23bfd..ff1d60cb37c1 100644 --- a/basic/source/classes/eventatt.cxx +++ b/basic/source/classes/eventatt.cxx @@ -418,7 +418,7 @@ css::uno::Reference< css::container::XNameContainer > implFindDialogLibForDialog return aDlgLib; } -void RTL_Impl_CreateUnoDialog( StarBASIC* pBasic, SbxArray& rPar, sal_Bool bWrite ) +void RTL_Impl_CreateUnoDialog( StarBASIC* pBasic, SbxArray& rPar, bool bWrite ) { (void)pBasic; (void)bWrite; diff --git a/basic/source/classes/propacc.cxx b/basic/source/classes/propacc.cxx index 0713a72b58fe..41781f7a5d34 100644 --- a/basic/source/classes/propacc.cxx +++ b/basic/source/classes/propacc.cxx @@ -227,7 +227,7 @@ Property PropertySetInfoImpl::getPropertyByName(const OUString& Name) throw( Run return Property(); } -sal_Bool PropertySetInfoImpl::hasPropertyByName(const OUString& Name) throw( RuntimeException ) +bool PropertySetInfoImpl::hasPropertyByName(const OUString& Name) throw( RuntimeException ) { sal_Int32 nIndex = GetIndex_Impl( Name ); return USHRT_MAX != nIndex; @@ -277,7 +277,7 @@ sal_Bool SbPropertySetInfo::hasPropertyByName(const OUString& Name) -void RTL_Impl_CreatePropertySet( StarBASIC* pBasic, SbxArray& rPar, sal_Bool bWrite ) +void RTL_Impl_CreatePropertySet( StarBASIC* pBasic, SbxArray& rPar, bool bWrite ) { (void)pBasic; (void)bWrite; diff --git a/basic/source/classes/sb.cxx b/basic/source/classes/sb.cxx index f5f247abbda6..526a01337c97 100644 --- a/basic/source/classes/sb.cxx +++ b/basic/source/classes/sb.cxx @@ -1697,7 +1697,7 @@ bool StarBASIC::CError( SbError code, const OUString& rMsg, } SetErrorData( code, l, c1, c2 ); GetSbData()->bCompiler = true; - sal_Bool bRet; + bool bRet; if( GetSbData()->aErrHdl.IsSet() ) { bRet = (sal_Bool) GetSbData()->aErrHdl.Call( this ); diff --git a/basic/source/classes/sbunoobj.cxx b/basic/source/classes/sbunoobj.cxx index 82d6081f39d7..9a0d83ccb824 100644 --- a/basic/source/classes/sbunoobj.cxx +++ b/basic/source/classes/sbunoobj.cxx @@ -550,7 +550,7 @@ SbxDataType unoToSbxType( const Reference< XIdlClass >& xIdlClass ) return eRetType; } -static void implSequenceToMultiDimArray( SbxDimArray*& pArray, Sequence< sal_Int32 >& indices, Sequence< sal_Int32 >& sizes, const Any& aValue, sal_Int32& dimension, sal_Bool bIsZeroIndex, Type* pType = NULL ) +static void implSequenceToMultiDimArray( SbxDimArray*& pArray, Sequence< sal_Int32 >& indices, Sequence< sal_Int32 >& sizes, const Any& aValue, sal_Int32& dimension, bool bIsZeroIndex, Type* pType = NULL ) { Type aType = aValue.getValueType(); TypeClass eTypeClass = aType.getTypeClass(); @@ -2136,7 +2136,7 @@ void SbUnoObject::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType, try { sal_uInt32 nParamCount = pParams ? ((sal_uInt32)pParams->Count() - 1) : 0; - sal_Bool bCanBeConsideredAMethod = mxInvocation->hasMethod( pProp->GetName() ); + bool bCanBeConsideredAMethod = mxInvocation->hasMethod( pProp->GetName() ); Any aRetAny; if ( bCanBeConsideredAMethod && nParamCount ) { @@ -2972,7 +2972,7 @@ void createAllObjectProperties( SbxObject* pObj ) } -void RTL_Impl_CreateUnoStruct( StarBASIC* pBasic, SbxArray& rPar, sal_Bool bWrite ) +void RTL_Impl_CreateUnoStruct( StarBASIC* pBasic, SbxArray& rPar, bool bWrite ) { (void)pBasic; (void)bWrite; @@ -2998,7 +2998,7 @@ void RTL_Impl_CreateUnoStruct( StarBASIC* pBasic, SbxArray& rPar, sal_Bool bWrit refVar->PutObject( (SbUnoObject*)xUnoObj ); } -void RTL_Impl_CreateUnoService( StarBASIC* pBasic, SbxArray& rPar, sal_Bool bWrite ) +void RTL_Impl_CreateUnoService( StarBASIC* pBasic, SbxArray& rPar, bool bWrite ) { (void)pBasic; (void)bWrite; @@ -3049,7 +3049,7 @@ void RTL_Impl_CreateUnoService( StarBASIC* pBasic, SbxArray& rPar, sal_Bool bWri } } -void RTL_Impl_CreateUnoServiceWithArguments( StarBASIC* pBasic, SbxArray& rPar, sal_Bool bWrite ) +void RTL_Impl_CreateUnoServiceWithArguments( StarBASIC* pBasic, SbxArray& rPar, bool bWrite ) { (void)pBasic; (void)bWrite; @@ -3104,7 +3104,7 @@ void RTL_Impl_CreateUnoServiceWithArguments( StarBASIC* pBasic, SbxArray& rPar, } } -void RTL_Impl_GetProcessServiceManager( StarBASIC* pBasic, SbxArray& rPar, sal_Bool bWrite ) +void RTL_Impl_GetProcessServiceManager( StarBASIC* pBasic, SbxArray& rPar, bool bWrite ) { (void)pBasic; (void)bWrite; @@ -3121,7 +3121,7 @@ void RTL_Impl_GetProcessServiceManager( StarBASIC* pBasic, SbxArray& rPar, sal_B refVar->PutObject( (SbUnoObject*)xUnoObj ); } -void RTL_Impl_HasInterfaces( StarBASIC* pBasic, SbxArray& rPar, sal_Bool bWrite ) +void RTL_Impl_HasInterfaces( StarBASIC* pBasic, SbxArray& rPar, bool bWrite ) { (void)pBasic; (void)bWrite; @@ -3183,7 +3183,7 @@ void RTL_Impl_HasInterfaces( StarBASIC* pBasic, SbxArray& rPar, sal_Bool bWrite refVar->PutBool( true ); } -void RTL_Impl_IsUnoStruct( StarBASIC* pBasic, SbxArray& rPar, sal_Bool bWrite ) +void RTL_Impl_IsUnoStruct( StarBASIC* pBasic, SbxArray& rPar, bool bWrite ) { (void)pBasic; (void)bWrite; @@ -3219,7 +3219,7 @@ void RTL_Impl_IsUnoStruct( StarBASIC* pBasic, SbxArray& rPar, sal_Bool bWrite ) } -void RTL_Impl_EqualUnoObjects( StarBASIC* pBasic, SbxArray& rPar, sal_Bool bWrite ) +void RTL_Impl_EqualUnoObjects( StarBASIC* pBasic, SbxArray& rPar, bool bWrite ) { (void)pBasic; (void)bWrite; @@ -4162,7 +4162,7 @@ sal_Bool SAL_CALL InvocationToAllListenerMapper::hasProperty(const OUString& Nam // create Uno-Service // 1. Parameter == Prefix-Name of the macro // 2. Parameter == fully qualified name of the listener -void SbRtl_CreateUnoListener( StarBASIC* pBasic, SbxArray& rPar, sal_Bool bWrite ) +void SbRtl_CreateUnoListener( StarBASIC* pBasic, SbxArray& rPar, bool bWrite ) //RTLFUNC(CreateUnoListener) { (void)bWrite; @@ -4224,7 +4224,7 @@ void SbRtl_CreateUnoListener( StarBASIC* pBasic, SbxArray& rPar, sal_Bool bWrite // Represents the DefaultContext property of the ProcessServiceManager // in the Basic runtime system. -void RTL_Impl_GetDefaultContext( StarBASIC* pBasic, SbxArray& rPar, sal_Bool bWrite ) +void RTL_Impl_GetDefaultContext( StarBASIC* pBasic, SbxArray& rPar, bool bWrite ) { (void)pBasic; (void)bWrite; @@ -4240,7 +4240,7 @@ void RTL_Impl_GetDefaultContext( StarBASIC* pBasic, SbxArray& rPar, sal_Bool bWr // Creates a Basic wrapper object for a strongly typed Uno value // 1. parameter: Uno type as full qualified type name, e.g. "byte[]" -void RTL_Impl_CreateUnoValue( StarBASIC* pBasic, SbxArray& rPar, sal_Bool bWrite ) +void RTL_Impl_CreateUnoValue( StarBASIC* pBasic, SbxArray& rPar, bool bWrite ) { (void)pBasic; (void)bWrite; @@ -4479,14 +4479,14 @@ Any SAL_CALL ModuleInvocationProxy::invoke( const OUString& rFunction, aFunctionName += rFunction; bool bSetRescheduleBack = false; - sal_Bool bOldReschedule = sal_True; + bool bOldReschedule = true; SbiInstance* pInst = GetSbData()->pInst; if( pInst && pInst->IsCompatibility() ) { bOldReschedule = pInst->IsReschedule(); if ( bOldReschedule ) { - pInst->EnableReschedule( sal_False ); + pInst->EnableReschedule( false ); bSetRescheduleBack = true; } } diff --git a/basic/source/classes/sbxmod.cxx b/basic/source/classes/sbxmod.cxx index 2742603b40b8..616b1a1bbc30 100644 --- a/basic/source/classes/sbxmod.cxx +++ b/basic/source/classes/sbxmod.cxx @@ -366,9 +366,9 @@ DocObjectWrapper::hasMethod( const OUString& aName ) throw (RuntimeException, st sal_Bool SAL_CALL DocObjectWrapper::hasProperty( const OUString& aName ) throw (RuntimeException, std::exception) { - sal_Bool bRes = sal_False; + bool bRes = false; if ( m_xAggInv.is() && m_xAggInv->hasProperty( aName ) ) - bRes = sal_True; + bRes = true; else bRes = getProperty( aName ).Is(); return bRes; } @@ -1194,7 +1194,7 @@ sal_uInt16 SbModule::Run( SbMethod* pMeth ) GetSbData()->pInst->pRun = pRt; if ( mbVBACompat ) { - GetSbData()->pInst->EnableCompatibility( sal_True ); + GetSbData()->pInst->EnableCompatibility( true ); } while( pRt->Step() ) {} if( pRt->pNext ) @@ -1749,8 +1749,8 @@ bool SbModule::ExceedsLegacyModuleSize() class ErrorHdlResetter { Link mErrHandler; - bool mbError; - public: + bool mbError; +public: ErrorHdlResetter() : mbError( false ) { // save error handler @@ -1766,6 +1766,7 @@ class ErrorHdlResetter DECL_LINK( BasicErrorHdl, StarBASIC * ); bool HasError() { return mbError; } }; + IMPL_LINK( ErrorHdlResetter, BasicErrorHdl, StarBASIC *, /*pBasic*/) { mbError = true; @@ -2748,7 +2749,7 @@ SbUserFormModule::Find( const OUString& rName, SbxClassType t ) SbProperty::SbProperty( const OUString& r, SbxDataType t, SbModule* p ) : SbxProperty( r, t ), pMod( p ) { - bInvalid = sal_False; + bInvalid = false; } SbProperty::~SbProperty() |
