diff options
| -rw-r--r-- | include/vcl/layout.hxx | 4 | ||||
| -rw-r--r-- | sc/source/ui/dbgui/filtdlg.cxx | 3 | ||||
| -rw-r--r-- | sc/source/ui/inc/filtdlg.hxx | 2 | ||||
| -rw-r--r-- | sfx2/source/doc/new.cxx | 5 | ||||
| -rw-r--r-- | vcl/source/window/layout.cxx | 2 |
5 files changed, 7 insertions, 9 deletions
diff --git a/include/vcl/layout.hxx b/include/vcl/layout.hxx index f3d0f980634e..6ae3692fad15 100644 --- a/include/vcl/layout.hxx +++ b/include/vcl/layout.hxx @@ -463,14 +463,14 @@ public: m_pDisclosureButton->SetText(rLabel); } virtual void StateChanged(StateChangedType nType) SAL_OVERRIDE; - void SetExpandedHdl( const Link<>& rLink ) { maExpandedHdl = rLink; } + void SetExpandedHdl( const Link<VclExpander&,void>& rLink ) { maExpandedHdl = rLink; } protected: virtual Size calculateRequisition() const SAL_OVERRIDE; virtual void setAllocation(const Size &rAllocation) SAL_OVERRIDE; private: bool m_bResizeTopLevel; VclPtr<DisclosureButton> m_pDisclosureButton; - Link<> maExpandedHdl; + Link<VclExpander&,void> maExpandedHdl; DECL_DLLPRIVATE_LINK_TYPED(ClickHdl, CheckBox&, void); }; diff --git a/sc/source/ui/dbgui/filtdlg.cxx b/sc/source/ui/dbgui/filtdlg.cxx index 2771e0acc7eb..15cf1d13dc42 100644 --- a/sc/source/ui/dbgui/filtdlg.cxx +++ b/sc/source/ui/dbgui/filtdlg.cxx @@ -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() ) pTimer->Start(); @@ -751,7 +751,6 @@ IMPL_LINK_NOARG(ScFilterDlg, MoreExpandedHdl) //@BugID 54702 Enable/disable only in Basic class //SFX_APPWINDOW->Disable(FALSE); //! general method in ScAnyRefDlg } - return 0; } IMPL_LINK_TYPED( ScFilterDlg, TimeOutHdl, Timer*, _pTimer, void ) diff --git a/sc/source/ui/inc/filtdlg.hxx b/sc/source/ui/inc/filtdlg.hxx index f01e1feeda5a..59bf701f9ea2 100644 --- a/sc/source/ui/inc/filtdlg.hxx +++ b/sc/source/ui/inc/filtdlg.hxx @@ -150,7 +150,7 @@ private: DECL_LINK_TYPED( CheckBoxHdl, Button*, void ); DECL_LINK_TYPED( EndDlgHdl, Button*, void ); DECL_LINK_TYPED( ScrollHdl, ScrollBar*, void ); - DECL_LINK( MoreExpandedHdl, void* ); + DECL_LINK_TYPED( MoreExpandedHdl, VclExpander&, void ); // Hack: RefInput control DECL_LINK_TYPED( TimeOutHdl, Timer*, void ); diff --git a/sfx2/source/doc/new.cxx b/sfx2/source/doc/new.cxx index 93121aa58884..c15911e76891 100644 --- a/sfx2/source/doc/new.cxx +++ b/sfx2/source/doc/new.cxx @@ -150,7 +150,7 @@ class SfxNewFileDialog_Impl DECL_LINK(RegionSelect, ListBox*); DECL_LINK(TemplateSelect, void*); DECL_LINK_TYPED(DoubleClick, ListBox&, void); - DECL_LINK(Expand, void*); + DECL_LINK_TYPED(Expand, VclExpander&, void); DECL_LINK_TYPED(LoadFile, Button*, void); sal_uInt16 GetSelectedTemplatePos() const; @@ -263,10 +263,9 @@ IMPL_LINK( SfxNewFileDialog_Impl, RegionSelect, ListBox*, pBox ) return 0; } -IMPL_LINK_NOARG(SfxNewFileDialog_Impl, Expand) +IMPL_LINK_NOARG_TYPED(SfxNewFileDialog_Impl, Expand, VclExpander&, void) { TemplateSelect(m_pTemplateLb); - return 0; } IMPL_LINK_NOARG(SfxNewFileDialog_Impl, TemplateSelect) diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx index 7f8262402036..aa8f6518161a 100644 --- a/vcl/source/window/layout.cxx +++ b/vcl/source/window/layout.cxx @@ -1635,7 +1635,7 @@ IMPL_LINK_TYPED( VclExpander, ClickHdl, CheckBox&, rBtn, void ) if (pResizeDialog) pResizeDialog->setOptimalLayoutSize(); } - maExpandedHdl.Call(this); + maExpandedHdl.Call(*this); } VclScrolledWindow::VclScrolledWindow(vcl::Window *pParent, WinBits nStyle) |