summaryrefslogtreecommitdiff
path: root/cui/source/dialogs
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-09-07 09:35:04 +0200
committerNoel Grandin <noel@peralex.com>2015-09-08 08:16:46 +0200
commit61623d5b90510ae6c791a41031d586a9316e74c4 (patch)
tree0b5a8115ae6d603cbe6208b958d8b440ea8fd06f /cui/source/dialogs
parentd7efea29cdc2faa57d172d7e4d8def18fd49536c (diff)
convert Link<> to typed
Change-Id: I365a81a0a960f5da736c9a97aa056da16c99452f
Diffstat (limited to 'cui/source/dialogs')
-rw-r--r--cui/source/dialogs/hangulhanjadlg.cxx4
-rw-r--r--cui/source/dialogs/linkdlg.cxx5
-rw-r--r--cui/source/dialogs/multipat.cxx10
-rw-r--r--cui/source/dialogs/scriptdlg.cxx10
-rw-r--r--cui/source/dialogs/thesdlg.cxx3
5 files changed, 13 insertions, 19 deletions
diff --git a/cui/source/dialogs/hangulhanjadlg.cxx b/cui/source/dialogs/hangulhanjadlg.cxx
index 789c3fa235c5..5144fddf3794 100644
--- a/cui/source/dialogs/hangulhanjadlg.cxx
+++ b/cui/source/dialogs/hangulhanjadlg.cxx
@@ -1015,14 +1015,12 @@ namespace svx
EndDialog( RET_OK );
}
- IMPL_LINK_NOARG(HangulHanjaOptionsDialog, DictsLB_SelectHdl)
+ IMPL_LINK_NOARG_TYPED(HangulHanjaOptionsDialog, DictsLB_SelectHdl, SvTreeListBox*, void)
{
bool bSel = m_pDictsLB->FirstSelected() != NULL;
m_pEditPB->Enable(bSel);
m_pDeletePB->Enable(bSel);
-
- return 0;
}
IMPL_LINK_NOARG_TYPED(HangulHanjaOptionsDialog, NewDictHdl, Button*, void)
diff --git a/cui/source/dialogs/linkdlg.cxx b/cui/source/dialogs/linkdlg.cxx
index d59c11587c57..685f9de6a061 100644
--- a/cui/source/dialogs/linkdlg.cxx
+++ b/cui/source/dialogs/linkdlg.cxx
@@ -164,7 +164,7 @@ void SvBaseLinksDlg::dispose()
/*************************************************************************
|* SvBaseLinksDlg::Handler()
*************************************************************************/
-IMPL_LINK( SvBaseLinksDlg, LinksSelectHdl, SvTabListBox *, pSvTabListBox )
+IMPL_LINK_TYPED( SvBaseLinksDlg, LinksSelectHdl, SvTreeListBox *, pSvTabListBox, void )
{
sal_uLong nSelectionCount = pSvTabListBox ?
pSvTabListBox->GetSelectionCount() : 0;
@@ -212,7 +212,7 @@ IMPL_LINK( SvBaseLinksDlg, LinksSelectHdl, SvTabListBox *, pSvTabListBox )
sal_uLong nPos;
SvBaseLink* pLink = GetSelEntry( &nPos );
if( !pLink )
- return 0;
+ return;
m_pPbUpdateNow->Enable();
@@ -245,7 +245,6 @@ IMPL_LINK( SvBaseLinksDlg, LinksSelectHdl, SvTabListBox *, pSvTabListBox )
m_pFtFullSourceName->SetText( sLink );
m_pFtFullTypeName->SetText( sType );
}
- return 0;
}
IMPL_LINK( SvBaseLinksDlg, LinksDoubleClickHdl, SvTabListBox *, pSvTabListBox )
diff --git a/cui/source/dialogs/multipat.cxx b/cui/source/dialogs/multipat.cxx
index 446d5d78a688..2a66dae2a47d 100644
--- a/cui/source/dialogs/multipat.cxx
+++ b/cui/source/dialogs/multipat.cxx
@@ -41,13 +41,12 @@ using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::ui::dialogs;
using namespace ::com::sun::star::uno;
-IMPL_LINK_NOARG(SvxMultiPathDialog, SelectHdl_Impl)
+IMPL_LINK_NOARG_TYPED(SvxMultiPathDialog, SelectHdl_Impl, SvTreeListBox*, void)
{
sal_uLong nCount = m_pRadioLB->GetEntryCount();
bool bIsSelected = m_pRadioLB->FirstSelected() != NULL;
bool bEnable = nCount > 1;
m_pDelBtn->Enable(bEnable && bIsSelected);
- return 0;
}
IMPL_LINK_NOARG(SvxPathSelectDialog, SelectHdl_Impl)
@@ -59,13 +58,14 @@ IMPL_LINK_NOARG(SvxPathSelectDialog, SelectHdl_Impl)
return 0;
}
-IMPL_LINK( SvxMultiPathDialog, CheckHdl_Impl, svx::SvxRadioButtonListBox *, pBox )
+IMPL_LINK_TYPED( SvxMultiPathDialog, CheckHdl_Impl, SvTreeListBox*, pBox, void )
{
SvTreeListEntry* pEntry =
- pBox ? pBox->GetEntry( pBox->GetCurMousePoint() ) : m_pRadioLB->FirstSelected();
+ pBox
+ ? pBox->GetEntry( static_cast<svx::SvxRadioButtonListBox*>(pBox)->GetCurMousePoint() )
+ : m_pRadioLB->FirstSelected();
if ( pEntry )
m_pRadioLB->HandleEntryChecked( pEntry );
- return 0;
}
IMPL_LINK_NOARG_TYPED(SvxMultiPathDialog, AddHdl_Impl, Button*, void)
diff --git a/cui/source/dialogs/scriptdlg.cxx b/cui/source/dialogs/scriptdlg.cxx
index 734fae986b07..f689b51618ad 100644
--- a/cui/source/dialogs/scriptdlg.cxx
+++ b/cui/source/dialogs/scriptdlg.cxx
@@ -508,7 +508,7 @@ SvxScriptOrgDialog::~SvxScriptOrgDialog()
void SvxScriptOrgDialog::dispose()
{
// clear the SelectHdl so that it isn't called during the dtor
- m_pScriptsBox->SetSelectHdl( Link<>() );
+ m_pScriptsBox->SetSelectHdl( Link<SvTreeListBox*,void>() );
m_pScriptsBox.clear();
m_pRunButton.clear();
m_pCloseButton.clear();
@@ -624,11 +624,11 @@ void SvxScriptOrgDialog::CheckButtons( Reference< browse::XBrowseNode >& node )
}
}
-IMPL_LINK( SvxScriptOrgDialog, ScriptSelectHdl, SvTreeListBox *, pBox )
+IMPL_LINK_TYPED( SvxScriptOrgDialog, ScriptSelectHdl, SvTreeListBox *, pBox, void )
{
if ( !pBox->IsSelected( pBox->GetHdlEntry() ) )
{
- return 0;
+ return;
}
SvTreeListEntry* pEntry = pBox->GetHdlEntry();
@@ -636,7 +636,7 @@ IMPL_LINK( SvxScriptOrgDialog, ScriptSelectHdl, SvTreeListBox *, pBox )
SFEntry* userData = 0;
if ( !pEntry )
{
- return 0;
+ return;
}
userData = static_cast<SFEntry*>(pEntry->GetUserData());
@@ -646,8 +646,6 @@ IMPL_LINK( SvxScriptOrgDialog, ScriptSelectHdl, SvTreeListBox *, pBox )
node = userData->GetNode();
CheckButtons( node );
}
-
- return 0;
}
IMPL_LINK_TYPED( SvxScriptOrgDialog, ButtonHdl, Button *, pButton, void )
diff --git a/cui/source/dialogs/thesdlg.cxx b/cui/source/dialogs/thesdlg.cxx
index 5dcf4e3281c9..697a8ebbe532 100644
--- a/cui/source/dialogs/thesdlg.cxx
+++ b/cui/source/dialogs/thesdlg.cxx
@@ -396,7 +396,7 @@ IMPL_LINK( SvxThesaurusDialog, WordSelectHdl_Impl, ComboBox *, pBox )
return 0;
}
-IMPL_LINK( SvxThesaurusDialog, AlternativesSelectHdl_Impl, SvxCheckListBox *, pBox )
+IMPL_LINK_TYPED( SvxThesaurusDialog, AlternativesSelectHdl_Impl, SvTreeListBox *, pBox, void )
{
SvTreeListEntry *pEntry = pBox ? pBox->GetCurEntry() : NULL;
if (pEntry)
@@ -410,7 +410,6 @@ IMPL_LINK( SvxThesaurusDialog, AlternativesSelectHdl_Impl, SvxCheckListBox *, pB
}
m_pReplaceEdit->SetText( aStr );
}
- return 0;
}
IMPL_LINK( SvxThesaurusDialog, AlternativesDoubleClickHdl_Impl, SvxCheckListBox *, pBox )