summaryrefslogtreecommitdiff
path: root/cui
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 /cui
parent91dd52bc54f59d9362f10988326839f8e7553e65 (diff)
Remove unnecessary STATIC_LINK macro
Change-Id: I4788824667c8e0d1d4e0717b7ae7737bb0fd2c90
Diffstat (limited to 'cui')
-rw-r--r--cui/source/customize/macropg.cxx6
-rw-r--r--cui/source/dialogs/SpellDialog.cxx2
-rw-r--r--cui/source/dialogs/insdlg.cxx4
-rw-r--r--cui/source/dialogs/thesdlg.cxx2
-rw-r--r--cui/source/tabpages/macroass.cxx10
-rw-r--r--cui/source/tabpages/tpline.cxx4
6 files changed, 14 insertions, 14 deletions
diff --git a/cui/source/customize/macropg.cxx b/cui/source/customize/macropg.cxx
index fc5194af6567..9ca5201839d4 100644
--- a/cui/source/customize/macropg.cxx
+++ b/cui/source/customize/macropg.cxx
@@ -723,14 +723,14 @@ void _SvxMacroTabPage::InitAndSetHandler( Reference< container::XNameReplace> xA
m_xModifiable = xModifiable;
SvHeaderTabListBox& rListBox = mpImpl->pEventLB->GetListBox();
HeaderBar& rHeaderBar = mpImpl->pEventLB->GetHeaderBar();
- Link aLnk(STATIC_LINK(this, _SvxMacroTabPage, AssignDeleteHdl_Impl ));
+ Link aLnk(LINK(this, _SvxMacroTabPage, AssignDeleteHdl_Impl ));
mpImpl->pDeletePB->SetClickHdl( aLnk );
mpImpl->pAssignPB->SetClickHdl( aLnk );
if( mpImpl->pAssignComponentPB )
mpImpl->pAssignComponentPB->SetClickHdl( aLnk );
- rListBox.SetDoubleClickHdl( STATIC_LINK(this, _SvxMacroTabPage, DoubleClickHdl_Impl ) );
+ rListBox.SetDoubleClickHdl( LINK(this, _SvxMacroTabPage, DoubleClickHdl_Impl ) );
- rListBox.SetSelectHdl( STATIC_LINK( this, _SvxMacroTabPage, SelectEvent_Impl ));
+ rListBox.SetSelectHdl( LINK( this, _SvxMacroTabPage, SelectEvent_Impl ));
rListBox.SetSelectionMode( SINGLE_SELECTION );
rListBox.SetTabs( &nTabs[0], MAP_APPFONT );
diff --git a/cui/source/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx
index 3b2a4c949561..dc55f899db19 100644
--- a/cui/source/dialogs/SpellDialog.cxx
+++ b/cui/source/dialogs/SpellDialog.cxx
@@ -238,7 +238,7 @@ SpellDialog::SpellDialog(SpellDialogChildWindow* pChildWindow,
//InitHdl wants to use virtual methods, so it
//can't be called during the ctor, so init
//it on next event cycle post-ctor
- Application::PostUserEvent( STATIC_LINK(
+ Application::PostUserEvent( LINK(
this, SpellDialog, InitHdl ) );
}
diff --git a/cui/source/dialogs/insdlg.cxx b/cui/source/dialogs/insdlg.cxx
index 0b24ea2a535c..22c3c277082a 100644
--- a/cui/source/dialogs/insdlg.cxx
+++ b/cui/source/dialogs/insdlg.cxx
@@ -556,7 +556,7 @@ void SfxInsertFloatingFrameDialog::Init()
get(m_pNMMarginHeight, "height");
get(m_pCBMarginHeightDefault, "defaultheight");
- Link aLink( STATIC_LINK( this, SfxInsertFloatingFrameDialog, CheckHdl ) );
+ Link aLink( LINK( this, SfxInsertFloatingFrameDialog, CheckHdl ) );
m_pCBMarginWidthDefault->SetClickHdl( aLink );
m_pCBMarginHeightDefault->SetClickHdl( aLink );
@@ -565,7 +565,7 @@ void SfxInsertFloatingFrameDialog::Init()
m_pRBScrollingAuto->Check();
m_pRBFrameBorderOn->Check();
- m_pBTOpen->SetClickHdl( STATIC_LINK( this, SfxInsertFloatingFrameDialog, OpenHdl ) );
+ m_pBTOpen->SetClickHdl( LINK( this, SfxInsertFloatingFrameDialog, OpenHdl ) );
}
short SfxInsertFloatingFrameDialog::Execute()
diff --git a/cui/source/dialogs/thesdlg.cxx b/cui/source/dialogs/thesdlg.cxx
index 4a98eb59a44b..a12e68c7fe21 100644
--- a/cui/source/dialogs/thesdlg.cxx
+++ b/cui/source/dialogs/thesdlg.cxx
@@ -443,7 +443,7 @@ IMPL_LINK( SvxThesaurusDialog, AlternativesDoubleClickHdl_Impl, SvxCheckListBox
//! workaround to set the selection since calling SelectEntryPos within
//! the double click handler does not work
- Application::PostUserEvent( STATIC_LINK( this, SvxThesaurusDialog, SelectFirstHdl_Impl ), pBox );
+ Application::PostUserEvent( LINK( this, SvxThesaurusDialog, SelectFirstHdl_Impl ), pBox );
return 0;
}
diff --git a/cui/source/tabpages/macroass.cxx b/cui/source/tabpages/macroass.cxx
index ced57182cea9..9c384f04800d 100644
--- a/cui/source/tabpages/macroass.cxx
+++ b/cui/source/tabpages/macroass.cxx
@@ -197,7 +197,7 @@ void _SfxMacroTabPage::LaunchFillGroup()
{
if (!mpImpl->maFillGroupIdle.GetIdleHdl().IsSet())
{
- mpImpl->maFillGroupIdle.SetIdleHdl( STATIC_LINK( this, _SfxMacroTabPage, TimeOut_Impl ) );
+ mpImpl->maFillGroupIdle.SetIdleHdl( LINK( this, _SfxMacroTabPage, TimeOut_Impl ) );
mpImpl->maFillGroupIdle.SetPriority( SchedulerPriority::HIGHEST );
mpImpl->maFillGroupIdle.Start();
}
@@ -369,15 +369,15 @@ void _SfxMacroTabPage::InitAndSetHandler()
{
SvHeaderTabListBox& rListBox = mpImpl->pEventLB->GetListBox();
HeaderBar& rHeaderBar = mpImpl->pEventLB->GetHeaderBar();
- Link aLnk(STATIC_LINK(this, _SfxMacroTabPage, AssignDeleteHdl_Impl ));
+ Link aLnk(LINK(this, _SfxMacroTabPage, AssignDeleteHdl_Impl ));
mpImpl->pMacroLB->SetDoubleClickHdl( aLnk );
mpImpl->pDeletePB->SetClickHdl( aLnk );
mpImpl->pAssignPB->SetClickHdl( aLnk );
rListBox.SetDoubleClickHdl( aLnk );
- rListBox.SetSelectHdl( STATIC_LINK( this, _SfxMacroTabPage, SelectEvent_Impl ));
- mpImpl->pGroupLB->SetSelectHdl( STATIC_LINK( this, _SfxMacroTabPage, SelectGroup_Impl ));
- mpImpl->pMacroLB->SetSelectHdl( STATIC_LINK( this, _SfxMacroTabPage, SelectMacro_Impl ));
+ rListBox.SetSelectHdl( LINK( this, _SfxMacroTabPage, SelectEvent_Impl ));
+ mpImpl->pGroupLB->SetSelectHdl( LINK( this, _SfxMacroTabPage, SelectGroup_Impl ));
+ mpImpl->pMacroLB->SetSelectHdl( LINK( this, _SfxMacroTabPage, SelectMacro_Impl ));
rListBox.SetSelectionMode( SINGLE_SELECTION );
rListBox.SetTabs( &nTabs[0], MAP_APPFONT );
diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx
index f6a6b3f7de54..bdc91ac2793f 100644
--- a/cui/source/tabpages/tpline.cxx
+++ b/cui/source/tabpages/tpline.cxx
@@ -316,7 +316,7 @@ void SvxLineTabPage::InitSymbols(MenuButton* pButton)
}
SvxBrushItem* pBrushItem = new SvxBrushItem(*it, aEmptyStr, GPOS_AREA, SID_ATTR_BRUSH);
- pBrushItem->SetDoneLink(STATIC_LINK(this, SvxLineTabPage, GraphicArrivedHdl_Impl));
+ pBrushItem->SetDoneLink(LINK(this, SvxLineTabPage, GraphicArrivedHdl_Impl));
SvxBmpItemInfo* pInfo = new SvxBmpItemInfo();
pInfo->pBrushItem = pBrushItem;
@@ -409,7 +409,7 @@ void SvxLineTabPage::InitSymbols(MenuButton* pButton)
SdrObject::Free(pObj);
SvxBrushItem* pBrushItem = new SvxBrushItem(Graphic(aMeta), GPOS_AREA, SID_ATTR_BRUSH);
- pBrushItem->SetDoneLink(STATIC_LINK(this, SvxLineTabPage, GraphicArrivedHdl_Impl));
+ pBrushItem->SetDoneLink(LINK(this, SvxLineTabPage, GraphicArrivedHdl_Impl));
SvxBmpItemInfo* pInfo = new SvxBmpItemInfo();
pInfo->pBrushItem = pBrushItem;