[Libreoffice-commits] core.git: 2 commits - sw/inc sw/source sw/util
sw/inc/finalthreadmanager.hxx | 11 ---
sw/source/core/docnode/finalthreadmanager.cxx | 34 +++
sw/source/core/inc/unofreg.hxx| 19 --
sw/source/core/layout/dumpfilter.cxx | 33 +++
sw/source/uibase/inc/SwXFilterOptions.hxx |8 --
sw/source/uibase/inc/unomailmerge.hxx |4 -
sw/source/uibase/uno/SwXFilterOptions.cxx | 27 +++--
sw/source/uibase/uno/unoatxt.cxx | 37
sw/source/uibase/uno/unofreg.cxx | 78 ++
sw/source/uibase/uno/unomailmerge.cxx | 28 -
sw/source/uibase/uno/unomod.cxx | 32 +++---
sw/util/sw.component | 17 +++--
12 files changed, 88 insertions(+), 240 deletions(-)
New commits:
commit 1c363fadccb5b0df92ecf0fa304e547092cba88d
Author: Stephan Bergmann
Date: Thu Mar 12 10:04:52 2015 +0100
Clean up previous commit
Change-Id: I76dbe81308a9a12a04d77a794bb1d11bfb2d5125
diff --git a/sw/inc/finalthreadmanager.hxx b/sw/inc/finalthreadmanager.hxx
index ce51064..babeba5 100644
--- a/sw/inc/finalthreadmanager.hxx
+++ b/sw/inc/finalthreadmanager.hxx
@@ -34,15 +34,6 @@ class CancelJobsThread;
class TerminateOfficeThread;
class SwPauseThreadStarting;
-// service helper namespace
-namespace comp_FinalThreadManager {
-
-// component and service helper functions:
-OUString SAL_CALL _getImplementationName();
-com::sun::star::uno::Sequence< OUString > SAL_CALL _getSupportedServiceNames();
-
-} // closing service helper namespace
-
class FinalThreadManager : public ::cppu::WeakImplHelper3<
com::sun::star::lang::XServiceInfo,
com::sun::star::util::XJobManager,
com::sun::star::frame::XTerminateListener2 >
diff --git a/sw/source/core/docnode/finalthreadmanager.cxx
b/sw/source/core/docnode/finalthreadmanager.cxx
index 3683f0a..bb7e97f 100644
--- a/sw/source/core/docnode/finalthreadmanager.cxx
+++ b/sw/source/core/docnode/finalthreadmanager.cxx
@@ -284,7 +284,7 @@ FinalThreadManager::~FinalThreadManager()
// com.sun.star.uno.XServiceInfo:
OUString SAL_CALL FinalThreadManager::getImplementationName() throw
(css::uno::RuntimeException, std::exception)
{
-return comp_FinalThreadManager::_getImplementationName();
+return OUString("com.sun.star.util.comp.FinalThreadManager");
}
sal_Bool SAL_CALL FinalThreadManager::supportsService(OUString const &
serviceName) throw (css::uno::RuntimeException, std::exception)
@@ -294,7 +294,9 @@ sal_Bool SAL_CALL
FinalThreadManager::supportsService(OUString const & serviceNa
css::uno::Sequence< OUString > SAL_CALL
FinalThreadManager::getSupportedServiceNames() throw
(css::uno::RuntimeException, std::exception)
{
-return comp_FinalThreadManager::_getSupportedServiceNames();
+css::uno::Sequence< OUString > s(1);
+s[0] = "com.sun.star.util.JobManager";
+return s;
}
// ::com::sun::star::util::XJobManager:
@@ -442,24 +444,6 @@ void SAL_CALL FinalThreadManager::disposing( const
css::lang::EventObject& ) thr
// nothing to do, because instance doesn't hold any references of observed
objects
}
-// component helper namespace
-namespace comp_FinalThreadManager {
-
-OUString SAL_CALL _getImplementationName()
-{
-return OUString("com.sun.star.util.comp.FinalThreadManager");
-}
-
-css::uno::Sequence< OUString > SAL_CALL _getSupportedServiceNames()
-{
-css::uno::Sequence< OUString > s(1);
-s[0] = "com.sun.star.util.JobManager";
-return s;
-}
-
-} // closing component helper namespace
-
-
extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL
com_sun_star_util_comp_FinalThreadManager_get_implementation(::com::sun::star::uno::XComponentContext*
context,
::com::sun::star::uno::Sequence
const &)
diff --git a/sw/source/core/inc/unofreg.hxx b/sw/source/core/inc/unofreg.hxx
index 0e7d087..962baac 100644
--- a/sw/source/core/inc/unofreg.hxx
+++ b/sw/source/core/inc/unofreg.hxx
@@ -39,22 +39,6 @@ css::uno::Sequence< OUString > SAL_CALL
SwTextDocument_getSupportedServiceNames(
OUString SAL_CALL SwTextDocument_getImplementationName() throw();
css::uno::Reference< css::uno::XInterface > SAL_CALL
SwTextDocument_createInstance( const css::uno::Reference<
css::lang::XMultiServiceFactory > &rSMgr, const sal_uInt64 _nCreationFlags )
throw( css::uno::Exception );
-//API objects
-css::uno::Sequence< OUString > SAL_CALL
SwXAutoTextContainer_getSupportedServiceNames() throw();
-OUString SAL_CALL SwXAutoTextContainer_getImplementationName() throw();
-css::uno::Reference< css::uno::XInterface > SAL_CALL
SwXAutoTextContainer_createInstance(const css::uno::Reference<
css::lang::XMultiServiceFactory > & rSMgr) throw( css::uno::Exception );
-
-css::uno::Sequence< OUString > SAL_CA
[Libreoffice-commits] core.git: 2 commits - sw/inc sw/source sw/util uui/source uui/util
sw/inc/SwPanelFactory.hxx | 71
sw/source/ui/sidebar/SwPanelFactory.cxx | 71
sw/source/ui/uno/unofreg.cxx|9
sw/util/sw.component|3 -
uui/source/interactionhandler.cxx | 44 +--
uui/source/interactionhandler.hxx | 15 --
uui/source/services.cxx | 20 -
uui/util/uui.component |3 -
8 files changed, 55 insertions(+), 181 deletions(-)
New commits:
commit fe537786a42abea57551395f73328db48bebd086
Author: Matúš Kukan
Date: Thu Jan 30 13:21:53 2014 +0100
uui: Ctor feature for com.sun.star.comp.uui.UUIInteractionHandler.
Change-Id: I94858cef5402e88ddcc3e0e9e4383f7be8443e77
diff --git a/uui/source/interactionhandler.cxx
b/uui/source/interactionhandler.cxx
index 207b968..dd71174 100644
--- a/uui/source/interactionhandler.cxx
+++ b/uui/source/interactionhandler.cxx
@@ -20,7 +20,6 @@
#include "iahndl.hxx"
#include "interactionhandler.hxx"
#include "comphelper/namedvaluecollection.hxx"
-#include "comphelper/processfactory.hxx"
#include
#include "com/sun/star/awt/XWindow.hpp"
@@ -42,7 +41,7 @@ UUIInteractionHandler::~UUIInteractionHandler()
OUString SAL_CALL UUIInteractionHandler::getImplementationName()
throw (uno::RuntimeException)
{
-return OUString::createFromAscii(m_aImplementationName);
+return OUString("com.sun.star.comp.uui.UUIInteractionHandler");
}
sal_Bool SAL_CALL
@@ -56,7 +55,13 @@ uno::Sequence< OUString > SAL_CALL
UUIInteractionHandler::getSupportedServiceNames()
throw (uno::RuntimeException)
{
-return getSupportedServiceNames_static();
+uno::Sequence< OUString > aNames(3);
+aNames[0] = "com.sun.star.task.InteractionHandler";
+// added to indicate support for configuration.backend.MergeRecoveryRequest
+aNames[1] = "com.sun.star.configuration.backend.InteractionHandler";
+aNames[2] = "com.sun.star.uui.InteractionHandler";
+// for backwards compatibility
+return aNames;
}
void SAL_CALL
@@ -119,35 +124,12 @@ UUIInteractionHandler::handle(
}
}
-char const UUIInteractionHandler::m_aImplementationName[]
-= "com.sun.star.comp.uui.UUIInteractionHandler";
-
-uno::Sequence< OUString >
-UUIInteractionHandler::getSupportedServiceNames_static()
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+com_sun_star_comp_uui_UUIInteractionHandler_get_implementation(
+css::uno::XComponentContext *context,
+css::uno::Sequence const &)
{
-uno::Sequence< OUString > aNames(3);
-aNames[0] = "com.sun.star.task.InteractionHandler";
-// added to indicate support for configuration.backend.MergeRecoveryRequest
-aNames[1] = "com.sun.star.configuration.backend.InteractionHandler";
-aNames[2] = "com.sun.star.uui.InteractionHandler";
-// for backwards compatibility
-return aNames;
-}
-
-uno::Reference< uno::XInterface > SAL_CALL
-UUIInteractionHandler::createInstance(
-uno::Reference< lang::XMultiServiceFactory > const &
-rServiceFactory)
-SAL_THROW((uno::Exception))
-{
-try
-{
-return *new
UUIInteractionHandler(comphelper::getComponentContext(rServiceFactory));
-}
-catch (std::bad_alloc const &)
-{
-throw uno::RuntimeException("out of memory", 0);
-}
+return cppu::acquire(new UUIInteractionHandler(context));
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/uui/source/interactionhandler.hxx
b/uui/source/interactionhandler.hxx
index a8d7595..d5ea999 100644
--- a/uui/source/interactionhandler.hxx
+++ b/uui/source/interactionhandler.hxx
@@ -32,26 +32,13 @@ class UUIInteractionHandler:
com::sun::star::lang::XInitialization,
com::sun::star::task::XInteractionHandler2 >
{
-public:
-static char const m_aImplementationName[];
-
-static com::sun::star::uno::Sequence< OUString >
-getSupportedServiceNames_static();
-
-static com::sun::star::uno::Reference< com::sun::star::uno::XInterface >
-SAL_CALL
-createInstance(
-com::sun::star::uno::Reference<
-com::sun::star::lang::XMultiServiceFactory > const &
-rServiceFactory)
-SAL_THROW((com::sun::star::uno::Exception));
-
private:
UUIInteractionHelper * m_pImpl;
UUIInteractionHandler(UUIInteractionHandler &); // not implemented
void operator =(UUIInteractionHandler); // not implemented
+public:
UUIInteractionHandler(com::sun::star::uno::Reference<
com::sun::star::uno::XComponentContext >
const & rxContext)
diff --git a/uui/source/services.cxx b/uui/source/services.cxx
index f2d7c76..642f863 100644
--- a/uui/source/services.cxx
+++ b/uui/source/services.cxx
@@ -24,7 +24,6 @@
#include
#include
-#include "interactionhandler.hxx"
#include "requeststringresolver
