include/svx/fmgridif.hxx | 11 ++++++----- include/toolkit/controls/unocontrols.hxx | 3 ++- svx/source/fmcomp/fmgridif.cxx | 4 ++-- 3 files changed, 10 insertions(+), 8 deletions(-)
New commits: commit 976847e25c8160dcbfe895cfa7945ac990494e1e Author: Noel Grandin <[email protected]> AuthorDate: Mon Nov 22 21:28:19 2021 +0200 Commit: Noel Grandin <[email protected]> CommitDate: Sat Nov 27 12:09:36 2021 +0100 use more OInterfaceContainerHelper3 in FmXGridPeer Change-Id: I6545b2a8ae750b0480da84a09f803be0151f85d0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125931 Tested-by: Jenkins Reviewed-by: Noel Grandin <[email protected]> diff --git a/include/svx/fmgridif.hxx b/include/svx/fmgridif.hxx index 6d4793ce9366..b98c8ac98c13 100644 --- a/include/svx/fmgridif.hxx +++ b/include/svx/fmgridif.hxx @@ -44,6 +44,7 @@ #include <tools/wintypes.hxx> #include <toolkit/controls/unocontrol.hxx> #include <toolkit/awt/vclxwindow.hxx> +#include <comphelper/interfacecontainer3.hxx> #include <comphelper/servicehelper.hxx> #include <comphelper/uno3.hxx> #include <cppuhelper/implbase.hxx> @@ -346,11 +347,11 @@ protected: private: css::uno::Reference< css::container::XIndexContainer > m_xColumns; css::uno::Reference< css::sdbc::XRowSet > m_xCursor; - ::comphelper::OInterfaceContainerHelper2 m_aModifyListeners, - m_aUpdateListeners, - m_aContainerListeners, - m_aSelectionListeners, - m_aGridControlListeners; + ::comphelper::OInterfaceContainerHelper3<css::util::XModifyListener> m_aModifyListeners; + ::comphelper::OInterfaceContainerHelper3<css::form::XUpdateListener> m_aUpdateListeners; + ::comphelper::OInterfaceContainerHelper3<css::container::XContainerListener> m_aContainerListeners; + ::comphelper::OInterfaceContainerHelper3<css::view::XSelectionChangeListener> m_aSelectionListeners; + ::comphelper::OInterfaceContainerHelper3<css::form::XGridControlListener> m_aGridControlListeners; OUString m_aMode; sal_Int32 m_nCursorListening; diff --git a/svx/source/fmcomp/fmgridif.cxx b/svx/source/fmcomp/fmgridif.cxx index fa63197a91b4..f20c8fca5a86 100644 --- a/svx/source/fmcomp/fmgridif.cxx +++ b/svx/source/fmcomp/fmgridif.cxx @@ -1451,10 +1451,10 @@ sal_Bool FmXGridPeer::commit() return true; EventObject aEvt(static_cast< ::cppu::OWeakObject* >(this)); - ::comphelper::OInterfaceIteratorHelper2 aIter(m_aUpdateListeners); + ::comphelper::OInterfaceIteratorHelper3 aIter(m_aUpdateListeners); bool bCancel = false; while (aIter.hasMoreElements() && !bCancel) - if ( !static_cast< XUpdateListener* >( aIter.next() )->approveUpdate( aEvt ) ) + if ( !aIter.next()->approveUpdate( aEvt ) ) bCancel = true; if (!bCancel) commit 481236a6f726cb4c6b2e09cba8182636fa4de4b7 Author: Noel Grandin <[email protected]> AuthorDate: Tue Nov 23 20:36:55 2021 +0200 Commit: Noel Grandin <[email protected]> CommitDate: Sat Nov 27 12:09:23 2021 +0100 use more OInterfaceContainerHelper3 in UnoControlListBoxModel Change-Id: I102c6fb50506f70911456e8efd36f79969ae631a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125934 Tested-by: Jenkins Reviewed-by: Noel Grandin <[email protected]> diff --git a/include/toolkit/controls/unocontrols.hxx b/include/toolkit/controls/unocontrols.hxx index 06b127b32f80..390f9451a47f 100644 --- a/include/toolkit/controls/unocontrols.hxx +++ b/include/toolkit/controls/unocontrols.hxx @@ -49,6 +49,7 @@ #include <cppuhelper/implbase5.hxx> #include <cppuhelper/implbase4.hxx> #include <cppuhelper/implbase1.hxx> +#include <comphelper/interfacecontainer3.hxx> #include <comphelper/uno3.hxx> #include <tools/gen.hxx> @@ -814,7 +815,7 @@ private: protected: std::unique_ptr<UnoControlListBoxModel_Data> m_xData; - ::comphelper::OInterfaceContainerHelper2 m_aItemListListeners; + ::comphelper::OInterfaceContainerHelper3<css::awt::XItemListListener> m_aItemListListeners; };
