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

convert Link<> to typed

Change-Id: Ib9a493af0f64c5f3eb50f392805c3278ed2164a0
Reviewed-on: https://gerrit.libreoffice.org/19304Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarNoel Grandin <noelgrandin@gmail.com>
üst ccc5ea08
...@@ -463,14 +463,14 @@ public: ...@@ -463,14 +463,14 @@ public:
m_pDisclosureButton->SetText(rLabel); m_pDisclosureButton->SetText(rLabel);
} }
virtual void StateChanged(StateChangedType nType) SAL_OVERRIDE; virtual void StateChanged(StateChangedType nType) SAL_OVERRIDE;
void SetExpandedHdl( const Link<>& rLink ) { maExpandedHdl = rLink; } void SetExpandedHdl( const Link<VclExpander&,void>& rLink ) { maExpandedHdl = rLink; }
protected: protected:
virtual Size calculateRequisition() const SAL_OVERRIDE; virtual Size calculateRequisition() const SAL_OVERRIDE;
virtual void setAllocation(const Size &rAllocation) SAL_OVERRIDE; virtual void setAllocation(const Size &rAllocation) SAL_OVERRIDE;
private: private:
bool m_bResizeTopLevel; bool m_bResizeTopLevel;
VclPtr<DisclosureButton> m_pDisclosureButton; VclPtr<DisclosureButton> m_pDisclosureButton;
Link<> maExpandedHdl; Link<VclExpander&,void> maExpandedHdl;
DECL_DLLPRIVATE_LINK_TYPED(ClickHdl, CheckBox&, void); DECL_DLLPRIVATE_LINK_TYPED(ClickHdl, CheckBox&, void);
}; };
......
...@@ -740,7 +740,7 @@ IMPL_LINK_TYPED( ScFilterDlg, EndDlgHdl, Button*, pBtn, void ) ...@@ -740,7 +740,7 @@ IMPL_LINK_TYPED( ScFilterDlg, EndDlgHdl, Button*, pBtn, void )
} }
} }
IMPL_LINK_NOARG(ScFilterDlg, MoreExpandedHdl) IMPL_LINK_NOARG_TYPED(ScFilterDlg, MoreExpandedHdl, VclExpander&, void)
{ {
if ( pExpander->get_expanded() ) if ( pExpander->get_expanded() )
pTimer->Start(); pTimer->Start();
...@@ -751,7 +751,6 @@ IMPL_LINK_NOARG(ScFilterDlg, MoreExpandedHdl) ...@@ -751,7 +751,6 @@ IMPL_LINK_NOARG(ScFilterDlg, MoreExpandedHdl)
//@BugID 54702 Enable/disable only in Basic class //@BugID 54702 Enable/disable only in Basic class
//SFX_APPWINDOW->Disable(FALSE); //! general method in ScAnyRefDlg //SFX_APPWINDOW->Disable(FALSE); //! general method in ScAnyRefDlg
} }
return 0;
} }
IMPL_LINK_TYPED( ScFilterDlg, TimeOutHdl, Timer*, _pTimer, void ) IMPL_LINK_TYPED( ScFilterDlg, TimeOutHdl, Timer*, _pTimer, void )
......
...@@ -150,7 +150,7 @@ private: ...@@ -150,7 +150,7 @@ private:
DECL_LINK_TYPED( CheckBoxHdl, Button*, void ); DECL_LINK_TYPED( CheckBoxHdl, Button*, void );
DECL_LINK_TYPED( EndDlgHdl, Button*, void ); DECL_LINK_TYPED( EndDlgHdl, Button*, void );
DECL_LINK_TYPED( ScrollHdl, ScrollBar*, void ); DECL_LINK_TYPED( ScrollHdl, ScrollBar*, void );
DECL_LINK( MoreExpandedHdl, void* ); DECL_LINK_TYPED( MoreExpandedHdl, VclExpander&, void );
// Hack: RefInput control // Hack: RefInput control
DECL_LINK_TYPED( TimeOutHdl, Timer*, void ); DECL_LINK_TYPED( TimeOutHdl, Timer*, void );
......
...@@ -150,7 +150,7 @@ class SfxNewFileDialog_Impl ...@@ -150,7 +150,7 @@ class SfxNewFileDialog_Impl
DECL_LINK(RegionSelect, ListBox*); DECL_LINK(RegionSelect, ListBox*);
DECL_LINK(TemplateSelect, void*); DECL_LINK(TemplateSelect, void*);
DECL_LINK_TYPED(DoubleClick, ListBox&, void); DECL_LINK_TYPED(DoubleClick, ListBox&, void);
DECL_LINK(Expand, void*); DECL_LINK_TYPED(Expand, VclExpander&, void);
DECL_LINK_TYPED(LoadFile, Button*, void); DECL_LINK_TYPED(LoadFile, Button*, void);
sal_uInt16 GetSelectedTemplatePos() const; sal_uInt16 GetSelectedTemplatePos() const;
...@@ -263,10 +263,9 @@ IMPL_LINK( SfxNewFileDialog_Impl, RegionSelect, ListBox*, pBox ) ...@@ -263,10 +263,9 @@ IMPL_LINK( SfxNewFileDialog_Impl, RegionSelect, ListBox*, pBox )
return 0; return 0;
} }
IMPL_LINK_NOARG(SfxNewFileDialog_Impl, Expand) IMPL_LINK_NOARG_TYPED(SfxNewFileDialog_Impl, Expand, VclExpander&, void)
{ {
TemplateSelect(m_pTemplateLb); TemplateSelect(m_pTemplateLb);
return 0;
} }
IMPL_LINK_NOARG(SfxNewFileDialog_Impl, TemplateSelect) IMPL_LINK_NOARG(SfxNewFileDialog_Impl, TemplateSelect)
......
...@@ -1635,7 +1635,7 @@ IMPL_LINK_TYPED( VclExpander, ClickHdl, CheckBox&, rBtn, void ) ...@@ -1635,7 +1635,7 @@ IMPL_LINK_TYPED( VclExpander, ClickHdl, CheckBox&, rBtn, void )
if (pResizeDialog) if (pResizeDialog)
pResizeDialog->setOptimalLayoutSize(); pResizeDialog->setOptimalLayoutSize();
} }
maExpandedHdl.Call(this); maExpandedHdl.Call(*this);
} }
VclScrolledWindow::VclScrolledWindow(vcl::Window *pParent, WinBits nStyle) VclScrolledWindow::VclScrolledWindow(vcl::Window *pParent, WinBits nStyle)
......
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