[Libreoffice-commits] core.git: include/svx svx/source

[Noel Grandin (via logerrit)]

 include/svx/fmgridif.hxx       |   10 +++++-----
 svx/source/fmcomp/fmgridif.cxx |   14 +++++++-------
 2 files changed, 12 insertions(+), 12 deletions(-)

New commits:
commit 1fcd79fb083a2db9cb56f09e0c7407f437177b0c
Author:     Noel Grandin <noelgran...@gmail.com>
AuthorDate: Mon Nov 22 21:32:24 2021 +0200
Commit:     Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Sat Nov 27 13:57:01 2021 +0100

    use more OInterfaceContainerHelper3 in FmX*Multiplexer
    
    Change-Id: I0e3a081b79dcdc3ffd298a03c31b71052b6a0cb7
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125932
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>

diff --git a/include/svx/fmgridif.hxx b/include/svx/fmgridif.hxx
index b98c8ac98c13..e0f43fcf069c 100644
--- a/include/svx/fmgridif.hxx
+++ b/include/svx/fmgridif.hxx
@@ -73,7 +73,7 @@ public:
 // FmXModifyMultiplexer
 
 class SAL_WARN_UNUSED FmXModifyMultiplexer final : public OWeakSubObject
-                            ,public ::comphelper::OInterfaceContainerHelper2
+                            ,public 
::comphelper::OInterfaceContainerHelper3<css::util::XModifyListener>
                             ,public css::util::XModifyListener
 {
 public:
@@ -96,7 +96,7 @@ public:
 // FmXUpdateMultiplexer
 
 class SAL_WARN_UNUSED FmXUpdateMultiplexer final : public OWeakSubObject,
-                             public ::comphelper::OInterfaceContainerHelper2,
+                             public 
::comphelper::OInterfaceContainerHelper3<css::form::XUpdateListener>,
                              public css::form::XUpdateListener
 {
 public:
@@ -121,7 +121,7 @@ public:
 // FmXSelectionMultiplexer
 
 class SAL_WARN_UNUSED FmXSelectionMultiplexer final : public OWeakSubObject
-                                ,public 
::comphelper::OInterfaceContainerHelper2
+                                ,public 
::comphelper::OInterfaceContainerHelper3<css::view::XSelectionChangeListener>
                                 ,public css::view::XSelectionChangeListener
 {
 public:
@@ -145,7 +145,7 @@ public:
 // FmXGridControlMultiplexer
 
 class SAL_WARN_UNUSED FmXGridControlMultiplexer final : public OWeakSubObject
-                                ,public 
::comphelper::OInterfaceContainerHelper2
+                                ,public 
::comphelper::OInterfaceContainerHelper3<css::form::XGridControlListener>
                                 ,public css::form::XGridControlListener
 {
 public:
@@ -169,7 +169,7 @@ public:
 // FmXContainerMultiplexer
 
 class SAL_WARN_UNUSED FmXContainerMultiplexer final : public OWeakSubObject,
-                                public 
::comphelper::OInterfaceContainerHelper2,
+                                public 
::comphelper::OInterfaceContainerHelper3<css::container::XContainerListener>,
                                 public css::container::XContainerListener
 {
 public:
diff --git a/svx/source/fmcomp/fmgridif.cxx b/svx/source/fmcomp/fmgridif.cxx
index f20c8fca5a86..bc008f01f7ce 100644
--- a/svx/source/fmcomp/fmgridif.cxx
+++ b/svx/source/fmcomp/fmgridif.cxx
@@ -127,7 +127,7 @@ static vcl::Font ImplCreateFont( const 
css::awt::FontDescriptor& rDescr )
 
 FmXModifyMultiplexer::FmXModifyMultiplexer( ::cppu::OWeakObject& rSource, 
::osl::Mutex& _rMutex )
                     :OWeakSubObject( rSource )
-                    ,OInterfaceContainerHelper2( _rMutex )
+                    ,OInterfaceContainerHelper3( _rMutex )
 {
 }
 
@@ -160,7 +160,7 @@ void FmXModifyMultiplexer::modified(const EventObject& e)
 
 FmXUpdateMultiplexer::FmXUpdateMultiplexer( ::cppu::OWeakObject& rSource, 
::osl::Mutex& _rMutex )
                     :OWeakSubObject( rSource )
-                    ,OInterfaceContainerHelper2( _rMutex )
+                    ,OInterfaceContainerHelper3( _rMutex )
 {
 }
 
@@ -192,9 +192,9 @@ sal_Bool FmXUpdateMultiplexer::approveUpdate(const 
EventObject &e)
     bool bResult = true;
     if (getLength())
     {
-        ::comphelper::OInterfaceIteratorHelper2 aIter(*this);
+        ::comphelper::OInterfaceIteratorHelper3 aIter(*this);
         while ( bResult && aIter.hasMoreElements() )
-            bResult = static_cast< XUpdateListener* >( aIter.next() 
)->approveUpdate( aMulti );
+            bResult = aIter.next()->approveUpdate( aMulti );
     }
 
     return bResult;
@@ -210,7 +210,7 @@ void FmXUpdateMultiplexer::updated(const EventObject &e)
 
 FmXSelectionMultiplexer::FmXSelectionMultiplexer( ::cppu::OWeakObject& 
rSource, ::osl::Mutex& _rMutex )
     :OWeakSubObject( rSource )
-    ,OInterfaceContainerHelper2( _rMutex )
+    ,OInterfaceContainerHelper3( _rMutex )
 {
 }
 
@@ -243,7 +243,7 @@ void SAL_CALL FmXSelectionMultiplexer::selectionChanged( 
const EventObject& _rEv
 
 FmXContainerMultiplexer::FmXContainerMultiplexer( ::cppu::OWeakObject& 
rSource, ::osl::Mutex& _rMutex )
                         :OWeakSubObject( rSource )
-                        ,OInterfaceContainerHelper2( _rMutex )
+                        ,OInterfaceContainerHelper3( _rMutex )
 {
 }
 
@@ -291,7 +291,7 @@ void FmXContainerMultiplexer::elementReplaced(const 
ContainerEvent& e)
 
 FmXGridControlMultiplexer::FmXGridControlMultiplexer( ::cppu::OWeakObject& 
rSource, ::osl::Mutex& _rMutex )
     :OWeakSubObject( rSource )
-    ,OInterfaceContainerHelper2( _rMutex )
+    ,OInterfaceContainerHelper3( _rMutex )
 {
 }