summaryrefslogtreecommitdiff
path: root/sw/source/ui/table
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 /sw/source/ui/table
parent17cb3391ece392497eeff4ed32cbf89b4bcb5825 (diff)
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 'sw/source/ui/table')
-rw-r--r--sw/source/ui/table/colwd.cxx3
-rw-r--r--sw/source/ui/table/instable.cxx3
-rw-r--r--sw/source/ui/table/tabledlg.cxx12
-rw-r--r--sw/source/ui/table/tautofmt.cxx3
4 files changed, 7 insertions, 14 deletions
diff --git a/sw/source/ui/table/colwd.cxx b/sw/source/ui/table/colwd.cxx
index 50ffa471b6f3..1ab303f1d9fd 100644
--- a/sw/source/ui/table/colwd.cxx
+++ b/sw/source/ui/table/colwd.cxx
@@ -31,7 +31,7 @@
#include <cmdid.h>
#include <table.hrc>
-IMPL_LINK_NOARG_INLINE_START(SwTableWidthDlg, LoseFocusHdl)
+IMPL_LINK_NOARG(SwTableWidthDlg, LoseFocusHdl)
{
sal_uInt16 nId = (sal_uInt16)m_pColNF->GetValue()-1;
const SwTwips lWidth = rFnc.GetColWidth(nId);
@@ -39,7 +39,6 @@ IMPL_LINK_NOARG_INLINE_START(SwTableWidthDlg, LoseFocusHdl)
m_pWidthMF->SetValue(m_pWidthMF->Normalize(lWidth), FUNIT_TWIP);
return 0;
}
-IMPL_LINK_NOARG_INLINE_END(SwTableWidthDlg, LoseFocusHdl)
SwTableWidthDlg::SwTableWidthDlg(vcl::Window *pParent, SwTableFUNC &rTableFnc )
: SvxStandardDialog( pParent, "ColumnWidthDialog", "modules/swriter/ui/columnwidth.ui" )
diff --git a/sw/source/ui/table/instable.cxx b/sw/source/ui/table/instable.cxx
index e67319432c11..0a24fe53619f 100644
--- a/sw/source/ui/table/instable.cxx
+++ b/sw/source/ui/table/instable.cxx
@@ -157,7 +157,7 @@ void SwInsTableDlg::dispose()
SfxModalDialog::dispose();
}
-IMPL_LINK_INLINE_START( SwInsTableDlg, ModifyName, Edit *, pEdit )
+IMPL_LINK( SwInsTableDlg, ModifyName, Edit *, pEdit )
{
OUString sTblName = pEdit->GetText();
if (sTblName.indexOf(' ') != -1)
@@ -169,7 +169,6 @@ IMPL_LINK_INLINE_START( SwInsTableDlg, ModifyName, Edit *, pEdit )
m_pInsertBtn->Enable(pShell->GetTblStyle( sTblName ) == 0);
return 0;
}
-IMPL_LINK_INLINE_END( SwInsTableDlg, ModifyName, Edit *, pEdit )
IMPL_LINK( SwInsTableDlg, ModifyRowCol, NumericField *, pField )
{
diff --git a/sw/source/ui/table/tabledlg.cxx b/sw/source/ui/table/tabledlg.cxx
index a90e84ce9eb7..00ee90230378 100644
--- a/sw/source/ui/table/tabledlg.cxx
+++ b/sw/source/ui/table/tabledlg.cxx
@@ -285,14 +285,13 @@ void SwFormatTablePage::RightModify()
}
}
-IMPL_LINK_INLINE_START( SwFormatTablePage, UpDownLoseFocusHdl, MetricField *, pEdit )
+IMPL_LINK( SwFormatTablePage, UpDownLoseFocusHdl, MetricField *, pEdit )
{
if( m_aRightMF.get() == pEdit)
RightModify();
ModifyHdl( pEdit );
return 0;
}
-IMPL_LINK_INLINE_END( SwFormatTablePage, UpDownLoseFocusHdl, MetricField *, pEdit )
void SwFormatTablePage::ModifyHdl(const Edit * pEdit)
{
@@ -906,23 +905,21 @@ IMPL_LINK( SwTableColumnPage, AutoClickHdl, void *, pControl )
return 0;
}
-IMPL_LINK_INLINE_START( SwTableColumnPage, UpHdl, MetricField*, pEdit )
+IMPL_LINK( SwTableColumnPage, UpHdl, MetricField*, pEdit )
{
bModified = true;
ModifyHdl( pEdit );
return 0;
}
-IMPL_LINK_INLINE_END( SwTableColumnPage, UpHdl, MetricField*, pEdit )
-IMPL_LINK_INLINE_START( SwTableColumnPage, DownHdl, MetricField*, pEdit )
+IMPL_LINK( SwTableColumnPage, DownHdl, MetricField*, pEdit )
{
bModified = true;
ModifyHdl( pEdit );
return 0;
}
-IMPL_LINK_INLINE_END( SwTableColumnPage, DownHdl, MetricField*, pEdit )
-IMPL_LINK_INLINE_START( SwTableColumnPage, LoseFocusHdl, MetricField*, pEdit )
+IMPL_LINK( SwTableColumnPage, LoseFocusHdl, MetricField*, pEdit )
{
if (pEdit->IsModified())
{
@@ -931,7 +928,6 @@ IMPL_LINK_INLINE_START( SwTableColumnPage, LoseFocusHdl, MetricField*, pEdit )
}
return 0;
}
-IMPL_LINK_INLINE_END( SwTableColumnPage, LoseFocusHdl, MetricField*, pEdit )
IMPL_LINK( SwTableColumnPage, ModeHdl, CheckBox*, pBox )
{
diff --git a/sw/source/ui/table/tautofmt.cxx b/sw/source/ui/table/tautofmt.cxx
index a60439cd3ec0..5ff495ddafe8 100644
--- a/sw/source/ui/table/tautofmt.cxx
+++ b/sw/source/ui/table/tautofmt.cxx
@@ -502,14 +502,13 @@ IMPL_LINK_NOARG(SwAutoFormatDlg, SelFmtHdl)
return 0;
}
-IMPL_LINK_NOARG_INLINE_START(SwAutoFormatDlg, OkHdl)
+IMPL_LINK_NOARG(SwAutoFormatDlg, OkHdl)
{
if( bSetAutoFmt )
pShell->SetTableAutoFmt( (*pTableTbl)[ nIndex ] );
EndDialog( RET_OK );
return sal_True;
}
-IMPL_LINK_NOARG_INLINE_END(SwAutoFormatDlg, OkHdl)
AutoFmtPreview::AutoFmtPreview(vcl::Window* pParent, WinBits nStyle) :
Window ( pParent, nStyle ),