diff options
author | Caolán McNamara <caolanm@redhat.com> | 2014-10-01 16:33:58 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2014-10-01 20:28:59 +0100 |
commit | 00d39034138bdb84b1304f4b6a41f265d6715c90 (patch) | |
tree | ecd2a050918eccfcedebd241854da8696b563b5e /sfx2 | |
parent | 1075cd6b5d7d5da9e347ac934d7acf51a39639db (diff) |
coverity#735489 constant guards dead code
Change-Id: I387dcfb34dd6f1fc74ed929cb6b2833ae8e0f574
Diffstat (limited to 'sfx2')
-rw-r--r-- | sfx2/source/appl/app.hrc | 1 | ||||
-rw-r--r-- | sfx2/source/appl/app.src | 5 | ||||
-rw-r--r-- | sfx2/source/appl/appinit.cxx | 3 | ||||
-rw-r--r-- | sfx2/source/appl/appquit.cxx | 20 |
4 files changed, 0 insertions, 29 deletions
diff --git a/sfx2/source/appl/app.hrc b/sfx2/source/appl/app.hrc index 1d74997ef325..801fe40b6861 100644 --- a/sfx2/source/appl/app.hrc +++ b/sfx2/source/appl/app.hrc @@ -23,7 +23,6 @@ #define STR_NO_WEBBROWSER_FOUND (RID_SFX_APP_START+7) #define STR_NO_ABS_URI_REF (RID_SFX_APP_START+8) -#define STR_CANT_QUIT (RID_SFX_APP_START+10) #define STR_ISMODIFIED (RID_SFX_APP_START+11) #define RID_FULLSCREENTOOLBOX (RID_SFX_APP_START+42) diff --git a/sfx2/source/appl/app.src b/sfx2/source/appl/app.src index aeb560d52e9f..0c606fd35a49 100644 --- a/sfx2/source/appl/app.src +++ b/sfx2/source/appl/app.src @@ -203,11 +203,6 @@ String GID_CONTROLS Text [ en-US ] = "Controls" ; }; -String STR_CANT_QUIT -{ - Text [ en-US ] = "The application cannot be terminated at the moment.\nPlease wait until all print jobs and/or\nOLE actions have finished and close all dialogs." ; -}; - String STR_ISMODIFIED { Text [ en-US ] = "Do you want to save the changes to %1?" ; diff --git a/sfx2/source/appl/appinit.cxx b/sfx2/source/appl/appinit.cxx index 1d92c5e71e0d..f5a468233864 100644 --- a/sfx2/source/appl/appinit.cxx +++ b/sfx2/source/appl/appinit.cxx @@ -93,9 +93,6 @@ void SAL_CALL SfxTerminateListener_Impl::disposing( const EventObject& ) throw( void SAL_CALL SfxTerminateListener_Impl::queryTermination( const EventObject& ) throw(TerminationVetoException, RuntimeException, std::exception ) { - SolarMutexGuard aGuard; - if ( !SfxGetpApp()->QueryExit_Impl() ) - throw TerminationVetoException(); } void SAL_CALL SfxTerminateListener_Impl::notifyTermination( const EventObject& aEvent ) throw(RuntimeException, std::exception ) diff --git a/sfx2/source/appl/appquit.cxx b/sfx2/source/appl/appquit.cxx index da121d3d3690..e37e98d29959 100644 --- a/sfx2/source/appl/appquit.cxx +++ b/sfx2/source/appl/appquit.cxx @@ -56,26 +56,6 @@ using ::basic::BasicManagerRepository; - -bool SfxApplication::QueryExit_Impl() -{ - bool bQuit = true; - - // Does some instance, that can not be shut down, still require the app? - if ( !bQuit ) - { - // Not really exit, only minimize - MessageDialog aInfoBox( NULL, SfxResId(STR_CANT_QUIT), VCL_MESSAGE_INFO ); - aInfoBox.Execute(); - OSL_TRACE( "QueryExit => sal_False (in use)" ); - return false; - } - - return true; -} - - - void SfxApplication::Deinitialize() { if ( pAppData_Impl->bDowning ) |