summaryrefslogtreecommitdiff
path: root/basctl
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 /basctl
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 'basctl')
-rw-r--r--basctl/source/basicide/baside2b.cxx13
-rw-r--r--basctl/source/basicide/basidesh.cxx5
-rw-r--r--basctl/source/basicide/bastypes.cxx9
-rw-r--r--basctl/source/basicide/brkdlg.cxx5
-rw-r--r--basctl/source/basicide/macrodlg.cxx3
-rw-r--r--basctl/source/basicide/moduldl2.cxx9
-rw-r--r--basctl/source/dlged/dlgedfunc.cxx3
7 files changed, 12 insertions, 35 deletions
diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx
index 6cbaaf5117ea..5182ebdb6931 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -1808,18 +1808,15 @@ bool WatchWindow::RemoveSelectedWatch()
}
-IMPL_LINK_INLINE_START( WatchWindow, ButtonHdl, ImageButton *, pButton )
+IMPL_LINK( WatchWindow, ButtonHdl, ImageButton *, pButton )
{
if (pButton == aRemoveWatchButton.get())
if (SfxDispatcher* pDispatcher = GetDispatcher())
pDispatcher->Execute(SID_BASICIDE_REMOVEWATCH);
return 0;
}
-IMPL_LINK_INLINE_END( WatchWindow, ButtonHdl, ImageButton *, pButton )
-
-
-IMPL_LINK_NOARG_INLINE_START(WatchWindow, TreeListHdl)
+IMPL_LINK_NOARG(WatchWindow, TreeListHdl)
{
SvTreeListEntry* pCurEntry = aTreeListBox->GetCurEntry();
if ( pCurEntry && pCurEntry->GetUserData() )
@@ -1827,10 +1824,8 @@ IMPL_LINK_NOARG_INLINE_START(WatchWindow, TreeListHdl)
return 0;
}
-IMPL_LINK_NOARG_INLINE_END(WatchWindow, TreeListHdl)
-
-IMPL_LINK_INLINE_START( WatchWindow, implEndDragHdl, HeaderBar *, pBar )
+IMPL_LINK( WatchWindow, implEndDragHdl, HeaderBar *, pBar )
{
(void)pBar;
@@ -1862,8 +1857,6 @@ IMPL_LINK_INLINE_START( WatchWindow, implEndDragHdl, HeaderBar *, pBar )
}
return 0;
}
-IMPL_LINK_INLINE_END( WatchWindow, implEndDragHdl, HeaderBar *, pBar )
-
IMPL_LINK( WatchWindow, EditAccHdl, Accelerator *, pAcc )
{
diff --git a/basctl/source/basicide/basidesh.cxx b/basctl/source/basicide/basidesh.cxx
index 214c5b6967db..1c01f29b3b8b 100644
--- a/basctl/source/basicide/basidesh.cxx
+++ b/basctl/source/basicide/basidesh.cxx
@@ -440,7 +440,7 @@ void Shell::OuterResizePixel( const Point &rPos, const Size &rSize )
}
-IMPL_LINK_INLINE_START( Shell, TabBarSplitHdl, TabBar *, pTBar )
+IMPL_LINK( Shell, TabBarSplitHdl, TabBar *, pTBar )
{
(void)pTBar;
bTabBarSplitted = true;
@@ -448,9 +448,6 @@ IMPL_LINK_INLINE_START( Shell, TabBarSplitHdl, TabBar *, pTBar )
return 0;
}
-IMPL_LINK_INLINE_END( Shell, TabBarSplitHdl, TabBar *, pTBar )
-
-
IMPL_LINK( Shell, TabBarHdl, TabBar *, pCurTabBar )
{
diff --git a/basctl/source/basicide/bastypes.cxx b/basctl/source/basicide/bastypes.cxx
index 6efa5cb29a19..278ac2f00f0d 100644
--- a/basctl/source/basicide/bastypes.cxx
+++ b/basctl/source/basicide/bastypes.cxx
@@ -97,13 +97,11 @@ void BaseWindow::GrabScrollBars( ScrollBar* pHScroll, ScrollBar* pVScroll )
-IMPL_LINK_INLINE_START( BaseWindow, ScrollHdl, ScrollBar *, pCurScrollBar )
+IMPL_LINK( BaseWindow, ScrollHdl, ScrollBar *, pCurScrollBar )
{
DoScroll( pCurScrollBar );
return 0;
}
-IMPL_LINK_INLINE_END( BaseWindow, ScrollHdl, ScrollBar *, pCurScrollBar )
-
void BaseWindow::ExecuteCommand (SfxRequest&)
{ }
@@ -456,14 +454,11 @@ IMPL_LINK_NOARG(ExtendedEdit, ImplLoseFocusHdl)
}
-IMPL_LINK_INLINE_START( ExtendedEdit, EditAccHdl, Accelerator *, pAcc )
+IMPL_LINK( ExtendedEdit, EditAccHdl, Accelerator *, pAcc )
{
aAccHdl.Call( pAcc );
return 0;
}
-IMPL_LINK_INLINE_END( ExtendedEdit, EditAccHdl, Accelerator *, pAcc )
-
-
// TabBar
diff --git a/basctl/source/basicide/brkdlg.cxx b/basctl/source/basicide/brkdlg.cxx
index fa8399a00512..eff2c10a4379 100644
--- a/basctl/source/basicide/brkdlg.cxx
+++ b/basctl/source/basicide/brkdlg.cxx
@@ -150,7 +150,7 @@ void BreakPointDialog::CheckButtons()
}
}
-IMPL_LINK_INLINE_START( BreakPointDialog, CheckBoxHdl, ::CheckBox *, pChkBx )
+IMPL_LINK( BreakPointDialog, CheckBoxHdl, ::CheckBox *, pChkBx )
{
BreakPoint* pBrk = GetSelectedBreakPoint();
if ( pBrk )
@@ -158,9 +158,6 @@ IMPL_LINK_INLINE_START( BreakPointDialog, CheckBoxHdl, ::CheckBox *, pChkBx )
return 0;
}
-IMPL_LINK_INLINE_END( BreakPointDialog, CheckBoxHdl, ::CheckBox *, pChkBx )
-
-
IMPL_LINK( BreakPointDialog, ComboBoxHighlightHdl, ComboBox *, pBox )
{
diff --git a/basctl/source/basicide/macrodlg.cxx b/basctl/source/basicide/macrodlg.cxx
index 2960bfa34929..7dbd9836d6e7 100644
--- a/basctl/source/basicide/macrodlg.cxx
+++ b/basctl/source/basicide/macrodlg.cxx
@@ -468,7 +468,7 @@ void MacroChooser::CheckButtons()
-IMPL_LINK_NOARG_INLINE_START(MacroChooser, MacroDoubleClickHdl)
+IMPL_LINK_NOARG(MacroChooser, MacroDoubleClickHdl)
{
StoreMacroDescription();
if (nMode == Recording)
@@ -481,7 +481,6 @@ IMPL_LINK_NOARG_INLINE_START(MacroChooser, MacroDoubleClickHdl)
EndDialog(Macro_OkRun);
return 0;
}
-IMPL_LINK_NOARG_INLINE_END(MacroChooser, MacroDoubleClickHdl)
IMPL_LINK( MacroChooser, MacroSelectHdl, SvTreeListBox *, pBox )
{
diff --git a/basctl/source/basicide/moduldl2.cxx b/basctl/source/basicide/moduldl2.cxx
index 7ac4766d3e14..2f0fcb496a44 100644
--- a/basctl/source/basicide/moduldl2.cxx
+++ b/basctl/source/basicide/moduldl2.cxx
@@ -606,22 +606,20 @@ void LibPage::DeactivatePage()
{
}
-IMPL_LINK_INLINE_START( LibPage, TreeListHighlightHdl, SvTreeListBox *, pBox )
+IMPL_LINK( LibPage, TreeListHighlightHdl, SvTreeListBox *, pBox )
{
if ( pBox->IsSelected( pBox->GetHdlEntry() ) )
CheckButtons();
return 0;
}
-IMPL_LINK_INLINE_END( LibPage, TreeListHighlightHdl, SvTreeListBox *, pBox )
-IMPL_LINK_INLINE_START( LibPage, BasicSelectHdl, ListBox *, pBox )
+IMPL_LINK( LibPage, BasicSelectHdl, ListBox *, pBox )
{
(void)pBox;
SetCurLib();
CheckButtons();
return 0;
}
-IMPL_LINK_INLINE_END( LibPage, BasicSelectHdl, ListBox *, pBox )
IMPL_LINK( LibPage, ButtonHdl, Button *, pButton )
{
@@ -712,7 +710,7 @@ IMPL_LINK( LibPage, ButtonHdl, Button *, pButton )
return 0;
}
-IMPL_LINK_INLINE_START( LibPage, CheckPasswordHdl, SvxPasswordDialog *, pDlg )
+IMPL_LINK( LibPage, CheckPasswordHdl, SvxPasswordDialog *, pDlg )
{
long nRet = 0;
@@ -736,7 +734,6 @@ IMPL_LINK_INLINE_START( LibPage, CheckPasswordHdl, SvxPasswordDialog *, pDlg )
return nRet;
}
-IMPL_LINK_INLINE_END( LibPage, CheckPasswordHdl, SvxPasswordDialog *, pDlg )
void LibPage::NewLib()
{
diff --git a/basctl/source/dlged/dlgedfunc.cxx b/basctl/source/dlged/dlgedfunc.cxx
index 3937b20f35fe..05ca39ddede5 100644
--- a/basctl/source/dlged/dlgedfunc.cxx
+++ b/basctl/source/dlged/dlgedfunc.cxx
@@ -27,7 +27,7 @@
namespace basctl
{
-IMPL_LINK_INLINE_START( DlgEdFunc, ScrollTimeout, Timer *, pTimer )
+IMPL_LINK( DlgEdFunc, ScrollTimeout, Timer *, pTimer )
{
(void)pTimer;
vcl::Window& rWindow = rParent.GetWindow();
@@ -36,7 +36,6 @@ IMPL_LINK_INLINE_START( DlgEdFunc, ScrollTimeout, Timer *, pTimer )
ForceScroll( aPos );
return 0;
}
-IMPL_LINK_INLINE_END( DlgEdFunc, ScrollTimeout, Timer *, pTimer )
void DlgEdFunc::ForceScroll( const Point& rPos )
{