Kaydet (Commit) 8578168b authored tarafından Noel Grandin's avatar Noel Grandin

convert Link<> to typed

Change-Id: I2e49e9b18db6ee6ce0dcaea0a83e862384d5beaa
üst f8fa7620
...@@ -168,7 +168,7 @@ private: ...@@ -168,7 +168,7 @@ private:
Link<const SwFlyFrameFormat*,void> m_aFlyMacroLnk; /**< Link will be called, if the Crsr is set Link<const SwFlyFrameFormat*,void> m_aFlyMacroLnk; /**< Link will be called, if the Crsr is set
into a fly. A macro can then be called */ into a fly. A macro can then be called */
Link<> m_aChgLnk; /**< link will be called by every attribute/ Link<SwCrsrShell*,void> m_aChgLnk; /**< link will be called by every attribute/
format changes at cursor position.*/ format changes at cursor position.*/
Link<> m_aGrfArrivedLnk; ///< Link calls to UI if a graphic is arrived Link<> m_aGrfArrivedLnk; ///< Link calls to UI if a graphic is arrived
...@@ -485,8 +485,8 @@ public: ...@@ -485,8 +485,8 @@ public:
const Link<const SwFlyFrameFormat*,void>& GetFlyMacroLnk() const { return m_aFlyMacroLnk; } const Link<const SwFlyFrameFormat*,void>& GetFlyMacroLnk() const { return m_aFlyMacroLnk; }
// Methods returning/altering link for changes of attributes/formates. // Methods returning/altering link for changes of attributes/formates.
void SetChgLnk( const Link<> &rLnk ) { m_aChgLnk = rLnk; } void SetChgLnk( const Link<SwCrsrShell*,void> &rLnk ) { m_aChgLnk = rLnk; }
const Link<>& GetChgLnk() const { return m_aChgLnk; } const Link<SwCrsrShell*,void>& GetChgLnk() const { return m_aChgLnk; }
// Methods returning/altering ling for "graphic completely loaded". // Methods returning/altering ling for "graphic completely loaded".
void SetGrfArrivedLnk( const Link<> &rLnk ) { m_aGrfArrivedLnk = rLnk; } void SetGrfArrivedLnk( const Link<> &rLnk ) { m_aGrfArrivedLnk = rLnk; }
......
...@@ -78,6 +78,7 @@ class Graphic; ...@@ -78,6 +78,7 @@ class Graphic;
class GraphicFilter; class GraphicFilter;
class SwPostItMgr; class SwPostItMgr;
enum class SotExchangeDest; enum class SotExchangeDest;
class SwCrsrShell;
namespace com{ namespace sun { namespace star { namespace com{ namespace sun { namespace star {
namespace view{ class XSelectionSupplier; } namespace view{ class XSelectionSupplier; }
...@@ -541,7 +542,7 @@ public: ...@@ -541,7 +542,7 @@ public:
void StateTabWin(SfxItemSet&); void StateTabWin(SfxItemSet&);
// attributes have changed // attributes have changed
DECL_LINK( AttrChangedNotify, void* ); DECL_LINK_TYPED( AttrChangedNotify, SwCrsrShell*, void );
// form control has been activated // form control has been activated
DECL_LINK_TYPED( FormControlActivated, LinkParamNone*, void ); DECL_LINK_TYPED( FormControlActivated, LinkParamNone*, void );
......
...@@ -1693,8 +1693,8 @@ bool SwTransferable::_PasteFileContent( TransferableDataHelper& rData, ...@@ -1693,8 +1693,8 @@ bool SwTransferable::_PasteFileContent( TransferableDataHelper& rData,
if( pStream && pRead ) if( pStream && pRead )
{ {
Link<> aOldLink( rSh.GetChgLnk() ); Link<SwCrsrShell*,void> aOldLink( rSh.GetChgLnk() );
rSh.SetChgLnk( Link<>() ); rSh.SetChgLnk( Link<SwCrsrShell*,void>() );
const SwPosition& rInsPos = *rSh.GetCrsr()->Start(); const SwPosition& rInsPos = *rSh.GetCrsr()->Start();
SwReader aReader( *pStream, aEmptyOUStr, OUString(), *rSh.GetCrsr() ); SwReader aReader( *pStream, aEmptyOUStr, OUString(), *rSh.GetCrsr() );
......
...@@ -464,7 +464,7 @@ extern "C" ...@@ -464,7 +464,7 @@ extern "C"
} }
} }
IMPL_LINK_NOARG(SwView, AttrChangedNotify) IMPL_LINK_NOARG_TYPED(SwView, AttrChangedNotify, SwCrsrShell*, void)
{ {
if ( GetEditWin().IsChainMode() ) if ( GetEditWin().IsChainMode() )
GetEditWin().SetChainMode( false ); GetEditWin().SetChainMode( false );
...@@ -508,8 +508,6 @@ IMPL_LINK_NOARG(SwView, AttrChangedNotify) ...@@ -508,8 +508,6 @@ IMPL_LINK_NOARG(SwView, AttrChangedNotify)
// actual cursor position is a post-it field // actual cursor position is a post-it field
m_pPostItMgr->SetShadowState( m_pWrtShell->GetPostItFieldAtCursor() ); m_pPostItMgr->SetShadowState( m_pWrtShell->GetPostItFieldAtCursor() );
} }
return 0;
} }
IMPL_LINK_NOARG_TYPED(SwView, TimeoutHdl, Timer *, void) IMPL_LINK_NOARG_TYPED(SwView, TimeoutHdl, Timer *, void)
......
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