Kaydet (Commit) d7c5d9e3 authored tarafından Noel Grandin's avatar Noel Grandin

basic: sal_Bool->bool

Change-Id: Idfe18863b2c6f60da5192d661f66e85a2bac09e5
üst 21dcef53
This diff is collapsed.
...@@ -84,7 +84,7 @@ class SfxScriptLibraryContainer : public SfxLibraryContainer, public OldBasicPas ...@@ -84,7 +84,7 @@ class SfxScriptLibraryContainer : public SfxLibraryContainer, public OldBasicPas
virtual void setLibraryPassword( const OUString& rLibraryName, const OUString& rPassword ) SAL_OVERRIDE; virtual void setLibraryPassword( const OUString& rLibraryName, const OUString& rPassword ) SAL_OVERRIDE;
virtual OUString getLibraryPassword( const OUString& rLibraryName ) SAL_OVERRIDE; virtual OUString getLibraryPassword( const OUString& rLibraryName ) SAL_OVERRIDE;
virtual void clearLibraryPassword( const OUString& rLibraryName ) SAL_OVERRIDE; virtual void clearLibraryPassword( const OUString& rLibraryName ) SAL_OVERRIDE;
virtual sal_Bool hasLibraryPassword( const OUString& rLibraryName ) SAL_OVERRIDE; virtual bool hasLibraryPassword( const OUString& rLibraryName ) SAL_OVERRIDE;
virtual const sal_Char* SAL_CALL getInfoFileName() const SAL_OVERRIDE; virtual const sal_Char* SAL_CALL getInfoFileName() const SAL_OVERRIDE;
virtual const sal_Char* SAL_CALL getOldInfoFileName() const SAL_OVERRIDE; virtual const sal_Char* SAL_CALL getOldInfoFileName() const SAL_OVERRIDE;
......
...@@ -40,14 +40,14 @@ ModuleSizeExceeded::ModuleSizeExceeded( const uno::Sequence< OUString >& sModule ...@@ -40,14 +40,14 @@ ModuleSizeExceeded::ModuleSizeExceeded( const uno::Sequence< OUString >& sModule
m_lContinuations[1] = m_xAbort; m_lContinuations[1] = m_xAbort;
} }
sal_Bool bool
ModuleSizeExceeded::isAbort() const ModuleSizeExceeded::isAbort() const
{ {
comphelper::OInteractionAbort* pBase = static_cast< comphelper::OInteractionAbort* >( m_xAbort.get() ); comphelper::OInteractionAbort* pBase = static_cast< comphelper::OInteractionAbort* >( m_xAbort.get() );
return pBase->wasSelected(); return pBase->wasSelected();
} }
sal_Bool bool
ModuleSizeExceeded::isApprove() const ModuleSizeExceeded::isApprove() const
{ {
comphelper::OInteractionApprove* pBase = static_cast< comphelper::OInteractionApprove* >( m_xApprove.get() ); comphelper::OInteractionApprove* pBase = static_cast< comphelper::OInteractionApprove* >( m_xApprove.get() );
......
...@@ -120,7 +120,7 @@ void SfxScriptLibraryContainer::clearLibraryPassword( const OUString& rLibraryNa ...@@ -120,7 +120,7 @@ void SfxScriptLibraryContainer::clearLibraryPassword( const OUString& rLibraryNa
catch(const NoSuchElementException& ) {} catch(const NoSuchElementException& ) {}
} }
sal_Bool SfxScriptLibraryContainer::hasLibraryPassword( const OUString& rLibraryName ) bool SfxScriptLibraryContainer::hasLibraryPassword( const OUString& rLibraryName )
{ {
SfxLibrary* pImplLib = getImplLib( rLibraryName ); SfxLibrary* pImplLib = getImplLib( rLibraryName );
return pImplLib->mbPasswordProtected; return pImplLib->mbPasswordProtected;
......
...@@ -76,7 +76,7 @@ public: ...@@ -76,7 +76,7 @@ public:
virtual void setLibraryPassword( const OUString& rLibraryName, const OUString& rPassword ) = 0; virtual void setLibraryPassword( const OUString& rLibraryName, const OUString& rPassword ) = 0;
virtual OUString getLibraryPassword( const OUString& rLibraryName ) = 0; virtual OUString getLibraryPassword( const OUString& rLibraryName ) = 0;
virtual void clearLibraryPassword( const OUString& rLibraryName ) = 0; virtual void clearLibraryPassword( const OUString& rLibraryName ) = 0;
virtual sal_Bool hasLibraryPassword( const OUString& rLibraryName ) = 0; virtual bool hasLibraryPassword( const OUString& rLibraryName ) = 0;
protected: protected:
~OldBasicPassword() {} ~OldBasicPassword() {}
...@@ -130,17 +130,17 @@ private: ...@@ -130,17 +130,17 @@ private:
BASIC_DLLPRIVATE void Init(); BASIC_DLLPRIVATE void Init();
protected: protected:
sal_Bool ImpLoadLibrary( BasicLibInfo* pLibInfo ) const; bool ImpLoadLibrary( BasicLibInfo* pLibInfo ) const;
sal_Bool ImpLoadLibrary( BasicLibInfo* pLibInfo, SotStorage* pCurStorage, sal_Bool bInfosOnly = sal_False ); bool ImpLoadLibrary( BasicLibInfo* pLibInfo, SotStorage* pCurStorage, bool bInfosOnly = false );
void ImpCreateStdLib( StarBASIC* pParentFromStdLib ); void ImpCreateStdLib( StarBASIC* pParentFromStdLib );
void ImpMgrNotLoaded( const OUString& rStorageName ); void ImpMgrNotLoaded( const OUString& rStorageName );
BasicLibInfo* CreateLibInfo(); BasicLibInfo* CreateLibInfo();
void LoadBasicManager( SotStorage& rStorage, const OUString& rBaseURL, sal_Bool bLoadBasics = sal_True ); void LoadBasicManager( SotStorage& rStorage, const OUString& rBaseURL, bool bLoadBasics = true );
void LoadOldBasicManager( SotStorage& rStorage ); void LoadOldBasicManager( SotStorage& rStorage );
sal_Bool ImplLoadBasic( SvStream& rStrm, StarBASICRef& rOldBasic ) const; bool ImplLoadBasic( SvStream& rStrm, StarBASICRef& rOldBasic ) const;
sal_Bool ImplEncryptStream( SvStream& rStream ) const; bool ImplEncryptStream( SvStream& rStream ) const;
BasicLibInfo* FindLibInfo( StarBASIC* pBasic ) const; BasicLibInfo* FindLibInfo( StarBASIC* pBasic ) const;
void CheckModules( StarBASIC* pBasic, sal_Bool bReference ) const; void CheckModules( StarBASIC* pBasic, bool bReference ) const;
~BasicManager(); ~BasicManager();
public: public:
...@@ -182,11 +182,11 @@ public: ...@@ -182,11 +182,11 @@ public:
const ::com::sun::star::uno::Reference< com::sun::star::script::XPersistentLibraryContainer >& const ::com::sun::star::uno::Reference< com::sun::star::script::XPersistentLibraryContainer >&
GetScriptLibraryContainer() const; GetScriptLibraryContainer() const;
sal_Bool LoadLib( sal_uInt16 nLib ); bool LoadLib( sal_uInt16 nLib );
sal_Bool RemoveLib( sal_uInt16 nLib, sal_Bool bDelBasicFromStorage ); bool RemoveLib( sal_uInt16 nLib, bool bDelBasicFromStorage );
// Modify-Flag will be reset only during save. // Modify-Flag will be reset only during save.
sal_Bool IsBasicModified() const; bool IsBasicModified() const;
std::vector<BasicError>& GetErrors(); std::vector<BasicError>& GetErrors();
...@@ -215,14 +215,14 @@ public: ...@@ -215,14 +215,14 @@ public:
ErrCode ExecuteMacro( OUString const& i_fullyQualifiedName, OUString const& i_commaSeparatedArgs, SbxValue* i_retValue ); ErrCode ExecuteMacro( OUString const& i_fullyQualifiedName, OUString const& i_commaSeparatedArgs, SbxValue* i_retValue );
private: private:
BASIC_DLLPRIVATE sal_Bool IsReference( sal_uInt16 nLib ); BASIC_DLLPRIVATE bool IsReference( sal_uInt16 nLib );
BASIC_DLLPRIVATE sal_Bool SetLibName( sal_uInt16 nLib, const OUString& rName ); BASIC_DLLPRIVATE bool SetLibName( sal_uInt16 nLib, const OUString& rName );
BASIC_DLLPRIVATE StarBASIC* GetStdLib() const; BASIC_DLLPRIVATE StarBASIC* GetStdLib() const;
BASIC_DLLPRIVATE StarBASIC* AddLib( SotStorage& rStorage, const OUString& rLibName, sal_Bool bReference ); BASIC_DLLPRIVATE StarBASIC* AddLib( SotStorage& rStorage, const OUString& rLibName, bool bReference );
BASIC_DLLPRIVATE sal_Bool RemoveLib( sal_uInt16 nLib ); BASIC_DLLPRIVATE bool RemoveLib( sal_uInt16 nLib );
BASIC_DLLPRIVATE sal_Bool HasLib( const OUString& rName ) const; BASIC_DLLPRIVATE bool HasLib( const OUString& rName ) const;
BASIC_DLLPRIVATE StarBASIC* CreateLibForLibContainer( const OUString& rLibName, BASIC_DLLPRIVATE StarBASIC* CreateLibForLibContainer( const OUString& rLibName,
const com::sun::star::uno::Reference< com::sun::star::script::XLibraryContainer >& const com::sun::star::uno::Reference< com::sun::star::script::XLibraryContainer >&
......
...@@ -30,8 +30,8 @@ class BASIC_DLLPUBLIC ModuleSizeExceeded : public ::cppu::WeakImplHelper1< ::com ...@@ -30,8 +30,8 @@ class BASIC_DLLPUBLIC ModuleSizeExceeded : public ::cppu::WeakImplHelper1< ::com
public: public:
ModuleSizeExceeded( const com::sun::star::uno::Sequence<OUString>& sModules ); ModuleSizeExceeded( const com::sun::star::uno::Sequence<OUString>& sModules );
sal_Bool isAbort() const; bool isAbort() const;
sal_Bool isApprove() const; bool isApprove() const;
// UNO interface // UNO interface
public: public:
......
...@@ -1317,7 +1317,7 @@ void SwDocShell::ReloadFromHtml( const OUString& rStreamName, SwSrcView* pSrcVie ...@@ -1317,7 +1317,7 @@ void SwDocShell::ReloadFromHtml( const OUString& rStreamName, SwSrcView* pSrcVie
// Only the modules are deleted from the standard-lib // Only the modules are deleted from the standard-lib
if( nLibCount ) if( nLibCount )
pBasicMan->RemoveLib( nLibCount, sal_True ); pBasicMan->RemoveLib( nLibCount, true );
else else
pBasic->Clear(); pBasic->Clear();
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment