summaryrefslogtreecommitdiff
path: root/starmath
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 /starmath
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 'starmath')
-rw-r--r--starmath/source/dialog.cxx11
-rw-r--r--starmath/source/edit.cxx6
-rw-r--r--starmath/source/view.cxx4
3 files changed, 6 insertions, 15 deletions
diff --git a/starmath/source/dialog.cxx b/starmath/source/dialog.cxx
index f562685b1683..80d39177e082 100644
--- a/starmath/source/dialog.cxx
+++ b/starmath/source/dialog.cxx
@@ -149,13 +149,11 @@ void SetFontStyle(const OUString &rStyleName, vcl::Font &rFont)
/**************************************************************************/
-IMPL_LINK_INLINE_START( SmPrintOptionsTabPage, SizeButtonClickHdl, Button *, EMPTYARG/*pButton*/ )
+IMPL_LINK( SmPrintOptionsTabPage, SizeButtonClickHdl, Button *, EMPTYARG/*pButton*/ )
{
m_pZoom->Enable(m_pSizeZoomed->IsChecked());
return 0;
}
-IMPL_LINK_INLINE_END( SmPrintOptionsTabPage, SizeButtonClickHdl, Button *, pButton )
-
SmPrintOptionsTabPage::SmPrintOptionsTabPage(vcl::Window *pParent, const SfxItemSet &rOptions)
: SfxTabPage(pParent, "SmathSettings", "modules/smath/ui/smathsettings.ui", &rOptions)
@@ -288,14 +286,12 @@ void SmShowFont::SetFont(const vcl::Font& rFont)
SetTextColor( aTxtColor );
}
-IMPL_LINK_INLINE_START( SmFontDialog, FontSelectHdl, ComboBox *, pComboBox )
+IMPL_LINK( SmFontDialog, FontSelectHdl, ComboBox *, pComboBox )
{
Face.SetName(pComboBox->GetText());
m_pShowFont->SetFont(Face);
return 0;
}
-IMPL_LINK_INLINE_END( SmFontDialog, FontSelectHdl, ComboBox *, pComboBox )
-
IMPL_LINK( SmFontDialog, FontModifyHdl, ComboBox *, pComboBox )
{
@@ -557,7 +553,7 @@ IMPL_LINK( SmFontTypeDialog, MenuSelectHdl, Menu *, pMenu )
}
-IMPL_LINK_INLINE_START( SmFontTypeDialog, DefaultButtonClickHdl, Button *, EMPTYARG /*pButton*/ )
+IMPL_LINK( SmFontTypeDialog, DefaultButtonClickHdl, Button *, EMPTYARG /*pButton*/ )
{
if (SaveDefaultsQuery(this).Execute() == RET_YES)
{
@@ -568,7 +564,6 @@ IMPL_LINK_INLINE_START( SmFontTypeDialog, DefaultButtonClickHdl, Button *, EMPTY
}
return 0;
}
-IMPL_LINK_INLINE_END( SmFontTypeDialog, DefaultButtonClickHdl, Button *, pButton )
SmFontTypeDialog::SmFontTypeDialog(vcl::Window * pParent, OutputDevice *pFntListDevice)
: ModalDialog(pParent, "FontsDialog", "modules/smath/ui/fonttypedialog.ui"),
diff --git a/starmath/source/edit.cxx b/starmath/source/edit.cxx
index cc0493072371..5e39c868a17d 100644
--- a/starmath/source/edit.cxx
+++ b/starmath/source/edit.cxx
@@ -403,7 +403,7 @@ bool SmEditWindow::HandleWheelCommands( const CommandEvent &rCEvt )
}
-IMPL_LINK_INLINE_START( SmEditWindow, MenuSelectHdl, Menu *, pMenu )
+IMPL_LINK( SmEditWindow, MenuSelectHdl, Menu *, pMenu )
{
SmViewShell *pViewSh = rCmdBox.GetView();
if (pViewSh)
@@ -412,7 +412,6 @@ IMPL_LINK_INLINE_START( SmEditWindow, MenuSelectHdl, Menu *, pMenu )
new SfxInt16Item(SID_INSERTCOMMAND, pMenu->GetCurItemId()), 0L);
return 0;
}
-IMPL_LINK_INLINE_END( SmEditWindow, MenuSelectHdl, Menu *, pMenu )
void SmEditWindow::KeyInput(const KeyEvent& rKEvt)
{
@@ -587,7 +586,7 @@ IMPL_LINK( SmEditWindow, EditStatusHdl, EditStatus *, EMPTYARG /*pStat*/ )
}
}
-IMPL_LINK_INLINE_START( SmEditWindow, ScrollHdl, ScrollBar *, EMPTYARG /*pScrollBar*/ )
+IMPL_LINK( SmEditWindow, ScrollHdl, ScrollBar *, EMPTYARG /*pScrollBar*/ )
{
OSL_ENSURE(pEditView, "EditView missing");
if (pEditView)
@@ -599,7 +598,6 @@ IMPL_LINK_INLINE_START( SmEditWindow, ScrollHdl, ScrollBar *, EMPTYARG /*pScroll
}
return 0;
}
-IMPL_LINK_INLINE_END( SmEditWindow, ScrollHdl, ScrollBar *, pScrollBar )
Rectangle SmEditWindow::AdjustScrollBars()
{
diff --git a/starmath/source/view.cxx b/starmath/source/view.cxx
index c967936c2f5c..829b6af9c2b2 100644
--- a/starmath/source/view.cxx
+++ b/starmath/source/view.cxx
@@ -606,15 +606,13 @@ void SmGraphicWindow::Command(const CommandEvent& rCEvt)
}
-IMPL_LINK_INLINE_START( SmGraphicWindow, MenuSelectHdl, Menu *, pMenu )
+IMPL_LINK( SmGraphicWindow, MenuSelectHdl, Menu *, pMenu )
{
SmViewShell *pViewSh = GetView();
if (pViewSh)
pViewSh->GetViewFrame()->GetDispatcher()->Execute( pMenu->GetCurItemId() );
return 0;
}
-IMPL_LINK_INLINE_END( SmGraphicWindow, MenuSelectHdl, Menu *, pMenu )
-
void SmGraphicWindow::SetZoom(sal_uInt16 Factor)
{