diff options
| author | Noel Grandin <noel@peralex.com> | 2012-10-31 14:58:31 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2012-11-05 16:43:14 +0100 |
| commit | 1dedb15b17a8e8bf04f248809ef48db663034254 (patch) | |
| tree | e8fc086787fb7506046b8a7756a24b76e2f4bde3 /package/source/zippackage/zipfileaccess.cxx | |
| parent | 4c49af256a456af48f0b29262c0b23aa1f6a9cd5 (diff) | |
fdo#46808, Adapt xml::crypto::SEInitializer UNO service to new style
Also create an NSSInitializer service IDL and split it's interfaces
out from SEInitializer.
It looks like this was the intention all along, but someone
took a shortcut.
Change-Id: I53ac1cb5d38b78b6718fe22c9666eae1f194a3b7
Diffstat (limited to 'package/source/zippackage/zipfileaccess.cxx')
| -rw-r--r-- | package/source/zippackage/zipfileaccess.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/package/source/zippackage/zipfileaccess.cxx b/package/source/zippackage/zipfileaccess.cxx index 0ee088f6ffda..09a6e89d7fca 100644 --- a/package/source/zippackage/zipfileaccess.cxx +++ b/package/source/zippackage/zipfileaccess.cxx @@ -38,14 +38,14 @@ using namespace ::com::sun::star; // ---------------------------------------------------------------- -OZipFileAccess::OZipFileAccess( const uno::Reference< lang::XMultiServiceFactory >& xFactory ) +OZipFileAccess::OZipFileAccess( const uno::Reference< uno::XComponentContext >& rxContext ) : m_aMutexHolder( new SotMutexHolder ) -, m_xFactory( xFactory ) +, m_xContext( rxContext ) , m_pZipFile( NULL ) , m_pListenersContainer( NULL ) , m_bDisposed( sal_False ) { - if ( !xFactory.is() ) + if ( !rxContext.is() ) throw uno::RuntimeException(OSL_LOG_PREFIX, uno::Reference< uno::XInterface >() ); } @@ -188,7 +188,7 @@ void SAL_CALL OZipFileAccess::initialize( const uno::Sequence< uno::Any >& aArgu ::ucbhelper::Content aContent( aParamURL, uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >(), - comphelper::getComponentContext( m_xFactory ) ); + m_xContext ); uno::Reference < io::XActiveDataSink > xSink = new ZipPackageSink; if ( aContent.openStream ( xSink ) ) { @@ -221,7 +221,7 @@ void SAL_CALL OZipFileAccess::initialize( const uno::Sequence< uno::Any >& aArgu // TODO: in case xSeekable is implemented on separated XStream implementation a wrapper is required m_pZipFile = new ZipFile( m_xContentStream, - m_xFactory, + m_xContext, sal_True ); } @@ -450,9 +450,9 @@ OUString SAL_CALL OZipFileAccess::impl_staticGetImplementationName() //------------------------------------------------------------------------- uno::Reference< uno::XInterface > SAL_CALL OZipFileAccess::impl_staticCreateSelfInstance( - const uno::Reference< lang::XMultiServiceFactory >& xServiceManager ) + const uno::Reference< lang::XMultiServiceFactory >& rxMSF ) { - return uno::Reference< uno::XInterface >( *new OZipFileAccess( xServiceManager ) ); + return uno::Reference< uno::XInterface >( *new OZipFileAccess( comphelper::getComponentContext(rxMSF) ) ); } //------------------------------------------------------------------------- |