diff options
| author | Noel Grandin <noel@peralex.com> | 2015-09-18 15:10:41 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2015-09-20 06:37:36 +0000 |
| commit | 99bfc363a6f6779d0be2284f85a9131254bce1f9 (patch) | |
| tree | 3da30adea892bae0f5e76031d8561e114c2da8d9 /chart2 | |
| parent | e3c3b7fde3c017bd7d25f04fabf9b4528e37fb49 (diff) | |
convert Link<> to typed
Change-Id: I10b050dc4aae45e646761a82520caa96969bc511
Reviewed-on: https://gerrit.libreoffice.org/18700
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'chart2')
| -rw-r--r-- | chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx | 5 | ||||
| -rw-r--r-- | chart2/source/controller/inc/dlg_CreationWizard_UNO.hxx | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx b/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx index f445f633acaa..cac2042e04aa 100644 --- a/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx +++ b/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx @@ -217,11 +217,10 @@ void CreationWizardUnoDlg::createDialogOnDemand() } } } -IMPL_LINK( CreationWizardUnoDlg, DialogEventHdl, VclWindowEvent*, pEvent ) +IMPL_LINK_TYPED( CreationWizardUnoDlg, DialogEventHdl, VclWindowEvent&, rEvent, void ) { - if(pEvent && (pEvent->GetId() == VCLEVENT_OBJECT_DYING) ) + if(rEvent.GetId() == VCLEVENT_OBJECT_DYING) m_pDialog = 0;//avoid duplicate destruction of m_pDialog - return 0; } sal_Int16 SAL_CALL CreationWizardUnoDlg::execute( ) throw(uno::RuntimeException, std::exception) diff --git a/chart2/source/controller/inc/dlg_CreationWizard_UNO.hxx b/chart2/source/controller/inc/dlg_CreationWizard_UNO.hxx index cb33c68a38cf..39ac29d1136d 100644 --- a/chart2/source/controller/inc/dlg_CreationWizard_UNO.hxx +++ b/chart2/source/controller/inc/dlg_CreationWizard_UNO.hxx @@ -94,7 +94,7 @@ public: virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - DECL_LINK( DialogEventHdl, VclWindowEvent* ); + DECL_LINK_TYPED( DialogEventHdl, VclWindowEvent&, void ); protected: // ____ OComponentHelper ____ |