include/vcl/layout.hxx | 4 ++--
sc/source/ui/dbgui/filtdlg.cxx | 3 +--
sc/source/ui/inc/filtdlg.hxx | 2 +-
sfx2/source/doc/new.cxx | 5 ++---
vcl/source/window/layout.cxx | 2 +-
5 files changed, 7 insertions(+), 9 deletions(-)
New commits:
commit e757c471139094525bd0a967e1b72747f35f99bf
Author: Noel Grandin <noelgran...@gmail.com>
Date: Fri Sep 25 14:38:44 2015 +0200
convert Link<> to typed
Change-Id: Ib9a493af0f64c5f3eb50f392805c3278ed2164a0
Reviewed-on: https://gerrit.libreoffice.org/19304
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Noel Grandin <noelgran...@gmail.com>
diff --git a/include/vcl/layout.hxx b/include/vcl/layout.hxx
index f3d0f98..6ae3692 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 2771e0a..15cf1d1 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 f01e1fe..59bf701 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 93121aa..c15911e 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 7f82624..aa8f651 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)
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
