diff options
Diffstat (limited to 'package')
-rw-r--r-- | package/inc/zipfileaccess.hxx | 6 | ||||
-rw-r--r-- | package/source/xstor/xfactory.cxx | 6 | ||||
-rw-r--r-- | package/source/xstor/xfactory.hxx | 6 | ||||
-rw-r--r-- | package/source/zippackage/zipfileaccess.cxx | 6 |
4 files changed, 12 insertions, 12 deletions
diff --git a/package/inc/zipfileaccess.hxx b/package/inc/zipfileaccess.hxx index 34e58b95a619..380e3428dd8b 100644 --- a/package/inc/zipfileaccess.hxx +++ b/package/inc/zipfileaccess.hxx @@ -61,11 +61,11 @@ public: static bool StringGoodForPattern_Impl( const OUString& aString, const css::uno::Sequence< OUString >& aPattern ); - static css::uno::Sequence< OUString > SAL_CALL impl_staticGetSupportedServiceNames(); + static css::uno::Sequence< OUString > impl_staticGetSupportedServiceNames(); - static OUString SAL_CALL impl_staticGetImplementationName(); + static OUString impl_staticGetImplementationName(); - static css::uno::Reference< css::uno::XInterface > SAL_CALL impl_staticCreateSelfInstance( + static css::uno::Reference< css::uno::XInterface > impl_staticCreateSelfInstance( const css::uno::Reference< css::lang::XMultiServiceFactory >& rxMSF ); // XInitialization diff --git a/package/source/xstor/xfactory.cxx b/package/source/xstor/xfactory.cxx index bc956e0e362b..58cff685cd06 100644 --- a/package/source/xstor/xfactory.cxx +++ b/package/source/xstor/xfactory.cxx @@ -65,7 +65,7 @@ bool CheckPackageSignature_Impl( const uno::Reference< io::XInputStream >& xInpu return true; // allow to create a storage based on empty stream } -uno::Sequence< OUString > SAL_CALL OStorageFactory::impl_staticGetSupportedServiceNames() +uno::Sequence< OUString > OStorageFactory::impl_staticGetSupportedServiceNames() { uno::Sequence< OUString > aRet(2); aRet[0] = "com.sun.star.embed.StorageFactory"; @@ -73,12 +73,12 @@ uno::Sequence< OUString > SAL_CALL OStorageFactory::impl_staticGetSupportedServi return aRet; } -OUString SAL_CALL OStorageFactory::impl_staticGetImplementationName() +OUString OStorageFactory::impl_staticGetImplementationName() { return OUString("com.sun.star.comp.embed.StorageFactory"); } -uno::Reference< uno::XInterface > SAL_CALL OStorageFactory::impl_staticCreateSelfInstance( +uno::Reference< uno::XInterface > OStorageFactory::impl_staticCreateSelfInstance( const uno::Reference< lang::XMultiServiceFactory >& xServiceManager ) { return uno::Reference< uno::XInterface >( *new OStorageFactory( comphelper::getComponentContext(xServiceManager) ) ); diff --git a/package/source/xstor/xfactory.hxx b/package/source/xstor/xfactory.hxx index a1e60271287e..a445f6a4c97a 100644 --- a/package/source/xstor/xfactory.hxx +++ b/package/source/xstor/xfactory.hxx @@ -38,12 +38,12 @@ public: OSL_ENSURE( xContext.is(), "No service manager is provided!" ); } - static css::uno::Sequence< OUString > SAL_CALL + static css::uno::Sequence< OUString > impl_staticGetSupportedServiceNames(); - static OUString SAL_CALL impl_staticGetImplementationName(); + static OUString impl_staticGetImplementationName(); - static css::uno::Reference< css::uno::XInterface > SAL_CALL + static css::uno::Reference< css::uno::XInterface > impl_staticCreateSelfInstance( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager ); diff --git a/package/source/zippackage/zipfileaccess.cxx b/package/source/zippackage/zipfileaccess.cxx index 8fe79b85e051..9bef00cafca6 100644 --- a/package/source/zippackage/zipfileaccess.cxx +++ b/package/source/zippackage/zipfileaccess.cxx @@ -451,7 +451,7 @@ void SAL_CALL OZipFileAccess::removeEventListener( const uno::Reference< lang::X m_pListenersContainer->removeInterface( xListener ); } -uno::Sequence< OUString > SAL_CALL OZipFileAccess::impl_staticGetSupportedServiceNames() +uno::Sequence< OUString > OZipFileAccess::impl_staticGetSupportedServiceNames() { uno::Sequence< OUString > aRet(2); aRet[0] = "com.sun.star.packages.zip.ZipFileAccess"; @@ -459,12 +459,12 @@ uno::Sequence< OUString > SAL_CALL OZipFileAccess::impl_staticGetSupportedServic return aRet; } -OUString SAL_CALL OZipFileAccess::impl_staticGetImplementationName() +OUString OZipFileAccess::impl_staticGetImplementationName() { return OUString("com.sun.star.comp.package.zip.ZipFileAccess"); } -uno::Reference< uno::XInterface > SAL_CALL OZipFileAccess::impl_staticCreateSelfInstance( +uno::Reference< uno::XInterface > OZipFileAccess::impl_staticCreateSelfInstance( const uno::Reference< lang::XMultiServiceFactory >& rxMSF ) { return uno::Reference< uno::XInterface >( *new OZipFileAccess( comphelper::getComponentContext(rxMSF) ) ); |