diff options
author | Noel Grandin <noelgrandin@gmail.com> | 2015-09-22 12:34:17 +0200 |
---|---|---|
committer | Noel Grandin <noelgrandin@gmail.com> | 2015-09-22 18:55:17 +0000 |
commit | 5645960113b3b7ded309bdb2ed5bd4a51877b96c (patch) | |
tree | c3f0abcea49e0f1f9b94fbd8eeeb1fbc2af075f5 /cui/source | |
parent | a19f981ea1c31a9a3af4a9368dc50f045701a047 (diff) |
convert Link<> to typed
Change-Id: I2d3ed4e04b19159bd847a925a7296e981a6d468a
Reviewed-on: https://gerrit.libreoffice.org/18771
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'cui/source')
-rw-r--r-- | cui/source/dialogs/hangulhanjadlg.cxx | 4 | ||||
-rw-r--r-- | cui/source/factory/dlgfact.cxx | 2 | ||||
-rw-r--r-- | cui/source/factory/dlgfact.hxx | 2 | ||||
-rw-r--r-- | cui/source/inc/hangulhanjadlg.hxx | 6 |
4 files changed, 7 insertions, 7 deletions
diff --git a/cui/source/dialogs/hangulhanjadlg.cxx b/cui/source/dialogs/hangulhanjadlg.cxx index 6bc9107fb2df..3bdc83734fb4 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 d754caa86f81..e31ce96bde5b 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 7e36ffe3c720..51171636821c 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 8210431f3462..fca9f5007b41 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 ); |