diff options
| -rw-r--r-- | dbaccess/util/dba.component | 1 | ||||
| -rw-r--r-- | extensions/source/logging/log.component | 1 | ||||
| -rw-r--r-- | extensions/source/resource/res.component | 1 | ||||
| -rw-r--r-- | extensions/source/resource/resourceservices.cxx | 1 | ||||
| -rw-r--r-- | framework/source/services/ContextChangeEventMultiplexer.cxx | 11 | ||||
| -rw-r--r-- | framework/util/fwk.component | 1 |
6 files changed, 2 insertions, 14 deletions
diff --git a/dbaccess/util/dba.component b/dbaccess/util/dba.component index 89b92a297cfb..fd688552d10e 100644 --- a/dbaccess/util/dba.component +++ b/dbaccess/util/dba.component @@ -23,7 +23,6 @@ <service name="com.sun.star.chart2.data.DatabaseDataProvider"/> </implementation> <implementation name="com.sun.star.comp.dba.DataAccessDescriptorFactory"> - <service name="com.sun.star.sdb.DataAccessDescriptorFactory"/> <singleton name="com.sun.star.sdb.DataAccessDescriptorFactory"/> </implementation> <implementation name="com.sun.star.comp.dba.OCommandDefinition"> diff --git a/extensions/source/logging/log.component b/extensions/source/logging/log.component index cf91ac5195ca..8352c9156a8f 100644 --- a/extensions/source/logging/log.component +++ b/extensions/source/logging/log.component @@ -29,7 +29,6 @@ <service name="com.sun.star.logging.FileHandler"/> </implementation> <implementation name="com.sun.star.comp.extensions.LoggerPool"> - <service name="com.sun.star.logging.LoggerPool"/> <singleton name="com.sun.star.logging.LoggerPool"/> </implementation> <implementation name="com.sun.star.comp.extensions.PlainTextFormatter"> diff --git a/extensions/source/resource/res.component b/extensions/source/resource/res.component index 561feedab338..4a573064fc09 100644 --- a/extensions/source/resource/res.component +++ b/extensions/source/resource/res.component @@ -20,7 +20,6 @@ <component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@" prefix="res" xmlns="http://openoffice.org/2010/uno-components"> <implementation name="com.sun.star.comp.resource.OpenOfficeResourceLoader"> - <service name="com.sun.star.resource.OfficeResourceLoader"/> <singleton name="com.sun.star.resource.OfficeResourceLoader"/> </implementation> <implementation name="org.libreoffice.extensions.resource.ResourceIndexAccess"> diff --git a/extensions/source/resource/resourceservices.cxx b/extensions/source/resource/resourceservices.cxx index f45615b6c742..f8e1f5e7a61c 100644 --- a/extensions/source/resource/resourceservices.cxx +++ b/extensions/source/resource/resourceservices.cxx @@ -23,6 +23,7 @@ const sdecl::ServiceDecl ResourceIndexAccessDecl( "org.libreoffice.extensions.resource.ResourceIndexAccess", "org.libreoffice.resource.ResourceIndexAccess"); +//TOOD: this is a singleton, not a service: const sdecl::ServiceDecl OpenOfficeResourceLoaderDecl( OpenOfficeResourceLoaderServiceImpl, "com.sun.star.comp.resource.OpenOfficeResourceLoader", diff --git a/framework/source/services/ContextChangeEventMultiplexer.cxx b/framework/source/services/ContextChangeEventMultiplexer.cxx index db8f8f17f17a..37f60006a9cb 100644 --- a/framework/source/services/ContextChangeEventMultiplexer.cxx +++ b/framework/source/services/ContextChangeEventMultiplexer.cxx @@ -27,9 +27,6 @@ using namespace cssu; namespace framework { #define IMPLEMENTATION_NAME "org.apache.openoffice.comp.framework.ContextChangeEventMultiplexer" -#define SERVICE_NAME "com.sun.star.ui.ContextChangeEventMultiplexer" -#define SINGLETON_NAME "org.apache.openoffice.comp.framework.ContextChangeEventMultiplexerSigleton" - ContextChangeEventMultiplexer::ContextChangeEventMultiplexer ( const cssu::Reference<cssu::XComponentContext>& rxContext) @@ -347,15 +344,9 @@ OUString SAL_CALL ContextChangeEventMultiplexer::impl_getStaticImplementationNam cssu::Sequence<OUString> SAL_CALL ContextChangeEventMultiplexer::static_GetSupportedServiceNames (void) { - cssu::Sequence<OUString> aServiceNames (2); - aServiceNames[0] = SERVICE_NAME; - aServiceNames[1] = SINGLETON_NAME; - return aServiceNames; + return css::uno::Sequence<OUString>(); } - - - cssu::Reference<cssu::XInterface> ContextChangeEventMultiplexer::impl_createFactory ( const cssu::Reference<cssl::XMultiServiceFactory>& rxServiceManager) { diff --git a/framework/util/fwk.component b/framework/util/fwk.component index 98ae10bcd12f..bbdce6214cb4 100644 --- a/framework/util/fwk.component +++ b/framework/util/fwk.component @@ -38,7 +38,6 @@ <service name="com.sun.star.ui.DocumentAcceleratorConfiguration"/> </implementation> <implementation name="org.apache.openoffice.comp.framework.ContextChangeEventMultiplexer"> - <service name="com.sun.star.ui.ContextChangeEventMultiplexer"/> <singleton name="com.sun.star.ui.ContextChangeEventMultiplexer"/> </implementation> <implementation name="com.sun.star.comp.framework.Frame"> |