diff options
Diffstat (limited to 'vcl')
29 files changed, 63 insertions, 63 deletions
diff --git a/vcl/inc/idlemgr.hxx b/vcl/inc/idlemgr.hxx index 674bdf070c3a..66664fe5fd1f 100644 --- a/vcl/inc/idlemgr.hxx +++ b/vcl/inc/idlemgr.hxx @@ -57,7 +57,7 @@ public: { if ( maTimer.IsActive() ) maTimer.Start(); } // Timer* kann auch NULL sein - DECL_LINK( TimeoutHdl, Timer* ); + DECL_LINK(TimeoutHdl, void *); }; #endif // _SV_IDLEMGR_HXX diff --git a/vcl/source/app/idlemgr.cxx b/vcl/source/app/idlemgr.cxx index 60d4fa5cba58..99b17c99bf8b 100644 --- a/vcl/source/app/idlemgr.cxx +++ b/vcl/source/app/idlemgr.cxx @@ -120,7 +120,7 @@ void ImplIdleMgr::RemoveIdleHdl( const Link& rLink ) // ----------------------------------------------------------------------- -IMPL_LINK( ImplIdleMgr, TimeoutHdl, Timer*, EMPTYARG ) +IMPL_LINK_NOARG(ImplIdleMgr, TimeoutHdl) { for ( size_t i = 0; i < mpIdleList->size(); ++i ) { ImplIdleData* pIdleData = (*mpIdleList)[ i ]; diff --git a/vcl/source/control/combobox.cxx b/vcl/source/control/combobox.cxx index 3d9823f77fbc..86a9b4816684 100644 --- a/vcl/source/control/combobox.cxx +++ b/vcl/source/control/combobox.cxx @@ -271,7 +271,7 @@ sal_Bool ComboBox::IsAutocompleteEnabled() const // ----------------------------------------------------------------------- -IMPL_LINK( ComboBox, ImplClickBtnHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(ComboBox, ImplClickBtnHdl) { ImplCallEventListeners( VCLEVENT_DROPDOWN_PRE_OPEN ); mpSubEdit->GrabFocus(); @@ -293,7 +293,7 @@ IMPL_LINK( ComboBox, ImplClickBtnHdl, void*, EMPTYARG ) // ----------------------------------------------------------------------- -IMPL_LINK( ComboBox, ImplPopupModeEndHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(ComboBox, ImplPopupModeEndHdl) { if( mpFloatWin->IsPopupModeCanceled() ) { @@ -375,7 +375,7 @@ IMPL_LINK( ComboBox, ImplAutocompleteHdl, Edit*, pEdit ) // ----------------------------------------------------------------------- -IMPL_LINK( ComboBox, ImplSelectHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(ComboBox, ImplSelectHdl) { sal_Bool bPopup = IsInDropDown(); sal_Bool bCallSelect = sal_False; @@ -469,7 +469,7 @@ IMPL_LINK( ComboBox, ImplSelectHdl, void*, EMPTYARG ) // ----------------------------------------------------------------------- -IMPL_LINK( ComboBox, ImplCancelHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(ComboBox, ImplCancelHdl) { if( IsInDropDown() ) mpFloatWin->EndPopupMode(); @@ -492,7 +492,7 @@ IMPL_LINK( ComboBox, ImplSelectionChangedHdl, void*, n ) // ----------------------------------------------------------------------- -IMPL_LINK( ComboBox, ImplDoubleClickHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(ComboBox, ImplDoubleClickHdl) { DoubleClick(); return 0; diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx index ec9d7b8a401c..7d033164bd63 100644 --- a/vcl/source/control/edit.cxx +++ b/vcl/source/control/edit.cxx @@ -2516,7 +2516,7 @@ void Edit::UpdateData() // ----------------------------------------------------------------------- -IMPL_LINK( Edit, ImplUpdateDataHdl, Timer*, EMPTYARG ) +IMPL_LINK_NOARG(Edit, ImplUpdateDataHdl) { UpdateData(); return 0; diff --git a/vcl/source/control/ilstbox.cxx b/vcl/source/control/ilstbox.cxx index 786e28a4c6ef..f6236b5d9e5d 100644 --- a/vcl/source/control/ilstbox.cxx +++ b/vcl/source/control/ilstbox.cxx @@ -2376,7 +2376,7 @@ void ImplListBox::Resize() // ----------------------------------------------------------------------- -IMPL_LINK( ImplListBox, MRUChanged, void*, EMPTYARG ) +IMPL_LINK_NOARG(ImplListBox, MRUChanged) { StateChanged( STATE_CHANGE_DATA ); return 1; @@ -2384,7 +2384,7 @@ IMPL_LINK( ImplListBox, MRUChanged, void*, EMPTYARG ) // ----------------------------------------------------------------------- -IMPL_LINK( ImplListBox, LBWindowScrolled, void*, EMPTYARG ) +IMPL_LINK_NOARG(ImplListBox, LBWindowScrolled) { long nSet = GetTopEntry(); if( nSet > mpVScrollBar->GetRangeMax() ) diff --git a/vcl/source/control/lstbox.cxx b/vcl/source/control/lstbox.cxx index 6441a361123d..9d2f7aaba3c8 100644 --- a/vcl/source/control/lstbox.cxx +++ b/vcl/source/control/lstbox.cxx @@ -225,7 +225,7 @@ void ListBox::ImplLoadRes( const ResId& rResId ) // ----------------------------------------------------------------------- -IMPL_LINK( ListBox, ImplSelectHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(ListBox, ImplSelectHdl) { sal_Bool bPopup = IsInDropDown(); if( IsDropDownBox() ) @@ -254,7 +254,7 @@ IMPL_LINK( ListBox, ImplSelectHdl, void*, EMPTYARG ) // ----------------------------------------------------------------------- -IMPL_LINK( ListBox, ImplScrollHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(ListBox, ImplScrollHdl) { ImplCallEventListeners( VCLEVENT_LISTBOX_SCROLLED ); return 1; @@ -262,7 +262,7 @@ IMPL_LINK( ListBox, ImplScrollHdl, void*, EMPTYARG ) // ----------------------------------------------------------------------- -IMPL_LINK( ListBox, ImplCancelHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(ListBox, ImplCancelHdl) { if( IsInDropDown() ) mpFloatWin->EndPopupMode(); @@ -305,7 +305,7 @@ IMPL_LINK( ListBox, ImplSelectionChangedHdl, void*, n ) // ----------------------------------------------------------------------- -IMPL_LINK( ListBox, ImplDoubleClickHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(ListBox, ImplDoubleClickHdl) { DoubleClick(); return 1; @@ -313,7 +313,7 @@ IMPL_LINK( ListBox, ImplDoubleClickHdl, void*, EMPTYARG ) // ----------------------------------------------------------------------- -IMPL_LINK( ListBox, ImplClickBtnHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(ListBox, ImplClickBtnHdl) { if( !mpFloatWin->IsInPopupMode() ) { @@ -335,7 +335,7 @@ IMPL_LINK( ListBox, ImplClickBtnHdl, void*, EMPTYARG ) // ----------------------------------------------------------------------- -IMPL_LINK( ListBox, ImplPopupModeEndHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(ListBox, ImplPopupModeEndHdl) { if( mpFloatWin->IsPopupModeCanceled() ) { diff --git a/vcl/source/control/menubtn.cxx b/vcl/source/control/menubtn.cxx index 3350d1476aa6..2bb141263f17 100644 --- a/vcl/source/control/menubtn.cxx +++ b/vcl/source/control/menubtn.cxx @@ -139,7 +139,7 @@ MenuButton::~MenuButton() // ----------------------------------------------------------------------- -IMPL_LINK( MenuButton, ImplMenuTimeoutHdl, Timer*, EMPTYARG ) +IMPL_LINK_NOARG(MenuButton, ImplMenuTimeoutHdl) { // Abfragen, ob Button-Benutzung noch aktiv ist, da diese ja auch // vorher abgebrochen wurden sein koennte diff --git a/vcl/source/control/scrbar.cxx b/vcl/source/control/scrbar.cxx index bb4cc3cfdb2c..d2611c624d69 100644 --- a/vcl/source/control/scrbar.cxx +++ b/vcl/source/control/scrbar.cxx @@ -1204,7 +1204,7 @@ void ScrollBar::Resize() // ----------------------------------------------------------------------- -IMPL_LINK( ScrollBar, ImplAutoTimerHdl, AutoTimer*, EMPTYARG ) +IMPL_LINK_NOARG(ScrollBar, ImplAutoTimerHdl) { if( mpData && mpData->mbHide ) return 0; diff --git a/vcl/source/control/tabctrl.cxx b/vcl/source/control/tabctrl.cxx index f5bf19f9ce1b..fb73946a68b7 100644 --- a/vcl/source/control/tabctrl.cxx +++ b/vcl/source/control/tabctrl.cxx @@ -1014,7 +1014,7 @@ long TabControl::ImplHandleKeyEvent( const KeyEvent& rKeyEvent ) // ----------------------------------------------------------------------- -IMPL_LINK( TabControl, ImplListBoxSelectHdl, ListBox*, EMPTYARG ) +IMPL_LINK_NOARG(TabControl, ImplListBoxSelectHdl) { SelectTabPage( GetPageId( mpTabCtrlData->mpListBox->GetSelectEntryPos() ) ); return 0; diff --git a/vcl/source/control/throbber.cxx b/vcl/source/control/throbber.cxx index 6f80a402921d..a6a6d00a0197 100644 --- a/vcl/source/control/throbber.cxx +++ b/vcl/source/control/throbber.cxx @@ -303,7 +303,7 @@ void Throbber::setImageList( const Sequence< Reference< XGraphic > >& rImageList } //---------------------------------------------------------------------------------------------------------------------- -IMPL_LINK( Throbber, TimeOutHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(Throbber, TimeOutHdl) { SolarMutexGuard aGuard; if ( maImageList.empty() ) diff --git a/vcl/source/gdi/animate.cxx b/vcl/source/gdi/animate.cxx index 90acdcf12706..630a589c38c4 100644 --- a/vcl/source/gdi/animate.cxx +++ b/vcl/source/gdi/animate.cxx @@ -408,7 +408,7 @@ void Animation::ImplRestartTimer( sal_uLong nTimeout ) // ----------------------------------------------------------------------- typedef ::std::vector< AInfo* > AInfoList_impl; -IMPL_LINK( Animation, ImplTimeoutHdl, Timer*, EMPTYARG ) +IMPL_LINK_NOARG(Animation, ImplTimeoutHdl) { const size_t nAnimCount = maList.size(); AInfoList_impl aAInfoList; diff --git a/vcl/source/gdi/print3.cxx b/vcl/source/gdi/print3.cxx index 482491d2c41a..482420333060 100644 --- a/vcl/source/gdi/print3.cxx +++ b/vcl/source/gdi/print3.cxx @@ -276,7 +276,7 @@ struct PrintJobAsync DECL_LINK( ExecJob, void* ); }; -IMPL_LINK( PrintJobAsync, ExecJob, void*, EMPTYARG ) +IMPL_LINK_NOARG(PrintJobAsync, ExecJob) { Printer::ImplPrintJob( mpController, maInitSetup ); diff --git a/vcl/source/helper/threadex.cxx b/vcl/source/helper/threadex.cxx index f3ade03d1b58..a404de804d99 100644 --- a/vcl/source/helper/threadex.cxx +++ b/vcl/source/helper/threadex.cxx @@ -47,7 +47,7 @@ SolarThreadExecutor::~SolarThreadExecutor() osl_destroyCondition( m_aFinish ); } -IMPL_LINK( SolarThreadExecutor, worker, void*, EMPTYARG ) +IMPL_LINK_NOARG(SolarThreadExecutor, worker) { if ( !m_bTimeout ) { diff --git a/vcl/source/window/cursor.cxx b/vcl/source/window/cursor.cxx index 178aef2e67c4..5be74b972306 100644 --- a/vcl/source/window/cursor.cxx +++ b/vcl/source/window/cursor.cxx @@ -270,7 +270,7 @@ void Cursor::ImplNew() // ----------------------------------------------------------------------- -IMPL_LINK( Cursor, ImplTimerHdl, AutoTimer*, EMPTYARG ) +IMPL_LINK_NOARG(Cursor, ImplTimerHdl) { if ( mpData->mbCurVisible ) ImplRestore(); diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx index 22d510b63b59..6e10da618442 100644 --- a/vcl/source/window/dialog.cxx +++ b/vcl/source/window/dialog.cxx @@ -426,7 +426,7 @@ Dialog::~Dialog() // ----------------------------------------------------------------------- -IMPL_LINK( Dialog, ImplAsyncCloseHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(Dialog, ImplAsyncCloseHdl) { Close(); return 0; diff --git a/vcl/source/window/dockmgr.cxx b/vcl/source/window/dockmgr.cxx index aa8b0b49d38d..2fd719393555 100644 --- a/vcl/source/window/dockmgr.cxx +++ b/vcl/source/window/dockmgr.cxx @@ -66,9 +66,9 @@ private: sal_Bool mbInMove; sal_uLong mnLastUserEvent; - DECL_LINK( DockingHdl, ImplDockFloatWin2* ); - DECL_LINK( DockTimerHdl, ImplDockFloatWin2* ); - DECL_LINK( EndDockTimerHdl, ImplDockFloatWin2* ); + DECL_LINK(DockingHdl, void *); + DECL_LINK(DockTimerHdl, void *); + DECL_LINK(EndDockTimerHdl, void *); public: ImplDockFloatWin2( Window* pParent, WinBits nWinBits, ImplDockingWindowWrapper* pDockingWin ); @@ -129,7 +129,7 @@ ImplDockFloatWin2::~ImplDockFloatWin2() // ----------------------------------------------------------------------- -IMPL_LINK( ImplDockFloatWin2, DockTimerHdl, ImplDockFloatWin2*, EMPTYARG ) +IMPL_LINK_NOARG(ImplDockFloatWin2, DockTimerHdl) { DBG_ASSERT( mpDockWin->IsFloatingMode(), "docktimer called but not floating" ); @@ -157,7 +157,7 @@ IMPL_LINK( ImplDockFloatWin2, DockTimerHdl, ImplDockFloatWin2*, EMPTYARG ) return 0; } -IMPL_LINK( ImplDockFloatWin2, EndDockTimerHdl, ImplDockFloatWin2*, EMPTYARG ) +IMPL_LINK_NOARG(ImplDockFloatWin2, EndDockTimerHdl) { DBG_ASSERT( mpDockWin->IsFloatingMode(), "enddocktimer called but not floating" ); @@ -177,7 +177,7 @@ IMPL_LINK( ImplDockFloatWin2, EndDockTimerHdl, ImplDockFloatWin2*, EMPTYARG ) } -IMPL_LINK( ImplDockFloatWin2, DockingHdl, ImplDockFloatWin2*, EMPTYARG ) +IMPL_LINK_NOARG(ImplDockFloatWin2, DockingHdl) { // called during move of a floating window mnLastUserEvent = 0; @@ -1264,7 +1264,7 @@ void ImplDockingWindowWrapper::StartPopupMode( ToolBox *pParentToolBox, sal_uLon } } -IMPL_LINK( ImplDockingWindowWrapper, PopupModeEnd, void*, EMPTYARG ) +IMPL_LINK_NOARG(ImplDockingWindowWrapper, PopupModeEnd) { GetWindow()->Show( sal_False, SHOW_NOFOCUSCHANGE ); diff --git a/vcl/source/window/dockwin.cxx b/vcl/source/window/dockwin.cxx index 9596bfb63acd..a98b994262de 100644 --- a/vcl/source/window/dockwin.cxx +++ b/vcl/source/window/dockwin.cxx @@ -84,8 +84,8 @@ private: sal_Bool mbInMove; sal_uLong mnLastUserEvent; - DECL_LINK( DockingHdl, ImplDockFloatWin* ); - DECL_LINK( DockTimerHdl, ImplDockFloatWin* ); + DECL_LINK(DockingHdl, void *); + DECL_LINK(DockTimerHdl, void *); public: ImplDockFloatWin( Window* pParent, WinBits nWinBits, DockingWindow* pDockingWin ); @@ -139,7 +139,7 @@ ImplDockFloatWin::~ImplDockFloatWin() // ----------------------------------------------------------------------- -IMPL_LINK( ImplDockFloatWin, DockTimerHdl, ImplDockFloatWin*, EMPTYARG ) +IMPL_LINK_NOARG(ImplDockFloatWin, DockTimerHdl) { DBG_ASSERT( mpDockWin->IsFloatingMode(), "docktimer called but not floating" ); @@ -168,7 +168,7 @@ IMPL_LINK( ImplDockFloatWin, DockTimerHdl, ImplDockFloatWin*, EMPTYARG ) return 0; } -IMPL_LINK( ImplDockFloatWin, DockingHdl, ImplDockFloatWin*, EMPTYARG ) +IMPL_LINK_NOARG(ImplDockFloatWin, DockingHdl) { PointerState aState = mpDockWin->GetParent()->GetPointerState(); diff --git a/vcl/source/window/floatwin.cxx b/vcl/source/window/floatwin.cxx index 32d70213aae2..44f172f26259 100644 --- a/vcl/source/window/floatwin.cxx +++ b/vcl/source/window/floatwin.cxx @@ -550,7 +550,7 @@ sal_Bool FloatingWindow::ImplIsFloatPopupModeWindow( const Window* pWindow ) // ----------------------------------------------------------------------- -IMPL_LINK( FloatingWindow, ImplEndPopupModeHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(FloatingWindow, ImplEndPopupModeHdl) { mnPostId = 0; mnPopupModeFlags = 0; diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx index 1f104f40cd7e..73283f3ea918 100644 --- a/vcl/source/window/menu.cxx +++ b/vcl/source/window/menu.cxx @@ -487,10 +487,10 @@ private: sal_Bool bIgnoreFirstMove; sal_Bool bKeyInput; - DECL_LINK( PopupEnd, FloatingWindow* ); + DECL_LINK(PopupEnd, void *); DECL_LINK( HighlightChanged, Timer* ); - DECL_LINK( SubmenuClose, Timer* ); - DECL_LINK( AutoScroll, Timer* ); + DECL_LINK(SubmenuClose, void *); + DECL_LINK(AutoScroll, void *); DECL_LINK( ShowHideListener, VclWindowEvent* ); void StateChanged( StateChangedType nType ); @@ -702,9 +702,9 @@ private: void ImplInitStyleSettings(); - DECL_LINK( CloserHdl, PushButton* ); - DECL_LINK( FloatHdl, PushButton* ); - DECL_LINK( HideHdl, PushButton* ); + DECL_LINK(CloserHdl, void *); + DECL_LINK(FloatHdl, void *); + DECL_LINK(HideHdl, void *); DECL_LINK( ToolboxEventHdl, VclWindowEvent* ); DECL_LINK( ShowHideListener, VclWindowEvent* ); @@ -2990,7 +2990,7 @@ void Menu::ImplCallHighlight( sal_uInt16 nHighlightedItem ) } } -IMPL_LINK( Menu, ImplCallSelect, Menu*, EMPTYARG ) +IMPL_LINK_NOARG(Menu, ImplCallSelect) { nEventId = 0; Select(); @@ -4122,7 +4122,7 @@ void MenuFloatingWindow::ImplHighlightItem( const MouseEvent& rMEvt, sal_Bool bM } } -IMPL_LINK( MenuFloatingWindow, PopupEnd, FloatingWindow*, EMPTYARG ) +IMPL_LINK_NOARG(MenuFloatingWindow, PopupEnd) { // "this" will be deleted before the end of this method! Menu* pM = pMenu; @@ -4171,7 +4171,7 @@ IMPL_LINK( MenuFloatingWindow, PopupEnd, FloatingWindow*, EMPTYARG ) return 0; } -IMPL_LINK( MenuFloatingWindow, AutoScroll, Timer*, EMPTYARG ) +IMPL_LINK_NOARG(MenuFloatingWindow, AutoScroll) { ImplScroll( GetPointerPosPixel() ); return 1; @@ -4240,7 +4240,7 @@ IMPL_LINK( MenuFloatingWindow, HighlightChanged, Timer*, pTimer ) return 0; } -IMPL_LINK( MenuFloatingWindow, SubmenuClose, Timer*, EMPTYARG ) +IMPL_LINK_NOARG(MenuFloatingWindow, SubmenuClose) { if( pMenu && pMenu->pStartedFrom ) { @@ -5221,7 +5221,7 @@ Size MenuBarWindow::MinCloseButtonSize() return aCloser.getMinSize(); } -IMPL_LINK( MenuBarWindow, CloserHdl, PushButton*, EMPTYARG ) +IMPL_LINK_NOARG(MenuBarWindow, CloserHdl) { if( ! pMenu ) return 0; @@ -5284,12 +5284,12 @@ IMPL_LINK( MenuBarWindow, ShowHideListener, VclWindowEvent*, pEvent ) return 0; } -IMPL_LINK( MenuBarWindow, FloatHdl, PushButton*, EMPTYARG ) +IMPL_LINK_NOARG(MenuBarWindow, FloatHdl) { return pMenu ? ((MenuBar*)pMenu)->GetFloatButtonClickHdl().Call( pMenu ) : 0; } -IMPL_LINK( MenuBarWindow, HideHdl, PushButton*, EMPTYARG ) +IMPL_LINK_NOARG(MenuBarWindow, HideHdl) { return pMenu ? ((MenuBar*)pMenu)->GetHideButtonClickHdl().Call( pMenu ) : 0; } diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx index 11fba1441ce6..ee646e81a341 100644 --- a/vcl/source/window/printdlg.cxx +++ b/vcl/source/window/printdlg.cxx @@ -2178,7 +2178,7 @@ IMPL_LINK( PrintDialog, ModifyHdl, Edit*, pEdit ) return 0; } -IMPL_LINK( PrintDialog, UIOptionsChanged, void*, EMPTYARG ) +IMPL_LINK_NOARG(PrintDialog, UIOptionsChanged) { checkOptionalControlDependencies(); return 0; diff --git a/vcl/source/window/scrwnd.cxx b/vcl/source/window/scrwnd.cxx index 364766e80190..7c41eee622a3 100644 --- a/vcl/source/window/scrwnd.cxx +++ b/vcl/source/window/scrwnd.cxx @@ -380,7 +380,7 @@ void ImplWheelWindow::MouseButtonUp( const MouseEvent& rMEvt ) // ------------------------------------------------------------------------ -IMPL_LINK( ImplWheelWindow, ImplScrollHdl, Timer*, EMPTYARG ) +IMPL_LINK_NOARG(ImplWheelWindow, ImplScrollHdl) { if ( mnActDeltaX || mnActDeltaY ) { diff --git a/vcl/source/window/scrwnd.hxx b/vcl/source/window/scrwnd.hxx index ccc38c778c99..efcb7b77bc58 100644 --- a/vcl/source/window/scrwnd.hxx +++ b/vcl/source/window/scrwnd.hxx @@ -74,7 +74,7 @@ private: void ImplDrawWheel(); void ImplRecalcScrollValues(); - DECL_LINK( ImplScrollHdl, Timer* pTimer ); + DECL_LINK(ImplScrollHdl, void *); protected: diff --git a/vcl/source/window/seleng.cxx b/vcl/source/window/seleng.cxx index d065b39cc7b0..6209ee6b0877 100644 --- a/vcl/source/window/seleng.cxx +++ b/vcl/source/window/seleng.cxx @@ -82,7 +82,7 @@ SelectionEngine::~SelectionEngine() |* *************************************************************************/ -IMPL_LINK( SelectionEngine, ImpWatchDog, Timer*, EMPTYARG ) +IMPL_LINK_NOARG(SelectionEngine, ImpWatchDog) { if ( !aArea.IsInside( aLastMove.GetPosPixel() ) ) SelMouseMove( aLastMove ); diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx index 2cf7fe092884..ff5cb5be324d 100644 --- a/vcl/source/window/toolbox.cxx +++ b/vcl/source/window/toolbox.cxx @@ -2854,7 +2854,7 @@ void ToolBox::ImplFormat( sal_Bool bResize ) // ----------------------------------------------------------------------- -IMPL_LINK( ToolBox, ImplDropdownLongClickHdl, ToolBox*, EMPTYARG ) +IMPL_LINK_NOARG(ToolBox, ImplDropdownLongClickHdl) { if( mnCurPos != TOOLBOX_ITEM_NOTFOUND && (mpData->m_aItems[ mnCurPos ].mnBits & TIB_DROPDOWN) @@ -2885,7 +2885,7 @@ IMPL_LINK( ToolBox, ImplDropdownLongClickHdl, ToolBox*, EMPTYARG ) // ----------------------------------------------------------------------- -IMPL_LINK( ToolBox, ImplUpdateHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(ToolBox, ImplUpdateHdl) { DBG_CHKTHIS( Window, ImplDbgCheckWindow ); diff --git a/vcl/source/window/toolbox2.cxx b/vcl/source/window/toolbox2.cxx index 0925ed6dd483..9528bdb2b1ff 100644 --- a/vcl/source/window/toolbox2.cxx +++ b/vcl/source/window/toolbox2.cxx @@ -2018,7 +2018,7 @@ IMPL_LINK( ToolBox, ImplCustomMenuListener, VclMenuEvent*, pEvent ) return 0; } -IMPL_LINK( ToolBox, ImplCallExecuteCustomMenu, void*, EMPTYARG ) +IMPL_LINK_NOARG(ToolBox, ImplCallExecuteCustomMenu) { mpData->mnEventId = 0; ImplExecuteCustomMenu(); diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx index 0dfe4de63a44..8c3d4554bc02 100644 --- a/vcl/source/window/window.cxx +++ b/vcl/source/window/window.cxx @@ -2488,7 +2488,7 @@ void Window::ImplPostPaint() // ----------------------------------------------------------------------- -IMPL_LINK( Window, ImplHandlePaintHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(Window, ImplHandlePaintHdl) { // save paint events until resizing is done if( mpWindowImpl->mbFrame && mpWindowImpl->mpFrameData->maResizeTimer.IsActive() ) @@ -2500,7 +2500,7 @@ IMPL_LINK( Window, ImplHandlePaintHdl, void*, EMPTYARG ) // ----------------------------------------------------------------------- -IMPL_LINK( Window, ImplHandleResizeTimerHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(Window, ImplHandleResizeTimerHdl) { if( mpWindowImpl->mbReallyVisible ) { @@ -3756,7 +3756,7 @@ void Window::ImplGenerateMouseMove() // ----------------------------------------------------------------------- -IMPL_LINK( Window, ImplGenerateMouseMoveHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(Window, ImplGenerateMouseMoveHdl) { mpWindowImpl->mpFrameData->mnMouseMoveId = 0; Window* pCaptureWin = ImplGetSVData()->maWinData.mpCaptureWin; diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx index 504b75347d2f..076657ff88c2 100644 --- a/vcl/source/window/winproc.cxx +++ b/vcl/source/window/winproc.cxx @@ -1732,7 +1732,7 @@ static void ImplActivateFloatingWindows( Window* pWindow, sal_Bool bActive ) // ----------------------------------------------------------------------- -IMPL_LINK( Window, ImplAsyncFocusHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(Window, ImplAsyncFocusHdl) { ImplGetWindowImpl()->mpFrameData->mnFocusId = 0; diff --git a/vcl/unx/generic/app/i18n_status.cxx b/vcl/unx/generic/app/i18n_status.cxx index 3077c34b9311..6c4b6a284a13 100644 --- a/vcl/unx/generic/app/i18n_status.cxx +++ b/vcl/unx/generic/app/i18n_status.cxx @@ -267,7 +267,7 @@ void XIMStatusWindow::setPosition( SalFrame* pParent ) } } -IMPL_LINK( XIMStatusWindow, DelayedShowHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(XIMStatusWindow, DelayedShowHdl) { m_nDelayedEvent = 0; const SystemEnvData* pData = GetSystemData(); diff --git a/vcl/unx/generic/window/salframe.cxx b/vcl/unx/generic/window/salframe.cxx index 141289f3f00d..0cebdbc2efc7 100644 --- a/vcl/unx/generic/window/salframe.cxx +++ b/vcl/unx/generic/window/salframe.cxx @@ -3714,7 +3714,7 @@ long X11SalFrame::HandleSizeEvent( XConfigureEvent *pEvent ) return 1; } -IMPL_LINK( X11SalFrame, HandleAlwaysOnTopRaise, void*, EMPTYARG ) +IMPL_LINK_NOARG(X11SalFrame, HandleAlwaysOnTopRaise) { if( bMapped_ ) ToTop( 0 ); |