diff options
27 files changed, 329 insertions, 328 deletions
diff --git a/basic/inc/sbprop.hxx b/basic/inc/sbprop.hxx index b736aee8311b..20126eaaa25b 100644 --- a/basic/inc/sbprop.hxx +++ b/basic/inc/sbprop.hxx @@ -32,7 +32,7 @@ class BASIC_DLLPUBLIC SbProperty : public SbxProperty friend class SbModule; friend class SbProcedureProperty; SbModule* pMod; - sal_Bool bInvalid; + bool bInvalid; BASIC_DLLPRIVATE SbProperty( const OUString&, SbxDataType, SbModule* ); virtual ~SbProperty(); public: diff --git a/basic/inc/sbstdobj.hxx b/basic/inc/sbstdobj.hxx index c9a5169599a0..ae7ab2dc7368 100644 --- a/basic/inc/sbstdobj.hxx +++ b/basic/inc/sbstdobj.hxx @@ -44,9 +44,9 @@ protected: virtual void SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType, const SfxHint& rHint, const TypeId& rHintType ) SAL_OVERRIDE; - void PropType( SbxVariable* pVar, SbxArray* pPar, sal_Bool bWrite ); - void PropWidth( SbxVariable* pVar, SbxArray* pPar, sal_Bool bWrite ); - void PropHeight( SbxVariable* pVar, SbxArray* pPar, sal_Bool bWrite ); + void PropType( SbxVariable* pVar, SbxArray* pPar, bool bWrite ); + void PropWidth( SbxVariable* pVar, SbxArray* pPar, bool bWrite ); + void PropHeight( SbxVariable* pVar, SbxArray* pPar, bool bWrite ); public: TYPEINFO_OVERRIDE(); @@ -62,10 +62,10 @@ public: class BASIC_DLLPUBLIC SbStdFont : public SbxObject { protected: - sal_Bool bBold; - sal_Bool bItalic; - sal_Bool bStrikeThrough; - sal_Bool bUnderline; + bool bBold; + bool bItalic; + bool bStrikeThrough; + bool bUnderline; sal_uInt16 nSize; OUString aName; @@ -73,12 +73,12 @@ protected: virtual void SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType, const SfxHint& rHint, const TypeId& rHintType ) SAL_OVERRIDE; - void PropBold( SbxVariable* pVar, SbxArray* pPar, sal_Bool bWrite ); - void PropItalic( SbxVariable* pVar, SbxArray* pPar, sal_Bool bWrite ); - void PropStrikeThrough( SbxVariable* pVar, SbxArray* pPar, sal_Bool bWrite ); - void PropUnderline( SbxVariable* pVar, SbxArray* pPar, sal_Bool bWrite ); - void PropSize( SbxVariable* pVar, SbxArray* pPar, sal_Bool bWrite ); - void PropName( SbxVariable* pVar, SbxArray* pPar, sal_Bool bWrite ); + void PropBold( SbxVariable* pVar, SbxArray* pPar, bool bWrite ); + void PropItalic( SbxVariable* pVar, SbxArray* pPar, bool bWrite ); + void PropStrikeThrough( SbxVariable* pVar, SbxArray* pPar, bool bWrite ); + void PropUnderline( SbxVariable* pVar, SbxArray* pPar, bool bWrite ); + void PropSize( SbxVariable* pVar, SbxArray* pPar, bool bWrite ); + void PropName( SbxVariable* pVar, SbxArray* pPar, bool bWrite ); public: TYPEINFO_OVERRIDE(); @@ -86,14 +86,14 @@ public: SbStdFont(); virtual SbxVariable* Find( const OUString&, SbxClassType ) SAL_OVERRIDE; - void SetBold( sal_Bool bB ) { bBold = bB; } - sal_Bool IsBold() const { return bBold; } - void SetItalic( sal_Bool bI ) { bItalic = bI; } - sal_Bool IsItalic() const { return bItalic; } - void SetStrikeThrough( sal_Bool bS ) { bStrikeThrough = bS; } - sal_Bool IsStrikeThrough() const { return bStrikeThrough; } - void SetUnderline( sal_Bool bU ) { bUnderline = bU; } - sal_Bool IsUnderline() const { return bUnderline; } + void SetBold( bool bB ) { bBold = bB; } + bool IsBold() const { return bBold; } + void SetItalic( bool bI ) { bItalic = bI; } + bool IsItalic() const { return bItalic; } + void SetStrikeThrough( bool bS ) { bStrikeThrough = bS; } + bool IsStrikeThrough() const { return bStrikeThrough; } + void SetUnderline( bool bU ) { bUnderline = bU; } + bool IsUnderline() const { return bUnderline; } void SetSize( sal_uInt16 nS ) { nSize = nS; } sal_uInt16 GetSize() const { return nSize; } void SetFontName( const OUString& rName ) { aName = rName; } @@ -109,12 +109,12 @@ protected: virtual void SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType, const SfxHint& rHint, const TypeId& rHintType ) SAL_OVERRIDE; - void MethClear( SbxVariable* pVar, SbxArray* pPar_, sal_Bool bWrite ); - void MethGetData( SbxVariable* pVar, SbxArray* pPar_, sal_Bool bWrite ); - void MethGetFormat( SbxVariable* pVar, SbxArray* pPar_, sal_Bool bWrite ); - void MethGetText( SbxVariable* pVar, SbxArray* pPar_, sal_Bool bWrite ); - void MethSetData( SbxVariable* pVar, SbxArray* pPar_, sal_Bool bWrite ); - void MethSetText( SbxVariable* pVar, SbxArray* pPar_, sal_Bool bWrite ); + void MethClear( SbxVariable* pVar, SbxArray* pPar_, bool bWrite ); + void MethGetData( SbxVariable* pVar, SbxArray* pPar_, bool bWrite ); + void MethGetFormat( SbxVariable* pVar, SbxArray* pPar_, bool bWrite ); + void MethGetText( SbxVariable* pVar, SbxArray* pPar_, bool bWrite ); + void MethSetData( SbxVariable* pVar, SbxArray* pPar_, bool bWrite ); + void MethSetText( SbxVariable* pVar, SbxArray* pPar_, bool bWrite ); public: TYPEINFO_OVERRIDE(); diff --git a/basic/source/basmgr/basmgr.cxx b/basic/source/basmgr/basmgr.cxx index 180e1c8188af..b8cc7cfb2255 100644 --- a/basic/source/basmgr/basmgr.cxx +++ b/basic/source/basmgr/basmgr.cxx @@ -1971,7 +1971,7 @@ sal_Bool ModuleContainer_Impl::hasByName( const OUString& aName ) throw(uno::RuntimeException, std::exception) { SbModule* pMod = mpLib ? mpLib->FindModule( aName ) : NULL; - sal_Bool bRet = (pMod != NULL); + bool bRet = (pMod != NULL); return bRet; } @@ -2083,7 +2083,7 @@ uno::Type DialogContainer_Impl::getElementType() sal_Bool DialogContainer_Impl::hasElements() throw(uno::RuntimeException, std::exception) { - sal_Bool bRet = sal_False; + bool bRet = false; mpLib->GetAll( SbxCLASS_OBJECT ); sal_Int16 nCount = mpLib->GetObjects()->Count(); @@ -2144,7 +2144,7 @@ uno::Sequence< OUString > DialogContainer_Impl::getElementNames() sal_Bool DialogContainer_Impl::hasByName( const OUString& aName ) throw(uno::RuntimeException, std::exception) { - sal_Bool bRet = sal_False; + bool bRet = false; SbxVariable* pVar = mpLib->GetObjects()->Find( aName, SbxCLASS_DONTCARE ); if( pVar && pVar->ISA( SbxObject ) && ( ((SbxObject*)pVar)->GetSbxId() == SBXID_DIALOG ) ) @@ -2244,7 +2244,7 @@ sal_Bool LibraryContainer_Impl::hasElements() throw(uno::RuntimeException, std::exception) { sal_Int32 nLibs = mpMgr->GetLibCount(); - sal_Bool bRet = (nLibs > 0); + bool bRet = (nLibs > 0); return bRet; } @@ -2308,7 +2308,7 @@ uno::Sequence< OUString > LibraryContainer_Impl::getElementNames() sal_Bool LibraryContainer_Impl::hasByName( const OUString& aName ) throw(uno::RuntimeException, std::exception) { - sal_Bool bRet = mpMgr->HasLib( aName ); + bool bRet = mpMgr->HasLib( aName ); return bRet; } 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() diff --git a/basic/source/inc/dlgcont.hxx b/basic/source/inc/dlgcont.hxx index 932a16823e9d..4259674e5b28 100644 --- a/basic/source/inc/dlgcont.hxx +++ b/basic/source/inc/dlgcont.hxx @@ -39,7 +39,7 @@ class SfxDialogLibraryContainer : public SfxLibraryContainer virtual SfxLibrary* SAL_CALL implCreateLibrary( const OUString& aName ) SAL_OVERRIDE; virtual SfxLibrary* SAL_CALL implCreateLibraryLink ( const OUString& aName, const OUString& aLibInfoFileURL, - const OUString& StorageURL, sal_Bool ReadOnly ) SAL_OVERRIDE; + const OUString& StorageURL, bool ReadOnly ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Any SAL_CALL createEmptyLibraryElement( void ) SAL_OVERRIDE; virtual bool SAL_CALL isLibraryElementValid( ::com::sun::star::uno::Any aElement ) const SAL_OVERRIDE; virtual void SAL_CALL writeLibraryElement @@ -113,7 +113,7 @@ class SfxDialogLibrary :public SfxLibrary OUString m_aName; // Provide modify state including resources - virtual sal_Bool isModified( void ) SAL_OVERRIDE; + virtual bool isModified( void ) SAL_OVERRIDE; virtual void storeResources( void ) SAL_OVERRIDE; virtual void storeResourcesAsURL( const OUString& URL, const OUString& NewName ) SAL_OVERRIDE; virtual void storeResourcesToURL( const OUString& URL, @@ -137,7 +137,7 @@ public: const OUString& aName, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext, const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XSimpleFileAccess3 >& xSFI, - const OUString& aLibInfoFileURL, const OUString& aStorageURL, sal_Bool ReadOnly, + const OUString& aLibInfoFileURL, const OUString& aStorageURL, bool ReadOnly, SfxDialogLibraryContainer* pParent ); diff --git a/basic/source/inc/namecont.hxx b/basic/source/inc/namecont.hxx index c9dd4144463a..109835a84927 100644 --- a/basic/source/inc/namecont.hxx +++ b/basic/source/inc/namecont.hxx @@ -154,18 +154,18 @@ class ModifiableHelper private: ::cppu::OInterfaceContainerHelper m_aModifyListeners; ::cppu::OWeakObject& m_rEventSource; - sal_Bool mbModified; + bool mbModified; public: ModifiableHelper( ::cppu::OWeakObject& _rEventSource, ::osl::Mutex& _rMutex ) :m_aModifyListeners( _rMutex ) ,m_rEventSource( _rEventSource ) - ,mbModified( sal_False ) + ,mbModified( false ) { } - inline sal_Bool isModified() const { return mbModified; } - void setModified( sal_Bool _bModified ); + inline bool isModified() const { return mbModified; } + void setModified( bool _bModified ); inline void addModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& _rxListener ) { @@ -215,7 +215,7 @@ class SfxLibraryContainer : public SfxLibraryContainer_BASE, public ::utl::OEven { VBAScriptListenerContainer maVBAScriptListeners; sal_Int32 mnRunningVBAScripts; - sal_Bool mbVBACompat; + bool mbVBACompat; OUString msProjectName; protected: ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > mxContext; @@ -283,7 +283,7 @@ protected: virtual SfxLibrary* SAL_CALL implCreateLibrary( const OUString& aName ) = 0; virtual SfxLibrary* SAL_CALL implCreateLibraryLink ( const OUString& aName, const OUString& aLibInfoFileURL, - const OUString& StorageURL, sal_Bool ReadOnly ) = 0; + const OUString& StorageURL, bool ReadOnly ) = 0; virtual ::com::sun::star::uno::Any SAL_CALL createEmptyLibraryElement( void ) = 0; virtual bool SAL_CALL isLibraryElementValid( ::com::sun::star::uno::Any aElement ) const = 0; virtual void SAL_CALL writeLibraryElement @@ -303,17 +303,17 @@ protected: virtual void SAL_CALL importFromOldStorage( const OUString& aFile ) = 0; // Password encryption - virtual sal_Bool implStorePasswordLibrary( SfxLibrary* pLib, const OUString& aName, + virtual bool implStorePasswordLibrary( SfxLibrary* pLib, const OUString& aName, const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& Handler ); // New variant for library export - virtual sal_Bool implStorePasswordLibrary( SfxLibrary* pLib, const OUString& aName, + virtual bool implStorePasswordLibrary( SfxLibrary* pLib, const OUString& aName, const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const OUString& aTargetURL, const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XSimpleFileAccess3 > xToUseSFI, const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& Handler ); - virtual sal_Bool implLoadPasswordLibrary( SfxLibrary* pLib, const OUString& Name, - sal_Bool bVerifyPasswordOnly=false ) + virtual bool implLoadPasswordLibrary( SfxLibrary* pLib, const OUString& Name, + bool bVerifyPasswordOnly=false ) throw(::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); @@ -565,8 +565,8 @@ class SfxLibrary ModifiableHelper& mrModifiable; NameContainer maNameContainer; - sal_Bool mbLoaded; - sal_Bool mbIsModified; + bool mbLoaded; + bool mbIsModified; bool mbInitialised; private: @@ -577,13 +577,13 @@ private: OUString maUnexpandedStorageURL; OUString maOriginalStorageURL; - sal_Bool mbLink; - sal_Bool mbReadOnly; - sal_Bool mbReadOnlyLink; - sal_Bool mbPreload; + bool mbLink; + bool mbReadOnly; + bool mbReadOnlyLink; + bool mbPreload; - sal_Bool mbPasswordProtected; - sal_Bool mbPasswordVerified; + bool mbPasswordProtected; + bool mbPasswordVerified; bool mbDoc50Password; OUString maPassword; @@ -592,7 +592,7 @@ private: // Additional functionality for localisation // Provide modify state including resources - virtual sal_Bool isModified( void ) = 0; + virtual bool isModified( void ) = 0; virtual void storeResources( void ) = 0; virtual void storeResourcesAsURL( const OUString& URL, const OUString& NewName ) = 0; virtual void storeResourcesToURL( const OUString& URL, @@ -601,8 +601,8 @@ private: < ::com::sun::star::embed::XStorage >& xStorage ) = 0; protected: - inline sal_Bool implIsModified() const { return mbIsModified; } - void implSetModified( sal_Bool _bIsModified ); + inline bool implIsModified() const { return mbIsModified; } + void implSetModified( bool _bIsModified ); private: /** checks whether the lib is readonly, or a readonly link, throws an IllegalArgumentException if so @@ -630,7 +630,7 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XSimpleFileAccess3 >& xSFI, const OUString& aLibInfoFileURL, const OUString& aStorageURL, - sal_Bool ReadOnly + bool ReadOnly ); // Methods XInterface diff --git a/basic/source/inc/propacc.hxx b/basic/source/inc/propacc.hxx index 19c560d274cd..84f3f8cfcb24 100644 --- a/basic/source/inc/propacc.hxx +++ b/basic/source/inc/propacc.hxx @@ -107,7 +107,7 @@ public: ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > SAL_CALL getProperties(void) throw (); ::com::sun::star::beans::Property SAL_CALL getPropertyByName(const OUString& Name) throw( ::com::sun::star::uno::RuntimeException ); - sal_Bool SAL_CALL hasPropertyByName(const OUString& Name) + bool SAL_CALL hasPropertyByName(const OUString& Name) throw ( ::com::sun::star::uno::RuntimeException ); }; @@ -133,7 +133,7 @@ public: class StarBASIC; class SbxArray; -void RTL_Impl_CreatePropertySet( StarBASIC* pBasic, SbxArray& rPar, sal_Bool bWrite ); +void RTL_Impl_CreatePropertySet( StarBASIC* pBasic, SbxArray& rPar, bool bWrite ); #endif diff --git a/basic/source/inc/runtime.hxx b/basic/source/inc/runtime.hxx index 673cd07d90ba..fac4613d1fb0 100644 --- a/basic/source/inc/runtime.hxx +++ b/basic/source/inc/runtime.hxx @@ -149,8 +149,8 @@ class SbiInstance SbError nErr; OUString aErrorMsg; // last error message for $ARG sal_Int32 nErl; // current error line - sal_Bool bReschedule; // Flag: sal_True = Reschedule in main loop - sal_Bool bCompatibility; // Flag: sal_True = VBA runtime compatibility mode + bool bReschedule; // Flag: sal_True = Reschedule in main loop + bool bCompatibility; // Flag: sal_True = VBA runtime compatibility mode ComponentVector_t ComponentVector; public: @@ -178,10 +178,10 @@ public: SbError GetErr() { return nErr; } OUString GetErrorMsg() { return aErrorMsg; } sal_Int32 GetErl() { return nErl; } - void EnableReschedule( sal_Bool bEnable ) { bReschedule = bEnable; } - sal_Bool IsReschedule( void ) { return bReschedule; } - void EnableCompatibility( sal_Bool bEnable ) { bCompatibility = bEnable; } - sal_Bool IsCompatibility( void ) { return bCompatibility; } + void EnableReschedule( bool bEnable ) { bReschedule = bEnable; } + bool IsReschedule( void ) { return bReschedule; } + void EnableCompatibility( bool bEnable ) { bCompatibility = bEnable; } + bool IsCompatibility( void ) { return bCompatibility; } ComponentVector_t& getComponentVector( void ) { return ComponentVector; } @@ -223,7 +223,7 @@ struct RefSaveItem class SbiRuntime { - friend void SbRtl_CallByName( StarBASIC* pBasic, SbxArray& rPar, sal_Bool bWrite ); + friend void SbRtl_CallByName( StarBASIC* pBasic, SbxArray& rPar, bool bWrite ); typedef void( SbiRuntime::*pStep0 )(); typedef void( SbiRuntime::*pStep1 )( sal_uInt32 nOp1 ); diff --git a/basic/source/inc/sbunoobj.hxx b/basic/source/inc/sbunoobj.hxx index dec4e34448ab..bb0eade36bba 100644 --- a/basic/source/inc/sbunoobj.hxx +++ b/basic/source/inc/sbunoobj.hxx @@ -350,15 +350,15 @@ public: class StarBASIC; // Impl-methods for RTL -void RTL_Impl_CreateUnoStruct( StarBASIC* pBasic, SbxArray& rPar, sal_Bool bWrite ); -void RTL_Impl_CreateUnoService( StarBASIC* pBasic, SbxArray& rPar, sal_Bool bWrite ); -void RTL_Impl_CreateUnoServiceWithArguments( StarBASIC* pBasic, SbxArray& rPar, sal_Bool bWrite ); -void RTL_Impl_CreateUnoValue( StarBASIC* pBasic, SbxArray& rPar, sal_Bool bWrite ); -void RTL_Impl_GetProcessServiceManager( StarBASIC* pBasic, SbxArray& rPar, sal_Bool bWrite ); -void RTL_Impl_HasInterfaces( StarBASIC* pBasic, SbxArray& rPar, sal_Bool bWrite ); -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_GetDefaultContext( StarBASIC* pBasic, SbxArray& rPar, sal_Bool bWrite ); +void RTL_Impl_CreateUnoStruct( StarBASIC* pBasic, SbxArray& rPar, bool bWrite ); +void RTL_Impl_CreateUnoService( StarBASIC* pBasic, SbxArray& rPar, bool bWrite ); +void RTL_Impl_CreateUnoServiceWithArguments( StarBASIC* pBasic, SbxArray& rPar, bool bWrite ); +void RTL_Impl_CreateUnoValue( StarBASIC* pBasic, SbxArray& rPar, bool bWrite ); +void RTL_Impl_GetProcessServiceManager( StarBASIC* pBasic, SbxArray& rPar, bool bWrite ); +void RTL_Impl_HasInterfaces( StarBASIC* pBasic, SbxArray& rPar, bool bWrite ); +void RTL_Impl_IsUnoStruct( StarBASIC* pBasic, SbxArray& rPar, bool bWrite ); +void RTL_Impl_EqualUnoObjects( StarBASIC* pBasic, SbxArray& rPar, bool bWrite ); +void RTL_Impl_GetDefaultContext( StarBASIC* pBasic, SbxArray& rPar, bool bWrite ); void disposeComVariablesForBasic( StarBASIC* pBasic ); void clearNativeObjectWrapperVector( void ); diff --git a/basic/source/inc/scriptcont.hxx b/basic/source/inc/scriptcont.hxx index ff6a469389bc..ea09a910a8e8 100644 --- a/basic/source/inc/scriptcont.hxx +++ b/basic/source/inc/scriptcont.hxx @@ -39,7 +39,7 @@ class SfxScriptLibraryContainer : public SfxLibraryContainer, public OldBasicPas virtual SfxLibrary* SAL_CALL implCreateLibrary( const OUString& aName ) SAL_OVERRIDE; virtual SfxLibrary* SAL_CALL implCreateLibraryLink ( const OUString& aName, const OUString& aLibInfoFileURL, - const OUString& StorageURL, sal_Bool ReadOnly ) SAL_OVERRIDE; + const OUString& StorageURL, bool ReadOnly ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Any SAL_CALL createEmptyLibraryElement( void ) SAL_OVERRIDE; virtual bool SAL_CALL isLibraryElementValid( ::com::sun::star::uno::Any aElement ) const SAL_OVERRIDE; virtual void SAL_CALL writeLibraryElement @@ -63,17 +63,17 @@ class SfxScriptLibraryContainer : public SfxLibraryContainer, public OldBasicPas // Password encryption - virtual sal_Bool implStorePasswordLibrary( SfxLibrary* pLib, const OUString& aName, + virtual bool implStorePasswordLibrary( SfxLibrary* pLib, const OUString& aName, const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage>& xStorage, const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& Handler ) SAL_OVERRIDE; // New variant for library export - virtual sal_Bool implStorePasswordLibrary( SfxLibrary* pLib, const OUString& aName, + virtual bool implStorePasswordLibrary( SfxLibrary* pLib, const OUString& aName, const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const OUString& aTargetURL, const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XSimpleFileAccess3 > xToUseSFI, const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& Handler ) SAL_OVERRIDE; - virtual sal_Bool implLoadPasswordLibrary( SfxLibrary* pLib, const OUString& Name, - sal_Bool bVerifyPasswordOnly=false ) + virtual bool implLoadPasswordLibrary( SfxLibrary* pLib, const OUString& Name, + bool bVerifyPasswordOnly=false ) throw(::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; @@ -147,7 +147,7 @@ class SfxScriptLibrary : public SfxLibrary, public SfxScriptLibrary_BASE ModuleInfoMap mModuleInfos; // Provide modify state including resources - virtual sal_Bool isModified( void ) SAL_OVERRIDE; + virtual bool isModified( void ) SAL_OVERRIDE; virtual void storeResources( void ) SAL_OVERRIDE; virtual void storeResourcesAsURL( const OUString& URL, const OUString& NewName ) SAL_OVERRIDE; virtual void storeResourcesToURL( const OUString& URL, @@ -168,7 +168,7 @@ public: ModifiableHelper& _rModifiable, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext, const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XSimpleFileAccess3 >& xSFI, - const OUString& aLibInfoFileURL, const OUString& aStorageURL, sal_Bool ReadOnly + const OUString& aLibInfoFileURL, const OUString& aStorageURL, bool ReadOnly ); DECLARE_XINTERFACE() diff --git a/basic/source/runtime/comenumwrapper.cxx b/basic/source/runtime/comenumwrapper.cxx index ece480eeff3e..24e90d960ed1 100644 --- a/basic/source/runtime/comenumwrapper.cxx +++ b/basic/source/runtime/comenumwrapper.cxx @@ -24,7 +24,7 @@ using namespace ::com::sun::star; sal_Bool SAL_CALL ComEnumerationWrapper::hasMoreElements() throw ( uno::RuntimeException, std::exception ) { - sal_Bool bResult = sal_False; + bool bResult = false; try { diff --git a/basic/source/runtime/iosys.cxx b/basic/source/runtime/iosys.cxx index cde1af0884e3..6d7836f97b35 100644 --- a/basic/source/runtime/iosys.cxx +++ b/basic/source/runtime/iosys.cxx @@ -221,7 +221,7 @@ bool needSecurityRestrictions( void ) // Get system user to compare to portal user oslSecurity aSecurity = osl_getCurrentSecurity(); OUString aSystemUser; - sal_Bool bRet = osl_getUserName( aSecurity, &aSystemUser.pData ); + bool bRet = osl_getUserName( aSecurity, &aSystemUser.pData ); osl_freeSecurityHandle(aSecurity); if( !bRet ) { diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx index 7544946240b1..881c097e1967 100644 --- a/basic/source/runtime/methods.cxx +++ b/basic/source/runtime/methods.cxx @@ -1212,7 +1212,7 @@ RTLFUNC(Mid) // can't be left out here. That's considered in bWrite already. if( nArgCount == 4 ) { - bWrite = sal_True; + bWrite = true; } OUString aArgStr = rPar.Get(1)->GetOUString(); sal_Int32 nStartPos = rPar.Get(2)->GetLong(); @@ -2147,7 +2147,7 @@ RTLFUNC(DateValue) sal_uInt32 nIndex = 0; double fResult; OUString aStr( rPar.Get(1)->GetOUString() ); - sal_Bool bSuccess = pFormatter->IsNumberFormat( aStr, nIndex, fResult ); + bool bSuccess = pFormatter->IsNumberFormat( aStr, nIndex, fResult ); short nType = pFormatter->GetType( nIndex ); // DateValue("February 12, 1969") raises error if the system locale is not en_US @@ -2214,7 +2214,7 @@ RTLFUNC(TimeValue) sal_uInt32 nIndex = 0; double fResult; - sal_Bool bSuccess = pFormatter->IsNumberFormat( rPar.Get(1)->GetOUString(), + bool bSuccess = pFormatter->IsNumberFormat( rPar.Get(1)->GetOUString(), nIndex, fResult ); short nType = pFormatter->GetType(nIndex); if(bSuccess && (nType==NUMBERFORMAT_TIME||nType==NUMBERFORMAT_DATETIME)) @@ -2544,7 +2544,7 @@ RTLFUNC(IsObject) SbxBase::ResetError(); SbUnoClass* pUnoClass; - sal_Bool bObject; + bool bObject; if( pObj && NULL != ( pUnoClass=PTR_CAST(SbUnoClass,pObj) ) ) { bObject = pUnoClass->getUnoClass().is(); @@ -2571,11 +2571,11 @@ RTLFUNC(IsDate) // #46134 only string is converted, all other types result in sal_False SbxVariableRef xArg = rPar.Get( 1 ); SbxDataType eType = xArg->GetType(); - sal_Bool bDate = sal_False; + bool bDate = false; if( eType == SbxDATE ) { - bDate = sal_True; + bDate = true; } else if( eType == SbxSTRING ) { @@ -2672,13 +2672,13 @@ RTLFUNC(IsNull) // #51475 because of Uno-objects return true // even if the pObj value is NULL SbxVariableRef pArg = rPar.Get( 1 ); - sal_Bool bNull = rPar.Get(1)->IsNull(); + bool bNull = rPar.Get(1)->IsNull(); if( !bNull && pArg->GetType() == SbxOBJECT ) { SbxBase* pObj = pArg->GetObject(); if( !pObj ) { - bNull = sal_True; + bNull = true; } } rPar.Get( 0 )->PutBool( bNull ); @@ -2786,9 +2786,9 @@ OUString implSetupWildcard( const OUString& rFileParam, SbiRTLData* pRTLData ) return aPathStr; } -inline sal_Bool implCheckWildcard( const OUString& rName, SbiRTLData* pRTLData ) +inline bool implCheckWildcard( const OUString& rName, SbiRTLData* pRTLData ) { - sal_Bool bMatch = sal_True; + bool bMatch = true; if( pRTLData->pWildCard ) { @@ -2863,7 +2863,7 @@ RTLFUNC(Dir) OUString aFileURLStr = implSetupWildcard( aFileParam, pRTLData ); if( !pRTLData->sFullNameToBeChecked.isEmpty()) { - sal_Bool bExists = sal_False; + bool bExists = false; try { bExists = xSFI->exists( aFileURLStr ); } catch(const Exception & ) {} @@ -2881,7 +2881,7 @@ RTLFUNC(Dir) try { OUString aDirURLStr; - sal_Bool bFolder = xSFI->isFolder( aFileURLStr ); + bool bFolder = xSFI->isFolder( aFileURLStr ); if( bFolder ) { @@ -2903,7 +2903,7 @@ RTLFUNC(Dir) pRTLData->nDirFlags = 0; } // Read directory - sal_Bool bIncludeFolders = ((nFlags & Sb_ATTR_DIRECTORY) != 0); + bool bIncludeFolders = ((nFlags & Sb_ATTR_DIRECTORY) != 0); pRTLData->aDirSeq = xSFI->getFolderContents( aDirURLStr, bIncludeFolders ); pRTLData->nCurDirPos = 0; @@ -2962,7 +2962,7 @@ RTLFUNC(Dir) { if( !bFolderFlag ) { - sal_Bool bFolder = xSFI->isFolder( aFile ); + bool bFolder = xSFI->isFolder( aFile ); if( bFolder ) { continue; @@ -2974,7 +2974,7 @@ RTLFUNC(Dir) // Only directories if( bFolderFlag ) { - sal_Bool bFolder = xSFI->isFolder( aFile ); + bool bFolder = xSFI->isFolder( aFile ); if( !bFolder ) { continue; @@ -2987,7 +2987,7 @@ RTLFUNC(Dir) INetURLObject::DECODE_WITH_CHARSET ); } - sal_Bool bMatch = implCheckWildcard( aPath, pRTLData ); + bool bMatch = implCheckWildcard( aPath, pRTLData ); if( !bMatch ) { continue; @@ -3094,7 +3094,7 @@ RTLFUNC(Dir) aPath = aFileStatus.getFileName(); } - sal_Bool bMatch = implCheckWildcard( aPath, pRTLData ); + bool bMatch = implCheckWildcard( aPath, pRTLData ); if( !bMatch ) { continue; @@ -3153,7 +3153,7 @@ RTLFUNC(GetAttr) try { OUString aPath = getFullPath( rPar.Get(1)->GetOUString() ); - sal_Bool bExists = sal_False; + bool bExists = false; try { bExists = xSFI->exists( aPath ); } catch(const Exception & ) {} if( !bExists ) @@ -3162,9 +3162,9 @@ RTLFUNC(GetAttr) return; } - sal_Bool bReadOnly = xSFI->isReadOnly( aPath ); - sal_Bool bHidden = xSFI->isHidden( aPath ); - sal_Bool bDirectory = xSFI->isFolder( aPath ); + bool bReadOnly = xSFI->isReadOnly( aPath ); + bool bHidden = xSFI->isHidden( aPath ); + bool bDirectory = xSFI->isFolder( aPath ); if( bReadOnly ) { nFlags |= Sb_ATTR_READONLY; @@ -3313,7 +3313,7 @@ RTLFUNC(EOF) StarBASIC::Error( SbERR_BAD_CHANNEL ); return; } - sal_Bool bIsEof; + bool bIsEof; SvStream* pSvStrm = pSbStrm->GetStrm(); if ( pSbStrm->IsText() ) { @@ -3679,7 +3679,7 @@ RTLFUNC(Shell) break; } - sal_Bool bSync = sal_False; + bool bSync = false; if( nArgCount >= 5 ) { bSync = rPar.Get(4)->GetBool(); @@ -3713,7 +3713,7 @@ RTLFUNC(Shell) } oslProcess pApp; - sal_Bool bSucc = osl_executeProcess( + bool bSucc = osl_executeProcess( aOUStrProgURL.pData, pParamList, nParamCount, @@ -4676,9 +4676,9 @@ RTLFUNC(SetAttr) { try { - sal_Bool bReadOnly = (nFlags & Sb_ATTR_READONLY) != 0; + bool bReadOnly = (nFlags & Sb_ATTR_READONLY) != 0; xSFI->setReadOnly( aStr, bReadOnly ); - sal_Bool bHidden = (nFlags & Sb_ATTR_HIDDEN) != 0; + bool bHidden = (nFlags & Sb_ATTR_HIDDEN) != 0; xSFI->setHidden( aStr, bHidden ); } catch(const Exception & ) @@ -4748,7 +4748,7 @@ RTLFUNC(FileExists) if ( rPar.Count() == 2 ) { OUString aStr = rPar.Get(1)->GetOUString(); - sal_Bool bExists = sal_False; + bool bExists = false; if( hasUno() ) { diff --git a/basic/source/runtime/methods1.cxx b/basic/source/runtime/methods1.cxx index 00c8b7d1a1eb..6d36037dae38 100644 --- a/basic/source/runtime/methods1.cxx +++ b/basic/source/runtime/methods1.cxx @@ -226,7 +226,7 @@ RTLFUNC(CBool) // JSM (void)pBasic; (void)bWrite; - sal_Bool bVal = sal_False; + bool bVal = false; if ( rPar.Count() == 2 ) { SbxVariable *pSbxVariable = rPar.Get(1); @@ -980,12 +980,12 @@ RTLFUNC(FindPropertyObject) -static sal_Bool lcl_WriteSbxVariable( const SbxVariable& rVar, SvStream* pStrm, - sal_Bool bBinary, short nBlockLen, sal_Bool bIsArray ) +static bool lcl_WriteSbxVariable( const SbxVariable& rVar, SvStream* pStrm, + bool bBinary, short nBlockLen, bool bIsArray ) { sal_Size nFPos = pStrm->Tell(); - sal_Bool bIsVariant = !rVar.IsFixed(); + bool bIsVariant = !rVar.IsFixed(); SbxDataType eType = rVar.GetType(); switch( eType ) @@ -1072,7 +1072,7 @@ static sal_Bool lcl_WriteSbxVariable( const SbxVariable& rVar, SvStream* pStrm, default: StarBASIC::Error( SbERR_BAD_ARGUMENT ); - return sal_False; + return false; } if( nBlockLen ) @@ -1082,8 +1082,8 @@ static sal_Bool lcl_WriteSbxVariable( const SbxVariable& rVar, SvStream* pStrm, return pStrm->GetErrorCode() ? sal_False : sal_True; } -static sal_Bool lcl_ReadSbxVariable( SbxVariable& rVar, SvStream* pStrm, - sal_Bool bBinary, short nBlockLen, sal_Bool bIsArray ) +static bool lcl_ReadSbxVariable( SbxVariable& rVar, SvStream* pStrm, + bool bBinary, short nBlockLen, bool bIsArray ) { (void)bBinary; (void)bIsArray; @@ -1092,7 +1092,7 @@ static sal_Bool lcl_ReadSbxVariable( SbxVariable& rVar, SvStream* pStrm, sal_Size nFPos = pStrm->Tell(); - sal_Bool bIsVariant = !rVar.IsFixed(); + bool bIsVariant = !rVar.IsFixed(); SbxDataType eVarType = rVar.GetType(); SbxDataType eSrcType = eVarType; @@ -1183,7 +1183,7 @@ static sal_Bool lcl_ReadSbxVariable( SbxVariable& rVar, SvStream* pStrm, default: StarBASIC::Error( SbERR_BAD_ARGUMENT ); - return sal_False; + return false; } if( nBlockLen ) @@ -1195,13 +1195,13 @@ static sal_Bool lcl_ReadSbxVariable( SbxVariable& rVar, SvStream* pStrm, // nCurDim = 1...n -static sal_Bool lcl_WriteReadSbxArray( SbxDimArray& rArr, SvStream* pStrm, - sal_Bool bBinary, short nCurDim, short* pOtherDims, sal_Bool bWrite ) +static bool lcl_WriteReadSbxArray( SbxDimArray& rArr, SvStream* pStrm, + bool bBinary, short nCurDim, short* pOtherDims, bool bWrite ) { SAL_WARN_IF( nCurDim <= 0,"basic", "Bad Dim"); short nLower, nUpper; if( !rArr.GetDim( nCurDim, nLower, nUpper ) ) - return sal_False; + return false; for( short nCur = nLower; nCur <= nUpper; nCur++ ) { pOtherDims[ nCurDim-1 ] = nCur; @@ -1210,19 +1210,19 @@ static sal_Bool lcl_WriteReadSbxArray( SbxDimArray& rArr, SvStream* pStrm, else { SbxVariable* pVar = rArr.Get( (const short*)pOtherDims ); - sal_Bool bRet; + bool bRet; if( bWrite ) - bRet = lcl_WriteSbxVariable(*pVar, pStrm, bBinary, 0, sal_True ); + bRet = lcl_WriteSbxVariable(*pVar, pStrm, bBinary, 0, true ); else - bRet = lcl_ReadSbxVariable(*pVar, pStrm, bBinary, 0, sal_True ); + bRet = lcl_ReadSbxVariable(*pVar, pStrm, bBinary, 0, true ); if( !bRet ) - return sal_False; + return false; } } - return sal_True; + return true; } -void PutGet( SbxArray& rPar, sal_Bool bPut ) +void PutGet( SbxArray& rPar, bool bPut ) { if ( rPar.Count() != 4 ) { @@ -1272,7 +1272,7 @@ void PutGet( SbxArray& rPar, sal_Bool bPut ) pArr = PTR_CAST(SbxDimArray,pParObj); } - sal_Bool bRet; + bool bRet; if( pArr ) { @@ -1287,9 +1287,9 @@ void PutGet( SbxArray& rPar, sal_Bool bPut ) else { if( bPut ) - bRet = lcl_WriteSbxVariable(*pVar, pStrm, !bRandom, nBlockLen, sal_False); + bRet = lcl_WriteSbxVariable(*pVar, pStrm, !bRandom, nBlockLen, false); else - bRet = lcl_ReadSbxVariable(*pVar, pStrm, !bRandom, nBlockLen, sal_False); + bRet = lcl_ReadSbxVariable(*pVar, pStrm, !bRandom, nBlockLen, false); } if( !bRet || pStrm->GetErrorCode() ) StarBASIC::Error( SbERR_IO_ERROR ); @@ -1300,7 +1300,7 @@ RTLFUNC(Put) (void)pBasic; (void)bWrite; - PutGet( rPar, sal_True ); + PutGet( rPar, true ); } RTLFUNC(Get) @@ -1308,7 +1308,7 @@ RTLFUNC(Get) (void)pBasic; (void)bWrite; - PutGet( rPar, sal_False ); + PutGet( rPar, false ); } RTLFUNC(Environ) @@ -1610,7 +1610,7 @@ RTLFUNC(EqualUnoObjects) // Instantiate "com.sun.star.awt.UnoControlDialog" on basis // of a DialogLibrary entry: Convert from XML-ByteSequence // and attach events. Implemented in classes\eventatt.cxx -void RTL_Impl_CreateUnoDialog( StarBASIC* pBasic, SbxArray& rPar, sal_Bool bWrite ); +void RTL_Impl_CreateUnoDialog( StarBASIC* pBasic, SbxArray& rPar, bool bWrite ); RTLFUNC(CreateUnoDialog) { @@ -1871,7 +1871,7 @@ RTLFUNC(MonthName) return; } - sal_Bool bAbbreviate = false; + bool bAbbreviate = false; if( nParCount == 3 ) bAbbreviate = rPar.Get(2)->GetBool(); @@ -1926,7 +1926,7 @@ RTLFUNC(WeekdayName) return; } - sal_Bool bAbbreviate = false; + bool bAbbreviate = false; if( nParCount >= 3 ) { SbxVariable* pPar2 = rPar.Get(2); diff --git a/basic/source/runtime/rtlproto.hxx b/basic/source/runtime/rtlproto.hxx index 18d2a66808df..0fab192ae196 100644 --- a/basic/source/runtime/rtlproto.hxx +++ b/basic/source/runtime/rtlproto.hxx @@ -23,10 +23,10 @@ #include <basic/sbstar.hxx> #include "sbtrace.hxx" -#define RTLFUNC( name ) void SbRtl_##name( StarBASIC* pBasic, SbxArray& rPar, sal_Bool bWrite ) +#define RTLFUNC( name ) void SbRtl_##name( StarBASIC* pBasic, SbxArray& rPar, bool bWrite ) #define RTLNAME( name ) &SbRtl_##name -typedef void( *RtlCall ) ( StarBASIC* p, SbxArray& rArgs, sal_Bool bWrite ); +typedef void( *RtlCall ) ( StarBASIC* p, SbxArray& rArgs, bool bWrite ); // Properties diff --git a/basic/source/runtime/runtime.cxx b/basic/source/runtime/runtime.cxx index 312dd17ff590..261d01f2af45 100644 --- a/basic/source/runtime/runtime.cxx +++ b/basic/source/runtime/runtime.cxx @@ -682,18 +682,18 @@ void SbiRuntime::SetParameters( SbxArray* pParams ) SbxVariable* v = pParams->Get( i ); // methods are always byval! - sal_Bool bByVal = v->IsA( TYPE(SbxMethod) ); + bool bByVal = v->IsA( TYPE(SbxMethod) ); SbxDataType t = v->GetType(); bool bTargetTypeIsArray = false; if( p ) { - bByVal |= sal_Bool( ( p->eType & SbxBYREF ) == 0 ); + bByVal |= ( p->eType & SbxBYREF ) == 0; t = (SbxDataType) ( p->eType & 0x0FFF ); if( !bByVal && t != SbxVARIANT && (!v->IsFixed() || (SbxDataType)(v->GetType() & 0x0FFF ) != t) ) { - bByVal = sal_True; + bByVal = true; } bTargetTypeIsArray = (p->nUserData & PARAM_INFO_WITHBRACKETS) != 0; @@ -1618,7 +1618,7 @@ void SbiRuntime::StepIS() eType2 = refVar2->GetType(); } - sal_Bool bRes = sal_Bool( eType1 == SbxOBJECT && eType2 == SbxOBJECT ); + bool bRes = ( eType1 == SbxOBJECT && eType2 == SbxOBJECT ); if ( bVBAEnabled && !bRes ) { Error( SbERR_INVALID_USAGE_OBJECT ); @@ -1942,7 +1942,7 @@ void SbiRuntime::StepSET_Impl( SbxVariableRef& refVal, SbxVariableRef& refVar, b xPrevVarObj = refVar->GetObject(); } // Handle withevents - sal_Bool bWithEvents = refVar->IsSet( SBX_WITH_EVENTS ); + bool bWithEvents = refVar->IsSet( SBX_WITH_EVENTS ); if ( bWithEvents ) { Reference< XInterface > xComListener; @@ -4568,7 +4568,7 @@ void SbiRuntime::StepPUBLIC_Impl( sal_uInt32 nOp1, sal_uInt32 nOp2, bool bUsedFo { OUString aName( pImg->GetString( static_cast<short>( nOp1 ) ) ); SbxDataType t = (SbxDataType)(SbxDataType)(nOp2 & 0xffff);; - sal_Bool bFlag = pMod->IsSet( SBX_NO_MODIFY ); + bool bFlag = pMod->IsSet( SBX_NO_MODIFY ); pMod->SetFlag( SBX_NO_MODIFY ); SbxVariableRef p = pMod->Find( aName, SbxCLASS_PROPERTY ); if( p.Is() ) @@ -4631,7 +4631,7 @@ void SbiRuntime::StepGLOBAL( sal_uInt32 nOp1, sal_uInt32 nOp2 ) pMod->AddVarName( aName ); } - sal_Bool bFlag = pStorage->IsSet( SBX_NO_MODIFY ); + bool bFlag = pStorage->IsSet( SBX_NO_MODIFY ); rBasic.SetFlag( SBX_NO_MODIFY ); SbxVariableRef p = pStorage->Find( aName, SbxCLASS_PROPERTY ); if( p.Is() ) diff --git a/basic/source/runtime/stdobj.cxx b/basic/source/runtime/stdobj.cxx index 1c0235864028..af89c8ffc113 100644 --- a/basic/source/runtime/stdobj.cxx +++ b/basic/source/runtime/stdobj.cxx @@ -834,9 +834,9 @@ void SbiStdObject::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType, pVar->SetInfo( GetInfo( (short) pVar->GetUserData() ) ); else { - sal_Bool bWrite = sal_False; + bool bWrite = false; if( t == SBX_HINT_DATACHANGED ) - bWrite = sal_True; + bWrite = true; if( t == SBX_HINT_DATAWANTED || bWrite ) { RtlCall p = (RtlCall) aMethods[ nCallId-1 ].pFunc; diff --git a/basic/source/runtime/stdobj1.cxx b/basic/source/runtime/stdobj1.cxx index 1d046983874e..69693a4795cb 100644 --- a/basic/source/runtime/stdobj1.cxx +++ b/basic/source/runtime/stdobj1.cxx @@ -59,7 +59,7 @@ SbxObject* SbStdFactory::CreateObject( const OUString& rClassName ) -void SbStdPicture::PropType( SbxVariable* pVar, SbxArray*, sal_Bool bWrite ) +void SbStdPicture::PropType( SbxVariable* pVar, SbxArray*, bool bWrite ) { if( bWrite ) { @@ -79,7 +79,7 @@ void SbStdPicture::PropType( SbxVariable* pVar, SbxArray*, sal_Bool bWrite ) } -void SbStdPicture::PropWidth( SbxVariable* pVar, SbxArray*, sal_Bool bWrite ) +void SbStdPicture::PropWidth( SbxVariable* pVar, SbxArray*, bool bWrite ) { if( bWrite ) { @@ -94,7 +94,7 @@ void SbStdPicture::PropWidth( SbxVariable* pVar, SbxArray*, sal_Bool bWrite ) pVar->PutInteger( (sal_Int16)aSize.Width() ); } -void SbStdPicture::PropHeight( SbxVariable* pVar, SbxArray*, sal_Bool bWrite ) +void SbStdPicture::PropHeight( SbxVariable* pVar, SbxArray*, bool bWrite ) { if( bWrite ) { @@ -157,7 +157,7 @@ void SbStdPicture::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType, SbxVariable* pVar = pHint->GetVar(); SbxArray* pPar_ = pVar->GetParameters(); sal_uInt16 nWhich = (sal_uInt16)pVar->GetUserData(); - sal_Bool bWrite = pHint->GetId() == SBX_HINT_DATACHANGED; + bool bWrite = pHint->GetId() == SBX_HINT_DATACHANGED; // Propteries switch( nWhich ) @@ -173,7 +173,7 @@ void SbStdPicture::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType, -void SbStdFont::PropBold( SbxVariable* pVar, SbxArray*, sal_Bool bWrite ) +void SbStdFont::PropBold( SbxVariable* pVar, SbxArray*, bool bWrite ) { if( bWrite ) SetBold( pVar->GetBool() ); @@ -181,7 +181,7 @@ void SbStdFont::PropBold( SbxVariable* pVar, SbxArray*, sal_Bool bWrite ) pVar->PutBool( IsBold() ); } -void SbStdFont::PropItalic( SbxVariable* pVar, SbxArray*, sal_Bool bWrite ) +void SbStdFont::PropItalic( SbxVariable* pVar, SbxArray*, bool bWrite ) { if( bWrite ) SetItalic( pVar->GetBool() ); @@ -189,7 +189,7 @@ void SbStdFont::PropItalic( SbxVariable* pVar, SbxArray*, sal_Bool bWrite ) pVar->PutBool( IsItalic() ); } -void SbStdFont::PropStrikeThrough( SbxVariable* pVar, SbxArray*, sal_Bool bWrite ) +void SbStdFont::PropStrikeThrough( SbxVariable* pVar, SbxArray*, bool bWrite ) { if( bWrite ) SetStrikeThrough( pVar->GetBool() ); @@ -197,7 +197,7 @@ void SbStdFont::PropStrikeThrough( SbxVariable* pVar, SbxArray*, sal_Bool bWrite pVar->PutBool( IsStrikeThrough() ); } -void SbStdFont::PropUnderline( SbxVariable* pVar, SbxArray*, sal_Bool bWrite ) +void SbStdFont::PropUnderline( SbxVariable* pVar, SbxArray*, bool bWrite ) { if( bWrite ) SetUnderline( pVar->GetBool() ); @@ -205,7 +205,7 @@ void SbStdFont::PropUnderline( SbxVariable* pVar, SbxArray*, sal_Bool bWrite ) pVar->PutBool( IsUnderline() ); } -void SbStdFont::PropSize( SbxVariable* pVar, SbxArray*, sal_Bool bWrite ) +void SbStdFont::PropSize( SbxVariable* pVar, SbxArray*, bool bWrite ) { if( bWrite ) SetSize( (sal_uInt16)pVar->GetInteger() ); @@ -213,7 +213,7 @@ void SbStdFont::PropSize( SbxVariable* pVar, SbxArray*, sal_Bool bWrite ) pVar->PutInteger( (sal_Int16)GetSize() ); } -void SbStdFont::PropName( SbxVariable* pVar, SbxArray*, sal_Bool bWrite ) +void SbStdFont::PropName( SbxVariable* pVar, SbxArray*, bool bWrite ) { if( bWrite ) { @@ -282,7 +282,7 @@ void SbStdFont::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType, SbxVariable* pVar = pHint->GetVar(); SbxArray* pPar_ = pVar->GetParameters(); sal_uInt16 nWhich = (sal_uInt16)pVar->GetUserData(); - sal_Bool bWrite = pHint->GetId() == SBX_HINT_DATACHANGED; + bool bWrite = pHint->GetId() == SBX_HINT_DATACHANGED; // Propteries switch( nWhich ) @@ -303,7 +303,7 @@ void SbStdFont::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType, -void SbStdClipboard::MethClear( SbxVariable*, SbxArray* pPar_, sal_Bool ) +void SbStdClipboard::MethClear( SbxVariable*, SbxArray* pPar_, bool ) { if( pPar_ && (pPar_->Count() > 1) ) { @@ -313,7 +313,7 @@ void SbStdClipboard::MethClear( SbxVariable*, SbxArray* pPar_, sal_Bool ) } -void SbStdClipboard::MethGetData( SbxVariable* pVar, SbxArray* pPar_, sal_Bool ) +void SbStdClipboard::MethGetData( SbxVariable* pVar, SbxArray* pPar_, bool ) { (void)pVar; @@ -332,7 +332,7 @@ void SbStdClipboard::MethGetData( SbxVariable* pVar, SbxArray* pPar_, sal_Bool ) } -void SbStdClipboard::MethGetFormat( SbxVariable* pVar, SbxArray* pPar_, sal_Bool ) +void SbStdClipboard::MethGetFormat( SbxVariable* pVar, SbxArray* pPar_, bool ) { if( !pPar_ || (pPar_->Count() != 2) ) { @@ -350,7 +350,7 @@ void SbStdClipboard::MethGetFormat( SbxVariable* pVar, SbxArray* pPar_, sal_Bool pVar->PutBool( false ); } -void SbStdClipboard::MethGetText( SbxVariable* pVar, SbxArray* pPar_, sal_Bool ) +void SbStdClipboard::MethGetText( SbxVariable* pVar, SbxArray* pPar_, bool ) { if( pPar_ && (pPar_->Count() > 1) ) { @@ -361,7 +361,7 @@ void SbStdClipboard::MethGetText( SbxVariable* pVar, SbxArray* pPar_, sal_Bool ) pVar->PutString( OUString() ); } -void SbStdClipboard::MethSetData( SbxVariable* pVar, SbxArray* pPar_, sal_Bool ) +void SbStdClipboard::MethSetData( SbxVariable* pVar, SbxArray* pPar_, bool ) { (void)pVar; @@ -380,7 +380,7 @@ void SbStdClipboard::MethSetData( SbxVariable* pVar, SbxArray* pPar_, sal_Bool ) } -void SbStdClipboard::MethSetText( SbxVariable* pVar, SbxArray* pPar_, sal_Bool ) +void SbStdClipboard::MethSetText( SbxVariable* pVar, SbxArray* pPar_, bool ) { (void)pVar; @@ -451,7 +451,7 @@ void SbStdClipboard::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType, SbxVariable* pVar = pHint->GetVar(); SbxArray* pPar_ = pVar->GetParameters(); sal_uInt16 nWhich = (sal_uInt16)pVar->GetUserData(); - sal_Bool bWrite = pHint->GetId() == SBX_HINT_DATACHANGED; + bool bWrite = pHint->GetId() == SBX_HINT_DATACHANGED; // Methods switch( nWhich ) diff --git a/basic/source/sbx/sbxdate.cxx b/basic/source/sbx/sbxdate.cxx index 0ed08e79ef0a..751c7e101ce5 100644 --- a/basic/source/sbx/sbxdate.cxx +++ b/basic/source/sbx/sbxdate.cxx @@ -129,14 +129,14 @@ double ImpGetDate( const SbxValues* p ) pFormatter->PutandConvertEntry( aStr, nCheckPos, nType, nIndex, LANGUAGE_ENGLISH_US, eLangType ); - sal_Bool bSuccess = pFormatter->IsNumberFormat( *p->pOUString, nIndex, nRes ); + bool bSuccess = pFormatter->IsNumberFormat( *p->pOUString, nIndex, nRes ); if ( bSuccess ) { short nType_ = pFormatter->GetType( nIndex ); if(!(nType_ & ( NUMBERFORMAT_DATETIME | NUMBERFORMAT_DATE | NUMBERFORMAT_TIME | NUMBERFORMAT_DEFINED ))) { - bSuccess = sal_False; + bSuccess = false; } } diff --git a/basic/source/sbx/sbxscan.cxx b/basic/source/sbx/sbxscan.cxx index dafcfc4dc007..b6b68d6b0e6c 100644 --- a/basic/source/sbx/sbxscan.cxx +++ b/basic/source/sbx/sbxscan.cxx @@ -762,7 +762,7 @@ void SbxValue::Format( OUString& rRes, const OUString* pFmt ) const double nNumber; Color* pCol; - sal_Bool bSuccess = aFormatter.IsNumberFormat( aStr, nIndex, nNumber ); + bool bSuccess = aFormatter.IsNumberFormat( aStr, nIndex, nNumber ); // number format, use SvNumberFormatter to handle it. if( bSuccess ) diff --git a/basic/source/uno/dlgcont.cxx b/basic/source/uno/dlgcont.cxx index 0c394ca3dbec..15415c251109 100644 --- a/basic/source/uno/dlgcont.cxx +++ b/basic/source/uno/dlgcont.cxx @@ -92,7 +92,7 @@ SfxLibrary* SfxDialogLibraryContainer::implCreateLibrary( const OUString& aName SfxLibrary* SfxDialogLibraryContainer::implCreateLibraryLink ( const OUString& aName, const OUString& aLibInfoFileURL, - const OUString& StorageURL, sal_Bool ReadOnly ) + const OUString& StorageURL, bool ReadOnly ) { SfxLibrary* pRet = new SfxDialogLibrary ( maModifiable, aName, mxContext, mxSFI, aLibInfoFileURL, StorageURL, ReadOnly, this ); @@ -289,7 +289,7 @@ Any SAL_CALL SfxDialogLibraryContainer::importLibraryElement } // Read from storage? - sal_Bool bStorage = xElementStream.is(); + bool bStorage = xElementStream.is(); Reference< XInputStream > xInput; if( bStorage ) @@ -363,7 +363,7 @@ Reference< ::com::sun::star::resource::XStringResourcePersistence > OUString aComment(aResourceFileCommentBase); aComment += aLibName; - sal_Bool bStorage = mxStorage.is(); + bool bStorage = mxStorage.is(); if( bStorage ) { uno::Reference< embed::XStorage > xLibrariesStor; @@ -507,7 +507,7 @@ SfxDialogLibrary::SfxDialogLibrary( ModifiableHelper& _rModifiable, const Reference< XSimpleFileAccess3 >& xSFI, const OUString& aLibInfoFileURL, const OUString& aStorageURL, - sal_Bool ReadOnly, + bool ReadOnly, SfxDialogLibraryContainer* pParent ) : SfxLibrary( _rModifiable, getCppuType( (const Reference< XInputStreamProvider > *)0 ), xContext, xSFI, aLibInfoFileURL, aStorageURL, ReadOnly) @@ -520,9 +520,9 @@ IMPLEMENT_FORWARD_XINTERFACE2( SfxDialogLibrary, SfxLibrary, SfxDialogLibrary_BA IMPLEMENT_FORWARD_XTYPEPROVIDER2( SfxDialogLibrary, SfxLibrary, SfxDialogLibrary_BASE ); // Provide modify state including resources -sal_Bool SfxDialogLibrary::isModified( void ) +bool SfxDialogLibrary::isModified( void ) { - sal_Bool bRet = implIsModified(); + bool bRet = implIsModified(); if( !bRet && m_xStringResourcePersistence.is() ) bRet = m_xStringResourcePersistence->isModified(); diff --git a/basic/source/uno/namecont.cxx b/basic/source/uno/namecont.cxx index 38d7a6a12578..8898781f1937 100644 --- a/basic/source/uno/namecont.cxx +++ b/basic/source/uno/namecont.cxx @@ -106,7 +106,7 @@ Type NameContainer::getElementType() sal_Bool NameContainer::hasElements() throw(RuntimeException, std::exception) { - sal_Bool bRet = (mnElementCount > 0); + bool bRet = (mnElementCount > 0); return bRet; } @@ -134,7 +134,7 @@ sal_Bool NameContainer::hasByName( const OUString& aName ) throw(RuntimeException, std::exception) { NameContainerNameMap::iterator aIt = mHashMap.find( aName ); - sal_Bool bRet = ( aIt != mHashMap.end() ); + bool bRet = ( aIt != mHashMap.end() ); return bRet; } @@ -334,7 +334,7 @@ void SAL_CALL NameContainer::removeChangesListener( const Reference< XChangesLis // ModifiableHelper -void ModifiableHelper::setModified( sal_Bool _bModified ) +void ModifiableHelper::setModified( bool _bModified ) { if ( _bModified == mbModified ) { @@ -370,7 +370,7 @@ SfxLibraryContainer::SfxLibraryContainer( void ) , maVBAScriptListeners( maMutex ) , mnRunningVBAScripts( 0 ) - , mbVBACompat( sal_False ) + , mbVBACompat( false ) , maModifiable( *this, maMutex ) , maNameContainer( getCppuType( (Reference< XNameAccess >*) NULL ) ) , mbOldInfoFormat( false ) @@ -649,7 +649,7 @@ void SfxLibraryContainer::init_Impl( const OUString& rInitialDocumentURL, else { // Decide between old and new document - sal_Bool bOldStorage = SotStorage::IsOLEStorage( aInitFileName ); + bool bOldStorage = SotStorage::IsOLEStorage( aInitFileName ); if ( bOldStorage ) { meInitMode = OLD_BASIC_STORAGE; @@ -860,7 +860,7 @@ void SfxLibraryContainer::init_Impl( const OUString& rInitialDocumentURL, if( mxSFI->isFolder( aLibDirPath ) ) { createVariableURL( rLib.aStorageURL, rLib.aName, maInfoFileName, true ); - maModifiable.setModified( sal_True ); + maModifiable.setModified( true ); } else if( rLib.bLink ) { @@ -872,7 +872,7 @@ void SfxLibraryContainer::init_Impl( const OUString& rInitialDocumentURL, if( mxSFI->isFolder( aShareLibDirPath ) ) { createVariableURL( rLib.aStorageURL, rLib.aName, maInfoFileName, false ); - maModifiable.setModified( sal_True ); + maModifiable.setModified( true ); } else { @@ -901,7 +901,7 @@ void SfxLibraryContainer::init_Impl( const OUString& rInitialDocumentURL, { Reference< XNameContainer > xLib = createLibrary( aLibName ); pImplLib = static_cast< SfxLibrary* >( xLib.get() ); - pImplLib->mbLoaded = sal_False; + pImplLib->mbLoaded = false; pImplLib->mbReadOnly = rLib.bReadOnly; if( !bStorage ) { @@ -909,7 +909,7 @@ void SfxLibraryContainer::init_Impl( const OUString& rInitialDocumentURL, pImplLib->maStorageURL, pImplLib->maUnexpandedStorageURL ); } } - maModifiable.setModified( sal_False ); + maModifiable.setModified( false ); // Read library info files if( !mbOldInfoFormat ) @@ -964,7 +964,7 @@ void SfxLibraryContainer::init_Impl( const OUString& rInitialDocumentURL, if( nPass == 1 ) { pImplLib->mbSharedIndexFile = true; - pImplLib->mbReadOnly = sal_True; + pImplLib->mbReadOnly = true; } } @@ -1187,7 +1187,7 @@ void SfxLibraryContainer::init_Impl( const OUString& rInitialDocumentURL, Reference< XNameContainer > xLib = createLibrary( aLibName ); SfxLibrary* pNewLib = static_cast< SfxLibrary* >( xLib.get() ); pNewLib->mbLoaded = false; - pNewLib->implSetModified( sal_False ); + pNewLib->implSetModified( false ); checkStorageURL( aLibFolder, pNewLib->maLibInfoFileURL, pNewLib->maStorageURL, pNewLib->maUnexpandedStorageURL ); @@ -1331,15 +1331,15 @@ SfxLibrary* SfxLibraryContainer::getImplLib( const OUString& rLibraryName ) // Storing with password encryption // Empty implementation, avoids unneccesary implementation in dlgcont.cxx -sal_Bool SfxLibraryContainer::implStorePasswordLibrary( SfxLibrary*, - const OUString&, - const uno::Reference< embed::XStorage >&, - const uno::Reference< task::XInteractionHandler >& ) +bool SfxLibraryContainer::implStorePasswordLibrary( SfxLibrary*, + const OUString&, + const uno::Reference< embed::XStorage >&, + const uno::Reference< task::XInteractionHandler >& ) { - return sal_False; + return false; } -sal_Bool SfxLibraryContainer::implStorePasswordLibrary( +bool SfxLibraryContainer::implStorePasswordLibrary( SfxLibrary* /*pLib*/, const OUString& /*aName*/, const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& /*xStorage*/, @@ -1347,16 +1347,16 @@ sal_Bool SfxLibraryContainer::implStorePasswordLibrary( const Reference< XSimpleFileAccess3 > /*xToUseSFI*/, const uno::Reference< task::XInteractionHandler >& ) { - return sal_False; + return false; } -sal_Bool SfxLibraryContainer::implLoadPasswordLibrary( +bool SfxLibraryContainer::implLoadPasswordLibrary( SfxLibrary* /*pLib*/, const OUString& /*Name*/, - sal_Bool /*bVerifyPasswordOnly*/ ) + bool /*bVerifyPasswordOnly*/ ) throw(WrappedTargetException, RuntimeException) { - return sal_True; + return true; } @@ -1407,7 +1407,7 @@ void SfxLibraryContainer::implStoreLibrary( SfxLibrary* pLib, Reference< XSimpleFileAccess3 > xToUseSFI, const Reference< XInteractionHandler >& xHandler ) { - sal_Bool bLink = pLib->mbLink; + bool bLink = pLib->mbLink; bool bStorage = xStorage.is() && !bLink; Sequence< OUString > aElementNames = pLib->getElementNames(); @@ -1565,7 +1565,7 @@ void SfxLibraryContainer::implStoreLibraryIndexFile( SfxLibrary* pLib, // Create sax writer Reference< XWriter > xWriter = xml::sax::Writer::create(mxContext); - sal_Bool bLink = pLib->mbLink; + bool bLink = pLib->mbLink; bool bStorage = xStorage.is() && !bLink; // Write info file @@ -1664,7 +1664,7 @@ bool SfxLibraryContainer::implLoadLibraryIndexFile( SfxLibrary* pLib, { Reference< XParser > xParser = xml::sax::Parser::create(mxContext); - sal_Bool bLink = sal_False; + bool bLink = false; bool bStorage = false; if( pLib ) { @@ -1744,7 +1744,7 @@ bool SfxLibraryContainer::implLoadLibraryIndexFile( SfxLibrary* pLib, { Reference< XNameContainer > xLib = createLibrary( rLib.aName ); pLib = static_cast< SfxLibrary* >( xLib.get() ); - pLib->mbLoaded = sal_False; + pLib->mbLoaded = false; rLib.aStorageURL = aIndexFileName; checkStorageURL( rLib.aStorageURL, pLib->maLibInfoFileURL, pLib->maStorageURL, pLib->maUnexpandedStorageURL ); @@ -1770,7 +1770,7 @@ void SfxLibraryContainer::implImportLibDescriptor( SfxLibrary* pLib, pLib->mbPasswordProtected = rLib.bPasswordProtected; pLib->mbReadOnly = rLib.bReadOnly; pLib->mbPreload = rLib.bPreload; - pLib->implSetModified( sal_False ); + pLib->implSetModified( false ); pLib->mbInitialised = true; } } @@ -1948,8 +1948,8 @@ void SfxLibraryContainer::storeLibraries_Impl( const uno::Reference< embed::XSto } } } - maModifiable.setModified( sal_True ); - pImplLib->implSetModified( sal_False ); + maModifiable.setModified( true ); + pImplLib->implSetModified( false ); } // For container info ReadOnly refers to mbReadOnlyLink @@ -2032,7 +2032,7 @@ void SfxLibraryContainer::storeLibraries_Impl( const uno::Reference< embed::XSto { return; } - maModifiable.setModified( sal_False ); + maModifiable.setModified( false ); mbOldInfoFormat = false; // Write library container info @@ -2139,7 +2139,7 @@ sal_Bool SfxLibraryContainer::hasElements() throw(RuntimeException, std::exception) { LibraryContainerMethodGuard aGuard( *this ); - sal_Bool bRet = maNameContainer.hasElements(); + bool bRet = maNameContainer.hasElements(); return bRet; } @@ -2180,7 +2180,7 @@ Reference< XNameContainer > SAL_CALL SfxLibraryContainer::createLibrary( const O Any aElement; aElement <<= xNameAccess; maNameContainer.insertByName( Name, aElement ); - maModifiable.setModified( sal_True ); + maModifiable.setModified( true ); Reference< XNameContainer > xRet( xNameAccess, UNO_QUERY ); return xRet; } @@ -2216,7 +2216,7 @@ Reference< XNameAccess > SAL_CALL SfxLibraryContainer::createLibraryLink Any aElement; aElement <<= xRet; maNameContainer.insertByName( Name, aElement ); - maModifiable.setModified( sal_True ); + maModifiable.setModified( true ); OUString aUserSearchStr("vnd.sun.star.expand:$UNO_USER_PACKAGES_CACHE"); OUString aSharedSearchStr("vnd.sun.star.expand:$UNO_SHARED_PACKAGES_CACHE"); @@ -2228,7 +2228,7 @@ Reference< XNameAccess > SAL_CALL SfxLibraryContainer::createLibraryLink else if( StorageURL.indexOf( aSharedSearchStr ) != -1 || StorageURL.indexOf( aBundledSearchStr ) != -1 ) { pNewLib->mbExtension = true; - pNewLib->mbReadOnly = sal_True; + pNewLib->mbReadOnly = true; } return xRet; @@ -2249,7 +2249,7 @@ void SAL_CALL SfxLibraryContainer::removeLibrary( const OUString& Name ) } // Remove from container maNameContainer.removeByName( Name ); - maModifiable.setModified( sal_True ); + maModifiable.setModified( true ); // Delete library files, but not for linked libraries if( !pImplLib->mbLink ) @@ -2310,7 +2310,7 @@ sal_Bool SAL_CALL SfxLibraryContainer::isLibraryLoaded( const OUString& Name ) { LibraryContainerMethodGuard aGuard( *this ); SfxLibrary* pImplLib = getImplLib( Name ); - sal_Bool bRet = pImplLib->mbLoaded; + bool bRet = pImplLib->mbLoaded; return bRet; } @@ -2324,8 +2324,8 @@ void SAL_CALL SfxLibraryContainer::loadLibrary( const OUString& Name ) aLibAny >>= xNameAccess; SfxLibrary* pImplLib = static_cast< SfxLibrary* >( xNameAccess.get() ); - sal_Bool bLoaded = pImplLib->mbLoaded; - pImplLib->mbLoaded = sal_True; + bool bLoaded = pImplLib->mbLoaded; + pImplLib->mbLoaded = true; if( !bLoaded && xNameAccess->hasElements() ) { if( pImplLib->mbPasswordProtected ) @@ -2334,7 +2334,7 @@ void SAL_CALL SfxLibraryContainer::loadLibrary( const OUString& Name ) return; } - sal_Bool bLink = pImplLib->mbLink; + bool bLink = pImplLib->mbLink; bool bStorage = mxStorage.is() && !bLink; uno::Reference< embed::XStorage > xLibrariesStor; @@ -2449,7 +2449,7 @@ void SAL_CALL SfxLibraryContainer::loadLibrary( const OUString& Name ) pImplLib->maNameContainer.insertByName( aElementName, aAny ); } } - pImplLib->implSetModified( sal_False ); + pImplLib->implSetModified( false ); } } @@ -2459,7 +2459,7 @@ sal_Bool SAL_CALL SfxLibraryContainer::isLibraryLink( const OUString& Name ) { LibraryContainerMethodGuard aGuard( *this ); SfxLibrary* pImplLib = getImplLib( Name ); - sal_Bool bRet = pImplLib->mbLink; + bool bRet = pImplLib->mbLink; return bRet; } @@ -2468,7 +2468,7 @@ OUString SAL_CALL SfxLibraryContainer::getLibraryLinkURL( const OUString& Name ) { LibraryContainerMethodGuard aGuard( *this ); SfxLibrary* pImplLib = getImplLib( Name ); - sal_Bool bLink = pImplLib->mbLink; + bool bLink = pImplLib->mbLink; if( !bLink ) { throw IllegalArgumentException(); @@ -2482,7 +2482,7 @@ sal_Bool SAL_CALL SfxLibraryContainer::isLibraryReadOnly( const OUString& Name ) { LibraryContainerMethodGuard aGuard( *this ); SfxLibrary* pImplLib = getImplLib( Name ); - sal_Bool bRet = pImplLib->mbReadOnly || (pImplLib->mbLink && pImplLib->mbReadOnlyLink); + bool bRet = pImplLib->mbReadOnly || (pImplLib->mbLink && pImplLib->mbReadOnlyLink); return bRet; } @@ -2493,19 +2493,19 @@ void SAL_CALL SfxLibraryContainer::setLibraryReadOnly( const OUString& Name, sal SfxLibrary* pImplLib = getImplLib( Name ); if( pImplLib->mbLink ) { - if( pImplLib->mbReadOnlyLink != bReadOnly ) + if( (pImplLib->mbReadOnlyLink ? 1 : 0) != bReadOnly ) { pImplLib->mbReadOnlyLink = bReadOnly; - pImplLib->implSetModified( sal_True ); - maModifiable.setModified( sal_True ); + pImplLib->implSetModified( true ); + maModifiable.setModified( true ); } } else { - if( pImplLib->mbReadOnly != bReadOnly ) + if( (pImplLib->mbReadOnly ? 1 : 0) != bReadOnly ) { pImplLib->mbReadOnly = bReadOnly; - pImplLib->implSetModified( sal_True ); + pImplLib->implSetModified( true ); } } } @@ -2533,7 +2533,7 @@ void SAL_CALL SfxLibraryContainer::renameLibrary( const OUString& Name, const OU // Remove from container maNameContainer.removeByName( Name ); - maModifiable.setModified( sal_True ); + maModifiable.setModified( true ); // Rename library folder, but not for linked libraries bool bMovedSuccessful = true; @@ -2620,7 +2620,7 @@ void SAL_CALL SfxLibraryContainer::renameLibrary( const OUString& Name, const OU } bMovedSuccessful = true; - pImplLib->implSetModified( sal_True ); + pImplLib->implSetModified( true ); } } catch(const Exception& ) @@ -2632,7 +2632,7 @@ void SAL_CALL SfxLibraryContainer::renameLibrary( const OUString& Name, const OU if( bStorage && !pImplLib->mbLink ) { - pImplLib->implSetModified( sal_True ); + pImplLib->implSetModified( true ); } if( bMovedSuccessful ) { @@ -2849,7 +2849,7 @@ OUString SAL_CALL SfxLibraryContainer::getOriginalLibraryLinkURL( const OUString { LibraryContainerMethodGuard aGuard( *this ); SfxLibrary* pImplLib = getImplLib( Name ); - sal_Bool bLink = pImplLib->mbLink; + bool bLink = pImplLib->mbLink; if( !bLink ) { throw IllegalArgumentException(); @@ -2969,15 +2969,15 @@ SfxLibrary::SfxLibrary( ModifiableHelper& _rModifiable, const Type& aType, , mxSFI( xSFI ) , mrModifiable( _rModifiable ) , maNameContainer( aType ) - , mbLoaded( sal_True ) - , mbIsModified( sal_True ) + , mbLoaded( true ) + , mbIsModified( true ) , mbInitialised( false ) - , mbLink( sal_False ) - , mbReadOnly( sal_False ) - , mbReadOnlyLink( sal_False ) - , mbPreload( sal_False ) - , mbPasswordProtected( sal_False ) - , mbPasswordVerified( sal_False ) + , mbLink( false ) + , mbReadOnly( false ) + , mbReadOnlyLink( false ) + , mbPreload( false ) + , mbPasswordProtected( false ) + , mbPasswordVerified( false ) , mbDoc50Password( false ) , mbSharedIndexFile( false ) , mbExtension( false ) @@ -2986,30 +2986,30 @@ SfxLibrary::SfxLibrary( ModifiableHelper& _rModifiable, const Type& aType, SfxLibrary::SfxLibrary( ModifiableHelper& _rModifiable, const Type& aType, const Reference< XComponentContext >& xContext, const Reference< XSimpleFileAccess3 >& xSFI, - const OUString& aLibInfoFileURL, const OUString& aStorageURL, sal_Bool ReadOnly ) + const OUString& aLibInfoFileURL, const OUString& aStorageURL, bool ReadOnly ) : OComponentHelper( m_aMutex ) , mxContext( xContext ) , mxSFI( xSFI ) , mrModifiable( _rModifiable ) , maNameContainer( aType ) - , mbLoaded( sal_False ) - , mbIsModified( sal_True ) + , mbLoaded( false ) + , mbIsModified( true ) , mbInitialised( false ) , maLibInfoFileURL( aLibInfoFileURL ) , maStorageURL( aStorageURL ) - , mbLink( sal_True ) - , mbReadOnly( sal_False ) + , mbLink( true ) + , mbReadOnly( false ) , mbReadOnlyLink( ReadOnly ) - , mbPreload( sal_False ) - , mbPasswordProtected( sal_False ) - , mbPasswordVerified( sal_False ) + , mbPreload( false ) + , mbPasswordProtected( false ) + , mbPasswordVerified( false ) , mbDoc50Password( false ) , mbSharedIndexFile( false ) , mbExtension( false ) { } -void SfxLibrary::implSetModified( sal_Bool _bIsModified ) +void SfxLibrary::implSetModified( bool _bIsModified ) { if ( mbIsModified == _bIsModified ) { @@ -3018,7 +3018,7 @@ void SfxLibrary::implSetModified( sal_Bool _bIsModified ) mbIsModified = _bIsModified; if ( mbIsModified ) { - mrModifiable.setModified( sal_True ); + mrModifiable.setModified( true ); } } @@ -3053,7 +3053,7 @@ Type SfxLibrary::getElementType() sal_Bool SfxLibrary::hasElements() throw(RuntimeException, std::exception) { - sal_Bool bRet = maNameContainer.hasElements(); + bool bRet = maNameContainer.hasElements(); return bRet; } @@ -3076,7 +3076,7 @@ Sequence< OUString > SfxLibrary::getElementNames() sal_Bool SfxLibrary::hasByName( const OUString& aName ) throw(RuntimeException, std::exception) { - sal_Bool bRet = maNameContainer.hasByName( aName ); + bool bRet = maNameContainer.hasByName( aName ); return bRet; } @@ -3119,7 +3119,7 @@ void SfxLibrary::replaceByName( const OUString& aName, const Any& aElement ) "SfxLibrary::replaceByName: replacing element is invalid!"); maNameContainer.replaceByName( aName, aElement ); - implSetModified( sal_True ); + implSetModified( true ); } @@ -3135,13 +3135,13 @@ void SfxLibrary::insertByName( const OUString& aName, const Any& aElement ) "SfxLibrary::insertByName: to-be-inserted element is invalid!"); maNameContainer.insertByName( aName, aElement ); - implSetModified( sal_True ); + implSetModified( true ); } void SfxLibrary::impl_removeWithoutChecks( const OUString& _rElementName ) { maNameContainer.removeByName( _rElementName ); - implSetModified( sal_True ); + implSetModified( true ); // Remove element file if( !maStorageURL.isEmpty() ) diff --git a/basic/source/uno/scriptcont.cxx b/basic/source/uno/scriptcont.cxx index e37e4cf1d9b7..c7117ef41824 100644 --- a/basic/source/uno/scriptcont.cxx +++ b/basic/source/uno/scriptcont.cxx @@ -90,7 +90,7 @@ void SfxScriptLibraryContainer::setLibraryPassword( const OUString& rLibraryName if( !rPassword.isEmpty() ) { pImplLib->mbDoc50Password = true; - pImplLib->mbPasswordProtected = sal_True; + pImplLib->mbPasswordProtected = true; pImplLib->maPassword = rPassword; } } @@ -114,7 +114,7 @@ void SfxScriptLibraryContainer::clearLibraryPassword( const OUString& rLibraryNa { SfxLibrary* pImplLib = getImplLib( rLibraryName ); pImplLib->mbDoc50Password = false; - pImplLib->mbPasswordProtected = sal_False; + pImplLib->mbPasswordProtected = false; pImplLib->maPassword = ""; } catch(const NoSuchElementException& ) {} @@ -151,7 +151,7 @@ SfxLibrary* SfxScriptLibraryContainer::implCreateLibrary( const OUString& aName SfxLibrary* SfxScriptLibraryContainer::implCreateLibraryLink( const OUString& aName, const OUString& aLibInfoFileURL, const OUString& StorageURL, - sal_Bool ReadOnly ) + bool ReadOnly ) { (void)aName; // Only needed for SfxDialogLibrary SfxLibrary* pRet = new SfxScriptLibrary( maModifiable, mxContext, mxSFI, @@ -232,7 +232,7 @@ Any SAL_CALL SfxScriptLibraryContainer::importLibraryElement Reference< XParser > xParser = xml::sax::Parser::create( mxContext ); // Read from storage? - sal_Bool bStorage = xInStream.is(); + bool bStorage = xInStream.is(); Reference< XInputStream > xInput; if( bStorage ) @@ -384,7 +384,7 @@ sal_Bool SAL_CALL SfxScriptLibraryContainer::isLibraryPasswordProtected( const O { LibraryContainerMethodGuard aGuard( *this ); SfxLibrary* pImplLib = getImplLib( Name ); - sal_Bool bRet = pImplLib->mbPasswordProtected; + bool bRet = pImplLib->mbPasswordProtected; return bRet; } @@ -397,7 +397,7 @@ sal_Bool SAL_CALL SfxScriptLibraryContainer::isLibraryPasswordVerified( const OU { throw IllegalArgumentException(); } - sal_Bool bRet = pImplLib->mbPasswordVerified; + bool bRet = pImplLib->mbPasswordVerified; return bRet; } @@ -412,26 +412,26 @@ sal_Bool SAL_CALL SfxScriptLibraryContainer::verifyLibraryPassword throw IllegalArgumentException(); } // Test password - sal_Bool bSuccess = sal_False; + bool bSuccess = false; if( pImplLib->mbDoc50Password ) { bSuccess = ( Password == pImplLib->maPassword ); if( bSuccess ) { - pImplLib->mbPasswordVerified = sal_True; + pImplLib->mbPasswordVerified = true; } } else { pImplLib->maPassword = Password; - bSuccess = implLoadPasswordLibrary( pImplLib, Name, sal_True ); + bSuccess = implLoadPasswordLibrary( pImplLib, Name, true ); if( bSuccess ) { // The library gets modified by verifying the password, because other- // wise for saving the storage would be copied and that doesn't work // with mtg's storages when the password is verified - pImplLib->implSetModified( sal_True ); - pImplLib->mbPasswordVerified = sal_True; + pImplLib->implSetModified( true ); + pImplLib->mbPasswordVerified = true; // Reload library to get source if( pImplLib->mbLoaded ) @@ -454,9 +454,9 @@ void SAL_CALL SfxScriptLibraryContainer::changeLibraryPassword( const OUString& { return; } - sal_Bool bOldPassword = !OldPassword.isEmpty(); - sal_Bool bNewPassword = !NewPassword.isEmpty(); - sal_Bool bStorage = mxStorage.is() && !pImplLib->mbLink; + bool bOldPassword = !OldPassword.isEmpty(); + bool bNewPassword = !NewPassword.isEmpty(); + bool bStorage = mxStorage.is() && !pImplLib->mbLink; if( pImplLib->mbReadOnly || (bOldPassword && !pImplLib->mbPasswordProtected) ) { @@ -490,12 +490,12 @@ void SAL_CALL SfxScriptLibraryContainer::changeLibraryPassword( const OUString& if( !bNewPassword ) { - pImplLib->mbPasswordProtected = sal_False; - pImplLib->mbPasswordVerified = sal_False; + pImplLib->mbPasswordProtected = false; + pImplLib->mbPasswordVerified = false; pImplLib->maPassword = ""; - maModifiable.setModified( sal_True ); - pImplLib->implSetModified( sal_True ); + maModifiable.setModified( true ); + pImplLib->implSetModified( true ); if( !bStorage && !pImplLib->mbDoc50Password ) { @@ -510,12 +510,12 @@ void SAL_CALL SfxScriptLibraryContainer::changeLibraryPassword( const OUString& // Set new password? if( bNewPassword ) { - pImplLib->mbPasswordProtected = sal_True; - pImplLib->mbPasswordVerified = sal_True; + pImplLib->mbPasswordProtected = true; + pImplLib->mbPasswordVerified = true; pImplLib->maPassword = NewPassword; - maModifiable.setModified( sal_True ); - pImplLib->implSetModified( sal_True ); + maModifiable.setModified( true ); + pImplLib->implSetModified( true ); if( !bStorage && !pImplLib->mbDoc50Password ) { @@ -574,21 +574,21 @@ void setStreamKey( uno::Reference< io::XStream > xStream, const OUString& aPass // Impl methods -sal_Bool SfxScriptLibraryContainer::implStorePasswordLibrary( SfxLibrary* pLib, - const OUString& aName, - const uno::Reference< embed::XStorage >& xStorage, - const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& xHandler ) +bool SfxScriptLibraryContainer::implStorePasswordLibrary( SfxLibrary* pLib, + const OUString& aName, + const uno::Reference< embed::XStorage >& xStorage, + const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& xHandler ) { OUString aDummyLocation; Reference< XSimpleFileAccess3 > xDummySFA; return implStorePasswordLibrary( pLib, aName, xStorage, aDummyLocation, xDummySFA, xHandler ); } -sal_Bool SfxScriptLibraryContainer::implStorePasswordLibrary( SfxLibrary* pLib, const OUString& aName, - const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, - const OUString& aTargetURL, - const Reference< XSimpleFileAccess3 > xToUseSFI, - const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& xHandler ) +bool SfxScriptLibraryContainer::implStorePasswordLibrary( SfxLibrary* pLib, const OUString& aName, + const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, + const OUString& aTargetURL, + const Reference< XSimpleFileAccess3 > xToUseSFI, + const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& xHandler ) { bool bExport = !aTargetURL.isEmpty(); @@ -596,7 +596,7 @@ sal_Bool SfxScriptLibraryContainer::implStorePasswordLibrary( SfxLibrary* pLib, OSL_ENSURE( pBasicMgr, "SfxScriptLibraryContainer::implStorePasswordLibrary: cannot do this without a BasicManager!" ); if ( !pBasicMgr ) { - return sal_False; + return false; } // Only need to handle the export case here, // save/saveas etc are handled in sfxbasemodel::storeSelf & @@ -619,14 +619,14 @@ sal_Bool SfxScriptLibraryContainer::implStorePasswordLibrary( SfxLibrary* pLib, StarBASIC* pBasicLib = pBasicMgr->GetLib( aName ); if( !pBasicLib ) { - return sal_False; + return false; } Sequence< OUString > aElementNames = pLib->getElementNames(); sal_Int32 nNameCount = aElementNames.getLength(); const OUString* pNames = aElementNames.getConstArray(); - sal_Bool bLink = pLib->mbLink; - sal_Bool bStorage = xStorage.is() && !bLink; + bool bLink = pLib->mbLink; + bool bStorage = xStorage.is() && !bLink; if( bStorage ) { for( sal_Int32 i = 0 ; i < nNameCount ; i++ ) @@ -871,17 +871,17 @@ sal_Bool SfxScriptLibraryContainer::implStorePasswordLibrary( SfxLibrary* pLib, { } } - return sal_True; + return true; } -sal_Bool SfxScriptLibraryContainer::implLoadPasswordLibrary - ( SfxLibrary* pLib, const OUString& Name, sal_Bool bVerifyPasswordOnly ) +bool SfxScriptLibraryContainer::implLoadPasswordLibrary + ( SfxLibrary* pLib, const OUString& Name, bool bVerifyPasswordOnly ) throw(WrappedTargetException, RuntimeException) { - sal_Bool bRet = sal_True; + bool bRet = true; - sal_Bool bLink = pLib->mbLink; - sal_Bool bStorage = mxStorage.is() && !bLink; + bool bLink = pLib->mbLink; + bool bStorage = mxStorage.is() && !bLink; // Already loaded? Then only verifiedPassword can change something SfxScriptLibrary* pScriptLib = static_cast< SfxScriptLibrary* >( pLib ); @@ -890,25 +890,25 @@ sal_Bool SfxScriptLibraryContainer::implLoadPasswordLibrary if( pScriptLib->mbLoadedBinary && !bVerifyPasswordOnly && (pScriptLib->mbLoadedSource || !pLib->mbPasswordVerified) ) { - return sal_False; + return false; } } StarBASIC* pBasicLib = NULL; - sal_Bool bLoadBinary = sal_False; + bool bLoadBinary = false; if( !pScriptLib->mbLoadedBinary && !bVerifyPasswordOnly && !pLib->mbPasswordVerified ) { BasicManager* pBasicMgr = getBasicManager(); OSL_ENSURE( pBasicMgr, "SfxScriptLibraryContainer::implLoadPasswordLibrary: cannot do this without a BasicManager!" ); - sal_Bool bLoaded = pScriptLib->mbLoaded; - pScriptLib->mbLoaded = sal_True; // Necessary to get lib + bool bLoaded = pScriptLib->mbLoaded; + pScriptLib->mbLoaded = true; // Necessary to get lib pBasicLib = pBasicMgr ? pBasicMgr->GetLib( Name ) : NULL; pScriptLib->mbLoaded = bLoaded; // Restore flag if( !pBasicLib ) { - return sal_False; + return false; } - bLoadBinary = sal_True; + bLoadBinary = true; pScriptLib->mbLoadedBinary = true; } @@ -944,7 +944,7 @@ sal_Bool SfxScriptLibraryContainer::implLoadPasswordLibrary catch(const uno::Exception& ) { OSL_FAIL( "### couldn't open sub storage for library\n" ); - return sal_False; + return false; } } @@ -1041,7 +1041,7 @@ sal_Bool SfxScriptLibraryContainer::implLoadPasswordLibrary } catch(const uno::Exception& ) { - bRet = sal_False; + bRet = false; } } } @@ -1158,7 +1158,7 @@ sal_Bool SfxScriptLibraryContainer::implLoadPasswordLibrary } catch (const uno::Exception& ) { - bRet = sal_False; + bRet = false; } } } @@ -1250,7 +1250,7 @@ SfxScriptLibrary::SfxScriptLibrary( ModifiableHelper& _rModifiable, const Reference< XSimpleFileAccess3 >& xSFI, const OUString& aLibInfoFileURL, const OUString& aStorageURL, - sal_Bool ReadOnly ) + bool ReadOnly ) : SfxLibrary( _rModifiable, getCppuType( (const OUString *)0 ), xContext, xSFI, aLibInfoFileURL, aStorageURL, ReadOnly) , mbLoadedSource( false ) @@ -1259,7 +1259,7 @@ SfxScriptLibrary::SfxScriptLibrary( ModifiableHelper& _rModifiable, } // Provide modify state including resources -sal_Bool SfxScriptLibrary::isModified( void ) +bool SfxScriptLibrary::isModified( void ) { return implIsModified(); // No resources } @@ -1318,12 +1318,12 @@ script::ModuleInfo SAL_CALL SfxScriptLibrary::getModuleInfo( const OUString& Mod sal_Bool SAL_CALL SfxScriptLibrary::hasModuleInfo( const OUString& ModuleName ) throw (RuntimeException, std::exception) { - sal_Bool bRes = sal_False; + bool bRes = false; ModuleInfoMap::iterator it = mModuleInfos.find( ModuleName ); if ( it != mModuleInfos.end() ) { - bRes = sal_True; + bRes = true; } return bRes; } |