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/zipfileaccess.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/zipfileaccess.hxx')
| -rw-r--r-- | package/inc/zipfileaccess.hxx | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/package/inc/zipfileaccess.hxx b/package/inc/zipfileaccess.hxx index b4c32af3e182..112e882c42de 100644 --- a/package/inc/zipfileaccess.hxx +++ b/package/inc/zipfileaccess.hxx @@ -29,10 +29,9 @@ #include <com/sun/star/container/XNameAccess.hpp> #include <comphelper/interfacecontainer2.hxx> +#include <comphelper/refcountedmutex.hxx> #include <cppuhelper/implbase.hxx> -#include <mutexholder.hxx> - #include <ZipFile.hxx> #include <HashMaps.hxx> @@ -44,7 +43,7 @@ class OZipFileAccess : public ::cppu::WeakImplHelper< css::lang::XComponent, css::lang::XServiceInfo > { - rtl::Reference<SotMutexHolder> m_aMutexHolder; + rtl::Reference<comphelper::RefCountedMutex> m_aMutexHolder; css::uno::Reference< css::uno::XComponentContext > m_xContext; css::uno::Reference< css::io::XInputStream > m_xContentStream; std::unique_ptr<ZipFile> m_pZipFile; |