Clean up previous commit

Change-Id: Icd4703c1541fa82bbe76f44369434a12cb397a19

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"/>

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