diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2021-12-18 09:41:52 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-12-18 19:50:07 +0100 |
| commit | 1d83453ce33de1ab72f0a635f73d13c440a46c81 (patch) | |
| tree | e81bd9b9b3f60d115b2d5f0118696360c578327b /scripting | |
| parent | 4c72b9d08afbb3c503c33b37771f1dc8968df1bb (diff) | |
use more cppu::BaseMutex
Change-Id: I679e9027f9550fefc0b4ced555f8ffb89bc9491a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127079
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'scripting')
| -rw-r--r-- | scripting/source/basprov/basmethnode.hxx | 3 | ||||
| -rw-r--r-- | scripting/source/basprov/basscript.hxx | 3 | ||||
| -rw-r--r-- | scripting/source/inc/bcholder.hxx | 12 |
3 files changed, 4 insertions, 14 deletions
diff --git a/scripting/source/basprov/basmethnode.hxx b/scripting/source/basprov/basmethnode.hxx index 53f9a8fbc357..d1eddada026b 100644 --- a/scripting/source/basprov/basmethnode.hxx +++ b/scripting/source/basprov/basmethnode.hxx @@ -27,6 +27,7 @@ #include <comphelper/proparrhlp.hxx> #include <comphelper/propertycontainer.hxx> #include <comphelper/uno3.hxx> +#include <cppuhelper/basemutex.hxx> #include <cppuhelper/implbase.hxx> @@ -44,7 +45,7 @@ namespace basprov css::script::XInvocation > BasicMethodNodeImpl_BASE; class BasicMethodNodeImpl : public BasicMethodNodeImpl_BASE, - public ::scripting_helper::OMutexHolder, + public cppu::BaseMutex, public ::scripting_helper::OBroadcastHelperHolder, public ::comphelper::OPropertyContainer, public ::comphelper::OPropertyArrayUsageHelper< BasicMethodNodeImpl > diff --git a/scripting/source/basprov/basscript.hxx b/scripting/source/basprov/basscript.hxx index f92691affe75..d0f9e6e7af85 100644 --- a/scripting/source/basprov/basscript.hxx +++ b/scripting/source/basprov/basscript.hxx @@ -22,6 +22,7 @@ #include <bcholder.hxx> #include <com/sun/star/script/provider/XScript.hpp> #include <com/sun/star/document/XScriptInvocationContext.hpp> +#include <cppuhelper/basemutex.hxx> #include <cppuhelper/implbase.hxx> #include <comphelper/proparrhlp.hxx> #include <comphelper/propertycontainer.hxx> @@ -42,7 +43,7 @@ namespace basprov class BasicScriptImpl : public BasicScriptImpl_BASE, public SfxListener, - public ::scripting_helper::OMutexHolder, + public cppu::BaseMutex, public ::scripting_helper::OBroadcastHelperHolder, public ::comphelper::OPropertyContainer, public ::comphelper::OPropertyArrayUsageHelper< BasicScriptImpl > diff --git a/scripting/source/inc/bcholder.hxx b/scripting/source/inc/bcholder.hxx index d9c994013bcb..9f8add31bb3e 100644 --- a/scripting/source/inc/bcholder.hxx +++ b/scripting/source/inc/bcholder.hxx @@ -26,18 +26,6 @@ namespace scripting_helper { - - - - class OMutexHolder - { - protected: - ::osl::Mutex m_aMutex; - }; - - - - class OBroadcastHelperHolder { ::cppu::OBroadcastHelper m_aBHelper; |