canvas/source/factory/canvasfactory.component | 5 +- canvas/source/factory/cf_service.cxx | 45 ++++---------------------- 2 files changed, 10 insertions(+), 40 deletions(-)
New commits: commit 9c89ce00d79c107bd704fc83b5061bd8a9f54913 Author: Stephan Bergmann <[email protected]> Date: Wed Mar 11 15:56:06 2015 +0100 Clean up previous commit Change-Id: Icd4703c1541fa82bbe76f44369434a12cb397a19 diff --git a/canvas/source/factory/canvasfactory.component b/canvas/source/factory/canvasfactory.component index 91a0fa7..3f9cabf 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 2dd9754..3f3c24e 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 commit ccd627d5105fc5157d4c65ab8abb903df01e5485 Author: Chris Sherlock <[email protected]> Date: Thu Mar 5 20:34:00 2015 +1100 canvas: use constructor syntax in canvas.component Change-Id: I983307f7eeb5702c51ca2398e69c9c560c6e2435 Signed-off-by: Stephan Bergmann <[email protected]> diff --git a/canvas/source/factory/canvasfactory.component b/canvas/source/factory/canvasfactory.component index 514f242..91a0fa7 100644 --- a/canvas/source/factory/canvasfactory.component +++ b/canvas/source/factory/canvasfactory.component @@ -19,7 +19,8 @@ <component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@" prefix="canvasfactory" xmlns="http://openoffice.org/2010/uno-components";> - <implementation name="com.sun.star.comp.rendering.CanvasFactory"> + <implementation name="com.sun.star.comp.rendering.CanvasFactory" + constructor="com_sun_star_comp_rendering_CanvasFactory_get_implementation"> <service name="com.sun.star.rendering.CanvasFactory"/> </implementation> </component> diff --git a/canvas/source/factory/cf_service.cxx b/canvas/source/factory/cf_service.cxx index 6d413fd..2dd9754 100644 --- a/canvas/source/factory/cf_service.cxx +++ b/canvas/source/factory/cf_service.cxx @@ -226,12 +226,6 @@ CanvasFactory::~CanvasFactory() } -Reference<XInterface> create( Reference<XComponentContext> const & xContext ) -{ - return static_cast< ::cppu::OWeakObject * >( - new CanvasFactory( xContext ) ); -} - // XServiceInfo OUString CanvasFactory::getImplementationName() throw (RuntimeException, std::exception) { @@ -503,30 +497,15 @@ Reference<XInterface> CanvasFactory::createInstanceWithArguments( name, args, m_xContext ); } -const ::cppu::ImplementationEntry s_entries [] = { - { - create, - getImplName, - getSuppServices, - ::cppu::createSingleComponentFactory, - 0, 0 - }, - { 0, 0, 0, 0, 0, 0 } -}; - } // anon namespace -extern "C" { -SAL_DLLPUBLIC_EXPORT void * SAL_CALL canvasfactory_component_getFactory( - sal_Char const * pImplName, - void * pServiceManager, - void * pRegistryKey ) +extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL +com_sun_star_comp_rendering_CanvasFactory_get_implementation(::com::sun::star::uno::XComponentContext* context, + ::com::sun::star::uno::Sequence<css::uno::Any> const &) { - return ::cppu::component_getFactoryHelper( - pImplName, pServiceManager, pRegistryKey, s_entries ); + return cppu::acquire(new CanvasFactory(context)); } -} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
