diff options
author | Takeshi Abe <tabe@fixedpoint.jp> | 2013-05-11 00:06:16 +0900 |
---|---|---|
committer | Takeshi Abe <tabe@fixedpoint.jp> | 2013-05-11 00:47:52 +0900 |
commit | 8fa7b8234f5b5a0f30972a3ece939363fff4fdae (patch) | |
tree | c569d926c6d147dbc06aba5be2d96ea4b63c1982 /vcl/source/app | |
parent | 6ae4e72ec510e2dd0496d181ba429b1d51716667 (diff) |
sal_Bool to bool
Change-Id: I7e69466f189b845a807edbf3ca4422b0fb2aec94
Diffstat (limited to 'vcl/source/app')
-rw-r--r-- | vcl/source/app/svmain.cxx | 10 | ||||
-rw-r--r-- | vcl/source/app/timer.cxx | 20 |
2 files changed, 15 insertions, 15 deletions
diff --git a/vcl/source/app/svmain.cxx b/vcl/source/app/svmain.cxx index f7533fdb5f05..e6ac094f7b6d 100644 --- a/vcl/source/app/svmain.cxx +++ b/vcl/source/app/svmain.cxx @@ -153,7 +153,7 @@ int ImplSVMain() int nReturn = EXIT_FAILURE; - sal_Bool bInit = InitVCL(); + bool bInit = InitVCL(); if( bInit ) { @@ -239,12 +239,12 @@ uno::Any SAL_CALL DesktopEnvironmentContext::getValueByName( const OUString& Nam return retVal; } -sal_Bool InitVCL() +bool InitVCL() { RTL_LOGFILE_CONTEXT( aLog, "vcl (ss112471) ::InitVCL" ); if( pExceptionHandler != NULL ) - return sal_False; + return false; EmbeddedFontsHelper::clearTemporaryFontFiles(); @@ -269,7 +269,7 @@ sal_Bool InitVCL() RTL_LOGFILE_CONTEXT_TRACE( aLog, "{ ::CreateSalInstance" ); pSVData->mpDefInst = CreateSalInstance(); if ( !pSVData->mpDefInst ) - return sal_False; + return false; RTL_LOGFILE_CONTEXT_TRACE( aLog, "} ::CreateSalInstance" ); // Desktop Environment context (to be able to get value of "system.desktop-environment" as soon as possible) @@ -302,7 +302,7 @@ sal_Bool InitVCL() // initialise debug data DBGGUI_INIT(); - return sal_True; + return true; } #ifdef ANDROID diff --git a/vcl/source/app/timer.cxx b/vcl/source/app/timer.cxx index 60147afbd9c8..de5efcae8bbb 100644 --- a/vcl/source/app/timer.cxx +++ b/vcl/source/app/timer.cxx @@ -42,8 +42,8 @@ struct ImplTimerData Timer* mpSVTimer; // Pointer to SV Timer instance sal_uLong mnUpdateTime; // Last Update Time sal_uLong mnTimerUpdate; // TimerCallbackProcs on stack - sal_Bool mbDelete; // Was timer deleted during Update()? - sal_Bool mbInTimeout; // Are we in a timeout handler? + bool mbDelete; // Was timer deleted during Update()? + bool mbInTimeout; // Are we in a timeout handler? }; // ======================================================================= @@ -125,13 +125,13 @@ void Timer::ImplTimerCallbackProc() if ( !pTimerData->mpSVTimer->mbAuto ) { pTimerData->mpSVTimer->mbActive = sal_False; - pTimerData->mbDelete = sal_True; + pTimerData->mbDelete = true; } // call Timeout - pTimerData->mbInTimeout = sal_True; + pTimerData->mbInTimeout = true; pTimerData->mpSVTimer->Timeout(); - pTimerData->mbInTimeout = sal_False; + pTimerData->mbInTimeout = false; } } @@ -233,7 +233,7 @@ Timer::~Timer() { if ( mpTimerData ) { - mpTimerData->mbDelete = sal_True; + mpTimerData->mbDelete = true; mpTimerData->mpSVTimer = NULL; } } @@ -284,8 +284,8 @@ void Timer::Start() mpTimerData->mpSVTimer = this; mpTimerData->mnUpdateTime = Time::GetSystemTicks(); mpTimerData->mnTimerUpdate = pSVData->mnTimerUpdate; - mpTimerData->mbDelete = sal_False; - mpTimerData->mbInTimeout = sal_False; + mpTimerData->mbDelete = false; + mpTimerData->mbInTimeout = false; // insert last due to SFX! ImplTimerData* pPrev = NULL; @@ -312,7 +312,7 @@ void Timer::Start() { mpTimerData->mnUpdateTime = Time::GetSystemTicks(); mpTimerData->mnTimerUpdate = pSVData->mnTimerUpdate; - mpTimerData->mbDelete = sal_False; + mpTimerData->mbDelete = false; } } @@ -323,7 +323,7 @@ void Timer::Stop() mbActive = sal_False; if ( mpTimerData ) - mpTimerData->mbDelete = sal_True; + mpTimerData->mbDelete = true; } // ----------------------------------------------------------------------- |