[Libreoffice-commits] core.git: sw/source

[Noel Grandin (via logerrit)]

 sw/source/uibase/inc/unomailmerge.hxx |    4 ++--
 sw/source/uibase/uno/unomailmerge.cxx |    6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 3b34255a63bf6dbbf669e951df898b37cfd48650
Author:     Noel Grandin <noelgran...@gmail.com>
AuthorDate: Wed Dec 1 21:57:40 2021 +0200
Commit:     Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Sat Dec 4 13:31:46 2021 +0100

    use OMultiTypeInterfaceContainerHelperVar3 in SwXMailMerge
    
    Change-Id: I6d02ff1133db770025151ab1af3cea2a62261d76
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126343
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>

diff --git a/sw/source/uibase/inc/unomailmerge.hxx 
b/sw/source/uibase/inc/unomailmerge.hxx
index 050e99ce806b..72a9417f178a 100644
--- a/sw/source/uibase/inc/unomailmerge.hxx
+++ b/sw/source/uibase/inc/unomailmerge.hxx
@@ -24,7 +24,7 @@
 #include <cppuhelper/interfacecontainer.hxx>
 #include <comphelper/interfacecontainer2.hxx>
 #include <comphelper/interfacecontainer3.hxx>
-#include <comphelper/multiinterfacecontainer2.hxx>
+#include <comphelper/multiinterfacecontainer3.hxx>
 
 #include <com/sun/star/task/XJob.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
@@ -58,7 +58,7 @@ namespace com::sun::star {
 
 }
 
-typedef comphelper::OMultiTypeInterfaceContainerHelperVar2<sal_Int32>
+typedef 
comphelper::OMultiTypeInterfaceContainerHelperVar3<css::beans::XPropertyChangeListener,
 sal_Int32>
     OPropertyListenerContainerHelper;
 
 class SwDBManager;
diff --git a/sw/source/uibase/uno/unomailmerge.cxx 
b/sw/source/uibase/uno/unomailmerge.cxx
index 3788e11387c1..417278c20722 100644
--- a/sw/source/uibase/uno/unomailmerge.cxx
+++ b/sw/source/uibase/uno/unomailmerge.cxx
@@ -839,14 +839,14 @@ void SwXMailMerge::LaunchMailMergeEvent( const 
MailMergeEvent &rEvt ) const
 
 void SwXMailMerge::launchEvent( const PropertyChangeEvent &rEvt ) const
 {
-    comphelper::OInterfaceContainerHelper2 *pContainer =
+    comphelper::OInterfaceContainerHelper3<XPropertyChangeListener> 
*pContainer =
             m_aPropListeners.getContainer( rEvt.PropertyHandle );
     if (pContainer)
     {
-        comphelper::OInterfaceIteratorHelper2 aIt( *pContainer );
+        comphelper::OInterfaceIteratorHelper3 aIt( *pContainer );
         while (aIt.hasMoreElements())
         {
-            static_cast< XPropertyChangeListener* >( aIt.next() 
)->propertyChange( rEvt );
+            aIt.next()->propertyChange( rEvt );
         }
     }
 }