diff options
Diffstat (limited to 'package/source')
-rw-r--r-- | package/source/xstor/switchpersistencestream.cxx | 4 | ||||
-rw-r--r-- | package/source/xstor/switchpersistencestream.hxx | 4 | ||||
-rw-r--r-- | package/source/xstor/xstorage.cxx | 6 |
3 files changed, 3 insertions, 11 deletions
diff --git a/package/source/xstor/switchpersistencestream.cxx b/package/source/xstor/switchpersistencestream.cxx index f27dce18edc5..ff6118726628 100644 --- a/package/source/xstor/switchpersistencestream.cxx +++ b/package/source/xstor/switchpersistencestream.cxx @@ -63,17 +63,13 @@ struct SPStreamData_Impl }; SwitchablePersistenceStream::SwitchablePersistenceStream( - uno::Reference< uno::XComponentContext > xContext, const uno::Reference< io::XStream >& xStream ) -: m_xContext(std::move( xContext )) { SwitchPersistenceTo( xStream ); } SwitchablePersistenceStream::SwitchablePersistenceStream( - uno::Reference< uno::XComponentContext > xContext, const uno::Reference< io::XInputStream >& xInputStream ) -: m_xContext(std::move( xContext )) { SwitchPersistenceTo( xInputStream ); } diff --git a/package/source/xstor/switchpersistencestream.hxx b/package/source/xstor/switchpersistencestream.hxx index ad0293be8110..64d4e37fd025 100644 --- a/package/source/xstor/switchpersistencestream.hxx +++ b/package/source/xstor/switchpersistencestream.hxx @@ -49,8 +49,6 @@ class SwitchablePersistenceStream { std::mutex m_aMutex; - const css::uno::Reference< css::uno::XComponentContext > m_xContext; - std::unique_ptr<SPStreamData_Impl> m_pStreamData; void CloseAll_Impl(); @@ -58,11 +56,9 @@ class SwitchablePersistenceStream public: SwitchablePersistenceStream( - css::uno::Reference< css::uno::XComponentContext > xContext, const css::uno::Reference< css::io::XStream >& xStream ); SwitchablePersistenceStream( - css::uno::Reference< css::uno::XComponentContext > xContext, const css::uno::Reference< css::io::XInputStream >& xInStream ); virtual ~SwitchablePersistenceStream() override; diff --git a/package/source/xstor/xstorage.cxx b/package/source/xstor/xstorage.cxx index 5ac7f0618b7d..31aa1924048b 100644 --- a/package/source/xstor/xstorage.cxx +++ b/package/source/xstor/xstorage.cxx @@ -165,7 +165,7 @@ OStorage_Impl::OStorage_Impl( uno::Reference< io::XInputStream > const & xInpu SAL_WARN_IF( !xInputStream.is(), "package.xstor", "No input stream is provided!" ); assert(xContext.is()); - m_pSwitchStream = new SwitchablePersistenceStream(xContext, xInputStream); + m_pSwitchStream = new SwitchablePersistenceStream(xInputStream); m_xInputStream = m_pSwitchStream->getInputStream(); if ( m_nStorageMode & embed::ElementModes::WRITE ) @@ -207,12 +207,12 @@ OStorage_Impl::OStorage_Impl( uno::Reference< io::XStream > const & xStream, if ( m_nStorageMode & embed::ElementModes::WRITE ) { - m_pSwitchStream = new SwitchablePersistenceStream(xContext, xStream); + m_pSwitchStream = new SwitchablePersistenceStream(xStream); m_xStream = static_cast< io::XStream* >( m_pSwitchStream.get() ); } else { - m_pSwitchStream = new SwitchablePersistenceStream(xContext, xStream->getInputStream()); + m_pSwitchStream = new SwitchablePersistenceStream(xStream->getInputStream()); m_xInputStream = m_pSwitchStream->getInputStream(); } } |