comphelper/source/eventattachermgr/eventattachermgr.cxx | 12 ++++++------
comphelper/source/property/opropertybag.hxx | 4 ++--
2 files changed, 8 insertions(+), 8 deletions(-)
New commits:
commit 14d2b32a462be277038f6a3dbb056d267c3413a3
Author: Noel Grandin <noelgran...@gmail.com>
AuthorDate: Mon Nov 22 18:07:24 2021 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Sat Nov 27 06:48:51 2021 +0100
use more OInterfaceContainerHelper3 in ImplEventAttacherManager
Change-Id: I5c73d61a5b7a0a7fcc218e0ee839be5b9fdbb987
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125916
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/comphelper/source/eventattachermgr/eventattachermgr.cxx
b/comphelper/source/eventattachermgr/eventattachermgr.cxx
index 1fc4673b631a..35e90a8379b0 100644
--- a/comphelper/source/eventattachermgr/eventattachermgr.cxx
+++ b/comphelper/source/eventattachermgr/eventattachermgr.cxx
@@ -42,7 +42,7 @@
#include <com/sun/star/script/XEventAttacherManager.hpp>
#include <com/sun/star/script/XScriptListener.hpp>
#include <cppuhelper/weak.hxx>
-#include <comphelper/interfacecontainer2.hxx>
+#include <comphelper/interfacecontainer3.hxx>
#include <cppuhelper/exc_hlp.hxx>
#include <cppuhelper/implbase.hxx>
#include <rtl/ref.hxx>
@@ -86,7 +86,7 @@ class ImplEventAttacherManager
std::deque< AttacherIndex_Impl > aIndex;
Mutex aLock;
// Container for the ScriptListener
- OInterfaceContainerHelper2 aScriptListeners;
+ OInterfaceContainerHelper3<XScriptListener> aScriptListeners;
// Instance of EventAttacher
Reference< XEventAttacher2 > xAttacher;
Reference< XComponentContext > mxContext;
@@ -179,9 +179,9 @@ void SAL_CALL AttacherAllListener_Impl::firing(const
AllEventObject& Event)
aScriptEvent.ScriptCode = aScriptCode;
// Iterate over all listeners and pass events.
- OInterfaceIteratorHelper2 aIt( mxManager->aScriptListeners );
+ OInterfaceIteratorHelper3 aIt( mxManager->aScriptListeners );
while( aIt.hasMoreElements() )
- static_cast<XScriptListener *>(aIt.next())->firing( aScriptEvent );
+ aIt.next()->firing( aScriptEvent );
}
@@ -242,10 +242,10 @@ Any SAL_CALL AttacherAllListener_Impl::approveFiring(
const AllEventObject& Even
Any aRet;
// Iterate over all listeners and pass events.
- OInterfaceIteratorHelper2 aIt( mxManager->aScriptListeners );
+ OInterfaceIteratorHelper3 aIt( mxManager->aScriptListeners );
while( aIt.hasMoreElements() )
{
- aRet = static_cast<XScriptListener *>(aIt.next())->approveFiring(
aScriptEvent );
+ aRet = aIt.next()->approveFiring( aScriptEvent );
try
{
Reference< XIdlClass > xListenerType = mxManager->getReflection()->
commit 7d30094766d6ef0f1084c42993dd2eb6b413cac7
Author: Noel Grandin <noelgran...@gmail.com>
AuthorDate: Mon Nov 22 18:05:13 2021 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Sat Nov 27 06:48:39 2021 +0100
use more OInterfaceContainerHelper3 in OPropertyBag
Change-Id: I915614c8e70a0f179655530b2c8822fa06c21386
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125915
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/comphelper/source/property/opropertybag.hxx
b/comphelper/source/property/opropertybag.hxx
index 73957e51a39f..28333901c2e3 100644
--- a/comphelper/source/property/opropertybag.hxx
+++ b/comphelper/source/property/opropertybag.hxx
@@ -26,7 +26,7 @@
#include <com/sun/star/container/XSet.hpp>
#include <cppuhelper/implbase5.hxx>
-#include <comphelper/interfacecontainer2.hxx>
+#include <comphelper/interfacecontainer3.hxx>
#include <comphelper/propstate.hxx>
#include <comphelper/broadcasthelper.hxx>
#include <comphelper/propertybag.hxx>
@@ -80,7 +80,7 @@ namespace comphelper
bool m_bAutoAddProperties;
/// for notification
- ::comphelper::OInterfaceContainerHelper2 m_NotifyListeners;
+ ::comphelper::OInterfaceContainerHelper3<css::util::XModifyListener>
m_NotifyListeners;
/// modify flag
bool m_isModified;
