diff options
author | Oliver Bolte <obo@openoffice.org> | 2004-11-16 15:59:13 +0000 |
---|---|---|
committer | Oliver Bolte <obo@openoffice.org> | 2004-11-16 15:59:13 +0000 |
commit | 0f16b73a3664c7b9209f31c97237e13d8550c6cd (patch) | |
tree | fac2cdb8a925d3d84f0353235b54028f4b6f6d7a /sw/source/ui | |
parent | c9080eb7854c8e9e2d4faabf6fcfa65f822bf23c (diff) |
INTEGRATION: CWS iha04 (1.3.70); FILE MERGED
2004/10/29 11:40:57 iha 1.3.70.1: #i34305# make find feature more comfortable
Diffstat (limited to 'sw/source/ui')
-rw-r--r-- | sw/source/ui/dbui/mmmergepage.cxx | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/sw/source/ui/dbui/mmmergepage.cxx b/sw/source/ui/dbui/mmmergepage.cxx index b79a323f0ab1..e7a45e492842 100644 --- a/sw/source/ui/dbui/mmmergepage.cxx +++ b/sw/source/ui/dbui/mmmergepage.cxx @@ -2,9 +2,9 @@ * * $RCSfile: mmmergepage.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: rt $ $Date: 2004-09-29 09:32:46 $ + * last change: $Author: obo $ $Date: 2004-11-16 16:59:13 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -126,6 +126,8 @@ SwMailMergeMergePage::SwMailMergeMergePage( SwMailMergeWizard* _pParent) : m_aEditPB.SetClickHdl( LINK( this, SwMailMergeMergePage, EditDocumentHdl_Impl)); m_aFindPB.SetClickHdl( LINK( this, SwMailMergeMergePage, FindHdl_Impl )); + m_aFindED.SetReturnActionLink( LINK(this, SwMailMergeMergePage, EnteredFindStringHdl_Impl )); + } /*-- 02.04.2004 16:38:45--------------------------------------------------- @@ -149,7 +151,7 @@ IMPL_LINK( SwMailMergeMergePage, FindHdl_Impl, PushButton*, pButton) { SvxSearchItem aSearchItem( SID_SEARCH_ITEM ); - SfxBoolItem aQuiet( SID_SEARCH_QUIET, sal_True ); + SfxBoolItem aQuiet( SID_SEARCH_QUIET, sal_False ); aSearchItem.SetSearchString(m_aFindED.GetText()); aSearchItem.SetWordOnly(m_aWholeWordsCB.IsChecked()); @@ -166,5 +168,8 @@ IMPL_LINK( SwMailMergeMergePage, FindHdl_Impl, PushButton*, pButton) return 0; } - - +IMPL_LINK( SwMailMergeMergePage, EnteredFindStringHdl_Impl, void*, EMPTYARG ) +{ + m_aFindPB.GetClickHdl().Call( &m_aFindPB ); + return 0; +} |