summaryrefslogtreecommitdiff
path: root/cui
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-05-09 21:35:10 +0200
committerStephan Bergmann <sbergman@redhat.com>2015-05-10 11:25:47 +0200
commit9bb254fc85eea7615cf8b9fa3700754fbd4c971c (patch)
tree96966587eee7453845fae3ec4c0868adbb48148c /cui
parent4d2a9bc3a63f682520e73f0c89c23cc87cbdef36 (diff)
NOINSTANCE is implied now in IMPL_STATIC_LINK...
Change-Id: Ifb032457d6c1b279c4183282ef2b271c706dd71a
Diffstat (limited to 'cui')
-rw-r--r--cui/source/dialogs/hlmailtp.cxx2
-rw-r--r--cui/source/dialogs/scriptdlg.cxx2
-rw-r--r--cui/source/dialogs/thesdlg.cxx2
-rw-r--r--cui/source/options/optinet2.cxx6
-rw-r--r--cui/source/options/treeopt.cxx2
-rw-r--r--cui/source/tabpages/chardlg.cxx2
-rw-r--r--cui/source/tabpages/paragrph.cxx2
-rw-r--r--cui/source/tabpages/tparea.cxx2
8 files changed, 10 insertions, 10 deletions
diff --git a/cui/source/dialogs/hlmailtp.cxx b/cui/source/dialogs/hlmailtp.cxx
index ce07304b2115..5c0f79f2043e 100644
--- a/cui/source/dialogs/hlmailtp.cxx
+++ b/cui/source/dialogs/hlmailtp.cxx
@@ -244,7 +244,7 @@ IMPL_LINK_NOARG(SvxHyperlinkMailTp, ModifiedReceiverHdl_Impl)
|*
|************************************************************************/
-IMPL_STATIC_LINK_NOINSTANCE_NOARG(SvxHyperlinkMailTp, ClickAdrBookHdl_Impl)
+IMPL_STATIC_LINK_NOARG(SvxHyperlinkMailTp, ClickAdrBookHdl_Impl)
{
SfxViewFrame* pViewFrame = SfxViewFrame::Current();
if( pViewFrame )
diff --git a/cui/source/dialogs/scriptdlg.cxx b/cui/source/dialogs/scriptdlg.cxx
index 2a5e29efefe2..4bddaae613f9 100644
--- a/cui/source/dialogs/scriptdlg.cxx
+++ b/cui/source/dialogs/scriptdlg.cxx
@@ -1483,7 +1483,7 @@ short SvxScriptErrorDialog::Execute()
return 0;
}
-IMPL_STATIC_LINK_NOINSTANCE(
+IMPL_STATIC_LINK(
SvxScriptErrorDialog, ShowDialog, OUString*, pMessage )
{
OUString message;
diff --git a/cui/source/dialogs/thesdlg.cxx b/cui/source/dialogs/thesdlg.cxx
index 81e7c7347b05..f5739672b840 100644
--- a/cui/source/dialogs/thesdlg.cxx
+++ b/cui/source/dialogs/thesdlg.cxx
@@ -437,7 +437,7 @@ IMPL_LINK( SvxThesaurusDialog, AlternativesDoubleClickHdl_Impl, SvxCheckListBox
return 0;
}
-IMPL_STATIC_LINK_NOINSTANCE( SvxThesaurusDialog, SelectFirstHdl_Impl, SvxCheckListBox *, pBox )
+IMPL_STATIC_LINK( SvxThesaurusDialog, SelectFirstHdl_Impl, SvxCheckListBox *, pBox )
{
if (pBox && pBox->GetEntryCount() >= 2)
pBox->SelectEntryPos( 1 ); // pos 0 is a 'header' that is not selectable
diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx
index 3694490e86b4..91296cb5a1d5 100644
--- a/cui/source/options/optinet2.cxx
+++ b/cui/source/options/optinet2.cxx
@@ -544,7 +544,7 @@ IMPL_LINK( SvxProxyTabPage, ProxyHdl_Impl, ListBox *, pBox )
-IMPL_STATIC_LINK_NOINSTANCE( SvxProxyTabPage, LoseFocusHdl_Impl, Edit *, pEdit )
+IMPL_STATIC_LINK( SvxProxyTabPage, LoseFocusHdl_Impl, Edit *, pEdit )
{
OUString aValue = pEdit->GetText();
@@ -732,7 +732,7 @@ IMPL_LINK_NOARG(SvxSecurityTabPage, SavePasswordHdl)
return 0;
}
-IMPL_STATIC_LINK_NOINSTANCE_NOARG(SvxSecurityTabPage, MasterPasswordHdl)
+IMPL_STATIC_LINK_NOARG(SvxSecurityTabPage, MasterPasswordHdl)
{
try
{
@@ -839,7 +839,7 @@ IMPL_LINK_NOARG(SvxSecurityTabPage, TSAURLsPBHdl)
return 0;
}
-IMPL_STATIC_LINK_NOINSTANCE_NOARG(SvxSecurityTabPage, MacroSecPBHdl)
+IMPL_STATIC_LINK_NOARG(SvxSecurityTabPage, MacroSecPBHdl)
{
try
{
diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx
index 7644fbfd348b..cf6021e63106 100644
--- a/cui/source/options/treeopt.cxx
+++ b/cui/source/options/treeopt.cxx
@@ -728,7 +728,7 @@ IMPL_LINK_NOARG(OfaTreeOptionsDialog, OKHdl_Impl)
}
// an opened group shall be completely visible
-IMPL_STATIC_LINK_NOINSTANCE(
+IMPL_STATIC_LINK(
OfaTreeOptionsDialog, ExpandedHdl_Impl, SvTreeListBox*, pBox )
{
pBox->Update();
diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx
index 97b6a957c873..ec30ed37a87e 100644
--- a/cui/source/tabpages/chardlg.cxx
+++ b/cui/source/tabpages/chardlg.cxx
@@ -2905,7 +2905,7 @@ IMPL_LINK_NOARG(SvxCharPositionPage, KerningModifyHdl_Impl)
-IMPL_STATIC_LINK_NOINSTANCE_NOARG(SvxCharPositionPage, PairKerningHdl_Impl)
+IMPL_STATIC_LINK_NOARG(SvxCharPositionPage, PairKerningHdl_Impl)
{
return 0;
}
diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx
index 46c204a24e06..8b647f452aab 100644
--- a/cui/source/tabpages/paragrph.cxx
+++ b/cui/source/tabpages/paragrph.cxx
@@ -2262,7 +2262,7 @@ void SvxAsianTabPage::Reset( const SfxItemSet* rSet )
lcl_SetBox(*rSet, SID_ATTR_PARA_SCRIPTSPACE, *m_pScriptSpaceCB );
}
-IMPL_STATIC_LINK_NOINSTANCE( SvxAsianTabPage, ClickHdl_Impl, CheckBox*, pBox )
+IMPL_STATIC_LINK( SvxAsianTabPage, ClickHdl_Impl, CheckBox*, pBox )
{
pBox->EnableTriState( false );
return 0;
diff --git a/cui/source/tabpages/tparea.cxx b/cui/source/tabpages/tparea.cxx
index 2e344e9bd77d..441fecb0928b 100644
--- a/cui/source/tabpages/tparea.cxx
+++ b/cui/source/tabpages/tparea.cxx
@@ -202,7 +202,7 @@ void SvxTransparenceTabPage::ActivateGradient(bool bActivate)
}
}
-IMPL_STATIC_LINK_NOINSTANCE_NOARG(
+IMPL_STATIC_LINK_NOARG(
SvxTransparenceTabPage, ChangeTrgrTypeHdl_Impl)
{
return 0L;