diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-04-29 17:05:19 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2015-04-29 18:29:59 +0200 |
commit | 0acd47f68e3efb46dafd866ee95497da818fa34f (patch) | |
tree | e7bc16002983079713868dd91478d24aac6cfed3 /sc | |
parent | 17cb3391ece392497eeff4ed32cbf89b4bcb5825 (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 'sc')
-rw-r--r-- | sc/source/core/data/documen9.cxx | 3 | ||||
-rw-r--r-- | sc/source/core/data/userdat.cxx | 3 | ||||
-rw-r--r-- | sc/source/ui/dbgui/dbnamdlg.cxx | 3 | ||||
-rw-r--r-- | sc/source/ui/dbgui/subtdlg.cxx | 3 | ||||
-rw-r--r-- | sc/source/ui/drawfunc/fupoor.cxx | 3 | ||||
-rw-r--r-- | sc/source/ui/miscdlgs/crdlg.cxx | 3 | ||||
-rw-r--r-- | sc/source/ui/miscdlgs/crnrdlg.cxx | 3 | ||||
-rw-r--r-- | sc/source/ui/miscdlgs/delcodlg.cxx | 3 | ||||
-rw-r--r-- | sc/source/ui/miscdlgs/lbseldlg.cxx | 3 | ||||
-rw-r--r-- | sc/source/ui/miscdlgs/mtrindlg.cxx | 3 | ||||
-rw-r--r-- | sc/source/ui/miscdlgs/scuiautofmt.cxx | 3 | ||||
-rw-r--r-- | sc/source/ui/miscdlgs/shtabdlg.cxx | 3 | ||||
-rw-r--r-- | sc/source/ui/view/viewdata.cxx | 3 | ||||
-rw-r--r-- | sc/workben/result.cxx | 3 |
14 files changed, 14 insertions, 28 deletions
diff --git a/sc/source/core/data/documen9.cxx b/sc/source/core/data/documen9.cxx index 2ec2a1753679..f780169310bb 100644 --- a/sc/source/core/data/documen9.cxx +++ b/sc/source/core/data/documen9.cxx @@ -232,11 +232,10 @@ bool ScDocument::IsChart( const SdrObject* pObject ) return false; } -IMPL_LINK_INLINE_START( ScDocument, GetUserDefinedColor, sal_uInt16 *, pColorIndex ) +IMPL_LINK( ScDocument, GetUserDefinedColor, sal_uInt16 *, pColorIndex ) { return reinterpret_cast<sal_IntPtr>( &((GetColorList()->GetColor(*pColorIndex))->GetColor()) ); } -IMPL_LINK_INLINE_END( ScDocument, GetUserDefinedColor, sal_uInt16 *, pColorIndex ) void ScDocument::DeleteDrawLayer() { diff --git a/sc/source/core/data/userdat.cxx b/sc/source/core/data/userdat.cxx index cb5566eed828..371c6e471715 100644 --- a/sc/source/core/data/userdat.cxx +++ b/sc/source/core/data/userdat.cxx @@ -31,7 +31,7 @@ ScDrawObjFactory::~ScDrawObjFactory() SdrObjFactory::RemoveMakeUserDataHdl( LINK ( this, ScDrawObjFactory, MakeUserData ) ); } -IMPL_LINK_INLINE_START( ScDrawObjFactory, MakeUserData, SdrObjFactory *, pObjFactory ) +IMPL_LINK( ScDrawObjFactory, MakeUserData, SdrObjFactory *, pObjFactory ) { if ( pObjFactory->nInventor == SC_DRAWLAYER ) { @@ -48,7 +48,6 @@ IMPL_LINK_INLINE_START( ScDrawObjFactory, MakeUserData, SdrObjFactory *, pObjFac } return 0; } -IMPL_LINK_INLINE_END( ScDrawObjFactory, MakeUserData, SdrObjFactory *, pObjFactory ) ScDrawObjData::ScDrawObjData() : SdrObjUserData( SC_DRAWLAYER, SC_UD_OBJDATA, 0 ), diff --git a/sc/source/ui/dbgui/dbnamdlg.cxx b/sc/source/ui/dbgui/dbnamdlg.cxx index 7df39d8335b2..3343c90181c5 100644 --- a/sc/source/ui/dbgui/dbnamdlg.cxx +++ b/sc/source/ui/dbgui/dbnamdlg.cxx @@ -400,12 +400,11 @@ IMPL_LINK_NOARG(ScDbNameDlg, OkBtnHdl) return 0; } -IMPL_LINK_NOARG_INLINE_START(ScDbNameDlg, CancelBtnHdl) +IMPL_LINK_NOARG(ScDbNameDlg, CancelBtnHdl) { Close(); return 0; } -IMPL_LINK_NOARG_INLINE_END(ScDbNameDlg, CancelBtnHdl) IMPL_LINK_NOARG(ScDbNameDlg, AddBtnHdl) { diff --git a/sc/source/ui/dbgui/subtdlg.cxx b/sc/source/ui/dbgui/subtdlg.cxx index 45132c0b02ff..9e34ba7e35ae 100644 --- a/sc/source/ui/dbgui/subtdlg.cxx +++ b/sc/source/ui/dbgui/subtdlg.cxx @@ -47,7 +47,7 @@ void ScSubTotalDlg::dispose() SfxTabDialog::dispose(); } -IMPL_LINK_INLINE_START( ScSubTotalDlg, RemoveHdl, PushButton *, pBtn ) +IMPL_LINK( ScSubTotalDlg, RemoveHdl, PushButton *, pBtn ) { if (pBtn == m_pBtnRemove) { @@ -55,6 +55,5 @@ IMPL_LINK_INLINE_START( ScSubTotalDlg, RemoveHdl, PushButton *, pBtn ) } return 0; } -IMPL_LINK_INLINE_END( ScSubTotalDlg, RemoveHdl, PushButton *, pBtn ) /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/drawfunc/fupoor.cxx b/sc/source/ui/drawfunc/fupoor.cxx index 46b4132fc7be..ac4b97811d3e 100644 --- a/sc/source/ui/drawfunc/fupoor.cxx +++ b/sc/source/ui/drawfunc/fupoor.cxx @@ -126,7 +126,7 @@ void FuPoor::ForceScroll(const Point& aPixPos) |* \************************************************************************/ -IMPL_LINK_NOARG_INLINE_START(FuPoor, ScrollHdl) +IMPL_LINK_NOARG(FuPoor, ScrollHdl) { Point aPosPixel = pWindow->GetPointerPosPixel(); @@ -136,7 +136,6 @@ IMPL_LINK_NOARG_INLINE_START(FuPoor, ScrollHdl) return 0; } -IMPL_LINK_INLINE_END( FuPoor, ScrollHdl, Timer *, pTimer ) // moved from inline to *.cxx bool FuPoor::MouseButtonUp(const MouseEvent& rMEvt) diff --git a/sc/source/ui/miscdlgs/crdlg.cxx b/sc/source/ui/miscdlgs/crdlg.cxx index 497a76ecfa8a..f4dbff4623f5 100644 --- a/sc/source/ui/miscdlgs/crdlg.cxx +++ b/sc/source/ui/miscdlgs/crdlg.cxx @@ -59,11 +59,10 @@ void ScColOrRowDlg::dispose() } -IMPL_LINK_NOARG_INLINE_START(ScColOrRowDlg, OkHdl) +IMPL_LINK_NOARG(ScColOrRowDlg, OkHdl) { EndDialog( m_pBtnCols->IsChecked() ? SCRET_COLS : SCRET_ROWS ); return 0; } -IMPL_LINK_NOARG_INLINE_END(ScColOrRowDlg, OkHdl) /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/miscdlgs/crnrdlg.cxx b/sc/source/ui/miscdlgs/crnrdlg.cxx index c2195145d446..55ca2df0cb59 100644 --- a/sc/source/ui/miscdlgs/crnrdlg.cxx +++ b/sc/source/ui/miscdlgs/crnrdlg.cxx @@ -517,12 +517,11 @@ IMPL_LINK_NOARG(ScColRowNameRangesDlg, OkBtnHdl) return 0; } -IMPL_LINK_NOARG_INLINE_START(ScColRowNameRangesDlg, CancelBtnHdl) +IMPL_LINK_NOARG(ScColRowNameRangesDlg, CancelBtnHdl) { Close(); return 0; } -IMPL_LINK_NOARG_INLINE_END(ScColRowNameRangesDlg, CancelBtnHdl) // handler called when add button clicked: set ranges and add to listbox IMPL_LINK_NOARG(ScColRowNameRangesDlg, AddBtnHdl) diff --git a/sc/source/ui/miscdlgs/delcodlg.cxx b/sc/source/ui/miscdlgs/delcodlg.cxx index 911af874bcbb..3ebd534f0e86 100644 --- a/sc/source/ui/miscdlgs/delcodlg.cxx +++ b/sc/source/ui/miscdlgs/delcodlg.cxx @@ -150,12 +150,11 @@ void ScDeleteContentsDlg::DisableObjects() aBtnDelObjects->Disable(); } -IMPL_LINK_NOARG_INLINE_START(ScDeleteContentsDlg, DelAllHdl) +IMPL_LINK_NOARG(ScDeleteContentsDlg, DelAllHdl) { DisableChecks( aBtnDelAll->IsChecked() ); return 0; } -IMPL_LINK_NOARG_INLINE_END(ScDeleteContentsDlg, DelAllHdl) /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/miscdlgs/lbseldlg.cxx b/sc/source/ui/miscdlgs/lbseldlg.cxx index 2528212d3776..e869d706b740 100644 --- a/sc/source/ui/miscdlgs/lbseldlg.cxx +++ b/sc/source/ui/miscdlgs/lbseldlg.cxx @@ -58,11 +58,10 @@ OUString ScSelEntryDlg::GetSelectEntry() const return m_pLb->GetSelectEntry(); } -IMPL_LINK_NOARG_INLINE_START(ScSelEntryDlg, DblClkHdl) +IMPL_LINK_NOARG(ScSelEntryDlg, DblClkHdl) { EndDialog( RET_OK ); return 0; } -IMPL_LINK_NOARG_INLINE_END(ScSelEntryDlg, DblClkHdl) /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/miscdlgs/mtrindlg.cxx b/sc/source/ui/miscdlgs/mtrindlg.cxx index ce23d3797014..f59a36cb22b2 100644 --- a/sc/source/ui/miscdlgs/mtrindlg.cxx +++ b/sc/source/ui/miscdlgs/mtrindlg.cxx @@ -108,11 +108,10 @@ IMPL_LINK_NOARG(ScMetricInputDlg, SetDefValHdl) return 0; } -IMPL_LINK_NOARG_INLINE_START(ScMetricInputDlg, ModifyHdl) +IMPL_LINK_NOARG(ScMetricInputDlg, ModifyHdl) { m_pBtnDefVal->Check( nDefaultValue == m_pEdValue->GetValue() ); return 0; } -IMPL_LINK_NOARG_INLINE_END(ScMetricInputDlg, ModifyHdl) /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/miscdlgs/scuiautofmt.cxx b/sc/source/ui/miscdlgs/scuiautofmt.cxx index 6a115706e598..8a5d071342de 100644 --- a/sc/source/ui/miscdlgs/scuiautofmt.cxx +++ b/sc/source/ui/miscdlgs/scuiautofmt.cxx @@ -175,7 +175,7 @@ IMPL_LINK( ScAutoFormatDlg, CloseHdl, PushButton *, pBtn ) return 0; } -IMPL_LINK_NOARG_INLINE_START(ScAutoFormatDlg, DblClkHdl) +IMPL_LINK_NOARG(ScAutoFormatDlg, DblClkHdl) { if ( bCoreDataChanged ) ScGlobal::GetOrCreateAutoFormat()->Save(); @@ -183,7 +183,6 @@ IMPL_LINK_NOARG_INLINE_START(ScAutoFormatDlg, DblClkHdl) EndDialog( RET_OK ); return 0; } -IMPL_LINK_NOARG_INLINE_END(ScAutoFormatDlg, DblClkHdl) IMPL_LINK( ScAutoFormatDlg, CheckHdl, Button *, pBtn ) { diff --git a/sc/source/ui/miscdlgs/shtabdlg.cxx b/sc/source/ui/miscdlgs/shtabdlg.cxx index 7898fc904488..d4c7339c27a5 100644 --- a/sc/source/ui/miscdlgs/shtabdlg.cxx +++ b/sc/source/ui/miscdlgs/shtabdlg.cxx @@ -81,11 +81,10 @@ sal_Int32 ScShowTabDlg::GetSelectEntryPos(sal_Int32 nPos) const return m_pLb->GetSelectEntryPos(nPos); } -IMPL_LINK_NOARG_INLINE_START(ScShowTabDlg, DblClkHdl) +IMPL_LINK_NOARG(ScShowTabDlg, DblClkHdl) { EndDialog( RET_OK ); return 0; } -IMPL_LINK_NOARG_INLINE_END(ScShowTabDlg, DblClkHdl) /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/viewdata.cxx b/sc/source/ui/view/viewdata.cxx index f2239a04669e..1f824dce2871 100644 --- a/sc/source/ui/view/viewdata.cxx +++ b/sc/source/ui/view/viewdata.cxx @@ -1090,11 +1090,10 @@ void ScViewData::SetEditEngine( ScSplitPos eWhich, // needed, wenn position changed } -IMPL_LINK_NOARG_INLINE_START(ScViewData, EmptyEditHdl) +IMPL_LINK_NOARG(ScViewData, EmptyEditHdl) { return 0; } -IMPL_LINK_NOARG_INLINE_END(ScViewData, EmptyEditHdl) IMPL_LINK( ScViewData, EditEngineHdl, EditStatus *, pStatus ) { diff --git a/sc/workben/result.cxx b/sc/workben/result.cxx index 3f951954339b..7d43f8d9322b 100644 --- a/sc/workben/result.cxx +++ b/sc/workben/result.cxx @@ -50,13 +50,12 @@ void ScAddInResult::NewValue() (*aListeners[n])->modified( aEvent ); } -IMPL_LINK_INLINE_START( ScAddInResult, TimeoutHdl, Timer*, pT ) +IMPL_LINK( ScAddInResult, TimeoutHdl, Timer*, pT ) { NewValue(); pT->Start(); return 0; } -IMPL_LINK_INLINE_END( ScAddInResult, TimeoutHdl, Timer*, pT ) ScAddInResult::~ScAddInResult() { |