Kaydet (Commit) 368291e7 authored tarafından Noel Grandin's avatar Noel Grandin Kaydeden (comit) Stephan Bergmann

basctl: Use typed Links

Change-Id: I0e0b6086852c06df88e1b623d4631f364eb28b09
Signed-off-by: 's avatarStephan Bergmann <sbergman@redhat.com>
üst 91d6b00f
......@@ -237,7 +237,7 @@ protected:
DECL_LINK( ButtonHdl, ImageButton * );
DECL_LINK(TreeListHdl, void *);
DECL_LINK( implEndDragHdl, HeaderBar * );
DECL_LINK( EditAccHdl, Accelerator * );
DECL_LINK_TYPED( EditAccHdl, Accelerator *, void );
public:
......
......@@ -1810,7 +1810,7 @@ IMPL_LINK( WatchWindow, implEndDragHdl, HeaderBar *, pBar )
return 0;
}
IMPL_LINK( WatchWindow, EditAccHdl, Accelerator *, pAcc )
IMPL_LINK_TYPED( WatchWindow, EditAccHdl, Accelerator *, pAcc, void )
{
switch ( pAcc->GetCurKeyCode().GetCode() )
{
......@@ -1830,8 +1830,6 @@ IMPL_LINK( WatchWindow, EditAccHdl, Accelerator *, pAcc )
}
break;
}
return 0;
}
void WatchWindow::UpdateWatches( bool bBasicStopped )
......
......@@ -83,8 +83,9 @@ DialogWindow::DialogWindow(DialogWindowLayout* pParent, ScriptDocument const& rD
{
InitSettings( true, true, true );
aOldNotifyUndoActionHdl = pEditor->GetModel().GetNotifyUndoActionHdl();
pEditor->GetModel().SetNotifyUndoActionHdl(LINK(this, DialogWindow, NotifyUndoActionHdl));
pEditor->GetModel().SetNotifyUndoActionHdl(
LINK(this, DialogWindow, NotifyUndoActionHdl)
);
SetHelpId( HID_BASICIDE_DIALOGWINDOW );
......
......@@ -29,10 +29,9 @@ namespace basctl
class ExtendedEdit : public Edit
{
private:
Accelerator aAcc;
Link<> aAccHdl;
Link<> aGotFocusHdl;
Link<> aLoseFocusHdl;
Accelerator aAcc;
Link<Accelerator*,void> aAccHdl;
Link<ExtendedEdit*,void> aLoseFocusHdl;
protected:
DECL_LINK( EditAccHdl, Accelerator * );
......@@ -42,10 +41,9 @@ protected:
public:
ExtendedEdit( vcl::Window* pParent, IDEResId nRes );
void SetAccHdl( const Link<>& rLink ) { aAccHdl = rLink; }
void SetLoseFocusHdl( const Link<>& rLink ) { aLoseFocusHdl = rLink; }
void SetGotFocusHdl( const Link<>& rLink ) { aGotFocusHdl = rLink; }
Accelerator& GetAccelerator() { return aAcc; }
void SetAccHdl( const Link<Accelerator*,void>& rLink ) { aAccHdl = rLink; }
void SetLoseFocusHdl( const Link<ExtendedEdit*,void>& rLink ) { aLoseFocusHdl = rLink; }
Accelerator& GetAccelerator() { return aAcc; }
};
} // namespace basctl
......
......@@ -58,7 +58,6 @@ private:
DialogWindowLayout& rLayout;
boost::scoped_ptr<DlgEditor> pEditor; // never nullptr
boost::scoped_ptr<SfxUndoManager> pUndoMgr; // never nullptr
Link<> aOldNotifyUndoActionHdl;
OUString aCurPath;
protected:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment