summaryrefslogtreecommitdiff
path: root/sfx2/source
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-04-28 15:10:58 +0200
committerStephan Bergmann <sbergman@redhat.com>2015-04-29 18:29:59 +0200
commite6c08b6b302b00cc55e9963ce47d6cc2416049a6 (patch)
treeb9120fd4dd8e53a415fee0f2305699dc3f111a4d /sfx2/source
parent91dd52bc54f59d9362f10988326839f8e7553e65 (diff)
Remove unnecessary STATIC_LINK macro
Change-Id: I4788824667c8e0d1d4e0717b7ae7737bb0fd2c90
Diffstat (limited to 'sfx2/source')
-rw-r--r--sfx2/source/appl/appmain.cxx2
-rw-r--r--sfx2/source/appl/fileobj.cxx4
-rw-r--r--sfx2/source/appl/impldde.cxx6
-rw-r--r--sfx2/source/appl/shutdownicon.cxx2
-rw-r--r--sfx2/source/control/recentdocsviewitem.cxx2
-rw-r--r--sfx2/source/dialog/tplcitem.cxx2
-rw-r--r--sfx2/source/inet/inettbc.cxx2
-rw-r--r--sfx2/source/menu/mnuitem.cxx2
-rw-r--r--sfx2/source/view/viewsh.cxx4
9 files changed, 13 insertions, 13 deletions
diff --git a/sfx2/source/appl/appmain.cxx b/sfx2/source/appl/appmain.cxx
index 8bbd1974e971..c8f8da897a18 100644
--- a/sfx2/source/appl/appmain.cxx
+++ b/sfx2/source/appl/appmain.cxx
@@ -51,7 +51,7 @@ SfxFilterMatcher& SfxApplication::GetFilterMatcher()
if( !pAppData_Impl->pMatcher )
{
pAppData_Impl->pMatcher = new SfxFilterMatcher();
- URIHelper::SetMaybeFileHdl( STATIC_LINK(
+ URIHelper::SetMaybeFileHdl( LINK(
pAppData_Impl->pMatcher, SfxFilterMatcher, MaybeFileHdl_Impl ) );
}
return *pAppData_Impl->pMatcher;
diff --git a/sfx2/source/appl/fileobj.cxx b/sfx2/source/appl/fileobj.cxx
index 0d8f3a03a68b..278034ceee0c 100644
--- a/sfx2/source/appl/fileobj.cxx
+++ b/sfx2/source/appl/fileobj.cxx
@@ -268,7 +268,7 @@ bool SvFileObject::LoadFile_Impl()
SfxMediumRef xTmpMed = xMed;
bInCallDownload = true;
- xMed->Download( STATIC_LINK( this, SvFileObject, LoadGrfReady_Impl ) );
+ xMed->Download( LINK( this, SvFileObject, LoadGrfReady_Impl ) );
bInCallDownload = false;
bClearMedium = !xMed.Is();
@@ -488,7 +488,7 @@ IMPL_STATIC_LINK( SvFileObject, LoadGrfReady_Impl, void*, EMPTYARG )
pThis->xMed->SetDoneLink( Link() );
pThis->pDelMed = new SfxMediumRef(pThis->xMed);
pThis->nPostUserEventId = Application::PostUserEvent(
- STATIC_LINK( pThis, SvFileObject, DelMedium_Impl ),
+ LINK( pThis, SvFileObject, DelMedium_Impl ),
pThis->pDelMed);
pThis->xMed.Clear();
}
diff --git a/sfx2/source/appl/impldde.cxx b/sfx2/source/appl/impldde.cxx
index 11aecd90473f..110fe238dc9f 100644
--- a/sfx2/source/appl/impldde.cxx
+++ b/sfx2/source/appl/impldde.cxx
@@ -85,9 +85,9 @@ SvDDELinkEditDialog::SvDDELinkEditDialog( vcl::Window* pParent, SvBaseLink* pLin
m_pEdDdeTopic->SetText( sTopic );
m_pEdDdeItem->SetText( sItem );
- m_pEdDdeApp->SetModifyHdl( STATIC_LINK( this, SvDDELinkEditDialog, EditHdl_Impl));
- m_pEdDdeTopic->SetModifyHdl( STATIC_LINK( this, SvDDELinkEditDialog, EditHdl_Impl));
- m_pEdDdeItem->SetModifyHdl( STATIC_LINK( this, SvDDELinkEditDialog, EditHdl_Impl));
+ m_pEdDdeApp->SetModifyHdl( LINK( this, SvDDELinkEditDialog, EditHdl_Impl));
+ m_pEdDdeTopic->SetModifyHdl( LINK( this, SvDDELinkEditDialog, EditHdl_Impl));
+ m_pEdDdeItem->SetModifyHdl( LINK( this, SvDDELinkEditDialog, EditHdl_Impl));
m_pOKButton->Enable( !sServer.isEmpty() && !sTopic.isEmpty() && !sItem.isEmpty() );
}
diff --git a/sfx2/source/appl/shutdownicon.cxx b/sfx2/source/appl/shutdownicon.cxx
index 146357287bff..6e573e5a3391 100644
--- a/sfx2/source/appl/shutdownicon.cxx
+++ b/sfx2/source/appl/shutdownicon.cxx
@@ -359,7 +359,7 @@ void ShutdownIcon::StartFileDialog()
m_pFileDlg = new FileDialogHelper(
ui::dialogs::TemplateDescription::FILEOPEN_READONLY_VERSION,
SFXWB_MULTISELECTION, OUString() );
- m_pFileDlg->StartExecuteModal( STATIC_LINK( this, ShutdownIcon, DialogClosedHdl_Impl ) );
+ m_pFileDlg->StartExecuteModal( LINK( this, ShutdownIcon, DialogClosedHdl_Impl ) );
}
diff --git a/sfx2/source/control/recentdocsviewitem.cxx b/sfx2/source/control/recentdocsviewitem.cxx
index d5da3ca8abb4..69c4a545505c 100644
--- a/sfx2/source/control/recentdocsviewitem.cxx
+++ b/sfx2/source/control/recentdocsviewitem.cxx
@@ -219,7 +219,7 @@ void RecentDocsViewItem::OpenDocument()
pLoadRecentFile->aTargetURL = aTargetURL;
pLoadRecentFile->aArgSeq = aArgsList;
- Application::PostUserEvent(STATIC_LINK(0, RecentDocsView, ExecuteHdl_Impl), pLoadRecentFile);
+ Application::PostUserEvent(LINK(0, RecentDocsView, ExecuteHdl_Impl), pLoadRecentFile);
}
}
diff --git a/sfx2/source/dialog/tplcitem.cxx b/sfx2/source/dialog/tplcitem.cxx
index c0b2a35bafee..8568ac54906a 100644
--- a/sfx2/source/dialog/tplcitem.cxx
+++ b/sfx2/source/dialog/tplcitem.cxx
@@ -107,7 +107,7 @@ void SfxTemplateControllerItem::StateChanged( sal_uInt16 nSID, SfxItemState eSta
}
//not necessary if the last event is still on the way
if(!nUserEventId)
- nUserEventId = Application::PostUserEvent( STATIC_LINK(
+ nUserEventId = Application::PostUserEvent( LINK(
this, SfxTemplateControllerItem, SetWaterCanStateHdl_Impl ) );
break;
}
diff --git a/sfx2/source/inet/inettbc.cxx b/sfx2/source/inet/inettbc.cxx
index 81f89fbf3aa3..e5d4fb020037 100644
--- a/sfx2/source/inet/inettbc.cxx
+++ b/sfx2/source/inet/inettbc.cxx
@@ -127,7 +127,7 @@ void SfxURLToolBoxControl_Impl::OpenURL( const OUString& rName, bool /*bNew*/ )
pExecuteInfo->xDispatch = xDispatch;
pExecuteInfo->aTargetURL = aTargetURL;
pExecuteInfo->aArgs = aArgs;
- Application::PostUserEvent( STATIC_LINK( 0, SfxURLToolBoxControl_Impl, ExecuteHdl_Impl), pExecuteInfo );
+ Application::PostUserEvent( LINK( 0, SfxURLToolBoxControl_Impl, ExecuteHdl_Impl), pExecuteInfo );
}
}
}
diff --git a/sfx2/source/menu/mnuitem.cxx b/sfx2/source/menu/mnuitem.cxx
index b6785b958416..3b52c6b3f86c 100644
--- a/sfx2/source/menu/mnuitem.cxx
+++ b/sfx2/source/menu/mnuitem.cxx
@@ -451,7 +451,7 @@ sal_IntPtr Select_Impl( void* /*pHdl*/, void* pVoid )
pExecuteInfo->xDispatch = xDisp;
pExecuteInfo->aTargetURL = aTargetURL;
pExecuteInfo->aArgs = Sequence< PropertyValue >();
- Application::PostUserEvent( STATIC_LINK( 0, SfxAppMenuControl_Impl, ExecuteHdl_Impl), pExecuteInfo );
+ Application::PostUserEvent( LINK( 0, SfxAppMenuControl_Impl, ExecuteHdl_Impl), pExecuteInfo );
}
return sal_True;
diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx
index 5cda42ef38dc..ab14264ee890 100644
--- a/sfx2/source/view/viewsh.cxx
+++ b/sfx2/source/view/viewsh.cxx
@@ -205,7 +205,7 @@ void SAL_CALL SfxClipboardChangeListener::disposing( const lang::EventObject& /*
// root for many deadlocks, especially in conjunction with the "Windows"
// based single thread apartment clipboard code!
AsyncExecuteInfo* pInfo = new AsyncExecuteInfo( ASYNCEXECUTE_CMD_DISPOSING, xThis, this );
- Application::PostUserEvent( STATIC_LINK( 0, SfxClipboardChangeListener, AsyncExecuteHdl_Impl ), pInfo );
+ Application::PostUserEvent( LINK( 0, SfxClipboardChangeListener, AsyncExecuteHdl_Impl ), pInfo );
}
void SAL_CALL SfxClipboardChangeListener::changedContents( const datatransfer::clipboard::ClipboardEvent& )
@@ -216,7 +216,7 @@ void SAL_CALL SfxClipboardChangeListener::changedContents( const datatransfer::c
// based single thread apartment clipboard code!
uno::Reference< datatransfer::clipboard::XClipboardListener > xThis( static_cast< datatransfer::clipboard::XClipboardListener* >( this ));
AsyncExecuteInfo* pInfo = new AsyncExecuteInfo( ASYNCEXECUTE_CMD_CHANGEDCONTENTS, xThis, this );
- Application::PostUserEvent( STATIC_LINK( 0, SfxClipboardChangeListener, AsyncExecuteHdl_Impl ), pInfo );
+ Application::PostUserEvent( LINK( 0, SfxClipboardChangeListener, AsyncExecuteHdl_Impl ), pInfo );
}