ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

use more OInterfaceContainerHelper3 in AnimationNode

Browse Source 
Change-Id: I619582287d3ce1712921782d47cc722deeb1e0d4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125918
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
This commit is contained in:
Noel Grandin
2021-11-27 08:09:31 +01:00
committed by Noel Grandin
parent d7cd65577d
commit 27651c72f2
1 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
animations/source/animcore/animcore.cxx
+6 -10
View File
@@ -48,7 +48,7 @@
#include <com/sun/star/lang/XUnoTunnel.hpp>
#include <comphelper/servicehelper.hxx>
#include <cppuhelper/queryinterface.hxx>
#include <comphelper/interfacecontainer2.hxx>
#include <comphelper/interfacecontainer3.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <cppuhelper/weakref.hxx>
@@ -65,8 +65,8 @@ namespace com::sun::star::beans { struct NamedValue; }
using ::osl::Mutex;
using ::osl::Guard;
using ::comphelper::OInterfaceContainerHelper2;
using ::comphelper::OInterfaceIteratorHelper2;
using ::comphelper::OInterfaceContainerHelper3;
using ::comphelper::OInterfaceIteratorHelper3;
using ::com::sun::star::uno::Any;
using ::com::sun::star::uno::UNO_QUERY;
using ::com::sun::star::uno::XInterface;
@@ -299,7 +299,7 @@ public:
void fireChangeListener();
private:
OInterfaceContainerHelper2 maChangeListener;
OInterfaceContainerHelper3<XChangesListener> maChangeListener;
static void initTypeProvider( sal_Int16 nNodeType ) noexcept;
@@ -2100,18 +2100,14 @@ void AnimationNode::fireChangeListener()
{
Guard< Mutex > aGuard( maMutex );
OInterfaceIteratorHelper2 aIterator( maChangeListener );
OInterfaceIteratorHelper3 aIterator( maChangeListener );
if( aIterator.hasMoreElements() )
{
Reference< XInterface > xSource( static_cast<OWeakObject*>(this), UNO_QUERY );
Sequence< ElementChange > aChanges;
const ChangesEvent aEvent( xSource, Any( mxParent.get() ), aChanges );
while( aIterator.hasMoreElements() )
{
Reference< XChangesListener > xListener( aIterator.next(), UNO_QUERY );
if( xListener.is() )
xListener->changesOccurred( aEvent );
}
aIterator.next()->changesOccurred( aEvent );
}
//fdo#69645 use WeakReference of mxParent to test if mpParent is still valid