diff options
| author | Noel Grandin <noel@peralex.com> | 2015-09-15 14:10:46 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-09-16 08:38:55 +0200 |
| commit | 11c4f58fb12810740cdd8409e4991a92efde6c97 (patch) | |
| tree | e90e7054a7bc682953669644bb2b061e7c229977 /sc/source/ui | |
| parent | 34c55149476dbdc369382098eab92874b296310e (diff) | |
convert Link<> to typed
Change-Id: I2573b42143078c4e72ab201392c69ee296f4974e
Diffstat (limited to 'sc/source/ui')
| -rw-r--r-- | sc/source/ui/docshell/arealink.cxx | 2 | ||||
| -rw-r--r-- | sc/source/ui/docshell/externalrefmgr.cxx | 4 | ||||
| -rw-r--r-- | sc/source/ui/docshell/tablink.cxx | 13 |
3 files changed, 9 insertions, 10 deletions
diff --git a/sc/source/ui/docshell/arealink.cxx b/sc/source/ui/docshell/arealink.cxx index b4c33ef08be6..c982dcb1bfa0 100644 --- a/sc/source/ui/docshell/arealink.cxx +++ b/sc/source/ui/docshell/arealink.cxx @@ -84,7 +84,7 @@ ScAreaLink::~ScAreaLink() delete pImpl; } -void ScAreaLink::Edit(vcl::Window* pParent, const Link<>& /* rEndEditHdl */ ) +void ScAreaLink::Edit(vcl::Window* pParent, const Link<SvBaseLink&,void>& /* rEndEditHdl */ ) { // use own dialog instead of SvBaseLink::Edit... // DefModalDialogParent setzen, weil evtl. aus der DocShell beim ConvertFrom diff --git a/sc/source/ui/docshell/externalrefmgr.cxx b/sc/source/ui/docshell/externalrefmgr.cxx index 870947ce7b71..96d174308807 100644 --- a/sc/source/ui/docshell/externalrefmgr.cxx +++ b/sc/source/ui/docshell/externalrefmgr.cxx @@ -1327,9 +1327,9 @@ void ScExternalRefLink::Closed() return SUCCESS; } -void ScExternalRefLink::Edit(vcl::Window* pParent, const Link<>& /*rEndEditHdl*/) +void ScExternalRefLink::Edit(vcl::Window* pParent, const Link<SvBaseLink&,void>& /*rEndEditHdl*/) { - SvBaseLink::Edit(pParent, Link<>()); + SvBaseLink::Edit(pParent, Link<SvBaseLink&,void>()); } void ScExternalRefLink::SetDoReferesh(bool b) diff --git a/sc/source/ui/docshell/tablink.cxx b/sc/source/ui/docshell/tablink.cxx index 3239b5a97c6f..a391691e86d5 100644 --- a/sc/source/ui/docshell/tablink.cxx +++ b/sc/source/ui/docshell/tablink.cxx @@ -47,9 +47,9 @@ struct TableLink_Impl { - ScDocShell* m_pDocSh; - VclPtr<vcl::Window> m_pOldParent; - Link<> m_aEndEditLink; + ScDocShell* m_pDocSh; + VclPtr<vcl::Window> m_pOldParent; + Link<sfx2::SvBaseLink&,void> m_aEndEditLink; TableLink_Impl() : m_pDocSh( NULL ), m_pOldParent( NULL ) {} }; @@ -105,7 +105,7 @@ ScTableLink::~ScTableLink() delete pImpl; } -void ScTableLink::Edit( vcl::Window* pParent, const Link<>& rEndEditHdl ) +void ScTableLink::Edit( vcl::Window* pParent, const Link<SvBaseLink&,void>& rEndEditHdl ) { // DefModalDialogParent setzen, weil evtl. aus der DocShell beim ConvertFrom // ein Optionen-Dialog kommt... @@ -418,13 +418,12 @@ IMPL_LINK_NOARG_TYPED(ScTableLink, RefreshHdl, Timer *, void) Refresh( aFileName, aFilterName, NULL, GetRefreshDelay() ); } -IMPL_LINK( ScTableLink, TableEndEditHdl, ::sfx2::SvBaseLink*, pLink ) +IMPL_LINK_TYPED( ScTableLink, TableEndEditHdl, ::sfx2::SvBaseLink&, rLink, void ) { if ( pImpl->m_aEndEditLink.IsSet() ) - pImpl->m_aEndEditLink.Call( pLink ); + pImpl->m_aEndEditLink.Call( rLink ); bInEdit = false; Application::SetDefDialogParent( pImpl->m_pOldParent ); - return 0; } // === ScDocumentLoader ================================================== |