[Libreoffice-commits] .: framework/inc framework/source

[David Tardon]

 framework/inc/services/desktop.hxx    |    4 ---
 framework/source/services/desktop.cxx |   35 ----------------------------------
 2 files changed, 39 deletions(-)

New commits:
commit 5487aa9e025762640eb2664e6f554ec535cb6f38
Author: David Tardon <dtardon at redhat.com>
Date:   Tue Dec 7 14:51:39 2010 +0100

    was part of the quickstarter shutdown hack; not needed anymore
    
    This reverts commit 5dfa2bcf6f4a7699c2acae87caa96de739f82636.

diff --git a/framework/inc/services/desktop.hxx b/framework/inc/services/desktop.hxx
index 45e91d0..c1cc855 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 d59b361..d0a4a8e 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