summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--cui/source/dialogs/linkdlg.cxx9
-rw-r--r--cui/source/inc/linkdlg.hxx2
-rw-r--r--include/sfx2/lnkbase.hxx2
-rw-r--r--sc/inc/arealink.hxx2
-rw-r--r--sc/inc/externalrefmgr.hxx2
-rw-r--r--sc/inc/tablink.hxx4
-rw-r--r--sc/source/ui/docshell/arealink.cxx2
-rw-r--r--sc/source/ui/docshell/externalrefmgr.cxx4
-rw-r--r--sc/source/ui/docshell/tablink.cxx13
-rw-r--r--sfx2/source/appl/lnkbase2.cxx8
10 files changed, 23 insertions, 25 deletions
diff --git a/cui/source/dialogs/linkdlg.cxx b/cui/source/dialogs/linkdlg.cxx
index 1f02356c7ef6..8fd24a159653 100644
--- a/cui/source/dialogs/linkdlg.cxx
+++ b/cui/source/dialogs/linkdlg.cxx
@@ -519,12 +519,12 @@ IMPL_LINK_NOARG_TYPED( SvBaseLinksDlg, UpdateWaitingHdl, Idle*, void )
m_pTbLinks->SetUpdateMode(true);
}
-IMPL_LINK( SvBaseLinksDlg, EndEditHdl, sfx2::SvBaseLink*, _pLink )
+IMPL_LINK_TYPED( SvBaseLinksDlg, EndEditHdl, sfx2::SvBaseLink&, _rLink, void )
{
sal_uLong nPos;
GetSelEntry( &nPos );
- if( _pLink && _pLink->WasLastEditOK() )
+ if( _rLink.WasLastEditOK() )
{
// StarImpress/Draw swap the LinkObjects themselves!
// So search for the link in the manager; if it does not exist
@@ -532,7 +532,7 @@ IMPL_LINK( SvBaseLinksDlg, EndEditHdl, sfx2::SvBaseLink*, _pLink )
// edited link needs to be refreshed.
bool bLinkFnd = false;
for( size_t n = pLinkMgr->GetLinks().size(); n; )
- if( _pLink == &(*pLinkMgr->GetLinks()[ --n ]) )
+ if( &_rLink == &(*pLinkMgr->GetLinks()[ --n ]) )
{
bLinkFnd = true;
break;
@@ -543,7 +543,7 @@ IMPL_LINK( SvBaseLinksDlg, EndEditHdl, sfx2::SvBaseLink*, _pLink )
m_pTbLinks->SetUpdateMode(false);
m_pTbLinks->GetModel()->Remove( m_pTbLinks->GetEntry( nPos ) );
SvTreeListEntry* pToUnselect = m_pTbLinks->FirstSelected();
- InsertEntry( *_pLink, nPos, true );
+ InsertEntry( _rLink, nPos, true );
if(pToUnselect)
m_pTbLinks->Select(pToUnselect, false);
m_pTbLinks->SetUpdateMode(true);
@@ -557,7 +557,6 @@ IMPL_LINK( SvBaseLinksDlg, EndEditHdl, sfx2::SvBaseLink*, _pLink )
if (pLinkMgr && pLinkMgr->GetPersist())
pLinkMgr->GetPersist()->SetModified();
}
- return 0;
}
OUString SvBaseLinksDlg::ImplGetStateStr( const SvBaseLink& rLnk )
diff --git a/cui/source/inc/linkdlg.hxx b/cui/source/inc/linkdlg.hxx
index 22f9a0db326f..429cef04c823 100644
--- a/cui/source/inc/linkdlg.hxx
+++ b/cui/source/inc/linkdlg.hxx
@@ -72,7 +72,7 @@ class SvBaseLinksDlg : public ModalDialog
DECL_LINK_TYPED( ChangeSourceClickHdl, Button *, void );
DECL_LINK_TYPED( BreakLinkClickHdl, Button *, void );
DECL_LINK_TYPED( UpdateWaitingHdl, Idle *, void );
- DECL_LINK( EndEditHdl, sfx2::SvBaseLink* );
+ DECL_LINK_TYPED( EndEditHdl, sfx2::SvBaseLink&, void );
sfx2::SvBaseLink* GetSelEntry( sal_uLong* pPos );
OUString ImplGetStateStr( const sfx2::SvBaseLink& );
void SetType( sfx2::SvBaseLink& rLink, sal_uLong nPos, SfxLinkUpdateMode nType );
diff --git a/include/sfx2/lnkbase.hxx b/include/sfx2/lnkbase.hxx
index 164b26d40e81..cb7e4a6d66df 100644
--- a/include/sfx2/lnkbase.hxx
+++ b/include/sfx2/lnkbase.hxx
@@ -146,7 +146,7 @@ public:
void Disconnect();
// Link impl: DECL_LINK( MyEndDialogHdl, SvBaseLink* ); <= param is this
- virtual void Edit( vcl::Window*, const Link<>& rEndEditHdl );
+ virtual void Edit( vcl::Window*, const Link<SvBaseLink&,void>& rEndEditHdl );
// should the link appear in the dialog? (to the left in the link in the...)
bool IsVisible() const { return bVisible; }
diff --git a/sc/inc/arealink.hxx b/sc/inc/arealink.hxx
index f55dc972db63..97b238845286 100644
--- a/sc/inc/arealink.hxx
+++ b/sc/inc/arealink.hxx
@@ -54,7 +54,7 @@ public:
virtual ::sfx2::SvBaseLink::UpdateResult DataChanged(
const OUString& rMimeType, const ::com::sun::star::uno::Any & rValue ) SAL_OVERRIDE;
- virtual void Edit( vcl::Window*, const Link<>& rEndEditHdl ) SAL_OVERRIDE;
+ virtual void Edit( vcl::Window*, const Link<SvBaseLink&,void>& rEndEditHdl ) SAL_OVERRIDE;
bool Refresh( const OUString& rNewFile, const OUString& rNewFilter,
const OUString& rNewArea, sal_uLong nNewRefresh );
diff --git a/sc/inc/externalrefmgr.hxx b/sc/inc/externalrefmgr.hxx
index c99bacc77427..be513510ac6d 100644
--- a/sc/inc/externalrefmgr.hxx
+++ b/sc/inc/externalrefmgr.hxx
@@ -70,7 +70,7 @@ public:
virtual void Closed() SAL_OVERRIDE;
virtual ::sfx2::SvBaseLink::UpdateResult DataChanged(
const OUString& rMimeType, const ::com::sun::star::uno::Any & rValue) SAL_OVERRIDE;
- virtual void Edit(vcl::Window* pParent, const Link<>& rEndEditHdl) SAL_OVERRIDE;
+ virtual void Edit(vcl::Window* pParent, const Link<SvBaseLink&,void>& rEndEditHdl) SAL_OVERRIDE;
void SetDoReferesh(bool b);
diff --git a/sc/inc/tablink.hxx b/sc/inc/tablink.hxx
index 6d096cec35b2..eebc5024e539 100644
--- a/sc/inc/tablink.hxx
+++ b/sc/inc/tablink.hxx
@@ -52,7 +52,7 @@ public:
virtual ::sfx2::SvBaseLink::UpdateResult DataChanged(
const OUString& rMimeType, const ::com::sun::star::uno::Any & rValue ) SAL_OVERRIDE;
- virtual void Edit( vcl::Window*, const Link<>& rEndEditHdl ) SAL_OVERRIDE;
+ virtual void Edit( vcl::Window*, const Link<SvBaseLink&,void>& rEndEditHdl ) SAL_OVERRIDE;
bool Refresh(const OUString& rNewFile, const OUString& rNewFilter,
const OUString* pNewOptions /* = NULL */, sal_uLong nNewRefresh );
@@ -66,7 +66,7 @@ public:
bool IsUsed() const;
DECL_LINK_TYPED( RefreshHdl, Timer*, void );
- DECL_LINK( TableEndEditHdl, ::sfx2::SvBaseLink* );
+ DECL_LINK_TYPED( TableEndEditHdl, ::sfx2::SvBaseLink&, void );
};
class ScDocument;
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 ==================================================
diff --git a/sfx2/source/appl/lnkbase2.cxx b/sfx2/source/appl/lnkbase2.cxx
index a899d9ed0035..6027539c4f09 100644
--- a/sfx2/source/appl/lnkbase2.cxx
+++ b/sfx2/source/appl/lnkbase2.cxx
@@ -44,7 +44,7 @@ class ImplDdeItem;
struct BaseLink_Impl
{
- Link<> m_aEndEditLink;
+ Link<SvBaseLink&,void> m_aEndEditLink;
LinkManager* m_pLinkMgr;
VclPtr<vcl::Window> m_pParentWin;
FileDialogHelper* m_pFileDlg;
@@ -254,7 +254,7 @@ IMPL_LINK_TYPED( SvBaseLink, EndEditHdl, const OUString&, _rNewName, void )
sNewName.clear();
bWasLastEditOK = !sNewName.isEmpty();
if ( pImpl->m_aEndEditLink.IsSet() )
- pImpl->m_aEndEditLink.Call( this );
+ pImpl->m_aEndEditLink.Call( *this );
}
@@ -472,7 +472,7 @@ SvBaseLink::UpdateResult SvBaseLink::DataChanged( const OUString &, const ::com:
return SUCCESS;
}
-void SvBaseLink::Edit( vcl::Window* pParent, const Link<>& rEndEditHdl )
+void SvBaseLink::Edit( vcl::Window* pParent, const Link<SvBaseLink&,void>& rEndEditHdl )
{
pImpl->m_pParentWin = pParent;
pImpl->m_aEndEditLink = rEndEditHdl;
@@ -506,7 +506,7 @@ void SvBaseLink::Edit( vcl::Window* pParent, const Link<>& rEndEditHdl )
ExecuteEdit( OUString() );
bWasLastEditOK = false;
if ( pImpl->m_aEndEditLink.IsSet() )
- pImpl->m_aEndEditLink.Call( this );
+ pImpl->m_aEndEditLink.Call( *this );
}
}
generated by cgit (git 2.34.1) at 2025-02-22 03:54:08 +0000