Kaydet (Commit) 6741a0f2 authored tarafından Noel Grandin's avatar Noel Grandin

convert Link<> to typed

Change-Id: I5469c9983ef94b418b729af841f8db10b9116667
Reviewed-on: https://gerrit.libreoffice.org/18316Reviewed-by: 's avatarNoel Grandin <noelgrandin@gmail.com>
Tested-by: 's avatarNoel Grandin <noelgrandin@gmail.com>
üst 5702e894
...@@ -174,7 +174,7 @@ private: ...@@ -174,7 +174,7 @@ private:
// handler for gallery popup menu button + size // handler for gallery popup menu button + size
DECL_LINK_TYPED( GraphicHdl_Impl, MenuButton *, void ); DECL_LINK_TYPED( GraphicHdl_Impl, MenuButton *, void );
DECL_LINK( MenuCreateHdl_Impl, MenuButton * ); DECL_LINK_TYPED( MenuCreateHdl_Impl, MenuButton *, void );
DECL_LINK( SizeHdl_Impl, MetricField * ); DECL_LINK( SizeHdl_Impl, MetricField * );
DECL_LINK_TYPED( RatioHdl_Impl, Button*, void ); DECL_LINK_TYPED( RatioHdl_Impl, Button*, void );
......
...@@ -1735,10 +1735,9 @@ void SvxLineTabPage::FillUserData() ...@@ -1735,10 +1735,9 @@ void SvxLineTabPage::FillUserData()
// #58425# Symbols on a list (e.g. StarChart) // #58425# Symbols on a list (e.g. StarChart)
// Handler for the symbol selection's popup menu (NumMenueButton) // Handler for the symbol selection's popup menu (NumMenueButton)
// The following link originates from SvxNumOptionsTabPage // The following link originates from SvxNumOptionsTabPage
IMPL_LINK( SvxLineTabPage, MenuCreateHdl_Impl, MenuButton *, pButton ) IMPL_LINK_TYPED( SvxLineTabPage, MenuCreateHdl_Impl, MenuButton *, pButton, void )
{ {
InitSymbols(pButton); InitSymbols(pButton);
return 0;
} }
// #58425# Symbols on a list (e.g. StarChart) // #58425# Symbols on a list (e.g. StarChart)
......
...@@ -41,8 +41,8 @@ private: ...@@ -41,8 +41,8 @@ private:
PopupMenu* mpMenu; PopupMenu* mpMenu;
sal_uInt16 mnCurItemId; sal_uInt16 mnCurItemId;
sal_uInt16 mnMenuMode; sal_uInt16 mnMenuMode;
Link<> maActivateHdl; Link<MenuButton*,void> maActivateHdl;
Link<MenuButton *, void> maSelectHdl; Link<MenuButton*,void> maSelectHdl;
SAL_DLLPRIVATE void ImplInitMenuButtonData(); SAL_DLLPRIVATE void ImplInitMenuButtonData();
DECL_DLLPRIVATE_LINK_TYPED( ImplMenuTimeoutHdl, Timer*, void ); DECL_DLLPRIVATE_LINK_TYPED( ImplMenuTimeoutHdl, Timer*, void );
...@@ -75,7 +75,7 @@ public: ...@@ -75,7 +75,7 @@ public:
sal_uInt16 GetCurItemId() const { return mnCurItemId; } sal_uInt16 GetCurItemId() const { return mnCurItemId; }
OString GetCurItemIdent() const; OString GetCurItemIdent() const;
void SetActivateHdl( const Link<>& rLink ) { maActivateHdl = rLink; } void SetActivateHdl( const Link<MenuButton *, void>& rLink ) { maActivateHdl = rLink; }
void SetSelectHdl( const Link<MenuButton *, void>& rLink ) { maSelectHdl = rLink; } void SetSelectHdl( const Link<MenuButton *, void>& rLink ) { maSelectHdl = rLink; }
}; };
......
...@@ -1375,7 +1375,7 @@ namespace svxform ...@@ -1375,7 +1375,7 @@ namespace svxform
Link<MenuButton *, void> aLink1 = LINK( this, DataNavigatorWindow, MenuSelectHdl ); Link<MenuButton *, void> aLink1 = LINK( this, DataNavigatorWindow, MenuSelectHdl );
m_pModelBtn->SetSelectHdl( aLink1 ); m_pModelBtn->SetSelectHdl( aLink1 );
m_pInstanceBtn->SetSelectHdl( aLink1 ); m_pInstanceBtn->SetSelectHdl( aLink1 );
Link<> aLink2 = LINK( this, DataNavigatorWindow, MenuActivateHdl ); Link<MenuButton*,void> aLink2 = LINK( this, DataNavigatorWindow, MenuActivateHdl );
m_pModelBtn->SetActivateHdl( aLink2 ); m_pModelBtn->SetActivateHdl( aLink2 );
m_pInstanceBtn->SetActivateHdl( aLink2 ); m_pInstanceBtn->SetActivateHdl( aLink2 );
m_pTabCtrl->SetActivatePageHdl( LINK( this, DataNavigatorWindow, ActivatePageHdl ) ); m_pTabCtrl->SetActivatePageHdl( LINK( this, DataNavigatorWindow, ActivatePageHdl ) );
...@@ -1774,7 +1774,7 @@ namespace svxform ...@@ -1774,7 +1774,7 @@ namespace svxform
return m_pTabCtrl->GetPagePos(nId) >= 3; return m_pTabCtrl->GetPagePos(nId) >= 3;
} }
IMPL_LINK( DataNavigatorWindow, MenuActivateHdl, MenuButton *, pBtn ) IMPL_LINK_TYPED( DataNavigatorWindow, MenuActivateHdl, MenuButton *, pBtn, void )
{ {
Menu* pMenu = pBtn->GetPopupMenu(); Menu* pMenu = pBtn->GetPopupMenu();
...@@ -1796,7 +1796,6 @@ namespace svxform ...@@ -1796,7 +1796,6 @@ namespace svxform
{ {
SAL_WARN( "svx.form", "DataNavigatorWindow::MenuActivateHdl(): wrong button" ); SAL_WARN( "svx.form", "DataNavigatorWindow::MenuActivateHdl(): wrong button" );
} }
return 0;
} }
IMPL_LINK_NOARG_TYPED(DataNavigatorWindow, ActivatePageHdl, TabControl*, void) IMPL_LINK_NOARG_TYPED(DataNavigatorWindow, ActivatePageHdl, TabControl*, void)
......
...@@ -349,9 +349,9 @@ namespace svxform ...@@ -349,9 +349,9 @@ namespace svxform
DECL_LINK( ModelSelectHdl, ListBox * ); DECL_LINK( ModelSelectHdl, ListBox * );
DECL_LINK_TYPED( MenuSelectHdl, MenuButton *, void ); DECL_LINK_TYPED( MenuSelectHdl, MenuButton *, void );
DECL_LINK( MenuActivateHdl, MenuButton * ); DECL_LINK_TYPED( MenuActivateHdl, MenuButton *, void );
DECL_LINK_TYPED(ActivatePageHdl, TabControl*, void); DECL_LINK_TYPED( ActivatePageHdl, TabControl*, void);
DECL_LINK_TYPED(UpdateHdl, Timer *, void); DECL_LINK_TYPED( UpdateHdl, Timer *, void);
XFormsPage* GetCurrentPage( sal_uInt16& rCurId ); XFormsPage* GetCurrentPage( sal_uInt16& rCurId );
void LoadModels(); void LoadModels();
......
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