Kaydet (Commit) 5ae90e15 authored tarafından Noel Grandin's avatar Noel Grandin

convert Link<> to typed

Change-Id: Ib0f043cf40f2a1b4b9f0837a5c536994bff3aeef
Reviewed-on: https://gerrit.libreoffice.org/18810Reviewed-by: 's avatarNoel Grandin <noelgrandin@gmail.com>
Tested-by: 's avatarNoel Grandin <noelgrandin@gmail.com>
üst c24ce843
...@@ -99,7 +99,7 @@ private: ...@@ -99,7 +99,7 @@ private:
static bool IsExtFileNameEntry(EditTextObject* pTextObj); static bool IsExtFileNameEntry(EditTextObject* pTextObj);
DECL_LINK( ListHdl_Impl, ListBox* ); DECL_LINK( ListHdl_Impl, ListBox* );
DECL_LINK_TYPED( ClickHdl, Button*, void ); DECL_LINK_TYPED( ClickHdl, Button*, void );
DECL_STATIC_LINK( ScHFEditPage, MenuHdl, ScExtIButton* ); DECL_STATIC_LINK_TYPED( ScHFEditPage, MenuHdl, ScExtIButton&, void );
}; };
class ScRightHeaderEditPage : public ScHFEditPage class ScRightHeaderEditPage : public ScHFEditPage
......
...@@ -103,7 +103,7 @@ private: ...@@ -103,7 +103,7 @@ private:
Idle aIdle; Idle aIdle;
PopupMenu* pPopupMenu; PopupMenu* pPopupMenu;
Link<> aMLink; Link<ScExtIButton&,void> aMLink;
sal_uInt16 nSelected; sal_uInt16 nSelected;
OString aSelectedIdent; OString aSelectedIdent;
...@@ -126,7 +126,7 @@ public: ...@@ -126,7 +126,7 @@ public:
sal_uInt16 GetSelected() const { return nSelected;} sal_uInt16 GetSelected() const { return nSelected;}
OString GetSelectedIdent() const { return aSelectedIdent;} OString GetSelectedIdent() const { return aSelectedIdent;}
void SetMenuHdl( const Link<>& rLink ) { aMLink = rLink; } void SetMenuHdl( const Link<ScExtIButton&,void>& rLink ) { aMLink = rLink; }
virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE;
}; };
......
...@@ -823,16 +823,14 @@ IMPL_LINK_TYPED( ScHFEditPage, ClickHdl, Button*, pBtn, void ) ...@@ -823,16 +823,14 @@ IMPL_LINK_TYPED( ScHFEditPage, ClickHdl, Button*, pBtn, void )
pActiveEdWnd->GrabFocus(); pActiveEdWnd->GrabFocus();
} }
IMPL_STATIC_LINK( ScHFEditPage, MenuHdl, ScExtIButton*, pBtn ) IMPL_STATIC_LINK_TYPED( ScHFEditPage, MenuHdl, ScExtIButton&, rBtn, void )
{ {
pActiveEdWnd = ::GetScEditWindow(); pActiveEdWnd = ::GetScEditWindow();
if ( !pActiveEdWnd ) if ( !pActiveEdWnd )
return 0; return;
if(pBtn!=NULL) SAL_WARN_IF(rBtn.GetSelected() == 0, "sc.ui", "nothing selected");
{ OString sSelectedId = rBtn.GetSelectedIdent();
SAL_WARN_IF(pBtn->GetSelected() == 0, "sc.ui", "nothing selected");
OString sSelectedId = pBtn->GetSelectedIdent();
if (sSelectedId == "title") if (sSelectedId == "title")
{ {
...@@ -848,8 +846,6 @@ IMPL_STATIC_LINK( ScHFEditPage, MenuHdl, ScExtIButton*, pBtn ) ...@@ -848,8 +846,6 @@ IMPL_STATIC_LINK( ScHFEditPage, MenuHdl, ScExtIButton*, pBtn )
pActiveEdWnd->InsertField( SvxFieldItem( SvxExtFileField( pActiveEdWnd->InsertField( SvxFieldItem( SvxExtFileField(
OUString(), SVXFILETYPE_VAR, SVXFILEFORMAT_FULLPATH ), EE_FEATURE_FIELD ) ); OUString(), SVXFILETYPE_VAR, SVXFILEFORMAT_FULLPATH ), EE_FEATURE_FIELD ) );
} }
}
return 0;
} }
// class ScRightHeaderEditPage // class ScRightHeaderEditPage
......
...@@ -395,7 +395,7 @@ void ScExtIButton::StartPopup() ...@@ -395,7 +395,7 @@ void ScExtIButton::StartPopup()
if(nSelected) if(nSelected)
{ {
aSelectedIdent = pPopupMenu->GetItemIdent(nSelected); aSelectedIdent = pPopupMenu->GetItemIdent(nSelected);
aMLink.Call(this); aMLink.Call(*this);
} }
SetPressed( false); SetPressed( false);
......
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