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

convert Link<> to typed

Change-Id: Id5c1ef7e094ab3796a09f3f451903fff525aaf97
üst 277b9950
......@@ -86,10 +86,9 @@ void RecentMasterPagesSelector::LateInit()
LINK(this,RecentMasterPagesSelector,MasterPageListListener));
}
IMPL_LINK_NOARG(RecentMasterPagesSelector, MasterPageListListener)
IMPL_LINK_NOARG_TYPED(RecentMasterPagesSelector, MasterPageListListener, LinkParamNone*, void)
{
MasterPagesSelector::Fill();
return 0;
}
void RecentMasterPagesSelector::Fill (ItemList& rItemList)
......
......@@ -37,7 +37,7 @@ public:
const css::uno::Reference<css::ui::XSidebar>& rxSidebar);
protected:
DECL_LINK(MasterPageListListener, void*);
DECL_LINK_TYPED(MasterPageListListener, LinkParamNone*, void);
virtual void Fill (ItemList& rItemList) SAL_OVERRIDE;
using sd::sidebar::MasterPagesSelector::Fill;
......
......@@ -237,7 +237,7 @@ void RecentlyUsedMasterPages::SavePersistentValues()
}
}
void RecentlyUsedMasterPages::AddEventListener (const Link<>& rEventListener)
void RecentlyUsedMasterPages::AddEventListener (const Link<LinkParamNone*,void>& rEventListener)
{
if (::std::find (
maListeners.begin(),
......@@ -248,7 +248,7 @@ void RecentlyUsedMasterPages::AddEventListener (const Link<>& rEventListener)
}
}
void RecentlyUsedMasterPages::RemoveEventListener (const Link<>& rEventListener)
void RecentlyUsedMasterPages::RemoveEventListener (const Link<LinkParamNone*,void>& rEventListener)
{
maListeners.erase (
::std::find (
......@@ -272,12 +272,9 @@ MasterPageContainer::Token RecentlyUsedMasterPages::GetTokenForIndex (sal_uInt32
void RecentlyUsedMasterPages::SendEvent()
{
::std::vector<Link<>>::iterator aLink (maListeners.begin());
::std::vector<Link<>>::iterator aEnd (maListeners.end());
while (aLink!=aEnd)
for (auto& aLink : maListeners)
{
aLink->Call (NULL);
++aLink;
aLink.Call(nullptr);
}
}
......
......@@ -46,8 +46,8 @@ public:
*/
static RecentlyUsedMasterPages& Instance();
void AddEventListener (const Link<>& rEventListener);
void RemoveEventListener (const Link<>& rEventListener);
void AddEventListener (const Link<LinkParamNone*,void>& rEventListener);
void RemoveEventListener (const Link<LinkParamNone*,void>& rEventListener);
int GetMasterPageCount() const;
MasterPageContainer::Token GetTokenForIndex (sal_uInt32 nIndex) const;
......@@ -84,7 +84,7 @@ private:
*/
static RecentlyUsedMasterPages* mpInstance;
::std::vector<Link<>> maListeners;
::std::vector<Link<LinkParamNone*,void>> maListeners;
typedef ::std::vector<Descriptor> MasterPageList;
MasterPageList mvMasterPages;
......
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