summaryrefslogtreecommitdiffstats
path: root/starmath
diff options
context:
space:
mode:
authorNoel Grandin <noelgrandin@gmail.com>2015-09-06 12:05:08 +0200
committerNoel Grandin <noelgrandin@gmail.com>2015-09-07 06:56:57 +0000
commit9af27324f5f5ef9bd340c6df8640b146a3eba21c (patch)
tree1bab2dbd1185adf86714718f5fb1a757c1a101e9 /starmath
parentcui: prefix members of SvxLineTabPage (diff)
downloadcore-9af27324f5f5ef9bd340c6df8640b146a3eba21c.tar.gz
core-9af27324f5f5ef9bd340c6df8640b146a3eba21c.zip
convert Link<> to typed
Change-Id: I38f2c15b4f8bb1d7187b019d26a2644b087898c1 Reviewed-on: https://gerrit.libreoffice.org/18357 Reviewed-by: Noel Grandin <noelgrandin@gmail.com> Tested-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'starmath')
-rw-r--r--starmath/inc/dialog.hxx4
-rw-r--r--starmath/inc/edit.hxx2
-rw-r--r--starmath/inc/view.hxx2
-rw-r--r--starmath/source/dialog.cxx8
-rw-r--r--starmath/source/edit.cxx4
-rw-r--r--starmath/source/view.cxx4
6 files changed, 12 insertions, 12 deletions
diff --git a/starmath/inc/dialog.hxx b/starmath/inc/dialog.hxx
index 70b627368501..7ac0f97ce6b0 100644
--- a/starmath/inc/dialog.hxx
+++ b/starmath/inc/dialog.hxx
@@ -159,7 +159,7 @@ class SmFontTypeDialog : public ModalDialog
VclPtr<OutputDevice> pFontListDev;
- DECL_LINK(MenuSelectHdl, Menu *);
+ DECL_LINK_TYPED(MenuSelectHdl, Menu *, bool);
DECL_LINK_TYPED(DefaultButtonClickHdl, Button *, void);
public:
@@ -223,7 +223,7 @@ class SmDistanceDialog : public ModalDialog
bool bScaleAllBrackets;
DECL_LINK(GetFocusHdl, Control *);
- DECL_LINK(MenuSelectHdl, Menu *);
+ DECL_LINK_TYPED(MenuSelectHdl, Menu *, bool);
DECL_LINK_TYPED(DefaultButtonClickHdl, Button *, void);
DECL_LINK_TYPED(CheckBoxClickHdl, Button *, void);
diff --git a/starmath/inc/edit.hxx b/starmath/inc/edit.hxx
index b69d90af9d83..b277bcdd3ba0 100644
--- a/starmath/inc/edit.hxx
+++ b/starmath/inc/edit.hxx
@@ -58,7 +58,7 @@ class SmEditWindow : public vcl::Window, public DropTargetHelper
virtual void KeyInput(const KeyEvent& rKEvt) SAL_OVERRIDE;
virtual void Command(const CommandEvent& rCEvt) SAL_OVERRIDE;
- DECL_LINK(MenuSelectHdl, Menu *);
+ DECL_LINK_TYPED(MenuSelectHdl, Menu *, bool);
DECL_LINK_TYPED(ModifyTimerHdl, Idle *, void);
DECL_LINK_TYPED(CursorMoveTimerHdl, Idle *, void);
diff --git a/starmath/inc/view.hxx b/starmath/inc/view.hxx
index 2cb968eddff7..edde0168903b 100644
--- a/starmath/inc/view.hxx
+++ b/starmath/inc/view.hxx
@@ -92,7 +92,7 @@ protected:
virtual void KeyInput(const KeyEvent& rKEvt) SAL_OVERRIDE;
virtual void Command(const CommandEvent& rCEvt) SAL_OVERRIDE;
virtual void StateChanged( StateChangedType eChanged ) SAL_OVERRIDE;
- DECL_LINK(MenuSelectHdl, Menu*);
+ DECL_LINK_TYPED(MenuSelectHdl, Menu*, bool);
private:
void RepaintViewShellDoc();
diff --git a/starmath/source/dialog.cxx b/starmath/source/dialog.cxx
index d47bd1229b2d..e572bbb1c7df 100644
--- a/starmath/source/dialog.cxx
+++ b/starmath/source/dialog.cxx
@@ -492,7 +492,7 @@ void SmFontSizeDialog::WriteTo(SmFormat &rFormat) const
rFormat.RequestApplyChanges();
}
-IMPL_LINK( SmFontTypeDialog, MenuSelectHdl, Menu *, pMenu )
+IMPL_LINK_TYPED( SmFontTypeDialog, MenuSelectHdl, Menu *, pMenu, bool )
{
SmFontPickListBox *pActiveListBox;
@@ -517,7 +517,7 @@ IMPL_LINK( SmFontTypeDialog, MenuSelectHdl, Menu *, pMenu )
if (pFontDialog->Execute() == RET_OK)
pActiveListBox->ReadFrom(*pFontDialog);
}
- return 0;
+ return false;
}
@@ -710,10 +710,10 @@ IMPL_LINK( SmDistanceDialog, GetFocusHdl, Control *, pControl )
return 0;
}
-IMPL_LINK( SmDistanceDialog, MenuSelectHdl, Menu *, pMenu )
+IMPL_LINK_TYPED( SmDistanceDialog, MenuSelectHdl, Menu *, pMenu, bool )
{
SetCategory(pMenu->GetCurItemId() - 1);
- return 0;
+ return false;
}
diff --git a/starmath/source/edit.cxx b/starmath/source/edit.cxx
index 983ab9a3d70d..4996e44579b3 100644
--- a/starmath/source/edit.cxx
+++ b/starmath/source/edit.cxx
@@ -398,14 +398,14 @@ bool SmEditWindow::HandleWheelCommands( const CommandEvent &rCEvt )
}
-IMPL_LINK( SmEditWindow, MenuSelectHdl, Menu *, pMenu )
+IMPL_LINK_TYPED( SmEditWindow, MenuSelectHdl, Menu *, pMenu, bool )
{
SmViewShell *pViewSh = rCmdBox.GetView();
if (pViewSh)
pViewSh->GetViewFrame()->GetDispatcher()->Execute(
SID_INSERTCOMMAND, SfxCallMode::RECORD,
new SfxInt16Item(SID_INSERTCOMMAND, pMenu->GetCurItemId()), 0L);
- return 0;
+ return false;
}
void SmEditWindow::KeyInput(const KeyEvent& rKEvt)
diff --git a/starmath/source/view.cxx b/starmath/source/view.cxx
index 93c49dc73935..d3d093be3288 100644
--- a/starmath/source/view.cxx
+++ b/starmath/source/view.cxx
@@ -601,12 +601,12 @@ void SmGraphicWindow::Command(const CommandEvent& rCEvt)
}
-IMPL_LINK( SmGraphicWindow, MenuSelectHdl, Menu *, pMenu )
+IMPL_LINK_TYPED( SmGraphicWindow, MenuSelectHdl, Menu *, pMenu, bool )
{
SmViewShell *pViewSh = GetView();
if (pViewSh)
pViewSh->GetViewFrame()->GetDispatcher()->Execute( pMenu->GetCurItemId() );
- return 0;
+ return false;
}
void SmGraphicWindow::SetZoom(sal_uInt16 Factor)