diff options
Diffstat (limited to 'sfx2/source/dialog')
-rw-r--r-- | sfx2/source/dialog/templdlg.cxx | 10 | ||||
-rw-r--r-- | sfx2/source/dialog/versdlg.cxx | 4 |
2 files changed, 9 insertions, 5 deletions
diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx index 1f1cc098d547..52ab26072267 100644 --- a/sfx2/source/dialog/templdlg.cxx +++ b/sfx2/source/dialog/templdlg.cxx @@ -866,7 +866,7 @@ void SfxCommonTemplateDialog_Impl::Initialize() Update_Impl(); aFilterLb->SetSelectHdl( LINK( this, SfxCommonTemplateDialog_Impl, FilterSelectHdl ) ); - aFmtLb->SetDoubleClickHdl( LINK( this, SfxCommonTemplateDialog_Impl, ApplyHdl ) ); + aFmtLb->SetDoubleClickHdl( LINK( this, SfxCommonTemplateDialog_Impl, TreeListApplyHdl ) ); aFmtLb->SetSelectHdl( LINK( this, SfxCommonTemplateDialog_Impl, FmtSelectHdl ) ); aFmtLb->SetSelectionMode(MULTIPLE_SELECTION); @@ -2086,10 +2086,14 @@ void SfxCommonTemplateDialog_Impl::ResetFocus() } } +IMPL_LINK_NOARG_TYPED( SfxCommonTemplateDialog_Impl, TreeListApplyHdl, SvTreeListBox *, bool ) +{ + return ApplyHdl(NULL) == 1; +} + // Double-click on a style sheet in the ListBox is applied. -IMPL_LINK( SfxCommonTemplateDialog_Impl, ApplyHdl, Control *, pControl ) +IMPL_LINK( SfxCommonTemplateDialog_Impl, ApplyHdl, Control *, /*pControl*/ ) { - (void)pControl; //unused // only if that region is allowed if ( IsInitialized() && 0 != pFamilyState[nActFamily-1] && !GetSelectedEntry().isEmpty() ) diff --git a/sfx2/source/dialog/versdlg.cxx b/sfx2/source/dialog/versdlg.cxx index 1bc6df1a8411..54e73aded93b 100644 --- a/sfx2/source/dialog/versdlg.cxx +++ b/sfx2/source/dialog/versdlg.cxx @@ -370,10 +370,10 @@ void SfxVersionDialog::Open_Impl() Close(); } -IMPL_LINK_NOARG(SfxVersionDialog, DClickHdl_Impl) +IMPL_LINK_NOARG_TYPED(SfxVersionDialog, DClickHdl_Impl, SvTreeListBox*, bool) { Open_Impl(); - return 0L; + return false; } IMPL_LINK_NOARG_TYPED(SfxVersionDialog, SelectHdl_Impl, SvTreeListBox*, void) |