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

convert Link<> to typed

Change-Id: I1acb6462aa32a0ee61e8ede3ed3e9607b8069298
üst 0e1d027f
...@@ -100,9 +100,8 @@ FontList; FontNameMenu; FontSizeBox ...@@ -100,9 +100,8 @@ FontList; FontNameMenu; FontSizeBox
class SVT_DLLPUBLIC FontNameMenu : public PopupMenu class SVT_DLLPUBLIC FontNameMenu : public PopupMenu
{ {
private: private:
OUString maCurName; OUString maCurName;
Link<> maSelectHdl; Link<FontNameMenu*,void> maSelectHdl;
Link<> maHighlightHdl;
public: public:
FontNameMenu(); FontNameMenu();
...@@ -116,7 +115,7 @@ public: ...@@ -116,7 +115,7 @@ public:
void SetCurName( const OUString& rName ); void SetCurName( const OUString& rName );
const OUString& GetCurName() const { return maCurName; } const OUString& GetCurName() const { return maCurName; }
void SetSelectHdl( const Link<>& rLink ) { maSelectHdl = rLink; } void SetSelectHdl( const Link<FontNameMenu*,void>& rLink ) { maSelectHdl = rLink; }
}; };
class SVT_DLLPUBLIC FontSizeMenu : public PopupMenu class SVT_DLLPUBLIC FontSizeMenu : public PopupMenu
......
...@@ -37,7 +37,7 @@ private: ...@@ -37,7 +37,7 @@ private:
Menu& rParent; Menu& rParent;
SVX_DLLPRIVATE void FillMenu(); SVX_DLLPRIVATE void FillMenu();
DECL_LINK( MenuSelect, FontNameMenu * ); DECL_LINK_TYPED( MenuSelect, FontNameMenu *, void);
SVX_DLLPRIVATE virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, SVX_DLLPRIVATE virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState,
const SfxPoolItem* pState ) SAL_OVERRIDE; const SfxPoolItem* pState ) SAL_OVERRIDE;
SVX_DLLPRIVATE virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; SVX_DLLPRIVATE virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE;
......
...@@ -41,10 +41,6 @@ void FontNameMenu::Select() ...@@ -41,10 +41,6 @@ void FontNameMenu::Select()
void FontNameMenu::Highlight() void FontNameMenu::Highlight()
{ {
OUString aTempName = maCurName;
maCurName = GetItemText( GetCurItemId() );
maHighlightHdl.Call( this );
maCurName = aTempName;
} }
void FontNameMenu::Fill( const FontList* pList ) void FontNameMenu::Fill( const FontList* pList )
......
...@@ -134,12 +134,11 @@ void SvxFontMenuControl::Notify( SfxBroadcaster&, const SfxHint& rHint ) ...@@ -134,12 +134,11 @@ void SvxFontMenuControl::Notify( SfxBroadcaster&, const SfxHint& rHint )
weiteren Fontinformationen mu\s durch die Applikation geschehen. weiteren Fontinformationen mu\s durch die Applikation geschehen.
*/ */
IMPL_LINK( SvxFontMenuControl, MenuSelect, FontNameMenu *, pMen ) IMPL_LINK_TYPED( SvxFontMenuControl, MenuSelect, FontNameMenu *, pMen, void )
{ {
SvxFontItem aItem( GetId() ); SvxFontItem aItem( GetId() );
aItem.SetFamilyName(pMen->GetCurName()); aItem.SetFamilyName(pMen->GetCurName());
GetBindings().GetDispatcher()->Execute( GetId(), SfxCallMode::RECORD, &aItem, 0L ); GetBindings().GetDispatcher()->Execute( GetId(), SfxCallMode::RECORD, &aItem, 0L );
return 0;
} }
/* [Beschreibung] /* [Beschreibung]
......
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