diff options
author | Tor Lillqvist <tml@iki.fi> | 2012-03-01 23:00:49 +0200 |
---|---|---|
committer | Tor Lillqvist <tml@iki.fi> | 2012-03-01 23:00:49 +0200 |
commit | 8a83ce2e7e6950450b63a5f189a48c8a4820b6d1 (patch) | |
tree | b67384e9d51d3bca4fb482d7a99b290722eb1bbb /svtools | |
parent | c1efe33b99436d740b67a09538efe2676f3b9974 (diff) |
More IMPL_LINK_NOARG fixes for clang
Diffstat (limited to 'svtools')
-rw-r--r-- | svtools/inc/svtools/addresstemplate.hxx | 2 | ||||
-rw-r--r-- | svtools/inc/svtools/brwbox.hxx | 2 | ||||
-rw-r--r-- | svtools/inc/svtools/calendar.hxx | 2 | ||||
-rw-r--r-- | svtools/inc/svtools/filechangedchecker.hxx | 2 | ||||
-rw-r--r-- | svtools/inc/svtools/filectrl.hxx | 2 | ||||
-rw-r--r-- | svtools/inc/svtools/prnsetup.hxx | 2 | ||||
-rw-r--r-- | svtools/inc/svtools/svlbox.hxx | 8 | ||||
-rw-r--r-- | svtools/inc/svtools/svmedit.hxx | 2 | ||||
-rw-r--r-- | svtools/inc/svtools/svtabbx.hxx | 4 | ||||
-rw-r--r-- | svtools/inc/svtools/taskbar.hxx | 2 | ||||
-rw-r--r-- | svtools/inc/svtools/templdlg.hxx | 12 | ||||
-rw-r--r-- | svtools/inc/svtools/texteng.hxx | 2 | ||||
-rw-r--r-- | svtools/inc/svtools/valueset.hxx | 2 | ||||
-rw-r--r-- | svtools/inc/svtools/wizardmachine.hxx | 6 |
14 files changed, 25 insertions, 25 deletions
diff --git a/svtools/inc/svtools/addresstemplate.hxx b/svtools/inc/svtools/addresstemplate.hxx index d69a7652affd..790740857156 100644 --- a/svtools/inc/svtools/addresstemplate.hxx +++ b/svtools/inc/svtools/addresstemplate.hxx @@ -149,7 +149,7 @@ namespace svt DECL_LINK(OnComboGetFocus, ComboBox*); DECL_LINK(OnComboLoseFocus, ComboBox*); DECL_LINK(OnComboSelect, ComboBox*); - DECL_LINK(OnOkClicked, Button*); + DECL_LINK(OnOkClicked, void*); DECL_LINK(OnDelayedInitialize, void*); }; diff --git a/svtools/inc/svtools/brwbox.hxx b/svtools/inc/svtools/brwbox.hxx index 326d660a18d0..cc1b5b58b0cb 100644 --- a/svtools/inc/svtools/brwbox.hxx +++ b/svtools/inc/svtools/brwbox.hxx @@ -325,7 +325,7 @@ private: SVT_DLLPRIVATE void ColumnInserted( sal_uInt16 nPos ); DECL_DLLPRIVATE_LINK( ScrollHdl, ScrollBar * ); - DECL_DLLPRIVATE_LINK( EndScrollHdl, ScrollBar * ); + DECL_DLLPRIVATE_LINK( EndScrollHdl, void * ); DECL_DLLPRIVATE_LINK( StartDragHdl, HeaderBar * ); SVT_DLLPRIVATE long GetFrozenWidth() const; diff --git a/svtools/inc/svtools/calendar.hxx b/svtools/inc/svtools/calendar.hxx index 9395b0a9ea34..94a7f5ebd230 100644 --- a/svtools/inc/svtools/calendar.hxx +++ b/svtools/inc/svtools/calendar.hxx @@ -434,7 +434,7 @@ private: #ifdef _SV_CALENDAR_CXX DECL_DLLPRIVATE_LINK( ImplSelectHdl, Calendar* ); DECL_DLLPRIVATE_LINK( ImplClickHdl, PushButton* ); - DECL_DLLPRIVATE_LINK( ImplPopupModeEndHdl, FloatingWindow* ); + DECL_DLLPRIVATE_LINK( ImplPopupModeEndHdl, void* ); #endif public: diff --git a/svtools/inc/svtools/filechangedchecker.hxx b/svtools/inc/svtools/filechangedchecker.hxx index fe5fd689c27c..5f6d03fb2ea6 100644 --- a/svtools/inc/svtools/filechangedchecker.hxx +++ b/svtools/inc/svtools/filechangedchecker.hxx @@ -43,7 +43,7 @@ private : ::boost::function0<void> mpCallback; bool SVT_DLLPRIVATE getCurrentModTime(TimeValue& o_rValue) const; - DECL_LINK(TimerHandler, Timer *); + DECL_LINK(TimerHandler, void *); public : void resetTimer(); diff --git a/svtools/inc/svtools/filectrl.hxx b/svtools/inc/svtools/filectrl.hxx index 9e5b3dc69592..14dcc75e615e 100644 --- a/svtools/inc/svtools/filectrl.hxx +++ b/svtools/inc/svtools/filectrl.hxx @@ -70,7 +70,7 @@ protected: SVT_DLLPRIVATE void GetFocus(); SVT_DLLPRIVATE void StateChanged( StateChangedType nType ); SVT_DLLPRIVATE WinBits ImplInitStyle( WinBits nStyle ); - DECL_DLLPRIVATE_LINK( ButtonHdl, PushButton* ); + DECL_DLLPRIVATE_LINK( ButtonHdl, void* ); public: FileControl( Window* pParent, WinBits nStyle, FileControlMode = 0 ); diff --git a/svtools/inc/svtools/prnsetup.hxx b/svtools/inc/svtools/prnsetup.hxx index 4fc096c5a85e..7f366aa37272 100644 --- a/svtools/inc/svtools/prnsetup.hxx +++ b/svtools/inc/svtools/prnsetup.hxx @@ -75,7 +75,7 @@ private: DECL_DLLPRIVATE_LINK( ImplPropertiesHdl, void* ); DECL_DLLPRIVATE_LINK( ImplOptionsHdl, void* ); DECL_DLLPRIVATE_LINK( ImplChangePrinterHdl, void* ); - DECL_DLLPRIVATE_LINK( ImplStatusHdl, Timer* ); + DECL_DLLPRIVATE_LINK( ImplStatusHdl, void* ); public: PrinterSetupDialog( Window* pWindow ); diff --git a/svtools/inc/svtools/svlbox.hxx b/svtools/inc/svtools/svlbox.hxx index b4f33c172386..3d1f6a6e343b 100644 --- a/svtools/inc/svtools/svlbox.hxx +++ b/svtools/inc/svtools/svlbox.hxx @@ -266,7 +266,7 @@ class SVT_DLLPUBLIC SvLBox { friend class SvLBoxEntry; - DECL_DLLPRIVATE_LINK( TextEditEndedHdl_Impl, SvInplaceEdit2 * ); + DECL_DLLPRIVATE_LINK( TextEditEndedHdl_Impl, void * ); // Handler, der von TreeList zum Clonen eines Entries aufgerufen wird DECL_DLLPRIVATE_LINK( CloneHdl_Impl, SvListEntry* ); @@ -592,9 +592,9 @@ class SvInplaceEdit2 sal_Bool bMultiLine; void CallCallBackHdl_Impl(); - DECL_LINK( Timeout_Impl, Timer * ); - DECL_LINK( ReturnHdl_Impl, Accelerator * ); - DECL_LINK( EscapeHdl_Impl, Accelerator * ); + DECL_LINK( Timeout_Impl, void * ); + DECL_LINK( ReturnHdl_Impl, void * ); + DECL_LINK( EscapeHdl_Impl, void * ); public: SvInplaceEdit2( Window* pParent, const Point& rPos, const Size& rSize, diff --git a/svtools/inc/svtools/svmedit.hxx b/svtools/inc/svtools/svmedit.hxx index bfce3168ae75..ffa54438258a 100644 --- a/svtools/inc/svtools/svmedit.hxx +++ b/svtools/inc/svtools/svmedit.hxx @@ -54,7 +54,7 @@ private: protected: - DECL_LINK( ImpUpdateDataHdl, Timer* ); + DECL_LINK( ImpUpdateDataHdl, void* ); void StateChanged( StateChangedType nType ); void DataChanged( const DataChangedEvent& rDCEvt ); virtual long PreNotify( NotifyEvent& rNEvt ); diff --git a/svtools/inc/svtools/svtabbx.hxx b/svtools/inc/svtools/svtabbx.hxx index 38aa9c098471..99fdba235c20 100644 --- a/svtools/inc/svtools/svtabbx.hxx +++ b/svtools/inc/svtools/svtabbx.hxx @@ -147,8 +147,8 @@ private: ::svt::IAccessibleTabListBox* m_pAccessible; AccessibleChildren m_aAccessibleChildren; - DECL_DLLPRIVATE_LINK( ScrollHdl_Impl, SvTabListBox* ); - DECL_DLLPRIVATE_LINK( CreateAccessibleHdl_Impl, HeaderBar* ); + DECL_DLLPRIVATE_LINK( ScrollHdl_Impl, void* ); + DECL_DLLPRIVATE_LINK( CreateAccessibleHdl_Impl, void* ); void RecalculateAccessibleChildren(); diff --git a/svtools/inc/svtools/taskbar.hxx b/svtools/inc/svtools/taskbar.hxx index c776e0dc2f9a..a303949fb4b2 100644 --- a/svtools/inc/svtools/taskbar.hxx +++ b/svtools/inc/svtools/taskbar.hxx @@ -290,7 +290,7 @@ private: SVT_DLLPRIVATE ImplTaskSBFldItem* ImplGetFieldItem( const Point& rPos, sal_Bool& rFieldRect ) const; SVT_DLLPRIVATE sal_Bool ImplUpdateClock(); SVT_DLLPRIVATE sal_Bool ImplUpdateFlashItems(); - DECL_DLLPRIVATE_LINK( ImplTimerHdl, Timer* ); + DECL_DLLPRIVATE_LINK( ImplTimerHdl, void* ); #endif public: diff --git a/svtools/inc/svtools/templdlg.hxx b/svtools/inc/svtools/templdlg.hxx index 4765dbb6a643..f2595150fdc3 100644 --- a/svtools/inc/svtools/templdlg.hxx +++ b/svtools/inc/svtools/templdlg.hxx @@ -54,14 +54,14 @@ private: SvtTmplDlg_Impl* pImpl; - DECL_DLLPRIVATE_LINK( SelectHdl_Impl, SvtTemplateWindow* ); - DECL_DLLPRIVATE_LINK( DoubleClickHdl_Impl, SvtTemplateWindow* ); - DECL_DLLPRIVATE_LINK( NewFolderHdl_Impl, SvtTemplateWindow* ); - DECL_DLLPRIVATE_LINK( SendFocusHdl_Impl, SvtTemplateWindow* ); + DECL_DLLPRIVATE_LINK( SelectHdl_Impl, void* ); + DECL_DLLPRIVATE_LINK( DoubleClickHdl_Impl, void* ); + DECL_DLLPRIVATE_LINK( NewFolderHdl_Impl, void* ); + DECL_DLLPRIVATE_LINK( SendFocusHdl_Impl, void* ); DECL_DLLPRIVATE_LINK( OKHdl_Impl, PushButton* ); - DECL_DLLPRIVATE_LINK( OrganizerHdl_Impl, PushButton* ); + DECL_DLLPRIVATE_LINK( OrganizerHdl_Impl, void* ); DECL_DLLPRIVATE_LINK( UpdateHdl_Impl, Timer* ); - DECL_DLLPRIVATE_LINK( OpenLinkHdl_Impl, svt::FixedHyperlink* ); + DECL_DLLPRIVATE_LINK( OpenLinkHdl_Impl, void* ); public: SvtDocumentTemplateDialog( Window* pParent ); diff --git a/svtools/inc/svtools/texteng.hxx b/svtools/inc/svtools/texteng.hxx index e9f0b6c51b06..ab897b26bb57 100644 --- a/svtools/inc/svtools/texteng.hxx +++ b/svtools/inc/svtools/texteng.hxx @@ -179,7 +179,7 @@ protected: void ImpTextHeightChanged(); void ImpTextFormatted(); - DECL_LINK( IdleFormatHdl, Timer * ); + DECL_LINK( IdleFormatHdl, void * ); void CheckIdleFormatter(); void IdleFormatAndUpdate( TextView* pCurView = 0, sal_uInt16 nMaxTimerRestarts = 5 ); diff --git a/svtools/inc/svtools/valueset.hxx b/svtools/inc/svtools/valueset.hxx index 059cdf260a8c..7e0b7db0f6d2 100644 --- a/svtools/inc/svtools/valueset.hxx +++ b/svtools/inc/svtools/valueset.hxx @@ -275,7 +275,7 @@ private: SVT_DLLPRIVATE void ImplTracking( const Point& rPos, bool bRepeat ); SVT_DLLPRIVATE void ImplEndTracking( const Point& rPos, bool bCancel ); DECL_DLLPRIVATE_LINK( ImplScrollHdl, ScrollBar* ); - DECL_DLLPRIVATE_LINK( ImplTimerHdl, Timer* ); + DECL_DLLPRIVATE_LINK( ImplTimerHdl, void* ); #endif // Forbidden and not implemented. diff --git a/svtools/inc/svtools/wizardmachine.hxx b/svtools/inc/svtools/wizardmachine.hxx index 9627f4e546d2..8700bf4ede06 100644 --- a/svtools/inc/svtools/wizardmachine.hxx +++ b/svtools/inc/svtools/wizardmachine.hxx @@ -354,9 +354,9 @@ namespace svt private: // long OnNextPage( PushButton* ); - DECL_DLLPRIVATE_LINK(OnNextPage, PushButton*); - DECL_DLLPRIVATE_LINK(OnPrevPage, PushButton*); - DECL_DLLPRIVATE_LINK(OnFinish, PushButton*); + DECL_DLLPRIVATE_LINK(OnNextPage, void*); + DECL_DLLPRIVATE_LINK(OnPrevPage, void*); + DECL_DLLPRIVATE_LINK(OnFinish, void*); SVT_DLLPRIVATE void implResetDefault(Window* _pWindow); SVT_DLLPRIVATE void implUpdateTitle(); |