diff options
Diffstat (limited to 'cui')
-rw-r--r-- | cui/source/dialogs/hangulhanjadlg.cxx | 7 | ||||
-rw-r--r-- | cui/source/inc/hangulhanjadlg.hxx | 6 |
2 files changed, 6 insertions, 7 deletions
diff --git a/cui/source/dialogs/hangulhanjadlg.cxx b/cui/source/dialogs/hangulhanjadlg.cxx index 3892484a9836..6bc9107fb2df 100644 --- a/cui/source/dialogs/hangulhanjadlg.cxx +++ b/cui/source/dialogs/hangulhanjadlg.cxx @@ -500,11 +500,11 @@ namespace svx m_aListBox->SelectEntryPos( nPos ); } m_bInSelectionUpdate = false; - m_aSelectLink.Call( this ); + m_aSelectLink.Call( *this ); return 0L; } - void SuggestionDisplay::SetSelectHdl( const Link<>& rLink ) + void SuggestionDisplay::SetSelectHdl( const Link<SuggestionDisplay&,void>& rLink ) { m_aSelectLink = rLink; } @@ -712,11 +712,10 @@ namespace svx } - IMPL_LINK_NOARG( HangulHanjaConversionDialog, OnSuggestionSelected ) + IMPL_LINK_NOARG_TYPED( HangulHanjaConversionDialog, OnSuggestionSelected, SuggestionDisplay&, void ) { m_pWordInput->SetText( m_pSuggestions->GetSelectEntry() ); OnSuggestionModified( NULL ); - return 0L; } diff --git a/cui/source/inc/hangulhanjadlg.hxx b/cui/source/inc/hangulhanjadlg.hxx index 711a03763590..8210431f3462 100644 --- a/cui/source/inc/hangulhanjadlg.hxx +++ b/cui/source/inc/hangulhanjadlg.hxx @@ -58,7 +58,7 @@ namespace svx void DisplayListBox( bool bDisplayListBox ); - void SetSelectHdl( const Link<>& rLink ); + void SetSelectHdl( const Link<SuggestionDisplay&,void>& rLink ); void Clear(); void InsertEntry( const OUString& rStr ); @@ -94,7 +94,7 @@ namespace svx VclPtr<SuggestionSet> m_aValueSet; VclPtr<ListBox> m_aListBox; - Link<> m_aSelectLink; + Link<SuggestionDisplay&,void> m_aSelectLink; bool m_bInSelectionUpdate; }; @@ -183,7 +183,7 @@ namespace svx private: DECL_LINK_TYPED( OnOption, Button*, void ); DECL_LINK( OnSuggestionModified, void* ); - DECL_LINK( OnSuggestionSelected, void* ); + DECL_LINK_TYPED( OnSuggestionSelected, SuggestionDisplay&, void ); DECL_LINK_TYPED( OnConversionDirectionClicked, Button*, void ); DECL_LINK_TYPED( ClickByCharacterHdl, Button*, void ); |