diff options
Diffstat (limited to 'svtools/source')
| -rw-r--r-- | svtools/source/config/colorcfg.cxx | 15 | ||||
| -rw-r--r-- | svtools/source/config/extcolorcfg.cxx | 15 |
2 files changed, 12 insertions, 18 deletions
diff --git a/svtools/source/config/colorcfg.cxx b/svtools/source/config/colorcfg.cxx index 5408aa19033a..e54f896dbf29 100644 --- a/svtools/source/config/colorcfg.cxx +++ b/svtools/source/config/colorcfg.cxx @@ -101,7 +101,7 @@ public: bool GetAutoDetectSystemHC() {return m_bAutoDetectSystemHC;} // #100822# - DECL_LINK( DataChangedEventListener, VclWindowEvent* ); + DECL_LINK_TYPED( DataChangedEventListener, VclSimpleEvent&, void ); void ImplUpdateApplicationSettings(); }; @@ -349,20 +349,17 @@ void ColorConfig_Impl::SettingsChanged() NotifyListeners(0); } -IMPL_LINK( ColorConfig_Impl, DataChangedEventListener, VclWindowEvent*, pEvent ) +IMPL_LINK_TYPED( ColorConfig_Impl, DataChangedEventListener, VclSimpleEvent&, rEvent, void ) { - if ( pEvent->GetId() == VCLEVENT_APPLICATION_DATACHANGED ) + if ( rEvent.GetId() == VCLEVENT_APPLICATION_DATACHANGED ) { - DataChangedEvent* pData = static_cast<DataChangedEvent*>(pEvent->GetData()); + DataChangedEvent* pData = static_cast<DataChangedEvent*>(static_cast<VclWindowEvent&>(rEvent).GetData()); if ( (pData->GetType() == DataChangedEventType::SETTINGS) && (pData->GetFlags() & AllSettingsFlags::STYLE) ) { SettingsChanged(); - return 1L; - } else - return 0L; - } else - return 0L; + } + } } diff --git a/svtools/source/config/extcolorcfg.cxx b/svtools/source/config/extcolorcfg.cxx index 812dcd704161..62eba2033a18 100644 --- a/svtools/source/config/extcolorcfg.cxx +++ b/svtools/source/config/extcolorcfg.cxx @@ -132,7 +132,7 @@ public: static void UnlockBroadcast(); // #100822# - DECL_LINK( DataChangedEventListener, VclWindowEvent* ); + DECL_LINK_TYPED( DataChangedEventListener, VclSimpleEvent&, void ); }; uno::Sequence< OUString> ExtendedColorConfig_Impl::GetPropertyNames(const OUString& rScheme) @@ -542,20 +542,17 @@ void ExtendedColorConfig_Impl::UnlockBroadcast() m_bLockBroadcast = false; } -IMPL_LINK( ExtendedColorConfig_Impl, DataChangedEventListener, VclWindowEvent*, pEvent ) +IMPL_LINK_TYPED( ExtendedColorConfig_Impl, DataChangedEventListener, VclSimpleEvent&, rEvent, void ) { - if ( pEvent->GetId() == VCLEVENT_APPLICATION_DATACHANGED ) + if ( rEvent.GetId() == VCLEVENT_APPLICATION_DATACHANGED ) { - DataChangedEvent* pData = static_cast<DataChangedEvent*>(pEvent->GetData()); + DataChangedEvent* pData = static_cast<DataChangedEvent*>(static_cast<VclWindowEvent&>(rEvent).GetData()); if ( (pData->GetType() == DataChangedEventType::SETTINGS) && (pData->GetFlags() & AllSettingsFlags::STYLE) ) { SettingsChanged(); - return 1L; - } else - return 0L; - } else - return 0L; + } + } } |