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

convert Link<> to typed

Change-Id: Ied94f9defc1650822b8d09713e3d2f6fa2b8611d
üst 11c4f58f
...@@ -719,7 +719,7 @@ void IndexTabPage_Impl::InitializeIndex() ...@@ -719,7 +719,7 @@ void IndexTabPage_Impl::InitializeIndex()
m_pIndexCB->SetUpdateMode( true ); m_pIndexCB->SetUpdateMode( true );
if ( !sKeyword.isEmpty() ) if ( !sKeyword.isEmpty() )
aKeywordLink.Call( this ); aKeywordLink.Call( *this );
} }
#undef INSERT_DATA #undef INSERT_DATA
...@@ -749,7 +749,7 @@ IMPL_LINK_TYPED( IndexTabPage_Impl, IdleHdl, Idle*, pIdle, void ) ...@@ -749,7 +749,7 @@ IMPL_LINK_TYPED( IndexTabPage_Impl, IdleHdl, Idle*, pIdle, void )
IMPL_LINK_TYPED( IndexTabPage_Impl, TimeoutHdl, Timer*, pTimer, void) IMPL_LINK_TYPED( IndexTabPage_Impl, TimeoutHdl, Timer*, pTimer, void)
{ {
if(&aKeywordTimer == pTimer && !sKeyword.isEmpty()) if(&aKeywordTimer == pTimer && !sKeyword.isEmpty())
aKeywordLink.Call(this); aKeywordLink.Call(*this);
} }
void IndexTabPage_Impl::ActivatePage() void IndexTabPage_Impl::ActivatePage()
...@@ -1616,7 +1616,7 @@ IMPL_LINK_NOARG_TYPED(SfxHelpIndexWindow_Impl, SelectFactoryHdl, Idle *, void) ...@@ -1616,7 +1616,7 @@ IMPL_LINK_NOARG_TYPED(SfxHelpIndexWindow_Impl, SelectFactoryHdl, Idle *, void)
} }
} }
IMPL_LINK_NOARG(SfxHelpIndexWindow_Impl, KeywordHdl) IMPL_LINK_NOARG_TYPED(SfxHelpIndexWindow_Impl, KeywordHdl, IndexTabPage_Impl&, void)
{ {
// keyword found on index? // keyword found on index?
bool bIndex = pIPage->HasKeyword(); bool bIndex = pIPage->HasKeyword();
...@@ -1636,8 +1636,6 @@ IMPL_LINK_NOARG(SfxHelpIndexWindow_Impl, KeywordHdl) ...@@ -1636,8 +1636,6 @@ IMPL_LINK_NOARG(SfxHelpIndexWindow_Impl, KeywordHdl)
pIPage->OpenKeyword(); pIPage->OpenKeyword();
else if ( !pSPage->OpenKeyword( sKeyword ) ) else if ( !pSPage->OpenKeyword( sKeyword ) )
pParentWin->ShowStartPage(); pParentWin->ShowStartPage();
return 0;
} }
void SfxHelpIndexWindow_Impl::Resize() void SfxHelpIndexWindow_Impl::Resize()
......
...@@ -127,7 +127,7 @@ private: ...@@ -127,7 +127,7 @@ private:
Idle aFactoryIdle; Idle aFactoryIdle;
Timer aKeywordTimer; Timer aKeywordTimer;
Link<> aKeywordLink; Link<IndexTabPage_Impl&,void> aKeywordLink;
OUString sFactory; OUString sFactory;
OUString sKeyword; OUString sKeyword;
...@@ -156,7 +156,7 @@ public: ...@@ -156,7 +156,7 @@ public:
inline void SetFocusOnBox() { m_pIndexCB->GrabFocus(); } inline void SetFocusOnBox() { m_pIndexCB->GrabFocus(); }
inline bool HasFocusOnEdit() const { return m_pIndexCB->HasChildPathFocus(); } inline bool HasFocusOnEdit() const { return m_pIndexCB->HasChildPathFocus(); }
inline void SetKeywordHdl( const Link<>& rLink ) { aKeywordLink = rLink; } inline void SetKeywordHdl( const Link<IndexTabPage_Impl&,void>& rLink ) { aKeywordLink = rLink; }
void SetKeyword( const OUString& rKeyword ); void SetKeyword( const OUString& rKeyword );
bool HasKeyword() const; bool HasKeyword() const;
bool HasKeywordIgnoreCase(); bool HasKeywordIgnoreCase();
...@@ -289,7 +289,7 @@ private: ...@@ -289,7 +289,7 @@ private:
Link<> aSelectFactoryLink; Link<> aSelectFactoryLink;
Link<> aPageDoubleClickLink; Link<> aPageDoubleClickLink;
Link<> aIndexKeywordLink; Link<IndexTabPage_Impl&,void> aIndexKeywordLink;
OUString sKeyword; OUString sKeyword;
VclPtr<SfxHelpWindow_Impl> pParentWin; VclPtr<SfxHelpWindow_Impl> pParentWin;
...@@ -316,7 +316,7 @@ private: ...@@ -316,7 +316,7 @@ private:
DECL_LINK(SelectHdl, void *); DECL_LINK(SelectHdl, void *);
DECL_LINK_TYPED(InitHdl, Idle *, void); DECL_LINK_TYPED(InitHdl, Idle *, void);
DECL_LINK_TYPED(SelectFactoryHdl, Idle *, void); DECL_LINK_TYPED(SelectFactoryHdl, Idle *, void);
DECL_LINK(KeywordHdl, void *); DECL_LINK_TYPED(KeywordHdl, IndexTabPage_Impl&, void);
DECL_LINK_TYPED(ContentTabPageDoubleClickHdl, SvTreeListBox*, bool); DECL_LINK_TYPED(ContentTabPageDoubleClickHdl, SvTreeListBox*, bool);
public: public:
......
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