cui/source/dialogs/hangulhanjadlg.cxx | 4 ++-- cui/source/factory/dlgfact.cxx | 2 +- cui/source/factory/dlgfact.hxx | 2 +- cui/source/inc/hangulhanjadlg.hxx | 6 +++--- editeng/source/misc/hangulhanja.cxx | 6 ++---- include/editeng/edtdlg.hxx | 2 +- 6 files changed, 10 insertions(+), 12 deletions(-)
New commits: commit 5645960113b3b7ded309bdb2ed5bd4a51877b96c Author: Noel Grandin <[email protected]> Date: Tue Sep 22 12:34:17 2015 +0200 convert Link<> to typed Change-Id: I2d3ed4e04b19159bd847a925a7296e981a6d468a Reviewed-on: https://gerrit.libreoffice.org/18771 Reviewed-by: Noel Grandin <[email protected]> Tested-by: Noel Grandin <[email protected]> diff --git a/cui/source/dialogs/hangulhanjadlg.cxx b/cui/source/dialogs/hangulhanjadlg.cxx index 6bc9107..3bdc837 100644 --- a/cui/source/dialogs/hangulhanjadlg.cxx +++ b/cui/source/dialogs/hangulhanjadlg.cxx @@ -658,7 +658,7 @@ namespace svx } - void HangulHanjaConversionDialog::SetOptionsChangedHdl( const Link<>& _rHdl ) + void HangulHanjaConversionDialog::SetOptionsChangedHdl( const Link<LinkParamNone*,void>& _rHdl ) { m_aOptionsChangedLink = _rHdl; } @@ -760,7 +760,7 @@ namespace svx { ScopedVclPtrInstance< HangulHanjaOptionsDialog > aOptDlg(this); aOptDlg->Execute(); - m_aOptionsChangedLink.Call( this ); + m_aOptionsChangedLink.Call( nullptr ); } diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx index d754caa..e31ce96 100644 --- a/cui/source/factory/dlgfact.cxx +++ b/cui/source/factory/dlgfact.cxx @@ -261,7 +261,7 @@ void AbstractHangulHanjaConversionDialog_Impl::SetConversionFormat( editeng::Han pDlg->SetConversionFormat(_eType); } -void AbstractHangulHanjaConversionDialog_Impl::SetOptionsChangedHdl( const Link<>& _rHdl ) +void AbstractHangulHanjaConversionDialog_Impl::SetOptionsChangedHdl( const Link<LinkParamNone*,void>& _rHdl ) { pDlg->SetOptionsChangedHdl(_rHdl ); } diff --git a/cui/source/factory/dlgfact.hxx b/cui/source/factory/dlgfact.hxx index 7e36ffe..5117163 100644 --- a/cui/source/factory/dlgfact.hxx +++ b/cui/source/factory/dlgfact.hxx @@ -139,7 +139,7 @@ class AbstractHangulHanjaConversionDialog_Impl: public AbstractHangulHanjaConver virtual void SetByCharacter( bool _bByCharacter ) SAL_OVERRIDE ; virtual void SetConversionDirectionState( bool _bTryBothDirections, editeng::HangulHanjaConversion::ConversionDirection _ePrimaryConversionDirection ) SAL_OVERRIDE; virtual void SetConversionFormat( editeng::HangulHanjaConversion::ConversionFormat _eType ) SAL_OVERRIDE; - virtual void SetOptionsChangedHdl( const Link<>& _rHdl ) SAL_OVERRIDE; + virtual void SetOptionsChangedHdl( const Link<LinkParamNone*,void>& _rHdl ) SAL_OVERRIDE; virtual void SetIgnoreHdl( const Link<Button*,void>& _rHdl ) SAL_OVERRIDE; virtual void SetIgnoreAllHdl( const Link<Button*,void>& _rHdl ) SAL_OVERRIDE ; virtual void SetChangeHdl( const Link<Button*,void>& _rHdl ) SAL_OVERRIDE ; diff --git a/cui/source/inc/hangulhanjadlg.hxx b/cui/source/inc/hangulhanjadlg.hxx index 8210431..fca9f50 100644 --- a/cui/source/inc/hangulhanjadlg.hxx +++ b/cui/source/inc/hangulhanjadlg.hxx @@ -124,14 +124,14 @@ namespace svx VclPtr<CheckBox> m_pHanjaOnly; VclPtr<CheckBox> m_pReplaceByChar; - VclPtr<CheckBox> m_pIgnoreNonPrimary; + VclPtr<CheckBox> m_pIgnoreNonPrimary; /** are we working for a document? This is normally true, but in case the user uses the "find" functionality, we switch to working with what the user entered, which then does not have any relation to the document anymore. Some functionality must be disabled then */ bool m_bDocumentMode; - Link<> m_aOptionsChangedLink; + Link<LinkParamNone*,void> m_aOptionsChangedLink; Link<> m_aClickByCharacterLink; public: @@ -142,7 +142,7 @@ namespace svx virtual void dispose() SAL_OVERRIDE; public: - void SetOptionsChangedHdl( const Link<>& _rHdl ); + void SetOptionsChangedHdl( const Link<LinkParamNone*,void>& _rHdl ); void SetIgnoreHdl( const Link<Button*,void>& _rHdl ); void SetIgnoreAllHdl( const Link<Button*,void>& _rHdl ); void SetChangeHdl( const Link<Button*,void>& _rHdl ); diff --git a/editeng/source/misc/hangulhanja.cxx b/editeng/source/misc/hangulhanja.cxx index 660d14d..286aadd 100644 --- a/editeng/source/misc/hangulhanja.cxx +++ b/editeng/source/misc/hangulhanja.cxx @@ -152,7 +152,7 @@ namespace editeng bool ContinueConversion( bool _bRepeatCurrentUnit ); private: - DECL_LINK( OnOptionsChanged, void* ); + DECL_LINK_TYPED( OnOptionsChanged, LinkParamNone*, void ); DECL_LINK_TYPED( OnIgnore, Button*, void ); DECL_LINK_TYPED( OnIgnoreAll, Button*, void ); DECL_LINK_TYPED( OnChange, Button*, void ); @@ -810,13 +810,11 @@ namespace editeng m_pAntiImpl->HandleNewUnit( m_nCurrentStartIndex - m_nReplacementBaseIndex, m_nCurrentEndIndex - m_nReplacementBaseIndex ); } - IMPL_LINK_NOARG(HangulHanjaConversion_Impl, OnOptionsChanged) + IMPL_LINK_NOARG_TYPED(HangulHanjaConversion_Impl, OnOptionsChanged, LinkParamNone*, void) { //options and dictionaries might have been changed //-> update our internal settings and the dialog implUpdateData(); - - return 0L; } IMPL_LINK_NOARG_TYPED(HangulHanjaConversion_Impl, OnIgnore, Button*, void) diff --git a/include/editeng/edtdlg.hxx b/include/editeng/edtdlg.hxx index 8081dc7..8882f95 100644 --- a/include/editeng/edtdlg.hxx +++ b/include/editeng/edtdlg.hxx @@ -57,7 +57,7 @@ class AbstractHangulHanjaConversionDialog : public VclAbstractTerminatedDialog virtual void SetByCharacter( bool _bByCharacter ) = 0; virtual void SetConversionDirectionState( bool _bTryBothDirections, editeng::HangulHanjaConversion::ConversionDirection _ePrimaryConversionDirection ) = 0; virtual void SetConversionFormat( editeng::HangulHanjaConversion::ConversionFormat _eType ) = 0; - virtual void SetOptionsChangedHdl( const Link<>& _rHdl ) = 0; + virtual void SetOptionsChangedHdl( const Link<LinkParamNone*,void>& _rHdl ) = 0; virtual void SetIgnoreHdl( const Link<Button*,void>& _rHdl ) = 0; virtual void SetIgnoreAllHdl( const Link<Button*,void>& _rHdl ) = 0; virtual void SetChangeHdl( const Link<Button*,void>& _rHdl ) = 0; _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
