diff options
Diffstat (limited to 'package/source/zippackage/ZipPackage.cxx')
-rw-r--r-- | package/source/zippackage/ZipPackage.cxx | 38 |
1 files changed, 9 insertions, 29 deletions
diff --git a/package/source/zippackage/ZipPackage.cxx b/package/source/zippackage/ZipPackage.cxx index 02aed7a66a2e..4e113e91d3bb 100644 --- a/package/source/zippackage/ZipPackage.cxx +++ b/package/source/zippackage/ZipPackage.cxx @@ -1661,34 +1661,15 @@ Sequence< ElementChange > SAL_CALL ZipPackage::getPendingChanges() return uno::Sequence < ElementChange > (); } -/** - * Function to create a new component instance; is needed by factory helper implementation. - * @param xMgr service manager to if the components needs other component instances - */ -static uno::Reference < XInterface > ZipPackage_createInstance( - const uno::Reference< XMultiServiceFactory > & xMgr ) -{ - return uno::Reference< XInterface >( *new ZipPackage( comphelper::getComponentContext(xMgr) ) ); -} - -OUString ZipPackage::static_getImplementationName() -{ - return "com.sun.star.packages.comp.ZipPackage"; -} - -Sequence< OUString > ZipPackage::static_getSupportedServiceNames() -{ - return { "com.sun.star.packages.Package" }; -} OUString ZipPackage::getImplementationName() { - return static_getImplementationName(); + return "com.sun.star.packages.comp.ZipPackage"; } Sequence< OUString > ZipPackage::getSupportedServiceNames() { - return static_getSupportedServiceNames(); + return { "com.sun.star.packages.Package" }; } sal_Bool SAL_CALL ZipPackage::supportsService( OUString const & rServiceName ) @@ -1696,14 +1677,6 @@ sal_Bool SAL_CALL ZipPackage::supportsService( OUString const & rServiceName ) return cppu::supportsService(this, rServiceName); } -uno::Reference < XSingleServiceFactory > ZipPackage::createServiceFactory( uno::Reference < XMultiServiceFactory > const & rServiceFactory ) -{ - return cppu::createSingleFactory ( rServiceFactory, - static_getImplementationName(), - ZipPackage_createInstance, - static_getSupportedServiceNames() ); -} - Sequence< sal_Int8 > ZipPackage::getUnoTunnelId() { static ::cppu::OImplementationId implId; @@ -1872,4 +1845,11 @@ void SAL_CALL ZipPackage::removeVetoableChangeListener( const OUString& /*Proper { } +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* +package_ZipPackage_get_implementation( + css::uno::XComponentContext* context , css::uno::Sequence<css::uno::Any> const&) +{ + return cppu::acquire(new ZipPackage(context)); +} + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |