diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2021-12-17 18:43:18 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-12-18 18:18:32 +0100 |
| commit | 580b5227144c6d71b1dc2663fc741ed29f119767 (patch) | |
| tree | 9c6a503773409bd027d02f25f019bcaa5dfc55a8 /include/ucbhelper | |
| parent | 9547114247c09a90f283e42c4db947ae57e9529c (diff) | |
osl::Mutex->std::mutex in ResultSetImplHelper
Change-Id: I7567369120593579740e23668d3426a25377a105
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127068
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'include/ucbhelper')
| -rw-r--r-- | include/ucbhelper/resultsethelper.hxx | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/include/ucbhelper/resultsethelper.hxx b/include/ucbhelper/resultsethelper.hxx index 94ab9e1a51de..e929531aa586 100644 --- a/include/ucbhelper/resultsethelper.hxx +++ b/include/ucbhelper/resultsethelper.hxx @@ -21,10 +21,11 @@ #define INCLUDED_UCBHELPER_RESULTSETHELPER_HXX #include <memory> -#include <osl/mutex.hxx> +#include <mutex> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/ucb/XDynamicResultSet.hpp> #include <com/sun/star/ucb/OpenCommandArgument2.hpp> +#include <comphelper/interfacecontainer4.hxx> #include <cppuhelper/implbase.hxx> #include <ucbhelper/ucbhelperdllapi.h> @@ -54,12 +55,12 @@ class UCBHELPER_DLLPUBLIC ResultSetImplHelper : css::lang::XServiceInfo, css::ucb::XDynamicResultSet> { - std::unique_ptr<cppu::OInterfaceContainerHelper> m_pDisposeEventListeners; + std::unique_ptr<comphelper::OInterfaceContainerHelper4<css::lang::XEventListener>> m_pDisposeEventListeners; bool m_bStatic; bool m_bInitDone; protected: - osl::Mutex m_aMutex; + std::mutex m_aMutex; css::ucb::OpenCommandArgument2 m_aCommand; css::uno::Reference< css::uno::XComponentContext > m_xContext; // Resultset #1 |