diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2023-03-07 15:53:58 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2023-03-08 07:51:44 +0000 |
| commit | 5caa11ea3b3ddf98db729ad79f0ce97d13c1414e (patch) | |
| tree | f43fd0164109c15f66103aa6e0a77e4a7830f7d2 /include | |
| parent | 6a0b41e0556de8eba093e0823f0845652c033960 (diff) | |
osl::Mutex->std::mutex in ParameterWrapperContainer
Change-Id: I5beb5981d40e970e8bdc68d7bd61f1adb502246d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148440
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'include')
| -rw-r--r-- | include/connectivity/paramwrapper.hxx | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/include/connectivity/paramwrapper.hxx b/include/connectivity/paramwrapper.hxx index b862a619af85..5ad0fa1c1972 100644 --- a/include/connectivity/paramwrapper.hxx +++ b/include/connectivity/paramwrapper.hxx @@ -31,7 +31,7 @@ #include <comphelper/broadcasthelper.hxx> #include <cppuhelper/weak.hxx> #include <cppuhelper/propshlp.hxx> -#include <cppuhelper/compbase.hxx> +#include <comphelper/compbase.hxx> #include <memory> #include <vector> @@ -123,7 +123,7 @@ namespace dbtools::param //= ParameterWrapperContainer - typedef ::cppu::WeakComponentImplHelper < css::container::XIndexAccess + typedef ::comphelper::WeakComponentImplHelper < css::container::XIndexAccess , css::container::XEnumerationAccess > ParameterWrapperContainer_Base; @@ -132,7 +132,6 @@ namespace dbtools::param public ParameterWrapperContainer_Base { private: - ::osl::Mutex m_aMutex; Parameters m_aParameters; virtual ~ParameterWrapperContainer() override; @@ -177,7 +176,7 @@ namespace dbtools::param private: // XComponent - virtual void SAL_CALL disposing() override; + virtual void disposing(std::unique_lock<std::mutex>& rGuard) override; void impl_checkDisposed_throw(); }; |