diff options
author | Takeshi Abe <tabe@fixedpoint.jp> | 2012-08-21 22:54:26 +0900 |
---|---|---|
committer | Takeshi Abe <tabe@fixedpoint.jp> | 2012-08-21 22:59:16 +0900 |
commit | 2efc59c9b6174e9b4b148a1c12dc8c5aac11865f (patch) | |
tree | e4373b57a438af2b047dc437c516930a9a14cce9 /basic/source/inc | |
parent | c2ead1e76ee63091bc00112e9b453b86487c2181 (diff) |
sal_Bool to bool
Change-Id: I38141187c4f0809343a93c5765c0773d2321968a
Diffstat (limited to 'basic/source/inc')
-rw-r--r-- | basic/source/inc/runtime.hxx | 30 | ||||
-rw-r--r-- | basic/source/inc/sbintern.hxx | 8 | ||||
-rw-r--r-- | basic/source/inc/sbunoobj.hxx | 4 | ||||
-rw-r--r-- | basic/source/inc/scriptcont.hxx | 4 |
4 files changed, 23 insertions, 23 deletions
diff --git a/basic/source/inc/runtime.hxx b/basic/source/inc/runtime.hxx index 7dbb9104d697..e2c795718736 100644 --- a/basic/source/inc/runtime.hxx +++ b/basic/source/inc/runtime.hxx @@ -263,11 +263,11 @@ class SbiRuntime SbxArrayRef refArgv; // #74254, one refSaveObj is not enough! new: pRefSaveList (see above) short nArgc; - sal_Bool bRun; + bool bRun; bool bError; // true: handle errors - sal_Bool bInError; // sal_True: in an error handler - sal_Bool bBlocked; // sal_True: blocked by next call level, #i48868 - sal_Bool bVBAEnabled; + bool bInError; // true: in an error handler + bool bBlocked; // true: blocked by next call level, #i48868 + bool bVBAEnabled; sal_uInt16 nFlags; // Debugging-Flags SbError nError; sal_uInt16 nOps; // opcode counter @@ -299,7 +299,7 @@ class SbiRuntime } SbxVariable* FindElement - ( SbxObject* pObj, sal_uInt32 nOp1, sal_uInt32 nOp2, SbError, sal_Bool bLocal, sal_Bool bStatic = sal_False ); + ( SbxObject* pObj, sal_uInt32 nOp1, sal_uInt32 nOp2, SbError, bool bLocal, bool bStatic = false ); void SetupArgs( SbxVariable*, sal_uInt32 ); SbxVariable* CheckArray( SbxVariable* ); @@ -307,7 +307,7 @@ class SbiRuntime SbxVariableRef PopVar(); SbxVariable* GetTOS( short=0 ); void TOSMakeTemp(); - sal_Bool ClearExprStack(); + bool ClearExprStack(); void PushGosub( const sal_uInt8* ); void PopGosub(); @@ -329,7 +329,7 @@ class SbiRuntime void SetParameters( SbxArray* ); // HAS TO BE IMPLEMENTED SOME TIME - void DllCall( const String&, const String&, SbxArray*, SbxDataType, sal_Bool ); + void DllCall( const String&, const String&, SbxArray*, SbxDataType, bool ); // #56204 swap out DIM-functionality into help method (step0.cxx) void DimImpl( SbxVariableRef refVar ); @@ -371,7 +371,7 @@ class SbiRuntime // all opcodes with two operands void StepRTL( sal_uInt32, sal_uInt32 ), StepPUBLIC( sal_uInt32, sal_uInt32 ), StepPUBLIC_P( sal_uInt32, sal_uInt32 ); void StepPUBLIC_Impl( sal_uInt32, sal_uInt32, bool bUsedForClassModule ); - void StepFIND_Impl( SbxObject* pObj, sal_uInt32 nOp1, sal_uInt32 nOp2, SbError, sal_Bool bLocal, sal_Bool bStatic = sal_False ); + void StepFIND_Impl( SbxObject* pObj, sal_uInt32 nOp1, sal_uInt32 nOp2, SbError, bool bLocal, bool bStatic = false ); void StepFIND( sal_uInt32, sal_uInt32 ), StepELEM( sal_uInt32, sal_uInt32 ); void StepGLOBAL( sal_uInt32, sal_uInt32 ), StepLOCAL( sal_uInt32, sal_uInt32 ); void StepPARAM( sal_uInt32, sal_uInt32), StepCREATE( sal_uInt32, sal_uInt32 ); @@ -400,10 +400,10 @@ public: void FatalError( SbError, const String& ); // error handling = standard, set error static sal_Int32 translateErrorToVba( SbError nError, String& rMsg ); void DumpPCode(); - sal_Bool Step(); // single step (one opcode) - void Stop() { bRun = sal_False; } - void block( void ) { bBlocked = sal_True; } - void unblock( void ) { bBlocked = sal_False; } + bool Step(); // single step (one opcode) + void Stop() { bRun = false; } + void block( void ) { bBlocked = true; } + void unblock( void ) { bBlocked = false; } SbMethod* GetMethod() { return pMeth; } SbModule* GetModule() { return pMod; } sal_uInt16 GetDebugFlags() { return nFlags; } @@ -441,12 +441,12 @@ StarBASIC* GetCurrentBasic( StarBASIC* pRTBasic ); // no DDE functionality, no DLLCALL) in basic because // of portal "virtual" users (portal user != UNIX user) // (Implemented in iosys.cxx) -sal_Bool needSecurityRestrictions( void ); +bool needSecurityRestrictions( void ); -// Returns sal_True if UNO is available, otherwise the old +// Returns true if UNO is available, otherwise the old // file system implementation has to be used // (Implemented in iosys.cxx) -sal_Bool hasUno( void ); +bool hasUno( void ); // Converts possibly relative paths to absolute paths // according to the setting done by ChDir/ChDrive diff --git a/basic/source/inc/sbintern.hxx b/basic/source/inc/sbintern.hxx index 3ed8e5f4359f..a4ff91f6d268 100644 --- a/basic/source/inc/sbintern.hxx +++ b/basic/source/inc/sbintern.hxx @@ -95,12 +95,12 @@ struct SbiGlobals SbError nCode; xub_StrLen nLine; xub_StrLen nCol1,nCol2; // from... to... - sal_Bool bCompiler; // flag for compiler error - sal_Bool bGlobalInitErr; - sal_Bool bRunInit; // sal_True, if RunInit active from the Basic + bool bCompiler; // flag for compiler error + bool bGlobalInitErr; + bool bRunInit; // true, if RunInit active from the Basic String aErrMsg; // buffer for GetErrorText() ::utl::TransliterationWrapper* pTransliterationWrapper; // For StrComp - sal_Bool bBlockCompilerError; + bool bBlockCompilerError; BasicManager* pAppBasMgr; StarBASIC* pMSOMacroRuntimLib; // Lib containing MSO Macro Runtime API entry symbols diff --git a/basic/source/inc/sbunoobj.hxx b/basic/source/inc/sbunoobj.hxx index 222943f87df7..ab0f43901099 100644 --- a/basic/source/inc/sbunoobj.hxx +++ b/basic/source/inc/sbunoobj.hxx @@ -106,8 +106,8 @@ class SbUnoObject: public SbxObject ::com::sun::star::uno::Reference< ::com::sun::star::script::XInvocation > mxInvocation; ::com::sun::star::uno::Reference< ::com::sun::star::beans::XExactName > mxExactName; ::com::sun::star::uno::Reference< ::com::sun::star::beans::XExactName > mxExactNameInvocation; - sal_Bool bNeedIntrospection; - sal_Bool bNativeCOMObject; + bool bNeedIntrospection; + bool bNativeCOMObject; ::com::sun::star::uno::Any maTmpUnoObj; // Only to save obj for doIntrospection! ::boost::shared_ptr< SbUnoStructRefObject > maStructInfo; // help method to establish the dbg_-properties diff --git a/basic/source/inc/scriptcont.hxx b/basic/source/inc/scriptcont.hxx index a3e848d6a914..372a298dcac4 100644 --- a/basic/source/inc/scriptcont.hxx +++ b/basic/source/inc/scriptcont.hxx @@ -142,8 +142,8 @@ class SfxScriptLibrary : public SfxLibrary, public SfxScriptLibrary_BASE typedef boost::unordered_map< ::rtl::OUString, ::com::sun::star::script::ModuleInfo, ::rtl::OUStringHash > ModuleInfoMap; - sal_Bool mbLoadedSource; - sal_Bool mbLoadedBinary; + bool mbLoadedSource; + bool mbLoadedBinary; ModuleInfoMap mModuleInfos; // Provide modify state including resources |