summaryrefslogtreecommitdiff
path: root/Repository.mk
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2014-04-17 23:39:38 +0200
committerMichael Stahl <mstahl@redhat.com>2014-04-17 23:58:17 +0200
commit96d36e876441f8ec9b2f1a05ab0a5f82f271e6cc (patch)
tree65bdf6b7cf98e628ab79ab7b893201c52df042fb /Repository.mk
parent31c32c14259e8479e61456230804e3e3b0f42067 (diff)
XSLTFilter/XSLTValidate jars are gone
removed by bfc71eb03e2bc6f26d53f70b32f9a8937086808b and 143f0b895fb2c0a1449af4f6f307487900921cbe Change-Id: Iaf6e99c15356ebe08cfb1d386a6dab97f47a730a
Diffstat (limited to 'Repository.mk')
-rw-r--r--Repository.mk2
1 files changed, 0 insertions, 2 deletions
diff --git a/Repository.mk b/Repository.mk
index a57ab087c0ea..cee72b8e3bca 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -678,8 +678,6 @@ $(eval $(call gb_Helper_register_jars_for_install,OOO,extensions_rhino, \
endif
$(eval $(call gb_Helper_register_jars,OOO, \
- XSLTFilter \
- XSLTValidate \
agenda \
aportisdoc \
fax \
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