diff options
| author | Noel Grandin <noel@peralex.com> | 2015-09-17 09:22:25 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-09-17 12:22:47 +0200 |
| commit | bd1da371633c8df7f31da1cdaeb6f9e61dee4429 (patch) | |
| tree | 88ebd80481bbaa62c46832d7c942ffc26bc98aaa /extensions | |
| parent | 4662def919d6fd2f8fa5b13ca7eb0cd031cefb3d (diff) | |
convert Link<> to typed
Change-Id: I1ce46ea4784ecbd30a47d749d863173e0fe86fe6
Diffstat (limited to 'extensions')
4 files changed, 6 insertions, 8 deletions
diff --git a/extensions/source/propctrlr/formcomponenthandler.cxx b/extensions/source/propctrlr/formcomponenthandler.cxx index 02696e090109..6957278d05aa 100644 --- a/extensions/source/propctrlr/formcomponenthandler.cxx +++ b/extensions/source/propctrlr/formcomponenthandler.cxx @@ -3228,7 +3228,7 @@ namespace pcr } - IMPL_LINK_NOARG( FormComponentPropertyHandler, OnDesignerClosed ) + IMPL_LINK_NOARG_TYPED( FormComponentPropertyHandler, OnDesignerClosed, SQLCommandDesigner&, void ) { OSL_ENSURE( m_xBrowserUI.is() && m_xCommandDesigner.is(), "FormComponentPropertyHandler::OnDesignerClosed: too many NULLs!" ); if ( m_xBrowserUI.is() && m_xCommandDesigner.is() ) @@ -3251,8 +3251,6 @@ namespace pcr DBG_UNHANDLED_EXCEPTION(); } } - - return 0L; } diff --git a/extensions/source/propctrlr/formcomponenthandler.hxx b/extensions/source/propctrlr/formcomponenthandler.hxx index 1530c259c1d7..32025fc812d4 100644 --- a/extensions/source/propctrlr/formcomponenthandler.hxx +++ b/extensions/source/propctrlr/formcomponenthandler.hxx @@ -431,7 +431,7 @@ namespace pcr OUString impl_getDocumentURL_nothrow() const; private: - DECL_LINK( OnDesignerClosed, void* ); + DECL_LINK_TYPED( OnDesignerClosed, SQLCommandDesigner&, void ); private: FormComponentPropertyHandler( const FormComponentPropertyHandler& ) SAL_DELETED_FUNCTION; diff --git a/extensions/source/propctrlr/sqlcommanddesign.cxx b/extensions/source/propctrlr/sqlcommanddesign.cxx index 753ab0eea7f9..cb9f003007df 100644 --- a/extensions/source/propctrlr/sqlcommanddesign.cxx +++ b/extensions/source/propctrlr/sqlcommanddesign.cxx @@ -100,7 +100,7 @@ namespace pcr SQLCommandDesigner::SQLCommandDesigner( const Reference< XComponentContext >& _rxContext, const ::rtl::Reference< ISQLCommandAdapter >& _rxPropertyAdapter, - const ::dbtools::SharedConnection& _rConnection, const Link<>& _rCloseLink ) + const ::dbtools::SharedConnection& _rConnection, const Link<SQLCommandDesigner&,void>& _rCloseLink ) :m_xContext( _rxContext ) ,m_xConnection( _rConnection ) ,m_xObjectAdapter( _rxPropertyAdapter ) @@ -310,7 +310,7 @@ namespace pcr void SQLCommandDesigner::impl_designerClosed_nothrow() { if ( m_aCloseLink.IsSet() ) - m_aCloseLink.Call( this ); + m_aCloseLink.Call( *this ); } diff --git a/extensions/source/propctrlr/sqlcommanddesign.hxx b/extensions/source/propctrlr/sqlcommanddesign.hxx index 1b0a6565129f..4a619e9f02e3 100644 --- a/extensions/source/propctrlr/sqlcommanddesign.hxx +++ b/extensions/source/propctrlr/sqlcommanddesign.hxx @@ -55,7 +55,7 @@ namespace pcr ::dbtools::SharedConnection m_xConnection; ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController > m_xDesigner; ::rtl::Reference< ISQLCommandAdapter > m_xObjectAdapter; - Link<> m_aCloseLink; + Link<SQLCommandDesigner&,void> m_aCloseLink; public: /** creates the instance, and immediately opens the SQL command design frame @@ -76,7 +76,7 @@ namespace pcr const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext, const ::rtl::Reference< ISQLCommandAdapter >& _rxPropertyAdapter, const ::dbtools::SharedConnection& _rConnection, - const Link<>& _rCloseLink + const Link<SQLCommandDesigner&,void>& _rCloseLink ); /** determines whether the SQL Command designer is currently active, i.e. |