mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Clean up previous commit

Browse Source 
Change-Id: Icd4703c1541fa82bbe76f44369434a12cb397a19
This commit is contained in:
Stephan Bergmann
2015-03-11 15:56:06 +01:00
parent ccd627d510
commit 9c89ce00d7
2 changed files with 4 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
canvas/source/factory/canvasfactory.component
View File

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

16
canvas/source/factory/cf_service.cxx
View File

@@ -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