diff options
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/source/deployment/gui/dp_gui_extlistbox.cxx | 8 | ||||
| -rw-r--r-- | desktop/source/deployment/gui/dp_gui_extlistbox.hxx | 2 |
2 files changed, 4 insertions, 6 deletions
diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx index 34b3fc25f427..47a89d2d3ea9 100644 --- a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx +++ b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx @@ -256,7 +256,7 @@ void ExtensionBox_Impl::dispose() for ( ITER iIndex = m_vEntries.begin(); iIndex < m_vEntries.end(); ++iIndex ) { (*iIndex)->m_pPublisher.disposeAndClear(); - (*iIndex)->m_xPackage->removeEventListener( uno::Reference< lang::XEventListener > ( m_xRemoveListener, uno::UNO_QUERY ) ); + (*iIndex)->m_xPackage->removeEventListener( m_xRemoveListener.get() ); } m_vEntries.clear(); @@ -912,8 +912,7 @@ void ExtensionBox_Impl::addEventListenerOnce( if ( ::std::none_of(m_vListenerAdded.begin(), m_vListenerAdded.end(), FindWeakRef(extension)) ) { - extension->addEventListener( uno::Reference< lang::XEventListener > ( - m_xRemoveListener, uno::UNO_QUERY ) ); + extension->addEventListener( m_xRemoveListener.get() ); m_vListenerAdded.push_back(extension); } } @@ -1026,8 +1025,7 @@ void ExtensionBox_Impl::removeEntry( const uno::Reference< deployment::XPackage // the entry will be moved into the m_vRemovedEntries list which will be // cleared on the next paint event m_vRemovedEntries.push_back( *iIndex ); - (*iIndex)->m_xPackage->removeEventListener( - uno::Reference<lang::XEventListener>(m_xRemoveListener, uno::UNO_QUERY)); + (*iIndex)->m_xPackage->removeEventListener(m_xRemoveListener.get()); m_vEntries.erase( iIndex ); m_bNeedsRecalc = true; diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.hxx b/desktop/source/deployment/gui/dp_gui_extlistbox.hxx index 1f927f31ee6b..3cee982becdf 100644 --- a/desktop/source/deployment/gui/dp_gui_extlistbox.hxx +++ b/desktop/source/deployment/gui/dp_gui_extlistbox.hxx @@ -130,7 +130,7 @@ class ExtensionBox_Impl : public ::svt::IExtensionListBox VclPtr<ScrollBar> m_pScrollBar; - css::uno::Reference<ExtensionRemovedListener> m_xRemoveListener; + rtl::Reference<ExtensionRemovedListener> m_xRemoveListener; TheExtensionManager *m_pManager; //This mutex is used for synchronizing access to m_vEntries. |