diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-06-19 17:06:34 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-06-20 14:13:35 +0200 |
| commit | 809e2d33b45b54b4438a4c55aed93efd73d2aa49 (patch) | |
| tree | 27f4995f949f25e7f26b3ac94028cecf0624ecb8 /package/inc/ZipPackage.hxx | |
| parent | f6add3f04bd5acc162ada79597a87398236f1320 (diff) | |
create comphelper::RefCountedMutex
and merge the two existing implementations of the idea - SotMutexHolder
from package and RefCountedMutex from connectivity
Change-Id: I87f09f359ac798cf934381a2c75225dab71dd43e
Reviewed-on: https://gerrit.libreoffice.org/38972
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'package/inc/ZipPackage.hxx')
| -rw-r--r-- | package/inc/ZipPackage.hxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/package/inc/ZipPackage.hxx b/package/inc/ZipPackage.hxx index 42f04801b643..cd5a8caba757 100644 --- a/package/inc/ZipPackage.hxx +++ b/package/inc/ZipPackage.hxx @@ -31,10 +31,10 @@ #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/xml/crypto/CipherID.hpp> #include <com/sun/star/lang/IllegalArgumentException.hpp> +#include <comphelper/refcountedmutex.hxx> #include <HashMaps.hxx> #include <osl/file.h> -#include <mutexholder.hxx> #include <vector> #include <memory> @@ -69,7 +69,7 @@ class ZipPackage : public cppu::WeakImplHelper > { protected: - rtl::Reference<SotMutexHolder> m_aMutexHolder; + rtl::Reference<comphelper::RefCountedMutex> m_aMutexHolder; css::uno::Sequence< css::beans::NamedValue > m_aStorageEncryptionKeys; css::uno::Sequence< sal_Int8 > m_aEncryptionKey; @@ -126,7 +126,7 @@ public: sal_Int32 GetChecksumAlgID() const { return m_nChecksumDigestID; } sal_Int32 GetDefaultDerivedKeySize() const { return m_nCommonEncryptionID == css::xml::crypto::CipherID::AES_CBC_W3C_PADDING ? 32 : 16; } - rtl::Reference<SotMutexHolder>& GetSharedMutexRef() { return m_aMutexHolder; } + rtl::Reference<comphelper::RefCountedMutex>& GetSharedMutexRef() { return m_aMutexHolder; } void ConnectTo( const css::uno::Reference< css::io::XInputStream >& xInStream ); const css::uno::Sequence< sal_Int8 > GetEncryptionKey(); |