diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-03-11 15:56:06 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-03-11 16:31:03 +0100 |
| commit | 9c89ce00d79c107bd704fc83b5061bd8a9f54913 (patch) | |
| tree | 5a85df2672f8ac4f81d4c74b02b3daad386ea407 /canvas | |
| parent | ccd627d5105fc5157d4c65ab8abb903df01e5485 (diff) | |
Clean up previous commit
Change-Id: Icd4703c1541fa82bbe76f44369434a12cb397a19
Diffstat (limited to 'canvas')
| -rw-r--r-- | canvas/source/factory/canvasfactory.component | 2 | ||||
| -rw-r--r-- | canvas/source/factory/cf_service.cxx | 16 |
2 files changed, 4 insertions, 14 deletions
diff --git a/canvas/source/factory/canvasfactory.component b/canvas/source/factory/canvasfactory.component index 91a0fa7d7625..3f9cabf718b9 100644 --- a/canvas/source/factory/canvasfactory.component +++ b/canvas/source/factory/canvasfactory.component @@ -18,7 +18,7 @@ --> <component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@" - prefix="canvasfactory" xmlns="http://openoffice.org/2010/uno-components"> + xmlns="http://openoffice.org/2010/uno-components"> <implementation name="com.sun.star.comp.rendering.CanvasFactory" constructor="com_sun_star_comp_rendering_CanvasFactory_get_implementation"> <service name="com.sun.star.rendering.CanvasFactory"/> diff --git a/canvas/source/factory/cf_service.cxx b/canvas/source/factory/cf_service.cxx index 2dd9754e9d97..3f3c24ef8cd0 100644 --- a/canvas/source/factory/cf_service.cxx +++ b/canvas/source/factory/cf_service.cxx @@ -49,17 +49,6 @@ using namespace ::com::sun::star::uno; namespace { -OUString SAL_CALL getImplName() -{ - return OUString("com.sun.star.comp.rendering.CanvasFactory"); -} - -Sequence<OUString> SAL_CALL getSuppServices() -{ - OUString name("com.sun.star.rendering.CanvasFactory"); - return Sequence<OUString>(&name, 1); -} - class CanvasFactory : public ::cppu::WeakImplHelper3< lang::XServiceInfo, lang::XMultiComponentFactory, @@ -229,7 +218,7 @@ CanvasFactory::~CanvasFactory() // XServiceInfo OUString CanvasFactory::getImplementationName() throw (RuntimeException, std::exception) { - return getImplName(); + return OUString("com.sun.star.comp.rendering.CanvasFactory"); } sal_Bool CanvasFactory::supportsService( OUString const & serviceName ) @@ -241,7 +230,8 @@ sal_Bool CanvasFactory::supportsService( OUString const & serviceName ) Sequence<OUString> CanvasFactory::getSupportedServiceNames() throw (RuntimeException, std::exception) { - return getSuppServices(); + OUString name("com.sun.star.rendering.CanvasFactory"); + return Sequence<OUString>(&name, 1); } // XMultiComponentFactory |