summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sw/inc/finalthreadmanager.hxx9
-rw-r--r--sw/source/core/docnode/finalthreadmanager.cxx24
-rw-r--r--sw/source/core/inc/unofreg.hxx16
-rw-r--r--sw/source/core/layout/dumpfilter.cxx19
-rw-r--r--sw/source/uibase/inc/SwXFilterOptions.hxx3
-rw-r--r--sw/source/uibase/inc/unomailmerge.hxx4
-rw-r--r--sw/source/uibase/uno/SwXFilterOptions.cxx17
-rw-r--r--sw/source/uibase/uno/unoatxt.cxx27
-rw-r--r--sw/source/uibase/uno/unomailmerge.cxx16
-rw-r--r--sw/source/uibase/uno/unomod.cxx25
-rw-r--r--sw/util/sw.component6
11 files changed, 24 insertions, 142 deletions
diff --git a/sw/inc/finalthreadmanager.hxx b/sw/inc/finalthreadmanager.hxx
index ce510648769a..babeba54da30 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 3683f0a5896f..bb7e97ff83df 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<css::uno::Any> const &)
diff --git a/sw/source/core/inc/unofreg.hxx b/sw/source/core/inc/unofreg.hxx
index 0e7d0879ad09..962baac7debc 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_CALL SwXModule_getSupportedServiceNames() throw();
-OUString SAL_CALL SwXModule_getImplementationName() throw();
-
-css::uno::Sequence< OUString > SAL_CALL SwXMailMerge_getSupportedServiceNames() throw();
-OUString SAL_CALL SwXMailMerge_getImplementationName() throw();
-css::uno::Reference< css::uno::XInterface > SAL_CALL SwXMailMerge_createInstance(const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr) throw( css::uno::Exception );
-
-// Layout dump filter
-css::uno::Sequence< OUString > SAL_CALL LayoutDumpFilter_getSupportedServiceNames() throw();
-OUString SAL_CALL LayoutDumpFilter_getImplementationName() throw();
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/layout/dumpfilter.cxx b/sw/source/core/layout/dumpfilter.cxx
index 9b7d3feef7b1..326491aa9bc1 100644
--- a/sw/source/core/layout/dumpfilter.cxx
+++ b/sw/source/core/layout/dumpfilter.cxx
@@ -8,7 +8,6 @@
*/
#include "dumpfilter.hxx"
-#include "unofreg.hxx"
#include <wrtsh.hxx>
#include <cppuhelper/supportsservice.hxx>
@@ -22,18 +21,6 @@
using namespace ::com::sun::star;
-OUString SAL_CALL LayoutDumpFilter_getImplementationName() throw()
-{
- return OUString( "com.sun.star.comp.Writer.LayoutDump" );
-}
-
-uno::Sequence< OUString > SAL_CALL LayoutDumpFilter_getSupportedServiceNames() throw()
-{
- uno::Sequence< OUString > aSeq( 1 );
- aSeq[0] = "com.sun.star.document.ExportFilter";
- return aSeq;
-}
-
namespace
{
int writeCallback( void* pContext, const char* sBuffer, int nLen )
@@ -156,7 +143,7 @@ namespace sw
OUString LayoutDumpFilter::getImplementationName( )
throw (uno::RuntimeException, std::exception)
{
- return LayoutDumpFilter_getImplementationName();
+ return OUString( "com.sun.star.comp.Writer.LayoutDump" );
}
sal_Bool LayoutDumpFilter::supportsService( const OUString& rServiceName )
@@ -168,7 +155,9 @@ namespace sw
uno::Sequence< OUString > LayoutDumpFilter::getSupportedServiceNames()
throw (uno::RuntimeException, std::exception)
{
- return LayoutDumpFilter_getSupportedServiceNames();
+ uno::Sequence< OUString > aSeq( 1 );
+ aSeq[0] = "com.sun.star.document.ExportFilter";
+ return aSeq;
}
} // Namespace sw
diff --git a/sw/source/uibase/inc/SwXFilterOptions.hxx b/sw/source/uibase/inc/SwXFilterOptions.hxx
index 32a1bc59c53f..12cb723f5007 100644
--- a/sw/source/uibase/inc/SwXFilterOptions.hxx
+++ b/sw/source/uibase/inc/SwXFilterOptions.hxx
@@ -51,9 +51,6 @@ public:
SwXFilterOptions();
virtual ~SwXFilterOptions();
- static OUString getImplementationName_Static();
- static ::com::sun::star::uno::Sequence< OUString> getSupportedServiceNames_Static();
-
// XPropertyAccess
virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >
SAL_CALL getPropertyValues() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
diff --git a/sw/source/uibase/inc/unomailmerge.hxx b/sw/source/uibase/inc/unomailmerge.hxx
index 8e3ac4c37650..6ede6aa3bd80 100644
--- a/sw/source/uibase/inc/unomailmerge.hxx
+++ b/sw/source/uibase/inc/unomailmerge.hxx
@@ -169,10 +169,6 @@ public:
virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
};
-extern com::sun::star::uno::Sequence< OUString > SAL_CALL SwXMailMerge_getSupportedServiceNames() throw();
-extern OUString SAL_CALL SwXMailMerge_getImplementationName() throw();
-extern com::sun::star::uno::Reference< com::sun::star::uno::XInterface > SAL_CALL SwXMailMerge_createInstance(const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > & rSMgr) throw( com::sun::star::uno::Exception );
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/uno/SwXFilterOptions.cxx b/sw/source/uibase/uno/SwXFilterOptions.cxx
index 96d46a4bf464..df68232cf0f0 100644
--- a/sw/source/uibase/uno/SwXFilterOptions.cxx
+++ b/sw/source/uibase/uno/SwXFilterOptions.cxx
@@ -39,7 +39,6 @@ using namespace ::com::sun::star::ui::dialogs;
using namespace ::com::sun::star::document;
using namespace ::com::sun::star::lang;
-#define SWFILTEROPTIONSOBJ_IMPLNAME "com.sun.star.comp.Writer.FilterOptionsDialog"
#define FILTER_OPTIONS_NAME "FilterOptions"
SwXFilterOptions::SwXFilterOptions() :
@@ -51,17 +50,6 @@ SwXFilterOptions::~SwXFilterOptions()
{
}
-OUString SwXFilterOptions::getImplementationName_Static()
-{
- return OUString(SWFILTEROPTIONSOBJ_IMPLNAME);
-}
-
-uno::Sequence< OUString> SwXFilterOptions::getSupportedServiceNames_Static()
-{
- OUString sService("com.sun.star.ui.dialogs.FilterOptionsDialog");
- return uno::Sequence< OUString> (&sService, 1);
-}
-
uno::Sequence< beans::PropertyValue > SwXFilterOptions::getPropertyValues() throw (uno::RuntimeException, std::exception)
{
uno::Sequence<beans::PropertyValue> aRet(1);
@@ -151,7 +139,7 @@ void SwXFilterOptions::setSourceDocument( const uno::Reference<XComponent >& x
OUString SwXFilterOptions::getImplementationName() throw(uno::RuntimeException, std::exception)
{
- return OUString(SWFILTEROPTIONSOBJ_IMPLNAME);
+ return OUString("com.sun.star.comp.Writer.FilterOptionsDialog");
}
sal_Bool SwXFilterOptions::supportsService( const OUString& rServiceName )
@@ -163,7 +151,8 @@ sal_Bool SwXFilterOptions::supportsService( const OUString& rServiceName )
uno::Sequence< OUString > SwXFilterOptions::getSupportedServiceNames()
throw(uno::RuntimeException, std::exception)
{
- return SwXFilterOptions::getSupportedServiceNames_Static();
+ OUString sService("com.sun.star.ui.dialogs.FilterOptionsDialog");
+ return uno::Sequence< OUString> (&sService, 1);
}
extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL
diff --git a/sw/source/uibase/uno/unoatxt.cxx b/sw/source/uibase/uno/unoatxt.cxx
index d3641ffe8a2a..497b95df2df3 100644
--- a/sw/source/uibase/uno/unoatxt.cxx
+++ b/sw/source/uibase/uno/unoatxt.cxx
@@ -59,27 +59,6 @@
using namespace ::com::sun::star;
-uno::Reference< uno::XInterface > SAL_CALL SwXAutoTextContainer_createInstance(
- const uno::Reference< lang::XMultiServiceFactory > & ) throw( uno::Exception )
-{
- //the module may not be loaded
- SolarMutexGuard aGuard;
- SwGlobals::ensure();
- return (cppu::OWeakObject*)new SwXAutoTextContainer();
-}
-
-uno::Sequence< OUString > SAL_CALL SwXAutoTextContainer_getSupportedServiceNames() throw()
-{
- OUString sService("com.sun.star.text.AutoTextContainer");
- const uno::Sequence< OUString > aSeq( &sService, 1 );
- return aSeq;
-}
-
-OUString SAL_CALL SwXAutoTextContainer_getImplementationName() throw()
-{
- return OUString("SwXAutoTextContainer" );
-}
-
SwXAutoTextContainer::SwXAutoTextContainer()
{
pGlossaries = ::GetGlossaries();
@@ -220,7 +199,7 @@ void SwXAutoTextContainer::removeByName(const OUString& aGroupName)
OUString SwXAutoTextContainer::getImplementationName(void) throw( uno::RuntimeException, std::exception )
{
- return SwXAutoTextContainer_getImplementationName();
+ return OUString("SwXAutoTextContainer" );
}
sal_Bool SwXAutoTextContainer::supportsService(const OUString& rServiceName) throw( uno::RuntimeException, std::exception )
@@ -230,7 +209,9 @@ sal_Bool SwXAutoTextContainer::supportsService(const OUString& rServiceName) thr
uno::Sequence< OUString > SwXAutoTextContainer::getSupportedServiceNames(void) throw( uno::RuntimeException, std::exception )
{
- return SwXAutoTextContainer_getSupportedServiceNames();
+ OUString sService("com.sun.star.text.AutoTextContainer");
+ const uno::Sequence< OUString > aSeq( &sService, 1 );
+ return aSeq;
}
namespace
diff --git a/sw/source/uibase/uno/unomailmerge.cxx b/sw/source/uibase/uno/unomailmerge.cxx
index 8564df6d9735..394ce27e416a 100644
--- a/sw/source/uibase/uno/unomailmerge.cxx
+++ b/sw/source/uibase/uno/unomailmerge.cxx
@@ -1190,8 +1190,7 @@ void SAL_CALL SwXMailMerge::removeMailMergeEventListener(
OUString SAL_CALL SwXMailMerge::getImplementationName()
throw(RuntimeException, std::exception)
{
- SolarMutexGuard aGuard;
- return SwXMailMerge_getImplementationName();
+ return OUString( "SwXMailMerge" );
}
sal_Bool SAL_CALL SwXMailMerge::supportsService( const OUString& rServiceName )
@@ -1203,13 +1202,6 @@ sal_Bool SAL_CALL SwXMailMerge::supportsService( const OUString& rServiceName )
uno::Sequence< OUString > SAL_CALL SwXMailMerge::getSupportedServiceNames()
throw(RuntimeException, std::exception)
{
- SolarMutexGuard aGuard;
- return SwXMailMerge_getSupportedServiceNames();
-}
-
-uno::Sequence< OUString > SAL_CALL SwXMailMerge_getSupportedServiceNames()
- throw()
-{
uno::Sequence< OUString > aNames(2);
OUString *pName = aNames.getArray();
pName[0] = "com.sun.star.text.MailMerge";
@@ -1217,10 +1209,4 @@ uno::Sequence< OUString > SAL_CALL SwXMailMerge_getSupportedServiceNames()
return aNames;
}
-OUString SAL_CALL SwXMailMerge_getImplementationName()
- throw()
-{
- return OUString( "SwXMailMerge" );
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/uno/unomod.cxx b/sw/source/uibase/uno/unomod.cxx
index 4e9009d31f00..477a9e49842e 100644
--- a/sw/source/uibase/uno/unomod.cxx
+++ b/sw/source/uibase/uno/unomod.cxx
@@ -19,7 +19,6 @@
#include <swtypes.hxx>
#include <osl/diagnose.h>
-#include <unofreg.hxx>
#include <unomod.hxx>
#include <unomid.h>
#include <unoprnms.hxx>
@@ -192,24 +191,6 @@ static ChainablePropertySetInfo * lcl_createPrintSettingsInfo()
return new ChainablePropertySetInfo ( aPrintSettingsMap_Impl );
}
-Reference< uno::XInterface > SAL_CALL SwXModule_createInstance(
- const Reference< XMultiServiceFactory > & /*rSMgr*/) throw( Exception )
-{
- return (cppu::OWeakObject*)new SwXModule();
-}
-
-Sequence< OUString > SAL_CALL SwXModule_getSupportedServiceNames() throw()
-{
- OUString sService( "com.sun.star.text.GlobalSettings");
- const Sequence< OUString > aSeq( &sService, 1 );
- return aSeq;
-}
-
-OUString SAL_CALL SwXModule_getImplementationName() throw()
-{
- return OUString( "SwXModule" );
-}
-
SwXModule::SwXModule() :
pxViewSettings(0),
pxPrintSettings(0)
@@ -248,7 +229,7 @@ Reference< XPropertySet > SwXModule::getPrintSettings(void) throw( uno::Runtime
OUString SwXModule::getImplementationName(void) throw( RuntimeException, std::exception )
{
- return SwXModule_getImplementationName();
+ return OUString( "SwXModule" );
}
sal_Bool SwXModule::supportsService(const OUString& rServiceName) throw( RuntimeException, std::exception )
@@ -258,7 +239,9 @@ sal_Bool SwXModule::supportsService(const OUString& rServiceName) throw( Runtime
Sequence< OUString > SwXModule::getSupportedServiceNames(void) throw( RuntimeException, std::exception )
{
- return SwXModule_getSupportedServiceNames();
+ OUString sService( "com.sun.star.text.GlobalSettings");
+ const Sequence< OUString > aSeq( &sService, 1 );
+ return aSeq;
}
SwXPrintSettings::SwXPrintSettings(SwXPrintSettingsType eType, SwDoc* pDoc)
diff --git a/sw/util/sw.component b/sw/util/sw.component
index e89271febeee..010f41bffb4e 100644
--- a/sw/util/sw.component
+++ b/sw/util/sw.component
@@ -18,10 +18,12 @@
-->
<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
prefix="sw" xmlns="http://openoffice.org/2010/uno-components">
- <implementation name="SwXAutoTextContainer" constructor="SwXAutoTextContainer_get_implementation">
+ <implementation name="SwXAutoTextContainer"
+ constructor="SwXAutoTextContainer_get_implementation">
<service name="com.sun.star.text.AutoTextContainer"/>
</implementation>
- <implementation name="SwXMailMerge" constructor="SwXMailMerge_get_implementation">
+ <implementation name="SwXMailMerge"
+ constructor="SwXMailMerge_get_implementation">
<service name="com.sun.star.sdb.DataAccessDescriptor"/>
<service name="com.sun.star.text.MailMerge"/>
</implementation>
generated by cgit (git 2.34.1) at 2025-01-11 03:52:40 +0000