summaryrefslogtreecommitdiff
path: root/svx
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-09-16 13:57:10 +0200
committerNoel Grandin <noel@peralex.com>2015-09-17 08:19:33 +0200
commit312330f6b0596014cdcb0967cb78885e9498afe2 (patch)
treeaa09bf31ddcf32c7ad495af6b40114b42220069d /svx
parentda1d52150d3475d44ee8be352154bbef5335421c (diff)
convert Link<> to typed
Change-Id: Ic828f5cc5047f1f130496cec940717d3ab8b142a
Diffstat (limited to 'svx')
-rw-r--r--svx/source/form/fmexch.cxx6
-rw-r--r--svx/source/form/navigatortree.cxx3
-rw-r--r--svx/source/inc/fmexch.hxx6
-rw-r--r--svx/source/inc/fmexpl.hxx6
4 files changed, 10 insertions, 11 deletions
diff --git a/svx/source/form/fmexch.cxx b/svx/source/form/fmexch.cxx
index 7d2f2671e634..cf7673a83c75 100644
--- a/svx/source/form/fmexch.cxx
+++ b/svx/source/form/fmexch.cxx
@@ -48,7 +48,7 @@ namespace svxform
if ( m_bClipboardOwner )
{ // simulate a lostOwnership to notify parties interested in
if ( m_aClipboardListener.IsSet() )
- m_aClipboardListener.Call( this );
+ m_aClipboardListener.Call( *this );
}
m_bClipboardOwner = true;
@@ -81,7 +81,7 @@ namespace svxform
m_bClipboardOwner = false;
if ( m_aClipboardListener.IsSet() )
- m_aClipboardListener.Call( this );
+ m_aClipboardListener.Call( *this );
}
@@ -391,7 +391,7 @@ namespace svxform
{
if (m_pTransferable)
{
- m_pTransferable->setClipboardListener( Link<>() );
+ m_pTransferable->setClipboardListener( Link<OLocalExchange&,void>() );
m_pTransferable->release();
m_pTransferable = NULL;
}
diff --git a/svx/source/form/navigatortree.cxx b/svx/source/form/navigatortree.cxx
index 9364f40a2258..82d858640ef2 100644
--- a/svx/source/form/navigatortree.cxx
+++ b/svx/source/form/navigatortree.cxx
@@ -1548,7 +1548,7 @@ namespace svxform
- IMPL_LINK_NOARG(NavigatorTree, OnClipboardAction)
+ IMPL_LINK_NOARG_TYPED(NavigatorTree, OnClipboardAction, OLocalExchange&, void)
{
if ( !m_aControlExchange.isClipboardOwner() )
{
@@ -1572,7 +1572,6 @@ namespace svxform
m_bKeyboardCut = false;
}
}
- return 0L;
}
diff --git a/svx/source/inc/fmexch.hxx b/svx/source/inc/fmexch.hxx
index d8a7557c6509..42deb7680b9f 100644
--- a/svx/source/inc/fmexch.hxx
+++ b/svx/source/inc/fmexch.hxx
@@ -49,7 +49,7 @@ namespace svxform
class SVX_DLLPUBLIC OLocalExchange : public TransferableHelper
{
private:
- Link<> m_aClipboardListener;
+ Link<OLocalExchange&,void> m_aClipboardListener;
bool m_bDragging : 1;
bool m_bClipboardOwner : 1;
@@ -68,7 +68,7 @@ namespace svxform
void startDrag( vcl::Window* pWindow, sal_Int8 nDragSourceActions, const GrantAccess& );
void copyToClipboard( vcl::Window* _pWindow, const GrantAccess& );
- void setClipboardListener( const Link<>& _rListener ) { m_aClipboardListener = _rListener; }
+ void setClipboardListener( const Link<OLocalExchange&,void>& _rListener ) { m_aClipboardListener = _rListener; }
void clear();
@@ -113,7 +113,7 @@ namespace svxform
inline bool isDataExchangeActive( ) const { return isDragSource() || isClipboardOwner(); }
inline void clear() { if ( isDataExchangeActive() ) m_pTransferable->clear(); }
- SVX_DLLPRIVATE void setClipboardListener( const Link<>& _rListener ) { if ( m_pTransferable ) m_pTransferable->setClipboardListener( _rListener ); }
+ SVX_DLLPRIVATE void setClipboardListener( const Link<OLocalExchange&,void>& _rListener ) { if ( m_pTransferable ) m_pTransferable->setClipboardListener( _rListener ); }
protected:
SVX_DLLPRIVATE virtual OLocalExchange* createExchange() const = 0;
diff --git a/svx/source/inc/fmexpl.hxx b/svx/source/inc/fmexpl.hxx
index ef470fe03e7f..837e8646165c 100644
--- a/svx/source/inc/fmexpl.hxx
+++ b/svx/source/inc/fmexpl.hxx
@@ -477,10 +477,10 @@ namespace svxform
DECL_LINK_TYPED( OnEdit, void*, void );
DECL_LINK_TYPED( OnDropActionTimer, Timer*, void );
- DECL_LINK_TYPED(OnEntrySelDesel, SvTreeListBox*, void);
- DECL_LINK_TYPED(OnSynchronizeTimer, Timer*, void);
+ DECL_LINK_TYPED( OnEntrySelDesel, SvTreeListBox*, void );
+ DECL_LINK_TYPED( OnSynchronizeTimer, Timer*, void );
- DECL_LINK( OnClipboardAction, void* );
+ DECL_LINK_TYPED( OnClipboardAction, OLocalExchange&, void );
protected:
virtual void Command( const CommandEvent& rEvt ) SAL_OVERRIDE;