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

convert Link<> to typed

Change-Id: Ifdcd9121b16b7f33632cf6671449152ebee8beef
üst d360dd35
......@@ -83,7 +83,7 @@ public:
DECL_LINK(WindowEventListener, VclWindowEvent*);
DECL_LINK(SelectionChangeListener, void*);
DECL_LINK_TYPED(BroadcastSelectionChange, void*, void);
DECL_LINK(FocusChangeListener, void*);
DECL_LINK_TYPED(FocusChangeListener, LinkParamNone*, void);
DECL_LINK_TYPED(VisibilityChangeListener, LinkParamNone*, void);
DECL_LINK_TYPED(UpdateChildrenCallback, void*, void);
......@@ -937,7 +937,7 @@ IMPL_LINK_NOARG_TYPED(AccessibleSlideSorterView::Implementation, BroadcastSelect
Any());
}
IMPL_LINK_NOARG(AccessibleSlideSorterView::Implementation, FocusChangeListener)
IMPL_LINK_NOARG_TYPED(AccessibleSlideSorterView::Implementation, FocusChangeListener, LinkParamNone*, void)
{
sal_Int32 nNewFocusedIndex (
mrSlideSorter.GetController().GetFocusManager().GetFocusedPageIndex());
......@@ -977,7 +977,6 @@ IMPL_LINK_NOARG(AccessibleSlideSorterView::Implementation, FocusChangeListener)
if (bSentFocus)
mnFocusedIndex = nNewFocusedIndex;
}
return 1;
}
IMPL_LINK_NOARG_TYPED(AccessibleSlideSorterView::Implementation, UpdateChildrenCallback, void*, void)
......
......@@ -243,7 +243,7 @@ void FocusManager::ShowFocusIndicator (
}
}
void FocusManager::AddFocusChangeListener (const Link<>& rListener)
void FocusManager::AddFocusChangeListener (const Link<LinkParamNone*,void>& rListener)
{
if (::std::find (maFocusChangeListeners.begin(), maFocusChangeListeners.end(), rListener)
== maFocusChangeListeners.end())
......@@ -252,7 +252,7 @@ void FocusManager::AddFocusChangeListener (const Link<>& rListener)
}
}
void FocusManager::RemoveFocusChangeListener (const Link<>& rListener)
void FocusManager::RemoveFocusChangeListener (const Link<LinkParamNone*,void>& rListener)
{
maFocusChangeListeners.erase (
::std::find (maFocusChangeListeners.begin(), maFocusChangeListeners.end(), rListener));
......@@ -261,11 +261,11 @@ void FocusManager::RemoveFocusChangeListener (const Link<>& rListener)
void FocusManager::NotifyFocusChangeListeners() const
{
// Create a copy of the listener list to be safe when that is modified.
::std::vector<Link<>> aListeners (maFocusChangeListeners);
::std::vector<Link<LinkParamNone*,void>> aListeners (maFocusChangeListeners);
// Tell the selection change listeners that the selection has changed.
::std::vector<Link<>>::iterator iListener (aListeners.begin());
::std::vector<Link<>>::iterator iEnd (aListeners.end());
::std::vector<Link<LinkParamNone*,void>>::iterator iListener (aListeners.begin());
::std::vector<Link<LinkParamNone*,void>>::iterator iEnd (aListeners.end());
for (; iListener!=iEnd; ++iListener)
{
iListener->Call(NULL);
......
......@@ -143,14 +143,14 @@ public:
the second and all following calls are ignored. Each listener
is added only once.
*/
void AddFocusChangeListener (const Link<>& rListener);
void AddFocusChangeListener (const Link<LinkParamNone*,void>& rListener);
/** Remove a focus change listener.
@param rListener
It is save to pass a listener that was not added are has been
removed previously. Such calls are ignored.
*/
void RemoveFocusChangeListener (const Link<>& rListener);
void RemoveFocusChangeListener (const Link<LinkParamNone*,void>& rListener);
/** Create an instance of this class to temporarily hide the focus
indicator. It is restored to its former visibility state when the
......@@ -179,7 +179,7 @@ private:
*/
bool mbPageIsFocused;
::std::vector<Link<>> maFocusChangeListeners;
::std::vector<Link<LinkParamNone*,void>> maFocusChangeListeners;
/** When vertical wrap is active then pressing UP in the top row moves
the focus to the bottom row, DOWN in the bottom row moves the focus
......
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