diff options
| author | Noel Grandin <noel@peralex.com> | 2015-09-07 14:01:23 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-09-08 08:16:46 +0200 |
| commit | e126468e5dbc4ef85fc4b6146e0ba73e85281f70 (patch) | |
| tree | 929c0344bcb272fe6fb4d158ec70abc775568b7d /cui | |
| parent | b4deeef405fc4200c1b33d2cecf7b301417b2398 (diff) | |
convert Link<> to typed
Change-Id: I1140910c8e90a3022cc88ff33fa37db62007b745
Diffstat (limited to 'cui')
| -rw-r--r-- | cui/source/dialogs/cuicharmap.cxx | 13 | ||||
| -rw-r--r-- | cui/source/inc/cuicharmap.hxx | 8 |
2 files changed, 8 insertions, 13 deletions
diff --git a/cui/source/dialogs/cuicharmap.cxx b/cui/source/dialogs/cuicharmap.cxx index c2329e5fda54..07183e85ba59 100644 --- a/cui/source/dialogs/cuicharmap.cxx +++ b/cui/source/dialogs/cuicharmap.cxx @@ -494,7 +494,7 @@ IMPL_LINK_NOARG(SvxCharacterMap, SubsetSelectHdl) -IMPL_LINK_NOARG(SvxCharacterMap, CharDoubleClickHdl) +IMPL_LINK_NOARG_TYPED(SvxCharacterMap, CharDoubleClickHdl, SvxShowCharSet*, void) { if (bOne) { @@ -502,12 +502,11 @@ IMPL_LINK_NOARG(SvxCharacterMap, CharDoubleClickHdl) m_pShowText->SetText(OUString(&cChar, 1)); } EndDialog( RET_OK ); - return 0; } -IMPL_LINK_NOARG(SvxCharacterMap, CharSelectHdl) +IMPL_LINK_NOARG_TYPED(SvxCharacterMap, CharSelectHdl, SvxShowCharSet*, void) { if ( !bOne ) { @@ -535,12 +534,11 @@ IMPL_LINK_NOARG(SvxCharacterMap, CharSelectHdl) } m_pOKBtn->Enable(); - return 0; } -IMPL_LINK_NOARG(SvxCharacterMap, CharHighlightHdl) +IMPL_LINK_NOARG_TYPED(SvxCharacterMap, CharHighlightHdl, SvxShowCharSet*, void) { OUString aText; sal_UCS4 cChar = m_pShowSet->GetSelectCharacter(); @@ -573,13 +571,11 @@ IMPL_LINK_NOARG(SvxCharacterMap, CharHighlightHdl) aText = OUString::createFromAscii(aBuf); } m_pCharCodeText->SetText( aText ); - - return 0; } -IMPL_LINK_NOARG(SvxCharacterMap, CharPreSelectHdl) +IMPL_LINK_NOARG_TYPED(SvxCharacterMap, CharPreSelectHdl, SvxShowCharSet*, void) { // adjust subset selection if( pSubsetMap ) @@ -591,7 +587,6 @@ IMPL_LINK_NOARG(SvxCharacterMap, CharPreSelectHdl) } m_pOKBtn->Enable(); - return 0; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/inc/cuicharmap.hxx b/cui/source/inc/cuicharmap.hxx index fb0a61f49cd8..c3967d23e5de 100644 --- a/cui/source/inc/cuicharmap.hxx +++ b/cui/source/inc/cuicharmap.hxx @@ -84,10 +84,10 @@ private: DECL_LINK_TYPED(OKHdl, Button*, void); DECL_LINK(FontSelectHdl, void *); DECL_LINK(SubsetSelectHdl, void *); - DECL_LINK(CharDoubleClickHdl, void *); - DECL_LINK(CharSelectHdl, void *); - DECL_LINK(CharHighlightHdl, void *); - DECL_LINK(CharPreSelectHdl, void *); + DECL_LINK_TYPED(CharDoubleClickHdl, SvxShowCharSet*,void); + DECL_LINK_TYPED(CharSelectHdl, SvxShowCharSet*, void); + DECL_LINK_TYPED(CharHighlightHdl, SvxShowCharSet*, void); + DECL_LINK_TYPED(CharPreSelectHdl, SvxShowCharSet*, void); static void fillAllSubsets(ListBox &rListBox); |