Kaydet (Commit) 00d39034 authored tarafından Caolán McNamara's avatar Caolán McNamara

coverity#735489 constant guards dead code

Change-Id: I387dcfb34dd6f1fc74ed929cb6b2833ae8e0f574
üst 1075cd6b
...@@ -209,7 +209,6 @@ public: ...@@ -209,7 +209,6 @@ public:
SAL_DLLPRIVATE SfxDispatcher* GetAppDispatcher_Impl(); SAL_DLLPRIVATE SfxDispatcher* GetAppDispatcher_Impl();
SAL_DLLPRIVATE SfxDispatcher* GetDispatcher_Impl(); SAL_DLLPRIVATE SfxDispatcher* GetDispatcher_Impl();
SAL_DLLPRIVATE bool QueryExit_Impl();
SAL_DLLPRIVATE void SetOptions_Impl(const SfxItemSet &); SAL_DLLPRIVATE void SetOptions_Impl(const SfxItemSet &);
SAL_DLLPRIVATE bool Initialize_Impl(); SAL_DLLPRIVATE bool Initialize_Impl();
......
...@@ -23,7 +23,6 @@ ...@@ -23,7 +23,6 @@
#define STR_NO_WEBBROWSER_FOUND (RID_SFX_APP_START+7) #define STR_NO_WEBBROWSER_FOUND (RID_SFX_APP_START+7)
#define STR_NO_ABS_URI_REF (RID_SFX_APP_START+8) #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 STR_ISMODIFIED (RID_SFX_APP_START+11)
#define RID_FULLSCREENTOOLBOX (RID_SFX_APP_START+42) #define RID_FULLSCREENTOOLBOX (RID_SFX_APP_START+42)
......
...@@ -203,11 +203,6 @@ String GID_CONTROLS ...@@ -203,11 +203,6 @@ String GID_CONTROLS
Text [ en-US ] = "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 String STR_ISMODIFIED
{ {
Text [ en-US ] = "Do you want to save the changes to %1?" ; Text [ en-US ] = "Do you want to save the changes to %1?" ;
......
...@@ -93,9 +93,6 @@ void SAL_CALL SfxTerminateListener_Impl::disposing( const EventObject& ) throw( ...@@ -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 ) 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 ) void SAL_CALL SfxTerminateListener_Impl::notifyTermination( const EventObject& aEvent ) throw(RuntimeException, std::exception )
......
...@@ -56,26 +56,6 @@ ...@@ -56,26 +56,6 @@
using ::basic::BasicManagerRepository; 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() void SfxApplication::Deinitialize()
{ {
if ( pAppData_Impl->bDowning ) if ( pAppData_Impl->bDowning )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment