diff options
author | David Tardon <dtardon@redhat.com> | 2010-12-07 14:51:39 +0100 |
---|---|---|
committer | David Tardon <dtardon@redhat.com> | 2010-12-07 14:51:39 +0100 |
commit | 3a87a743231cabaa1d47c51e6ff2554997c6e9bc (patch) | |
tree | f15ac5a8336e11bfe5747426dd6585c45dfa3f63 /framework | |
parent | dc61075ee045c020cd073642bb8e7a0e8d473f1e (diff) |
was part of the quickstarter shutdown hack; not needed anymore
This reverts commit 5dfa2bcf6f4a7699c2acae87caa96de739f82636.
Diffstat (limited to 'framework')
-rw-r--r-- | framework/inc/services/desktop.hxx | 4 | ||||
-rw-r--r-- | framework/source/services/desktop.cxx | 35 |
2 files changed, 0 insertions, 39 deletions
diff --git a/framework/inc/services/desktop.hxx b/framework/inc/services/desktop.hxx index 79e04ca967ac..8dcc87227780 100644 --- a/framework/inc/services/desktop.hxx +++ b/framework/inc/services/desktop.hxx @@ -429,8 +429,6 @@ class Desktop : // interfaces */ ::sal_Bool impl_closeFrames(::sal_Bool bAllowUI); - sal_Bool impl_terminate(); - //------------------------------------------------------------------------------------------------------------- // debug methods // (should be private everytime!) @@ -509,8 +507,6 @@ class Desktop : // interfaces css::uno::Reference< css::frame::XUntitledNumbers > m_xTitleNumberGenerator; - bool m_bTerminating; // we are in the process of terminating already - }; // class Desktop } // namespace framework diff --git a/framework/source/services/desktop.cxx b/framework/source/services/desktop.cxx index 216c7a94624c..1c862faf36bf 100644 --- a/framework/source/services/desktop.cxx +++ b/framework/source/services/desktop.cxx @@ -83,7 +83,6 @@ //_________________________________________________________________________________________________________________ // includes of other projects //_________________________________________________________________________________________________________________ -#include <cppuhelper/exc_hlp.hxx> #include <cppuhelper/queryinterface.hxx> #include <cppuhelper/typeprovider.hxx> #include <cppuhelper/factory.hxx> @@ -265,7 +264,6 @@ Desktop::Desktop( const css::uno::Reference< css::lang::XMultiServiceFactory >& , m_xSWThreadManager ( ) , m_xSfxTerminator ( ) , m_xTitleNumberGenerator ( ) - , m_bTerminating(false) { // Safe impossible cases // We don't accept all incoming parameter. @@ -293,39 +291,6 @@ Desktop::~Desktop() sal_Bool SAL_CALL Desktop::terminate() throw( css::uno::RuntimeException ) { - bool bTerminating(false); - { - WriteGuard aGuard(m_aLock); - bTerminating = m_bTerminating; - m_bTerminating = true; - } - if (bTerminating) - return false; - - css::uno::Any aException; - sal_Bool bTerminate(false); - try - { - bTerminate = impl_terminate(); - } - catch (const css::uno::RuntimeException& rEx) - { - aException <<= rEx; - } - - { - WriteGuard aGuard(m_aLock); - m_bTerminating = false; - } - - if (aException.hasValue()) - cppu::throwException(aException); - - return bTerminate; -} - -sal_Bool Desktop::impl_terminate() -{ TransactionGuard aTransaction( m_aTransactionManager, E_HARDEXCEPTIONS ); SYNCHRONIZED_START |