summaryrefslogtreecommitdiff
path: root/basic/source
diff options
context:
space:
mode:
authorTakeshi Abe <tabe@fixedpoint.jp>2012-09-07 04:59:11 +0900
committerTakeshi Abe <tabe@fixedpoint.jp>2012-09-07 09:57:39 +0900
commit00b7328732f560b3c8517f0125e22b6ce6064c09 (patch)
tree11a0df126c18a5a9a34056d9f585d12e0032dd99 /basic/source
parent30affe2f2fde8add8b1e89799e0e09515ccd9e54 (diff)
sal_Bool to bool
Change-Id: Ie8a128db35bebcdcee5eda984a7875339418d9bb
Diffstat (limited to 'basic/source')
-rw-r--r--basic/source/basmgr/basmgr.cxx4
-rw-r--r--basic/source/classes/eventatt.cxx2
-rw-r--r--basic/source/classes/image.cxx4
-rw-r--r--basic/source/classes/sb.cxx2
-rw-r--r--basic/source/classes/sbunoobj.cxx8
-rw-r--r--basic/source/classes/sbxmod.cxx6
-rw-r--r--basic/source/runtime/basrdll.cxx10
7 files changed, 18 insertions, 18 deletions
diff --git a/basic/source/basmgr/basmgr.cxx b/basic/source/basmgr/basmgr.cxx
index 62fde97846af..697ca6d8f19c 100644
--- a/basic/source/basmgr/basmgr.cxx
+++ b/basic/source/basmgr/basmgr.cxx
@@ -579,7 +579,7 @@ BasicLibInfo* BasicLibInfo::Create( SotStorageStream& rSStream )
return pInfo;
}
-BasicManager::BasicManager( SotStorage& rStorage, const String& rBaseURL, StarBASIC* pParentFromStdLib, String* pLibPath, sal_Bool bDocMgr ) : mbDocMgr( bDocMgr )
+BasicManager::BasicManager( SotStorage& rStorage, const String& rBaseURL, StarBASIC* pParentFromStdLib, String* pLibPath, bool bDocMgr ) : mbDocMgr( bDocMgr )
{
DBG_CTOR( BasicManager, 0 );
@@ -776,7 +776,7 @@ void BasicManager::SetLibraryContainerInfo( const LibraryContainerInfo& rInfo )
SetGlobalUNOConstant( "DialogLibraries", makeAny( mpImpl->maContainerInfo.mxDialogCont ) );
}
-BasicManager::BasicManager( StarBASIC* pSLib, String* pLibPath, sal_Bool bDocMgr ) : mbDocMgr( bDocMgr )
+BasicManager::BasicManager( StarBASIC* pSLib, String* pLibPath, bool bDocMgr ) : mbDocMgr( bDocMgr )
{
DBG_CTOR( BasicManager, 0 );
Init();
diff --git a/basic/source/classes/eventatt.cxx b/basic/source/classes/eventatt.cxx
index 10f096b82812..1c111e2d2eda 100644
--- a/basic/source/classes/eventatt.cxx
+++ b/basic/source/classes/eventatt.cxx
@@ -252,7 +252,7 @@ void BasicScriptListener_Impl::firing_impl( const ScriptEvent& aScriptEvent, Any
xAppStandardBasic = (StarBASIC*)p;
}
- sal_Bool bSearchLib = true;
+ bool bSearchLib = true;
StarBASICRef xLibSearchBasic;
if( aLocation.EqualsAscii("application") )
xLibSearchBasic = xAppStandardBasic;
diff --git a/basic/source/classes/image.cxx b/basic/source/classes/image.cxx
index 81c0910b7df3..3c91470aacf9 100644
--- a/basic/source/classes/image.cxx
+++ b/basic/source/classes/image.cxx
@@ -115,14 +115,14 @@ bool SbiImage::Load( SvStream& r, sal_uInt32& nVersion )
sal_uInt16 nReserved1;
sal_uInt32 nReserved2;
sal_uInt32 nReserved3;
- sal_Bool bBadVer = sal_False;
+ bool bBadVer = false;
if( nSign == B_MODULE )
{
r >> nVersion >> nCharSet >> lDimBase
>> nFlags >> nReserved1 >> nReserved2 >> nReserved3;
eCharSet = (CharSet) nCharSet;
eCharSet = GetSOLoadTextEncoding( eCharSet );
- bBadVer = sal_Bool( nVersion > B_CURVERSION );
+ bBadVer = ( nVersion > B_CURVERSION );
nDimBase = (sal_uInt16) lDimBase;
}
diff --git a/basic/source/classes/sb.cxx b/basic/source/classes/sb.cxx
index 06ec0263ed85..394d2994bc0a 100644
--- a/basic/source/classes/sb.cxx
+++ b/basic/source/classes/sb.cxx
@@ -876,7 +876,7 @@ SbModule* SbClassFactory::FindClass( const String& rClassName )
return pMod;
}
-StarBASIC::StarBASIC( StarBASIC* p, sal_Bool bIsDocBasic )
+StarBASIC::StarBASIC( StarBASIC* p, bool bIsDocBasic )
: SbxObject( String( RTL_CONSTASCII_USTRINGPARAM("StarBASIC") ) ), bDocBasic( bIsDocBasic )
{
SetParent( p );
diff --git a/basic/source/classes/sbunoobj.cxx b/basic/source/classes/sbunoobj.cxx
index 5f44542fe620..c4f5fd82ead3 100644
--- a/basic/source/classes/sbunoobj.cxx
+++ b/basic/source/classes/sbunoobj.cxx
@@ -963,7 +963,7 @@ Type getUnoTypeForSbxValue( SbxValue* pVal )
{
// If all elements of the arrays are from the same type, take
// this one - otherwise the whole will be considered as Any-Sequence
- sal_Bool bNeedsInit = sal_True;
+ bool bNeedsInit = true;
sal_Int32 nSize = nUpper - nLower + 1;
sal_Int32 nIdx = nLower;
@@ -981,7 +981,7 @@ Type getUnoTypeForSbxValue( SbxValue* pVal )
break;
}
aElementType = aType;
- bNeedsInit = sal_False;
+ bNeedsInit = false;
}
else if( aElementType != aType )
{
@@ -1005,7 +1005,7 @@ Type getUnoTypeForSbxValue( SbxValue* pVal )
// For this check the array's dim structure does not matter
sal_uInt32 nFlatArraySize = pArray->Count32();
- sal_Bool bNeedsInit = sal_True;
+ bool bNeedsInit = true;
for( sal_uInt32 i = 0 ; i < nFlatArraySize ; i++ )
{
SbxVariableRef xVar = pArray->SbxArray::Get32( i );
@@ -1020,7 +1020,7 @@ Type getUnoTypeForSbxValue( SbxValue* pVal )
break;
}
aElementType = aType;
- bNeedsInit = sal_False;
+ bNeedsInit = false;
}
else if( aElementType != aType )
{
diff --git a/basic/source/classes/sbxmod.cxx b/basic/source/classes/sbxmod.cxx
index 6c423947d8dd..a70a7eaa413f 100644
--- a/basic/source/classes/sbxmod.cxx
+++ b/basic/source/classes/sbxmod.cxx
@@ -1085,7 +1085,7 @@ sal_uInt16 SbModule::Run( SbMethod* pMeth )
static sal_uInt16 nMaxCallLevel = 0;
sal_uInt16 nRes = 0;
- sal_Bool bDelInst = sal_Bool( GetSbData()->pInst == NULL );
+ bool bDelInst = ( GetSbData()->pInst == NULL );
bool bQuit = false;
StarBASICRef xBasic;
uno::Reference< frame::XModel > xModel;
@@ -1229,7 +1229,7 @@ sal_uInt16 SbModule::Run( SbMethod* pMeth )
clearNativeObjectWrapperVector();
DBG_ASSERT(GetSbData()->pInst->nCallLvl==0,"BASIC-Call-Level > 0");
- delete GetSbData()->pInst, GetSbData()->pInst = NULL, bDelInst = sal_False;
+ delete GetSbData()->pInst, GetSbData()->pInst = NULL, bDelInst = false;
// #i30690
SolarMutexGuard aSolarGuard;
@@ -1447,7 +1447,7 @@ void StarBASIC::ClearAllModuleVars( void )
}
// Execution of the init-code of all module
-void SbModule::GlobalRunInit( sal_Bool bBasicStart )
+void SbModule::GlobalRunInit( bool bBasicStart )
{
// If no Basic-Start, only initialise, if the module is not initialised
if( !bBasicStart )
diff --git a/basic/source/runtime/basrdll.cxx b/basic/source/runtime/basrdll.cxx
index a49b6f379d91..d5d00ea3bad4 100644
--- a/basic/source/runtime/basrdll.cxx
+++ b/basic/source/runtime/basrdll.cxx
@@ -38,8 +38,8 @@ BasicDLL::BasicDLL()
BASIC_DLL() = this;
::com::sun::star::lang::Locale aLocale = Application::GetSettings().GetUILocale();
pBasResMgr = ResMgr::CreateResMgr("sb", aLocale );
- bDebugMode = sal_False;
- bBreakEnabled = sal_True;
+ bDebugMode = false;
+ bBreakEnabled = true;
}
BasicDLL::~BasicDLL()
@@ -47,7 +47,7 @@ BasicDLL::~BasicDLL()
delete pBasResMgr;
}
-void BasicDLL::EnableBreak( sal_Bool bEnable )
+void BasicDLL::EnableBreak( bool bEnable )
{
BasicDLL* pThis = BASIC_DLL();
DBG_ASSERT( pThis, "BasicDLL::EnableBreak: Noch keine Instanz!" );
@@ -55,7 +55,7 @@ void BasicDLL::EnableBreak( sal_Bool bEnable )
pThis->bBreakEnabled = bEnable;
}
-void BasicDLL::SetDebugMode( sal_Bool bDebugMode )
+void BasicDLL::SetDebugMode( bool bDebugMode )
{
BasicDLL* pThis = BASIC_DLL();
DBG_ASSERT( pThis, "BasicDLL::EnableBreak: Noch keine Instanz!" );
@@ -68,7 +68,7 @@ void BasicDLL::BasicBreak()
{
// bJustStopping: if there's someone pressing STOP like crazy umpteen times,
// but the Basic doesn't stop early enough, the box might appear more often...
- static bool bJustStopping = sal_False;
+ static bool bJustStopping = false;
BasicDLL* pThis = BASIC_DLL();
DBG_ASSERT( pThis, "BasicDLL::EnableBreak: Noch keine Instanz!" );