diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2021-12-20 19:59:46 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2022-01-03 20:54:39 +0100 |
| commit | 7d87312ab6b39c3c03e93d305a1e6d7f0b78f9a7 (patch) | |
| tree | 512dccadfb297e6b52adc74ee7f45edbc98af7d1 /sfx2/inc | |
| parent | 3bb2cec6f9b81724f5a5e98065122da1f502e6ff (diff) | |
osl::Mutex->std::mutex in SfxStatusDispatcher
Change-Id: Icfd23cb898da6d2fc6de9f5e57c906044b9a28de
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127900
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sfx2/inc')
| -rw-r--r-- | sfx2/inc/unoctitm.hxx | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/sfx2/inc/unoctitm.hxx b/sfx2/inc/unoctitm.hxx index 6eb9e7147945..1a53091b2b74 100644 --- a/sfx2/inc/unoctitm.hxx +++ b/sfx2/inc/unoctitm.hxx @@ -21,14 +21,14 @@ #include <memory> #include <com/sun/star/frame/XNotifyingDispatch.hpp> #include <com/sun/star/lang/XUnoTunnel.hpp> -#include <comphelper/multiinterfacecontainer3.hxx> +#include <comphelper/multiinterfacecontainer4.hxx> #include <cppuhelper/implbase.hxx> #include <cppuhelper/interfacecontainer.hxx> #include <cppuhelper/weakref.hxx> #include <svl/lstner.hxx> #include <sfx2/ctrlitem.hxx> -#include <osl/mutex.hxx> +#include <mutex> namespace com::sun::star::frame { class XFrame; } namespace com::sun::star::frame { class XNotifyingDispatch; } @@ -39,13 +39,14 @@ class SfxBindings; class SfxDispatcher; class SfxSlot; -typedef comphelper::OMultiTypeInterfaceContainerHelperVar3<css::frame::XStatusListener, OUString> +typedef comphelper::OMultiTypeInterfaceContainerHelperVar4<OUString, css::frame::XStatusListener> SfxStatusDispatcher_Impl_ListenerContainer; class SfxStatusDispatcher : public cppu::WeakImplHelper<css::frame::XNotifyingDispatch> { - ::osl::Mutex aMutex; - SfxStatusDispatcher_Impl_ListenerContainer aListeners; +protected: + std::mutex maMutex; + SfxStatusDispatcher_Impl_ListenerContainer maListeners; public: @@ -61,8 +62,8 @@ public: // Something else void ReleaseAll(); - SfxStatusDispatcher_Impl_ListenerContainer& GetListeners() - { return aListeners; } + void sendStatusChanged(const OUString& rURL, const css::frame::FeatureStateEvent& rEvent); + std::vector<OUString> getContainedTypes() { return maListeners.getContainedTypes(); }; }; class SfxSlotServer; |