diff options
| author | Noel Grandin <noel@peralex.com> | 2015-08-14 16:02:42 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-08-17 09:59:59 +0200 |
| commit | f6dd3ca86263f6e350e9e5fcd62387e686e239da (patch) | |
| tree | a5fb4d4b3f20182cbedde7bd7b425a2394c292a1 | |
| parent | dfcf7927022bc564b2e1416c5f83b976dec7ab33 (diff) | |
make Link<> typed
Change-Id: I14bac096b3060ecc5b80319643390dc724157feb
| -rw-r--r-- | include/svtools/calendar.hxx | 10 | ||||
| -rw-r--r-- | svtools/source/control/calendar.cxx | 3 |
2 files changed, 6 insertions, 7 deletions
diff --git a/include/svtools/calendar.hxx b/include/svtools/calendar.hxx index 8fc0e3b0efa6..e4144f54e0d1 100644 --- a/include/svtools/calendar.hxx +++ b/include/svtools/calendar.hxx @@ -216,9 +216,9 @@ private: mbSelLeft:1, mbAllSel:1, mbDropPos:1; - Link<> maSelectHdl; - Timer maDragScrollTimer; - sal_uInt16 mnDragScrollHitTest; + Link<Calendar*,void> maSelectHdl; + Timer maDragScrollTimer; + sal_uInt16 mnDragScrollHitTest; using Control::ImplInitSettings; using Window::ImplInit; @@ -299,7 +299,7 @@ public: Size CalcWindowSizePixel( long nCalcMonthPerLine = 1, long nCalcLines = 1 ) const; - void SetSelectHdl( const Link<>& rLink ) { maSelectHdl = rLink; } + void SetSelectHdl( const Link<Calendar*,void>& rLink ) { maSelectHdl = rLink; } }; @@ -358,7 +358,7 @@ private: bool mbNone; Link<> maSelectHdl; - DECL_DLLPRIVATE_LINK( ImplSelectHdl, Calendar* ); + DECL_DLLPRIVATE_LINK_TYPED( ImplSelectHdl, Calendar*, void ); DECL_DLLPRIVATE_LINK( ImplClickHdl, PushButton* ); DECL_DLLPRIVATE_LINK( ImplPopupModeEndHdl, void* ); diff --git a/svtools/source/control/calendar.cxx b/svtools/source/control/calendar.cxx index 542e9193e204..e5876142b98c 100644 --- a/svtools/source/control/calendar.cxx +++ b/svtools/source/control/calendar.cxx @@ -2235,7 +2235,7 @@ void CalendarField::dispose() DateField::dispose(); } -IMPL_LINK( CalendarField, ImplSelectHdl, Calendar*, pCalendar ) +IMPL_LINK_TYPED( CalendarField, ImplSelectHdl, Calendar*, pCalendar, void ) { if ( !pCalendar->IsTravelSelect() ) { @@ -2251,7 +2251,6 @@ IMPL_LINK( CalendarField, ImplSelectHdl, Calendar*, pCalendar ) } Select(); } - return 0; } IMPL_LINK( CalendarField, ImplClickHdl, PushButton*, pBtn ) |