diff options
| -rw-r--r-- | include/svx/fmgridif.hxx | 11 | ||||
| -rw-r--r-- | svx/source/fmcomp/fmgridif.cxx | 4 |
2 files changed, 8 insertions, 7 deletions
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) |