diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2021-11-28 13:06:24 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-11-28 18:11:00 +0100 |
| commit | ba8e7113fa8172533be736a25f936fc52f96e6a4 (patch) | |
| tree | 7f5d6d7d8a952dc0c7ee0886515dc48eb448904b /slideshow/source/engine/slide | |
| parent | 8d9c4792129e3dcf263ffffe39324c94b2ffe2bf (diff) | |
use more OInterfaceContainerHelper3 in slideshow
Change-Id: I8f098b57411758cfbb5d5f41e319cf085a23f66b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125973
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'slideshow/source/engine/slide')
| -rw-r--r-- | slideshow/source/engine/slide/shapemanagerimpl.cxx | 11 | ||||
| -rw-r--r-- | slideshow/source/engine/slide/shapemanagerimpl.hxx | 3 |
2 files changed, 7 insertions, 7 deletions
diff --git a/slideshow/source/engine/slide/shapemanagerimpl.cxx b/slideshow/source/engine/slide/shapemanagerimpl.cxx index 73c7cda1ac02..7ef3f455996f 100644 --- a/slideshow/source/engine/slide/shapemanagerimpl.cxx +++ b/slideshow/source/engine/slide/shapemanagerimpl.cxx @@ -161,13 +161,13 @@ bool ShapeManagerImpl::handleMouseReleased( awt::MouseEvent const& e ) // shape hit, and shape is visible. Raise // event. - std::shared_ptr<comphelper::OInterfaceContainerHelper2> const pCont( - aCurrBroadcaster->second ); + std::shared_ptr<comphelper::OInterfaceContainerHelper3<css::presentation::XShapeEventListener>> const & pCont = + aCurrBroadcaster->second; uno::Reference<drawing::XShape> const xShape( aCurrBroadcaster->first->getXShape() ); // DON'T do anything with /this/ after this point! - pCont->forEach<presentation::XShapeEventListener>( + pCont->forEach( [&xShape, &e]( const uno::Reference< presentation::XShapeEventListener >& rListener ) { return rListener->click( xShape, e ); } ); @@ -297,9 +297,8 @@ void ShapeManagerImpl::revokeSubset( const AttributableShapeSharedPtr& rOrigShap bool ShapeManagerImpl::listenerAdded( const uno::Reference<drawing::XShape>& xShape ) { - ShapeEventListenerMap::const_iterator aIter; - if( (aIter = mrGlobalListenersMap.find( xShape )) == - mrGlobalListenersMap.end() ) + ShapeEventListenerMap::const_iterator aIter = mrGlobalListenersMap.find( xShape ); + if( aIter == mrGlobalListenersMap.end() ) { ENSURE_OR_RETURN_FALSE(false, "ShapeManagerImpl::listenerAdded(): global " diff --git a/slideshow/source/engine/slide/shapemanagerimpl.hxx b/slideshow/source/engine/slide/shapemanagerimpl.hxx index 5025450326e1..20bbe0340242 100644 --- a/slideshow/source/engine/slide/shapemanagerimpl.hxx +++ b/slideshow/source/engine/slide/shapemanagerimpl.hxx @@ -22,6 +22,7 @@ #include <com/sun/star/drawing/XDrawPage.hpp> #include <com/sun/star/uno/Reference.hxx> +#include <comphelper/interfacecontainer3.hxx> #include <shape.hxx> #include <subsettableshapemanager.hxx> #include <eventmultiplexer.hxx> @@ -157,7 +158,7 @@ private: typedef std::map<ShapeSharedPtr, - std::shared_ptr< ::comphelper::OInterfaceContainerHelper2 >, + std::shared_ptr< ::comphelper::OInterfaceContainerHelper3<css::presentation::XShapeEventListener> >, Shape::lessThanShape> ShapeToListenersMap; typedef std::map<ShapeSharedPtr, sal_Int16, Shape::lessThanShape> ShapeToCursorMap; |