diff options
Diffstat (limited to 'sfx2/source/appl/appquit.cxx')
-rw-r--r-- | sfx2/source/appl/appquit.cxx | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/sfx2/source/appl/appquit.cxx b/sfx2/source/appl/appquit.cxx index 2a5456989aa7..351376091929 100644 --- a/sfx2/source/appl/appquit.cxx +++ b/sfx2/source/appl/appquit.cxx @@ -72,9 +72,9 @@ using ::basic::BasicManagerRepository; //=================================================================== -BOOL SfxApplication::QueryExit_Impl() +sal_Bool SfxApplication::QueryExit_Impl() { - BOOL bQuit = TRUE; + sal_Bool bQuit = sal_True; // will trotzdem noch jemand, den man nicht abschiessen kann, die App haben? if ( !bQuit ) @@ -83,10 +83,10 @@ BOOL SfxApplication::QueryExit_Impl() InfoBox aInfoBox( NULL, SfxResId(MSG_CANT_QUIT) ); aInfoBox.Execute(); DBG_TRACE( "QueryExit => FALSE (in use)" ); - return FALSE; + return sal_False; } - return TRUE; + return sal_True; } //------------------------------------------------------------------------- @@ -105,7 +105,7 @@ void SfxApplication::Deinitialize() SaveBasicAndDialogContainer(); - pAppData_Impl->bDowning = TRUE; // wegen Timer aus DecAliveCount und QueryExit + pAppData_Impl->bDowning = sal_True; // wegen Timer aus DecAliveCount und QueryExit DELETEZ( pAppData_Impl->pTemplates ); @@ -115,15 +115,15 @@ void SfxApplication::Deinitialize() // For more information see: // #123501# //SetViewFrame(0); - pAppData_Impl->bDowning = FALSE; + pAppData_Impl->bDowning = sal_False; DBG_ASSERT( !SfxViewFrame::GetFirst(), "existing SfxViewFrame after Execute" ); DBG_ASSERT( !SfxObjectShell::GetFirst(), "existing SfxObjectShell after Execute" ); pAppData_Impl->pAppDispat->Pop( *this, SFX_SHELL_POP_UNTIL ); pAppData_Impl->pAppDispat->Flush(); - pAppData_Impl->bDowning = TRUE; - pAppData_Impl->pAppDispat->DoDeactivate_Impl( TRUE, NULL ); + pAppData_Impl->bDowning = sal_True; + pAppData_Impl->pAppDispat->DoDeactivate_Impl( sal_True, NULL ); // call derived application-exit Exit(); @@ -146,8 +146,6 @@ void SfxApplication::Deinitialize() // ab hier d"urfen keine SvObjects mehr existieren DELETEZ(pAppData_Impl->pMatcher); - delete pAppData_Impl->pLabelResMgr; - DELETEX(pAppData_Impl->pSlotPool); DELETEX(pAppData_Impl->pFactArr); DELETEX(pAppData_Impl->pInitLinkList); |