diff options
| author | Noel Grandin <noel@peralex.com> | 2015-09-21 08:03:25 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-09-21 08:03:52 +0200 |
| commit | 1e67e94f1a308ca60d4934e9fe9d5c048225ebe8 (patch) | |
| tree | c3bdf0fcec6912bc84e835fe48a80ee9f9391106 /reportdesign | |
| parent | c916152d8562cab868d4c522748ac30029fad179 (diff) | |
convert Link<> to typed
Change-Id: If3e2b00092440ebd42ae5b73ae2b0e44c3702683
Diffstat (limited to 'reportdesign')
| -rw-r--r-- | reportdesign/source/ui/inc/ReportControllerObserver.hxx | 2 | ||||
| -rw-r--r-- | reportdesign/source/ui/report/ReportControllerObserver.cxx | 11 |
2 files changed, 4 insertions, 9 deletions
diff --git a/reportdesign/source/ui/inc/ReportControllerObserver.hxx b/reportdesign/source/ui/inc/ReportControllerObserver.hxx index ea440d319132..735a149ca047 100644 --- a/reportdesign/source/ui/inc/ReportControllerObserver.hxx +++ b/reportdesign/source/ui/inc/ReportControllerObserver.hxx @@ -103,7 +103,7 @@ namespace rptui void switchListening( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& _rxContainer, bool _bStartListening ); void switchListening( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxObject, bool _bStartListening ); - DECL_LINK(SettingsChanged, VclWindowEvent* ); + DECL_LINK_TYPED(SettingsChanged, VclSimpleEvent&, void ); private: ::std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::container::XChild> >::const_iterator getSection(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XChild>& _xContainer) const; diff --git a/reportdesign/source/ui/report/ReportControllerObserver.cxx b/reportdesign/source/ui/report/ReportControllerObserver.cxx index b93f49f8b45a..52c67e3a6bb0 100644 --- a/reportdesign/source/ui/report/ReportControllerObserver.cxx +++ b/reportdesign/source/ui/report/ReportControllerObserver.cxx @@ -94,15 +94,13 @@ public: } - IMPL_LINK(OXReportControllerObserver, SettingsChanged, VclWindowEvent*, _pEvt) + IMPL_LINK_TYPED(OXReportControllerObserver, SettingsChanged, VclSimpleEvent&, _rEvt, void) { - if ( _pEvt ) - { - sal_Int32 nEvent = _pEvt->GetId(); + sal_Int32 nEvent = _rEvt.GetId(); if (nEvent == VCLEVENT_APPLICATION_DATACHANGED ) { - DataChangedEvent* pData = static_cast<DataChangedEvent*>(_pEvt->GetData()); + DataChangedEvent* pData = static_cast<DataChangedEvent*>(static_cast<VclWindowEvent&>(_rEvt).GetData()); if ( pData && ((( pData->GetType() == DataChangedEventType::SETTINGS ) || ( pData->GetType() == DataChangedEventType::DISPLAY )) && ( pData->GetFlags() & AllSettingsFlags::STYLE ))) @@ -137,9 +135,6 @@ public: } } } - } - - return 0L; } // XEventListener |