diff options
Diffstat (limited to 'basic/source/classes')
-rw-r--r-- | basic/source/classes/sbunoobj.cxx | 10 | ||||
-rw-r--r-- | basic/source/classes/sbxmod.cxx | 26 |
2 files changed, 18 insertions, 18 deletions
diff --git a/basic/source/classes/sbunoobj.cxx b/basic/source/classes/sbunoobj.cxx index eba896f0609b..4e4dd94e50bb 100644 --- a/basic/source/classes/sbunoobj.cxx +++ b/basic/source/classes/sbunoobj.cxx @@ -1483,15 +1483,15 @@ Any sbxToUnoValue( const SbxValue* pVar, const Type& rType, Property* pUnoProper case TypeClass_BYTE: { sal_Int16 nVal = pVar->GetInteger(); - sal_Bool bOverflow = sal_False; + bool bOverflow = false; if( nVal < -128 ) { - bOverflow = sal_True; + bOverflow = true; nVal = -128; } else if( nVal > 127 ) { - bOverflow = sal_True; + bOverflow = true; nVal = 127; } if( bOverflow ) @@ -1936,7 +1936,7 @@ OUString Impl_DumpProperties( SbUnoObject* pUnoObj ) // Is it in Uno a sequence? SbxDataType eType = pVar->GetFullType(); - sal_Bool bMaybeVoid = sal_False; + bool bMaybeVoid = false; if( i < nUnoPropCount ) { const Property& rProp = pUnoProps[ i ]; @@ -1946,7 +1946,7 @@ OUString Impl_DumpProperties( SbUnoObject* pUnoObj ) if( rProp.Attributes & PropertyAttribute::MAYBEVOID ) { eType = unoToSbxType( rProp.Type.getTypeClass() ); - bMaybeVoid = sal_True; + bMaybeVoid = true; } if( eType == SbxOBJECT ) { diff --git a/basic/source/classes/sbxmod.cxx b/basic/source/classes/sbxmod.cxx index b1e4b8ffad9a..f8ac006a01ca 100644 --- a/basic/source/classes/sbxmod.cxx +++ b/basic/source/classes/sbxmod.cxx @@ -1125,7 +1125,7 @@ sal_uInt16 SbModule::Run( SbMethod* pMeth ) // Launcher problem // i80726 The Find below will genarate an error in Testtool so we reset it unless there was one before already - sal_Bool bWasError = SbxBase::GetError() != 0; + bool bWasError = SbxBase::GetError() != 0; SbxVariable* pMSOMacroRuntimeLibVar = Find( "Launcher", SbxCLASS_OBJECT ); if ( !bWasError && (SbxBase::GetError() == SbxERR_PROC_UNDEFINED) ) SbxBase::ResetError(); @@ -2277,9 +2277,9 @@ class FormObjEventListenerImpl : public FormObjEventListener_BASE uno::Reference< lang::XComponent > mxComponent; uno::Reference< frame::XModel > mxModel; bool mbDisposed; - sal_Bool mbOpened; - sal_Bool mbActivated; - sal_Bool mbShowing; + bool mbOpened; + bool mbActivated; + bool mbShowing; FormObjEventListenerImpl(const FormObjEventListenerImpl&); // not defined FormObjEventListenerImpl& operator=(const FormObjEventListenerImpl&); // not defined @@ -2287,7 +2287,7 @@ class FormObjEventListenerImpl : public FormObjEventListener_BASE public: FormObjEventListenerImpl( SbUserFormModule* pUserForm, const uno::Reference< lang::XComponent >& xComponent, const uno::Reference< frame::XModel >& xModel ) : mpUserForm( pUserForm ), mxComponent( xComponent), mxModel( xModel ), - mbDisposed( false ), mbOpened( sal_False ), mbActivated( sal_False ), mbShowing( sal_False ) + mbDisposed( false ), mbOpened( false ), mbActivated( false ), mbShowing( false ) { if ( mxComponent.is() ) { @@ -2319,7 +2319,7 @@ public: removeListener(); } - sal_Bool isShowing() const { return mbShowing; } + bool isShowing() const { return mbShowing; } void removeListener() { @@ -2354,11 +2354,11 @@ public: { if ( mpUserForm ) { - mbOpened = sal_True; - mbShowing = sal_True; + mbOpened = true; + mbShowing = true; if ( mbActivated ) { - mbOpened = mbActivated = sal_False; + mbOpened = mbActivated = false; mpUserForm->triggerActivateEvent(); } } @@ -2399,8 +2399,8 @@ public: virtual void SAL_CALL windowClosed( const lang::EventObject& /*e*/ ) throw (uno::RuntimeException) { - mbOpened = sal_False; - mbShowing = sal_False; + mbOpened = false; + mbShowing = false; } virtual void SAL_CALL windowMinimized( const lang::EventObject& /*e*/ ) throw (uno::RuntimeException) @@ -2415,10 +2415,10 @@ public: { if ( mpUserForm ) { - mbActivated = sal_True; + mbActivated = true; if ( mbOpened ) { - mbOpened = mbActivated = sal_False; + mbOpened = mbActivated = false; mpUserForm->triggerActivateEvent(); } } |