diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2021-11-28 18:37:34 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-12-01 08:46:57 +0100 |
| commit | 74d827c1757b991f926df80d30a8d2549201d0b9 (patch) | |
| tree | a8dcf1b21895273b509fb4a39ac9e54aeff1719d /sw/source/core/access/accmap.cxx | |
| parent | 70a479abe267c0bd4c0c0fd1e945d8e6e4856af2 (diff) | |
use more OInterfaceContainerHelper3 in sw
Change-Id: Icb194de0521bf60f3db623c35e695afc3a3edbcc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125982
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sw/source/core/access/accmap.cxx')
| -rw-r--r-- | sw/source/core/access/accmap.cxx | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/sw/source/core/access/accmap.cxx b/sw/source/core/access/accmap.cxx index 62a5f61c5c2b..7234a571a72c 100644 --- a/sw/source/core/access/accmap.cxx +++ b/sw/source/core/access/accmap.cxx @@ -62,7 +62,7 @@ #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/document/XShapeEventBroadcaster.hpp> #include <cppuhelper/implbase.hxx> -#include <comphelper/interfacecontainer2.hxx> +#include <comphelper/interfacecontainer3.hxx> #include <pagepreviewlayout.hxx> #include <dcontact.hxx> #include <svx/unoapi.hxx> @@ -133,7 +133,7 @@ class SwDrawModellListener_Impl : public SfxListener, public ::cppu::WeakImplHelper< document::XShapeEventBroadcaster > { mutable ::osl::Mutex maListenerMutex; - ::comphelper::OInterfaceContainerHelper2 maEventListeners; + ::comphelper::OInterfaceContainerHelper3<css::document::XEventListener> maEventListeners; std::unordered_multimap<css::uno::Reference< css::drawing::XShape >, css::uno::Reference< css::document::XShapeEventListener >> maShapeListeners; SdrModel *mpDrawModel; protected: @@ -224,14 +224,12 @@ void SwDrawModellListener_Impl::Notify( SfxBroadcaster& /*rBC*/, if( !SvxUnoDrawMSFactory::createEvent( mpDrawModel, pSdrHint, aEvent ) ) return; - ::comphelper::OInterfaceIteratorHelper2 aIter( maEventListeners ); + ::comphelper::OInterfaceIteratorHelper3 aIter( maEventListeners ); while( aIter.hasMoreElements() ) { - uno::Reference < document::XEventListener > xListener( aIter.next(), - uno::UNO_QUERY ); try { - xListener->notifyEvent( aEvent ); + aIter.next()->notifyEvent( aEvent ); } catch( uno::RuntimeException const & ) { |