diff options
| author | Noel Grandin <noel@peralex.com> | 2014-04-04 10:11:25 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2014-04-04 13:44:16 +0200 |
| commit | 2d1eaee66b12fc0fdc7acdd911a63f5b68d5a196 (patch) | |
| tree | 51fc2e007c7b49779043146489662571439506a0 | |
| parent | 88ab8181d95272bea1b15c88fcc127e7be836454 (diff) | |
SbxObject::Call sal_Bool->bool
Change-Id: I2e52ddf704679a118fbbc4efebb7cf9fb36f0c34
| -rw-r--r-- | basic/source/classes/sb.cxx | 4 | ||||
| -rw-r--r-- | basic/source/sbx/sbxobj.cxx | 6 | ||||
| -rw-r--r-- | include/basic/sbstar.hxx | 2 | ||||
| -rw-r--r-- | include/basic/sbxobj.hxx | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/basic/source/classes/sb.cxx b/basic/source/classes/sb.cxx index 8c5fe1b3167d..c1d93636f070 100644 --- a/basic/source/classes/sb.cxx +++ b/basic/source/classes/sb.cxx @@ -1379,9 +1379,9 @@ SbxVariable* StarBASIC::Find( const OUString& rName, SbxClassType t ) return pRes; } -sal_Bool StarBASIC::Call( const OUString& rName, SbxArray* pParam ) +bool StarBASIC::Call( const OUString& rName, SbxArray* pParam ) { - sal_Bool bRes = SbxObject::Call( rName, pParam ); + bool bRes = SbxObject::Call( rName, pParam ); if( !bRes ) { SbxError eErr = SbxBase::GetError(); diff --git a/basic/source/sbx/sbxobj.cxx b/basic/source/sbx/sbxobj.cxx index 9bf8fc406d36..6b43ec6f3a49 100644 --- a/basic/source/sbx/sbxobj.cxx +++ b/basic/source/sbx/sbxobj.cxx @@ -297,7 +297,7 @@ SbxVariable* SbxObject::Find( const OUString& rName, SbxClassType t ) // The whole thing recursive, because Call() might be overloaded // Qualified names are allowed -sal_Bool SbxObject::Call( const OUString& rName, SbxArray* pParam ) +bool SbxObject::Call( const OUString& rName, SbxArray* pParam ) { SbxVariable* pMeth = FindQualified( rName, SbxCLASS_DONTCARE); if( pMeth && pMeth->ISA(SbxMethod) ) @@ -309,10 +309,10 @@ sal_Bool SbxObject::Call( const OUString& rName, SbxArray* pParam ) } pMeth->Broadcast( SBX_HINT_DATAWANTED ); pMeth->SetParameters( NULL ); - return sal_True; + return true; } SetError( SbxERR_NO_METHOD ); - return sal_False; + return false; } SbxProperty* SbxObject::GetDfltProperty() diff --git a/include/basic/sbstar.hxx b/include/basic/sbstar.hxx index 26302a3d4a62..b5f50aa844ec 100644 --- a/include/basic/sbstar.hxx +++ b/include/basic/sbstar.hxx @@ -122,7 +122,7 @@ public: static sal_Int32 GetErl(); virtual SbxVariable* Find( const OUString&, SbxClassType ) SAL_OVERRIDE; - virtual sal_Bool Call( const OUString&, SbxArray* = NULL ) SAL_OVERRIDE; + virtual bool Call( const OUString&, SbxArray* = NULL ) SAL_OVERRIDE; SbxArray* GetModules() { return pModules; } SbxObject* GetRtl() { return pRtl; } diff --git a/include/basic/sbxobj.hxx b/include/basic/sbxobj.hxx index 458b6ca01996..586af9f4ff32 100644 --- a/include/basic/sbxobj.hxx +++ b/include/basic/sbxobj.hxx @@ -63,7 +63,7 @@ public: virtual SbxVariable* Find( const OUString&, SbxClassType ); SbxVariable* FindQualified( const OUString&, SbxClassType ); // Quick-Call-Interface for Methods - virtual sal_Bool Call( const OUString&, SbxArray* = NULL ); + virtual bool Call( const OUString&, SbxArray* = NULL ); // Execution of DDE-Commands SbxVariable* Execute( const OUString& ); // Manage elements |