summaryrefslogtreecommitdiff
path: root/sd/source
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-09-17 14:08:51 +0200
committerNoel Grandin <noel@peralex.com>2015-09-17 14:41:59 +0200
commitd360dd359936f79046193c9ea25dd0e165e1b7bf (patch)
tree84c5285d7e2db7fd3c231f15b6a5d88853ea2bac /sd/source
parent8659487298c141aee5e7cc16c45808e3754397f6 (diff)
convert Link<> to typed
Change-Id: Ibbfcfe019ea4f0a414e2760779d61f1948ac373d
Diffstat (limited to 'sd/source')
-rw-r--r--sd/source/ui/accessibility/AccessibleSlideSorterView.cxx5
-rw-r--r--sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx6
-rw-r--r--sd/source/ui/slidesorter/view/SlideSorterView.cxx8
3 files changed, 9 insertions, 10 deletions
diff --git a/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx b/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx
index c0d5c25b40fd..fff57c22442f 100644
--- a/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx
+++ b/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx
@@ -84,7 +84,7 @@ public:
DECL_LINK(SelectionChangeListener, void*);
DECL_LINK_TYPED(BroadcastSelectionChange, void*, void);
DECL_LINK(FocusChangeListener, void*);
- DECL_LINK(VisibilityChangeListener, void*);
+ DECL_LINK_TYPED(VisibilityChangeListener, LinkParamNone*, void);
DECL_LINK_TYPED(UpdateChildrenCallback, void*, void);
void Activated();
@@ -986,10 +986,9 @@ IMPL_LINK_NOARG_TYPED(AccessibleSlideSorterView::Implementation, UpdateChildrenC
UpdateChildren();
}
-IMPL_LINK_NOARG(AccessibleSlideSorterView::Implementation, VisibilityChangeListener)
+IMPL_LINK_NOARG_TYPED(AccessibleSlideSorterView::Implementation, VisibilityChangeListener, LinkParamNone*, void)
{
UpdateChildren();
- return 1;
}
} // end of namespace ::accessibility
diff --git a/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx b/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx
index 8242d24970ea..9d7f242a4aaf 100644
--- a/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx
+++ b/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx
@@ -166,14 +166,14 @@ public:
the second and all following calls are ignored. Each listener
is added only once.
*/
- void AddVisibilityChangeListener (const Link<>& rListener);
+ void AddVisibilityChangeListener (const Link<LinkParamNone*,void>& rListener);
/** Remove a listener that is called when the set of visible slides changes.
@param rListener
It is save to pass a listener that was not added or has been
removed previously. Such calls are ignored.
*/
- void RemoveVisibilityChangeListener (const Link<>& rListener);
+ void RemoveVisibilityChangeListener (const Link<LinkParamNone*,void>& rListener);
/** The page under the mouse is not highlighted in some contexts. Call
this method on context changes.
@@ -234,7 +234,7 @@ private:
SharedILayerPainter mpBackgroundPainter;
::boost::scoped_ptr<ToolTip> mpToolTip;
bool mbIsRearrangePending;
- ::std::vector<Link<>> maVisibilityChangeListeners;
+ ::std::vector<Link<LinkParamNone*,void>> maVisibilityChangeListeners;
/** Determine the visibility of all page objects.
*/
diff --git a/sd/source/ui/slidesorter/view/SlideSorterView.cxx b/sd/source/ui/slidesorter/view/SlideSorterView.cxx
index 9e92f4b942d7..0cf7ea0274df 100644
--- a/sd/source/ui/slidesorter/view/SlideSorterView.cxx
+++ b/sd/source/ui/slidesorter/view/SlideSorterView.cxx
@@ -486,8 +486,8 @@ void SlideSorterView::DeterminePageObjectVisibilities()
// Tell the listeners that the visibility of some objects has
// changed.
- ::std::vector<Link<>>& aChangeListeners (maVisibilityChangeListeners);
- for (::std::vector<Link<>>::const_iterator
+ ::std::vector<Link<LinkParamNone*,void>>& aChangeListeners (maVisibilityChangeListeners);
+ for (::std::vector<Link<LinkParamNone*,void>>::const_iterator
iLink(aChangeListeners.begin()),
iEnd(aChangeListeners.end());
iLink!=iEnd;
@@ -720,7 +720,7 @@ Pair SlideSorterView::GetVisiblePageRange()
return maVisiblePageRange;
}
-void SlideSorterView::AddVisibilityChangeListener (const Link<>& rListener)
+void SlideSorterView::AddVisibilityChangeListener (const Link<LinkParamNone*,void>& rListener)
{
if (::std::find (
maVisibilityChangeListeners.begin(),
@@ -731,7 +731,7 @@ void SlideSorterView::AddVisibilityChangeListener (const Link<>& rListener)
}
}
-void SlideSorterView::RemoveVisibilityChangeListener(const Link<>&rListener)
+void SlideSorterView::RemoveVisibilityChangeListener(const Link<LinkParamNone*,void>&rListener)
{
maVisibilityChangeListeners.erase (
::std::find (