summaryrefslogtreecommitdiffstats
path: root/sfx2/source/dialog
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-04-29 17:05:19 +0200
committerStephan Bergmann <sbergman@redhat.com>2015-04-29 18:29:59 +0200
commit0acd47f68e3efb46dafd866ee95497da818fa34f (patch)
treee7bc16002983079713868dd91478d24aac6cfed3 /sfx2/source/dialog
parentRemove unnecessary IMPL_LINK_INLINE macro (diff)
downloadcore-0acd47f68e3efb46dafd866ee95497da818fa34f.tar.gz
core-0acd47f68e3efb46dafd866ee95497da818fa34f.zip
Remove unnecessary IMPL_LINK[_NOARG]_INLINE_START/END
...just use IMPL_LINK[_NOARG] and let the compiler decide what to inline Change-Id: I63ec5116df7e79093ebf31193f8c674f1351c0e6
Diffstat (limited to 'sfx2/source/dialog')
-rw-r--r--sfx2/source/dialog/mgetempl.cxx9
-rw-r--r--sfx2/source/dialog/newstyle.cxx3
-rw-r--r--sfx2/source/dialog/passwd.cxx5
-rw-r--r--sfx2/source/dialog/templdlg.cxx3
4 files changed, 5 insertions, 15 deletions
diff --git a/sfx2/source/dialog/mgetempl.cxx b/sfx2/source/dialog/mgetempl.cxx
index 47c59880a8b3..5bc78c42855b 100644
--- a/sfx2/source/dialog/mgetempl.cxx
+++ b/sfx2/source/dialog/mgetempl.cxx
@@ -419,7 +419,7 @@ bool SfxManageStyleSheetPage::Execute_Impl(
}
-IMPL_LINK_INLINE_START( SfxManageStyleSheetPage, GetFocusHdl, Edit *, pEdit )
+IMPL_LINK( SfxManageStyleSheetPage, GetFocusHdl, Edit *, pEdit )
/* [Description]
@@ -430,10 +430,8 @@ IMPL_LINK_INLINE_START( SfxManageStyleSheetPage, GetFocusHdl, Edit *, pEdit )
aBuf = comphelper::string::stripStart(pEdit->GetText(), ' ');
return 0;
}
-IMPL_LINK_INLINE_END( SfxManageStyleSheetPage, GetFocusHdl, Edit *, pEdit )
-
-IMPL_LINK_INLINE_START( SfxManageStyleSheetPage, LoseFocusHdl, Edit *, pEdit )
+IMPL_LINK( SfxManageStyleSheetPage, LoseFocusHdl, Edit *, pEdit )
/* [Description]
@@ -450,9 +448,6 @@ IMPL_LINK_INLINE_START( SfxManageStyleSheetPage, LoseFocusHdl, Edit *, pEdit )
UpdateName_Impl(m_pFollowLb, aStr);
return 0;
}
-IMPL_LINK_INLINE_END( SfxManageStyleSheetPage, LoseFocusHdl, Edit *, pEdit )
-
-
bool SfxManageStyleSheetPage::FillItemSet( SfxItemSet* rSet )
diff --git a/sfx2/source/dialog/newstyle.cxx b/sfx2/source/dialog/newstyle.cxx
index d3f26dc748cb..0824e3d3c09d 100644
--- a/sfx2/source/dialog/newstyle.cxx
+++ b/sfx2/source/dialog/newstyle.cxx
@@ -50,12 +50,11 @@ IMPL_LINK( SfxNewStyleDlg, OKHdl, Control *, pControl )
return 0;
}
-IMPL_LINK_INLINE_START( SfxNewStyleDlg, ModifyHdl, ComboBox *, pBox )
+IMPL_LINK( SfxNewStyleDlg, ModifyHdl, ComboBox *, pBox )
{
m_pOKBtn->Enable( !comphelper::string::remove(pBox->GetText(), ' ').isEmpty() );
return 0;
}
-IMPL_LINK_INLINE_END( SfxNewStyleDlg, ModifyHdl, ComboBox *, pBox )
SfxNewStyleDlg::SfxNewStyleDlg( vcl::Window* pParent, SfxStyleSheetBasePool& rInPool )
: ModalDialog(pParent, "CreateStyleDialog", "sfx/ui/newstyle.ui")
diff --git a/sfx2/source/dialog/passwd.cxx b/sfx2/source/dialog/passwd.cxx
index 0b6a20278a13..e120179324ae 100644
--- a/sfx2/source/dialog/passwd.cxx
+++ b/sfx2/source/dialog/passwd.cxx
@@ -29,7 +29,7 @@
-IMPL_LINK_INLINE_START( SfxPasswordDialog, EditModifyHdl, Edit *, pEdit )
+IMPL_LINK( SfxPasswordDialog, EditModifyHdl, Edit *, pEdit )
{
if (mbAsciiOnly && (pEdit == mpPassword1ED || pEdit == mpPassword2ED))
{
@@ -59,9 +59,6 @@ IMPL_LINK_INLINE_START( SfxPasswordDialog, EditModifyHdl, Edit *, pEdit )
mpOKBtn->Enable( bEnable );
return 0;
}
-IMPL_LINK_INLINE_END(SfxPasswordDialog, EditModifyHdl, Edit *, pEdit)
-
-
IMPL_LINK_NOARG(SfxPasswordDialog, OKHdl)
{
diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx
index 1a922bba75b8..53dca486fe3a 100644
--- a/sfx2/source/dialog/templdlg.cxx
+++ b/sfx2/source/dialog/templdlg.cxx
@@ -2430,13 +2430,12 @@ bool SfxTemplateDialog_Impl::IsCheckedItem(sal_uInt16 nMesId)
}
}
-IMPL_LINK_INLINE_START( SfxTemplateDialog_Impl, ToolBoxLSelect, ToolBox *, pBox )
+IMPL_LINK( SfxTemplateDialog_Impl, ToolBoxLSelect, ToolBox *, pBox )
{
const sal_uInt16 nEntry = pBox->GetCurItemId();
FamilySelect(nEntry);
return 0;
}
-IMPL_LINK_INLINE_END( SfxTemplateDialog_Impl, ToolBoxLSelect, ToolBox *, pBox )
static OUString lcl_GetLabel(uno::Any& rAny)
{