diff options
author | Noel Grandin <noel@peralex.com> | 2015-08-13 09:33:14 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2015-08-13 10:49:57 +0200 |
commit | 200e336d1d5c036b5ecd308d93e4131274b1efb8 (patch) | |
tree | cd81d3e0a7e0d68a9ebcd90c346594aab8a89fc8 /sfx2 | |
parent | 63e1890675ecaaf50d855a1daf85fc41798bb898 (diff) |
make Link<> instances typed
Change-Id: I7d20875cc498d54140cfe75b21373fdab9c369ce
Diffstat (limited to 'sfx2')
-rw-r--r-- | sfx2/source/control/templateabstractview.cxx | 2 | ||||
-rw-r--r-- | sfx2/source/control/templatesearchview.cxx | 2 | ||||
-rw-r--r-- | sfx2/source/dialog/backingwindow.cxx | 4 | ||||
-rw-r--r-- | sfx2/source/dialog/backingwindow.hxx | 2 | ||||
-rw-r--r-- | sfx2/source/doc/templatedlg.cxx | 10 | ||||
-rw-r--r-- | sfx2/source/inc/templatesearchview.hxx | 4 |
6 files changed, 10 insertions, 14 deletions
diff --git a/sfx2/source/control/templateabstractview.cxx b/sfx2/source/control/templateabstractview.cxx index 3be294cee78d..1db333ec5bce 100644 --- a/sfx2/source/control/templateabstractview.cxx +++ b/sfx2/source/control/templateabstractview.cxx @@ -224,7 +224,7 @@ void TemplateAbstractView::setOpenRegionHdl(const Link<void*,void> &rLink) maOpenRegionHdl = rLink; } -void TemplateAbstractView::setOpenTemplateHdl(const Link<> &rLink) +void TemplateAbstractView::setOpenTemplateHdl(const Link<ThumbnailViewItem*,void> &rLink) { maOpenTemplateHdl = rLink; } diff --git a/sfx2/source/control/templatesearchview.cxx b/sfx2/source/control/templatesearchview.cxx index 30cd035da20d..16fc7e2028c6 100644 --- a/sfx2/source/control/templatesearchview.cxx +++ b/sfx2/source/control/templatesearchview.cxx @@ -19,7 +19,7 @@ TemplateSearchView::TemplateSearchView (vcl::Window *pParent, WinBits nWinStyle) VCL_BUILDER_FACTORY(TemplateSearchView) -void TemplateSearchView::setOpenTemplateHdl(const Link<> &rLink) +void TemplateSearchView::setOpenTemplateHdl(const Link<ThumbnailViewItem*, void> &rLink) { maOpenTemplateHdl = rLink; } diff --git a/sfx2/source/dialog/backingwindow.cxx b/sfx2/source/dialog/backingwindow.cxx index d267e3b97dc6..a6eabcea28a6 100644 --- a/sfx2/source/dialog/backingwindow.cxx +++ b/sfx2/source/dialog/backingwindow.cxx @@ -655,7 +655,7 @@ IMPL_LINK_NOARG_TYPED( BackingWindow, OpenRegionHdl, void*, void) maSelTemplates.clear(); } -IMPL_LINK(BackingWindow, OpenTemplateHdl, ThumbnailViewItem*, pItem) +IMPL_LINK_TYPED(BackingWindow, OpenTemplateHdl, ThumbnailViewItem*, pItem, void) { if (!mbIsSaveMode) { @@ -681,8 +681,6 @@ IMPL_LINK(BackingWindow, OpenTemplateHdl, ThumbnailViewItem*, pItem) { } } - - return 0; } struct ImplDelayedDispatch diff --git a/sfx2/source/dialog/backingwindow.hxx b/sfx2/source/dialog/backingwindow.hxx index 50b3fb427d98..5c8dd072bc67 100644 --- a/sfx2/source/dialog/backingwindow.hxx +++ b/sfx2/source/dialog/backingwindow.hxx @@ -109,7 +109,7 @@ class BackingWindow : public vcl::Window, public VclBuilderContainer DECL_LINK_TYPED(MenuSelectHdl, MenuButton*, void); DECL_LINK(ExtLinkClickHdl, Button*); DECL_LINK_TYPED(OpenRegionHdl, void*, void); - DECL_LINK(OpenTemplateHdl, ThumbnailViewItem*); + DECL_LINK_TYPED(OpenTemplateHdl, ThumbnailViewItem*, void); void initControls(); diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx index cfe783214192..275b8e55d5a6 100644 --- a/sfx2/source/doc/templatedlg.cxx +++ b/sfx2/source/doc/templatedlg.cxx @@ -313,14 +313,14 @@ void SfxTemplateManagerDlg::dispose() // Ignore view events since we are cleaning the object mpLocalView->setItemStateHdl(Link<>()); mpLocalView->setOpenRegionHdl(Link<void*,void>()); - mpLocalView->setOpenTemplateHdl(Link<>()); + mpLocalView->setOpenTemplateHdl(Link<ThumbnailViewItem*, void>()); mpRemoteView->setItemStateHdl(Link<>()); mpRemoteView->setOpenRegionHdl(Link<void*,void>()); - mpRemoteView->setOpenTemplateHdl(Link<>()); + mpRemoteView->setOpenTemplateHdl(Link<ThumbnailViewItem*,void>()); mpSearchView->setItemStateHdl(Link<>()); - mpSearchView->setOpenTemplateHdl(Link<>()); + mpSearchView->setOpenTemplateHdl(Link<ThumbnailViewItem*, void>()); mpTabControl.clear(); mpSearchEdit.clear(); @@ -684,7 +684,7 @@ IMPL_LINK_NOARG_TYPED(SfxTemplateManagerDlg, OpenRegionHdl, void*, void) mpActionBar->Show(); } -IMPL_LINK(SfxTemplateManagerDlg, OpenTemplateHdl, ThumbnailViewItem*, pItem) +IMPL_LINK_TYPED(SfxTemplateManagerDlg, OpenTemplateHdl, ThumbnailViewItem*, pItem, void) { if (!mbIsSaveMode) { @@ -710,8 +710,6 @@ IMPL_LINK(SfxTemplateManagerDlg, OpenTemplateHdl, ThumbnailViewItem*, pItem) Close(); } - - return 0; } IMPL_LINK_NOARG(SfxTemplateManagerDlg, SearchUpdateHdl) diff --git a/sfx2/source/inc/templatesearchview.hxx b/sfx2/source/inc/templatesearchview.hxx index 86551f3fd0d9..69873c69f9d4 100644 --- a/sfx2/source/inc/templatesearchview.hxx +++ b/sfx2/source/inc/templatesearchview.hxx @@ -18,7 +18,7 @@ public: TemplateSearchView ( vcl::Window* pParent, WinBits nWinStyle = WB_TABSTOP | WB_VSCROLL); - void setOpenTemplateHdl (const Link<> &rLink); + void setOpenTemplateHdl (const Link<ThumbnailViewItem*, void> &rLink); void AppendItem(sal_uInt16 nAssocItemId, sal_uInt16 nRegionId, sal_uInt16 nIdx, const OUString &rTitle, const OUString &rSubtitle, @@ -28,7 +28,7 @@ protected: virtual void OnItemDblClicked(ThumbnailViewItem *pItem) SAL_OVERRIDE; protected: - Link<> maOpenTemplateHdl; + Link<ThumbnailViewItem*, void> maOpenTemplateHdl; }; #endif // INCLUDED_SFX2_SOURCE_INC_TEMPLATESEARCHVIEW_HXX |