diff options
| author | Noel Grandin <noel@peralex.com> | 2015-08-31 10:18:23 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-09-04 13:08:29 +0200 |
| commit | 5b77f6d04f8798eaf6bd1e2d3b3087bcdab9db4a (patch) | |
| tree | 5bf0cdd987089b9dd5473acbe8955059cb0f84b3 | |
| parent | 0e1d027f84a41509d6e9b086fba5372511461433 (diff) | |
convert Link<> to typed
Change-Id: I1acb6462aa32a0ee61e8ede3ed3e9607b8069298
| -rw-r--r-- | include/svtools/stdmenu.hxx | 7 | ||||
| -rw-r--r-- | include/svx/fntctl.hxx | 2 | ||||
| -rw-r--r-- | svtools/source/control/stdmenu.cxx | 4 | ||||
| -rw-r--r-- | svx/source/mnuctrls/fntctl.cxx | 3 |
4 files changed, 5 insertions, 11 deletions
diff --git a/include/svtools/stdmenu.hxx b/include/svtools/stdmenu.hxx index 4e9c0fb6f096..7abd16548884 100644 --- a/include/svtools/stdmenu.hxx +++ b/include/svtools/stdmenu.hxx @@ -100,9 +100,8 @@ FontList; FontNameMenu; FontSizeBox class SVT_DLLPUBLIC FontNameMenu : public PopupMenu { private: - OUString maCurName; - Link<> maSelectHdl; - Link<> maHighlightHdl; + OUString maCurName; + Link<FontNameMenu*,void> maSelectHdl; public: FontNameMenu(); @@ -116,7 +115,7 @@ public: void SetCurName( const OUString& rName ); 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 diff --git a/include/svx/fntctl.hxx b/include/svx/fntctl.hxx index 4b671b1e3c4e..7aeb67fcf9d7 100644 --- a/include/svx/fntctl.hxx +++ b/include/svx/fntctl.hxx @@ -37,7 +37,7 @@ private: Menu& rParent; SVX_DLLPRIVATE void FillMenu(); - DECL_LINK( MenuSelect, FontNameMenu * ); + DECL_LINK_TYPED( MenuSelect, FontNameMenu *, void); SVX_DLLPRIVATE virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) SAL_OVERRIDE; SVX_DLLPRIVATE virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; diff --git a/svtools/source/control/stdmenu.cxx b/svtools/source/control/stdmenu.cxx index 760e7848f1a7..fd6306d8d027 100644 --- a/svtools/source/control/stdmenu.cxx +++ b/svtools/source/control/stdmenu.cxx @@ -41,10 +41,6 @@ void FontNameMenu::Select() void FontNameMenu::Highlight() { - OUString aTempName = maCurName; - maCurName = GetItemText( GetCurItemId() ); - maHighlightHdl.Call( this ); - maCurName = aTempName; } void FontNameMenu::Fill( const FontList* pList ) diff --git a/svx/source/mnuctrls/fntctl.cxx b/svx/source/mnuctrls/fntctl.cxx index 197fe7bd5245..6c2f18d25f5d 100644 --- a/svx/source/mnuctrls/fntctl.cxx +++ b/svx/source/mnuctrls/fntctl.cxx @@ -134,12 +134,11 @@ void SvxFontMenuControl::Notify( SfxBroadcaster&, const SfxHint& rHint ) 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() ); aItem.SetFamilyName(pMen->GetCurName()); GetBindings().GetDispatcher()->Execute( GetId(), SfxCallMode::RECORD, &aItem, 0L ); - return 0; } /* [Beschreibung] |