diff options
Diffstat (limited to 'svtools/source')
-rw-r--r-- | svtools/source/contnr/treelistbox.cxx | 2 | ||||
-rw-r--r-- | svtools/source/control/asynclink.cxx | 4 | ||||
-rw-r--r-- | svtools/source/control/calendar.cxx | 2 | ||||
-rw-r--r-- | svtools/source/control/inettbc.cxx | 2 | ||||
-rw-r--r-- | svtools/source/hatchwindow/documentcloser.cxx | 2 | ||||
-rw-r--r-- | svtools/source/uno/contextmenuhelper.cxx | 2 | ||||
-rw-r--r-- | svtools/source/uno/generictoolboxcontroller.cxx | 2 | ||||
-rw-r--r-- | svtools/source/uno/popupmenucontrollerbase.cxx | 2 | ||||
-rw-r--r-- | svtools/source/uno/popupwindowcontroller.cxx | 2 | ||||
-rw-r--r-- | svtools/source/uno/toolboxcontroller.cxx | 2 |
10 files changed, 11 insertions, 11 deletions
diff --git a/svtools/source/contnr/treelistbox.cxx b/svtools/source/contnr/treelistbox.cxx index a6247190ccb8..c8a7802ffd0e 100644 --- a/svtools/source/contnr/treelistbox.cxx +++ b/svtools/source/contnr/treelistbox.cxx @@ -1419,7 +1419,7 @@ IMPL_STATIC_LINK( SvTreeListBox, DragFinishHdl_Impl, sal_Int8*, pAction ) Link SvTreeListBox::GetDragFinishedHdl() const { AddBoxToDDList_Impl( *this ); - return STATIC_LINK( const_cast<SvTreeListBox*>(this), SvTreeListBox, DragFinishHdl_Impl ); + return LINK( const_cast<SvTreeListBox*>(this), SvTreeListBox, DragFinishHdl_Impl ); } /* diff --git a/svtools/source/control/asynclink.cxx b/svtools/source/control/asynclink.cxx index 74225829cf8e..87e30ec3c7f1 100644 --- a/svtools/source/control/asynclink.cxx +++ b/svtools/source/control/asynclink.cxx @@ -56,7 +56,7 @@ bAllowDoubles { _pIdle = new Idle; _pIdle->SetPriority( SchedulerPriority::HIGHEST ); - _pIdle->SetIdleHdl( STATIC_LINK( + _pIdle->SetIdleHdl( LINK( this, AsynchronLink, HandleCall) ); } _pIdle->Start(); @@ -64,7 +64,7 @@ bAllowDoubles else { if( _pMutex ) _pMutex->acquire(); - _nEventId = Application::PostUserEvent( STATIC_LINK( this, AsynchronLink, HandleCall), 0 ); + _nEventId = Application::PostUserEvent( LINK( this, AsynchronLink, HandleCall), 0 ); if( _pMutex ) _pMutex->release(); } } diff --git a/svtools/source/control/calendar.cxx b/svtools/source/control/calendar.cxx index 6fca550f6f0a..ba2eac4b0959 100644 --- a/svtools/source/control/calendar.cxx +++ b/svtools/source/control/calendar.cxx @@ -218,7 +218,7 @@ void Calendar::ImplInit( WinBits nWinStyle ) for (sal_Int32 i = 0; i < 31; ++i) maDayTexts[i] = OUString::number(i+1); - maDragScrollTimer.SetTimeoutHdl( STATIC_LINK( this, Calendar, ScrollHdl ) ); + maDragScrollTimer.SetTimeoutHdl( LINK( this, Calendar, ScrollHdl ) ); maDragScrollTimer.SetTimeout( GetSettings().GetMouseSettings().GetScrollRepeat() ); mnDragScrollHitTest = 0; diff --git a/svtools/source/control/inettbc.cxx b/svtools/source/control/inettbc.cxx index 370a1f97eaab..7f95b5d113cc 100644 --- a/svtools/source/control/inettbc.cxx +++ b/svtools/source/control/inettbc.cxx @@ -129,7 +129,7 @@ namespace SvtMatchContext_Impl::SvtMatchContext_Impl( SvtURLBox* pBoxP, const OUString& rText ) : Thread( "SvtMatchContext_Impl" ) - , aLink( STATIC_LINK( this, SvtMatchContext_Impl, Select_Impl ) ) + , aLink( LINK( this, SvtMatchContext_Impl, Select_Impl ) ) , aBaseURL( pBoxP->aBaseURL ) , aText( rText ) , pBox( pBoxP ) diff --git a/svtools/source/hatchwindow/documentcloser.cxx b/svtools/source/hatchwindow/documentcloser.cxx index 08716455213a..54fe1975acb0 100644 --- a/svtools/source/hatchwindow/documentcloser.cxx +++ b/svtools/source/hatchwindow/documentcloser.cxx @@ -93,7 +93,7 @@ void MainThreadFrameCloserRequest::Start( MainThreadFrameCloserRequest* pMTReque worker( NULL, pMTRequest ); } else - Application::PostUserEvent( STATIC_LINK( NULL, MainThreadFrameCloserRequest, worker ), pMTRequest ); + Application::PostUserEvent( LINK( NULL, MainThreadFrameCloserRequest, worker ), pMTRequest ); } } diff --git a/svtools/source/uno/contextmenuhelper.cxx b/svtools/source/uno/contextmenuhelper.cxx index 943c2d868fd8..e46adf6d71cb 100644 --- a/svtools/source/uno/contextmenuhelper.cxx +++ b/svtools/source/uno/contextmenuhelper.cxx @@ -367,7 +367,7 @@ ContextMenuHelper::dispatchCommand( pExecuteInfo->aTargetURL = aTargetURL; pExecuteInfo->aArgs = m_aDefaultArgs; - Application::PostUserEvent( STATIC_LINK(0, ContextMenuHelper , ExecuteHdl_Impl), pExecuteInfo ); + Application::PostUserEvent( LINK(0, ContextMenuHelper , ExecuteHdl_Impl), pExecuteInfo ); return true; } diff --git a/svtools/source/uno/generictoolboxcontroller.cxx b/svtools/source/uno/generictoolboxcontroller.cxx index 04e6203477a4..f0a50647a1e6 100644 --- a/svtools/source/uno/generictoolboxcontroller.cxx +++ b/svtools/source/uno/generictoolboxcontroller.cxx @@ -119,7 +119,7 @@ throw ( RuntimeException, std::exception ) pExecuteInfo->xDispatch = xDispatch; pExecuteInfo->aTargetURL = aTargetURL; pExecuteInfo->aArgs = aArgs; - Application::PostUserEvent( STATIC_LINK(0, GenericToolboxController , ExecuteHdl_Impl), pExecuteInfo ); + Application::PostUserEvent( LINK(0, GenericToolboxController , ExecuteHdl_Impl), pExecuteInfo ); } } diff --git a/svtools/source/uno/popupmenucontrollerbase.cxx b/svtools/source/uno/popupmenucontrollerbase.cxx index 0e89ae17b6c5..9e2090a52dd6 100644 --- a/svtools/source/uno/popupmenucontrollerbase.cxx +++ b/svtools/source/uno/popupmenucontrollerbase.cxx @@ -147,7 +147,7 @@ void PopupMenuControllerBase::dispatchCommand( const OUString& sCommandURL, cons Reference< XDispatch > xDispatch( xDispatchProvider->queryDispatch( aURL, OUString(), 0 ), UNO_QUERY_THROW ); - Application::PostUserEvent( STATIC_LINK(0, PopupMenuControllerBase, ExecuteHdl_Impl), new PopupMenuControllerBaseDispatchInfo( xDispatch, aURL, rArgs ) ); + Application::PostUserEvent( LINK(0, PopupMenuControllerBase, ExecuteHdl_Impl), new PopupMenuControllerBaseDispatchInfo( xDispatch, aURL, rArgs ) ); } catch( Exception& ) diff --git a/svtools/source/uno/popupwindowcontroller.cxx b/svtools/source/uno/popupwindowcontroller.cxx index 82f61e3b9e49..b3a63698ee79 100644 --- a/svtools/source/uno/popupwindowcontroller.cxx +++ b/svtools/source/uno/popupwindowcontroller.cxx @@ -68,7 +68,7 @@ void PopupWindowControllerImpl::SetPopupWindow( vcl::Window* pPopupWindow, ToolB if( mpPopupWindow ) { mpPopupWindow->RemoveEventListener( LINK( this, PopupWindowControllerImpl, WindowEventListener ) ); - Application::PostUserEvent( STATIC_LINK( this, PopupWindowControllerImpl, AsyncDeleteWindowHdl ), mpPopupWindow ); + Application::PostUserEvent( LINK( this, PopupWindowControllerImpl, AsyncDeleteWindowHdl ), mpPopupWindow ); } mpPopupWindow = pPopupWindow; mpToolBox = pToolBox; diff --git a/svtools/source/uno/toolboxcontroller.cxx b/svtools/source/uno/toolboxcontroller.cxx index 86ed9a7ccdf4..afdde4d52509 100644 --- a/svtools/source/uno/toolboxcontroller.cxx +++ b/svtools/source/uno/toolboxcontroller.cxx @@ -688,7 +688,7 @@ void ToolboxController::dispatchCommand( const OUString& sCommandURL, const Sequ Reference< XDispatch > xDispatch( xDispatchProvider->queryDispatch( aURL, sTarget, 0 ), UNO_QUERY_THROW ); DispatchInfo *pDispatchInfo = new DispatchInfo( xDispatch, aURL, rArgs ); - if ( !Application::PostUserEvent( STATIC_LINK(0, ToolboxController, ExecuteHdl_Impl), + if ( !Application::PostUserEvent( LINK(0, ToolboxController, ExecuteHdl_Impl), pDispatchInfo ) ) delete pDispatchInfo; |