[Libreoffice-commits] core.git: cui/source editeng/source include/editeng

[Noel Grandin]

 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   |    5 ++---
 include/editeng/edtdlg.hxx            |    3 ++-
 6 files changed, 11 insertions(+), 11 deletions(-)

New commits:
commit a829ba593c921a2b6b5fce7f216f48ee9d6c3812
Author: Noel Grandin <noelgrandin at gmail.com>
Date:   Tue Sep 22 15:04:21 2015 +0200

    convert Link<> to typed
    
    Change-Id: I99710933b818ebb0e2d70262c3edd7937e5f03ca
    Reviewed-on: https://gerrit.libreoffice.org/18772
    Reviewed-by: Noel Grandin <noelgrandin at gmail.com>
    Tested-by: Noel Grandin <noelgrandin at gmail.com>

diff --git a/cui/source/dialogs/hangulhanjadlg.cxx b/cui/source/dialogs/hangulhanjadlg.cxx
index 3bdc837..36570b9 100644
--- a/cui/source/dialogs/hangulhanjadlg.cxx
+++ b/cui/source/dialogs/hangulhanjadlg.cxx
@@ -706,7 +706,7 @@ namespace svx
     }
 
 
-    void HangulHanjaConversionDialog::SetClickByCharacterHdl( const Link<>& _rHdl )
+    void HangulHanjaConversionDialog::SetClickByCharacterHdl( const Link<CheckBox*,void>& _rHdl )
     {
         m_aClickByCharacterLink = _rHdl;
     }
@@ -733,7 +733,7 @@ namespace svx
 
     IMPL_LINK_TYPED( HangulHanjaConversionDialog, ClickByCharacterHdl, Button*, pBox, void )
     {
-        m_aClickByCharacterLink.Call( pBox );
+        m_aClickByCharacterLink.Call( static_cast<CheckBox*>(pBox) );
 
         bool bByCharacter = static_cast<CheckBox*>(pBox)->IsChecked();
         m_pSuggestions->DisplayListBox( !bByCharacter );
diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx
index e31ce96..f18a3ec 100644
--- a/cui/source/factory/dlgfact.cxx
+++ b/cui/source/factory/dlgfact.cxx
@@ -286,7 +286,7 @@ void AbstractHangulHanjaConversionDialog_Impl::SetChangeAllHdl( const Link<Butto
     pDlg->SetChangeAllHdl(_rHdl );
 }
 
-void AbstractHangulHanjaConversionDialog_Impl::SetClickByCharacterHdl( const Link<>& _rHdl )
+void AbstractHangulHanjaConversionDialog_Impl::SetClickByCharacterHdl( const Link<CheckBox*,void>& _rHdl )
 {
      pDlg->SetClickByCharacterHdl(_rHdl );
 }
diff --git a/cui/source/factory/dlgfact.hxx b/cui/source/factory/dlgfact.hxx
index 5117163..7b803b4 100644
--- a/cui/source/factory/dlgfact.hxx
+++ b/cui/source/factory/dlgfact.hxx
@@ -144,7 +144,7 @@ class AbstractHangulHanjaConversionDialog_Impl: public AbstractHangulHanjaConver
     virtual void      SetIgnoreAllHdl( const Link<Button*,void>& _rHdl ) SAL_OVERRIDE ;
     virtual void      SetChangeHdl( const Link<Button*,void>& _rHdl ) SAL_OVERRIDE ;
     virtual void      SetChangeAllHdl( const Link<Button*,void>& _rHdl ) SAL_OVERRIDE ;
-    virtual void      SetClickByCharacterHdl( const Link<>& _rHdl ) SAL_OVERRIDE ;
+    virtual void      SetClickByCharacterHdl( const Link<CheckBox*,void>& _rHdl ) SAL_OVERRIDE ;
     virtual void      SetConversionFormatChangedHdl( const Link<Button*,void>& _rHdl ) SAL_OVERRIDE ;
     virtual void      SetFindHdl( const Link<Button*,void>& _rHdl ) SAL_OVERRIDE;
     virtual bool      GetUseBothDirections( ) const SAL_OVERRIDE;
diff --git a/cui/source/inc/hangulhanjadlg.hxx b/cui/source/inc/hangulhanjadlg.hxx
index fca9f50..42a85b2a 100644
--- a/cui/source/inc/hangulhanjadlg.hxx
+++ b/cui/source/inc/hangulhanjadlg.hxx
@@ -129,10 +129,10 @@ namespace svx
             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;
+        bool                       m_bDocumentMode;
 
         Link<LinkParamNone*,void>  m_aOptionsChangedLink;
-        Link<>          m_aClickByCharacterLink;
+        Link<CheckBox*,void>       m_aClickByCharacterLink;
 
     public:
         HangulHanjaConversionDialog(
@@ -148,7 +148,7 @@ namespace svx
         void    SetChangeHdl( const Link<Button*,void>& _rHdl );
         void    SetChangeAllHdl( const Link<Button*,void>& _rHdl );
 
-        void    SetClickByCharacterHdl( const Link<>& _rHdl );
+        void    SetClickByCharacterHdl( const Link<CheckBox*,void>& _rHdl );
         void    SetConversionFormatChangedHdl( const Link<Button*,void>& _rHdl );
         void    SetFindHdl( const Link<Button*,void>& _rHdl );
 
diff --git a/editeng/source/misc/hangulhanja.cxx b/editeng/source/misc/hangulhanja.cxx
index 286aadd..885525c 100644
--- a/editeng/source/misc/hangulhanja.cxx
+++ b/editeng/source/misc/hangulhanja.cxx
@@ -157,7 +157,7 @@ namespace editeng
         DECL_LINK_TYPED( OnIgnoreAll, Button*, void );
         DECL_LINK_TYPED( OnChange, Button*, void );
         DECL_LINK_TYPED( OnChangeAll, Button*, void );
-        DECL_LINK( OnByCharClicked, CheckBox* );
+        DECL_LINK_TYPED( OnByCharClicked, CheckBox*, void );
         DECL_LINK_TYPED( OnConversionTypeChanged, Button*, void );
         DECL_LINK_TYPED( OnFind, Button*, void );
 
@@ -873,13 +873,12 @@ namespace editeng
         }
     }
 
-    IMPL_LINK( HangulHanjaConversion_Impl, OnByCharClicked, CheckBox*, _pBox )
+    IMPL_LINK_TYPED( HangulHanjaConversion_Impl, OnByCharClicked, CheckBox*, _pBox, void )
     {
         m_bByCharacter = _pBox->IsChecked();
 
         // continue conversion, without advancing to the next unit, but instead continuing with the current unit
         implProceed( true );
-        return 0L;
     }
 
     IMPL_LINK_NOARG_TYPED(HangulHanjaConversion_Impl, OnConversionTypeChanged, Button*, void)
diff --git a/include/editeng/edtdlg.hxx b/include/editeng/edtdlg.hxx
index 8882f95..b509c69 100644
--- a/include/editeng/edtdlg.hxx
+++ b/include/editeng/edtdlg.hxx
@@ -37,6 +37,7 @@ namespace vcl { class Window; }
 class ResId;
 class SvxSpellWrapper;
 class Button;
+class CheckBox;
 
 class AbstractThesaurusDialog : public VclAbstractDialog
 {
@@ -62,7 +63,7 @@ class AbstractHangulHanjaConversionDialog : public VclAbstractTerminatedDialog
     virtual void     SetIgnoreAllHdl( const Link<Button*,void>& _rHdl ) = 0;
     virtual void     SetChangeHdl( const Link<Button*,void>& _rHdl ) = 0;
     virtual void     SetChangeAllHdl( const Link<Button*,void>& _rHdl ) = 0;
-    virtual void     SetClickByCharacterHdl( const Link<>& _rHdl ) = 0;
+    virtual void     SetClickByCharacterHdl( const Link<CheckBox*,void>& _rHdl ) = 0;
     virtual void     SetConversionFormatChangedHdl( const Link<Button*,void>& _rHdl ) = 0;
     virtual void     SetFindHdl( const Link<Button*,void>& _rHdl ) = 0;
     virtual bool     GetUseBothDirections() const= 0;