summaryrefslogtreecommitdiff
path: root/package/source/zipapi
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-06-29 09:15:16 +0200
committerNoel Grandin <noel@peralex.com>2015-06-29 09:16:18 +0200
commit371200675c2fb2fef0ac8362ebd7bf4203835440 (patch)
treef694a17d0837d052be53ae104b3390b189bb846d /package/source/zipapi
parentefc66942f29c0127691d30a9d4f31b684443b672 (diff)
drop yet another reimplementation of rtl::Reference (SotMutexHolderRef)
Change-Id: I57f9dff931242405420bd45fae7ec5f13718707f
Diffstat (limited to 'package/source/zipapi')
-rw-r--r--package/source/zipapi/XUnbufferedStream.cxx4
-rw-r--r--package/source/zipapi/XUnbufferedStream.hxx4
-rw-r--r--package/source/zipapi/ZipFile.cxx10
3 files changed, 9 insertions, 9 deletions
diff --git a/package/source/zipapi/XUnbufferedStream.cxx b/package/source/zipapi/XUnbufferedStream.cxx
index 7ce12a285478..3af35f9e8246 100644
--- a/package/source/zipapi/XUnbufferedStream.cxx
+++ b/package/source/zipapi/XUnbufferedStream.cxx
@@ -41,7 +41,7 @@ using com::sun::star::packages::zip::ZipIOException;
XUnbufferedStream::XUnbufferedStream(
const uno::Reference< uno::XComponentContext >& xContext,
- SotMutexHolderRef aMutexHolder,
+ const rtl::Reference<SotMutexHolder>& aMutexHolder,
ZipEntry & rEntry,
Reference < XInputStream > xNewZipStream,
const ::rtl::Reference< EncryptionData >& rData,
@@ -49,7 +49,7 @@ XUnbufferedStream::XUnbufferedStream(
bool bIsEncrypted,
const OUString& aMediaType,
bool bRecoveryMode )
-: maMutexHolder( aMutexHolder.Is() ? aMutexHolder : SotMutexHolderRef( new SotMutexHolder ) )
+: maMutexHolder( aMutexHolder.is() ? aMutexHolder : rtl::Reference<SotMutexHolder>( new SotMutexHolder ) )
, mxZipStream ( xNewZipStream )
, mxZipSeek ( xNewZipStream, UNO_QUERY )
, maEntry ( rEntry )
diff --git a/package/source/zipapi/XUnbufferedStream.hxx b/package/source/zipapi/XUnbufferedStream.hxx
index e64728408bd4..922aa826f5e1 100644
--- a/package/source/zipapi/XUnbufferedStream.hxx
+++ b/package/source/zipapi/XUnbufferedStream.hxx
@@ -47,7 +47,7 @@ class XUnbufferedStream : public cppu::WeakImplHelper1
>
{
protected:
- SotMutexHolderRef maMutexHolder;
+ rtl::Reference<SotMutexHolder> maMutexHolder;
com::sun::star::uno::Reference < com::sun::star::io::XInputStream > mxZipStream;
com::sun::star::uno::Reference < com::sun::star::io::XSeekable > mxZipSeek;
@@ -66,7 +66,7 @@ protected:
public:
XUnbufferedStream(
const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext,
- SotMutexHolderRef aMutexHolder,
+ const rtl::Reference<SotMutexHolder>& aMutexHolder,
ZipEntry & rEntry,
com::sun::star::uno::Reference < com::sun::star::io::XInputStream > xNewZipStream,
const ::rtl::Reference< EncryptionData >& rData,
diff --git a/package/source/zipapi/ZipFile.cxx b/package/source/zipapi/ZipFile.cxx
index 71442c59dfb5..7d4b9987a82d 100644
--- a/package/source/zipapi/ZipFile.cxx
+++ b/package/source/zipapi/ZipFile.cxx
@@ -510,7 +510,7 @@ bool ZipFile::hasValidPassword ( ZipEntry & rEntry, const ::rtl::Reference< Encr
}
uno::Reference< XInputStream > ZipFile::createUnbufferedStream(
- SotMutexHolderRef aMutexHolder,
+ const rtl::Reference<SotMutexHolder>& aMutexHolder,
ZipEntry & rEntry,
const ::rtl::Reference< EncryptionData > &rData,
sal_Int8 nStreamMode,
@@ -530,7 +530,7 @@ ZipEnumeration * SAL_CALL ZipFile::entries( )
uno::Reference< XInputStream > SAL_CALL ZipFile::getInputStream( ZipEntry& rEntry,
const ::rtl::Reference< EncryptionData > &rData,
bool bIsEncrypted,
- SotMutexHolderRef aMutexHolder )
+ const rtl::Reference<SotMutexHolder>& aMutexHolder )
throw(IOException, ZipException, RuntimeException)
{
::osl::MutexGuard aGuard( m_aMutex );
@@ -558,7 +558,7 @@ uno::Reference< XInputStream > SAL_CALL ZipFile::getInputStream( ZipEntry& rEntr
uno::Reference< XInputStream > SAL_CALL ZipFile::getDataStream( ZipEntry& rEntry,
const ::rtl::Reference< EncryptionData > &rData,
bool bIsEncrypted,
- SotMutexHolderRef aMutexHolder )
+ const rtl::Reference<SotMutexHolder>& aMutexHolder )
throw ( packages::WrongPasswordException,
IOException,
ZipException,
@@ -598,7 +598,7 @@ uno::Reference< XInputStream > SAL_CALL ZipFile::getDataStream( ZipEntry& rEntry
uno::Reference< XInputStream > SAL_CALL ZipFile::getRawData( ZipEntry& rEntry,
const ::rtl::Reference< EncryptionData >& rData,
bool bIsEncrypted,
- SotMutexHolderRef aMutexHolder )
+ const rtl::Reference<SotMutexHolder>& aMutexHolder )
throw(IOException, ZipException, RuntimeException)
{
::osl::MutexGuard aGuard( m_aMutex );
@@ -613,7 +613,7 @@ uno::Reference< XInputStream > SAL_CALL ZipFile::getWrappedRawStream(
ZipEntry& rEntry,
const ::rtl::Reference< EncryptionData >& rData,
const OUString& aMediaType,
- SotMutexHolderRef aMutexHolder )
+ const rtl::Reference<SotMutexHolder>& aMutexHolder )
throw ( packages::NoEncryptionException,
IOException,
ZipException,