diff options
author | Takeshi Abe <tabe@fixedpoint.jp> | 2012-09-08 22:59:22 +0900 |
---|---|---|
committer | Takeshi Abe <tabe@fixedpoint.jp> | 2012-09-08 23:05:11 +0900 |
commit | 969e6870e8e4c7b4452928d821ffe61384a376b1 (patch) | |
tree | f44f4d4771a7aeddab1d407bbd2cc7e2a8993231 | |
parent | ec580b3a1d9bc240479dcce6fca07b6d83c35e1a (diff) |
sal_Bool to bool
Change-Id: I86e5b49ccc9737517ecde17dbdaba44eeaee2371
-rw-r--r-- | basic/inc/basic/sbstar.hxx | 18 | ||||
-rw-r--r-- | basic/source/classes/sb.cxx | 16 | ||||
-rw-r--r-- | basic/source/runtime/runtime.cxx | 8 | ||||
-rw-r--r-- | basic/source/runtime/step2.cxx | 8 |
4 files changed, 25 insertions, 25 deletions
diff --git a/basic/inc/basic/sbstar.hxx b/basic/inc/basic/sbstar.hxx index e40583a3d04a..451e6117dd88 100644 --- a/basic/inc/basic/sbstar.hxx +++ b/basic/inc/basic/sbstar.hxx @@ -60,12 +60,12 @@ class BASIC_DLLPUBLIC StarBASIC : public SbxObject // Handler-Support: Link aErrorHdl; // Error handler Link aBreakHdl; // Breakpoint handler - sal_Bool bNoRtl; // if sal_True: do not search RTL - sal_Bool bBreak; // if sal_True: Break, otherwise Step + bool bNoRtl; // if true: do not search RTL + bool bBreak; // if true: Break, otherwise Step bool bDocBasic; - sal_Bool bVBAEnabled; + bool bVBAEnabled; BasicLibInfo* pLibInfo; // Info block for basic manager - sal_Bool bQuit; + bool bQuit; SbxObjectRef pVBAGlobals; BASIC_DLLPRIVATE SbxObject* getVBAGlobals( ); @@ -120,7 +120,7 @@ public: static void Error( SbError, const String& rMsg ); static void FatalError( SbError ); static void FatalError( SbError, const String& rMsg ); - static sal_Bool IsRunning(); + static bool IsRunning(); static SbError GetErrBasic(); // #66536 make additional message accessible by RTL function Error static String GetErrorMsg(); @@ -151,7 +151,7 @@ public: static bool IsCompilerError(); static sal_uInt16 GetVBErrorCode( SbError nError ); static SbError GetSfxFromVBError( sal_uInt16 nError ); - sal_Bool IsBreak() const { return bBreak; } + bool IsBreak() const { return bBreak; } static Link GetGlobalErrorHdl(); static void SetGlobalErrorHdl( const Link& rNewHdl ); @@ -167,15 +167,15 @@ public: static SbxBase* FindSBXInCurrentScope( const String& rName ); static SbMethod* GetActiveMethod( sal_uInt16 nLevel = 0 ); static SbModule* GetActiveModule(); - void SetVBAEnabled( sal_Bool bEnabled ); - sal_Bool isVBAEnabled(); + void SetVBAEnabled( bool bEnabled ); + bool isVBAEnabled(); SbxObjectRef getRTL( void ) { return pRtl; } bool IsDocBasic() { return bDocBasic; } SbxVariable* VBAFind( const rtl::OUString& rName, SbxClassType t ); bool GetUNOConstant( const sal_Char* _pAsciiName, ::com::sun::star::uno::Any& aOut ); void QuitAndExitApplication(); - sal_Bool IsQuitApplication() { return bQuit; }; + bool IsQuitApplication() { return bQuit; }; static ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > GetModelFromBasic( SbxObject* pBasic ); diff --git a/basic/source/classes/sb.cxx b/basic/source/classes/sb.cxx index 394d2994bc0a..6ddb5311cb57 100644 --- a/basic/source/classes/sb.cxx +++ b/basic/source/classes/sb.cxx @@ -881,8 +881,8 @@ StarBASIC::StarBASIC( StarBASIC* p, bool bIsDocBasic ) { SetParent( p ); pLibInfo = NULL; - bNoRtl = bBreak = sal_False; - bVBAEnabled = sal_False; + bNoRtl = bBreak = false; + bVBAEnabled = false; pModules = new SbxArray; if( !GetSbData()->nInst++ ) @@ -904,7 +904,7 @@ StarBASIC::StarBASIC( StarBASIC* p, bool bIsDocBasic ) // Search via StarBasic is always global SetFlag( SBX_GBLSEARCH ); pVBAGlobals = NULL; - bQuit = sal_False; + bQuit = false; if( bDocBasic ) lclInsertDocBasicItem( *this ); @@ -1342,7 +1342,7 @@ SbxBase* StarBASIC::FindSBXInCurrentScope( const String& rName ) void StarBASIC::QuitAndExitApplication() { Stop(); - bQuit = sal_True; + bQuit = true; } void StarBASIC::Stop() @@ -1355,9 +1355,9 @@ void StarBASIC::Stop() } } -sal_Bool StarBASIC::IsRunning() +bool StarBASIC::IsRunning() { - return sal_Bool( GetSbData()->pInst != NULL ); + return GetSbData()->pInst != NULL; } /************************************************************************** @@ -1385,7 +1385,7 @@ SbModule* StarBASIC::GetActiveModule() sal_uInt16 StarBASIC::BreakPoint( sal_uInt16 l, sal_uInt16 c1, sal_uInt16 c2 ) { SetErrorData( 0, l, c1, c2 ); - bBreak = sal_True; + bBreak = true; if( GetSbData()->aBreakHdl.IsSet() ) return (sal_uInt16) GetSbData()->aBreakHdl.Call( this ); else @@ -1395,7 +1395,7 @@ sal_uInt16 StarBASIC::BreakPoint( sal_uInt16 l, sal_uInt16 c1, sal_uInt16 c2 ) sal_uInt16 StarBASIC::StepPoint( sal_uInt16 l, sal_uInt16 c1, sal_uInt16 c2 ) { SetErrorData( 0, l, c1, c2 ); - bBreak = sal_False; + bBreak = false; if( GetSbData()->aBreakHdl.IsSet() ) return (sal_uInt16) GetSbData()->aBreakHdl.Call( this ); else diff --git a/basic/source/runtime/runtime.cxx b/basic/source/runtime/runtime.cxx index f81e99dd89a5..803fb85b0585 100644 --- a/basic/source/runtime/runtime.cxx +++ b/basic/source/runtime/runtime.cxx @@ -50,7 +50,7 @@ bool SbiRuntime::isVBAEnabled() return result; } -void StarBASIC::SetVBAEnabled( sal_Bool bEnabled ) +void StarBASIC::SetVBAEnabled( bool bEnabled ) { if ( bDocBasic ) { @@ -58,15 +58,15 @@ void StarBASIC::SetVBAEnabled( sal_Bool bEnabled ) } } -sal_Bool StarBASIC::isVBAEnabled() +bool StarBASIC::isVBAEnabled() { if ( bDocBasic ) { if( SbiRuntime::isVBAEnabled() ) - return sal_True; + return true; return bVBAEnabled; } - return sal_False; + return false; } diff --git a/basic/source/runtime/step2.cxx b/basic/source/runtime/step2.cxx index b1cc6609b2cb..ad151a72b07d 100644 --- a/basic/source/runtime/step2.cxx +++ b/basic/source/runtime/step2.cxx @@ -95,8 +95,8 @@ SbxVariable* SbiRuntime::FindElement } if( !pElem ) { - sal_Bool bSave = rBasic.bNoRtl; - rBasic.bNoRtl = sal_True; + bool bSave = rBasic.bNoRtl; + rBasic.bNoRtl = true; pElem = pObj->Find( aName, SbxCLASS_DONTCARE ); // #110004, #112015: Make private really private @@ -317,8 +317,8 @@ SbxBase* SbiRuntime::FindElementExtern( const String& rName ) // search in module if( !pElem ) { - sal_Bool bSave = rBasic.bNoRtl; - rBasic.bNoRtl = sal_True; + bool bSave = rBasic.bNoRtl; + rBasic.bNoRtl = true; pElem = pMod->Find( rName, SbxCLASS_DONTCARE ); rBasic.bNoRtl = bSave; } |