diff options
| author | Oliver Bolte <obo@openoffice.org> | 2004-11-16 15:59:24 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2004-11-16 15:59:24 +0000 |
| commit | 7a58226de852021dd8ca898be63dc23f7fc2c8d7 (patch) | |
| tree | 1fbdbd70dd9b348b76b0ddad27de9a8fc10fbae4 /sw/source/ui | |
| parent | 0f16b73a3664c7b9209f31c97237e13d8550c6cd (diff) | |
INTEGRATION: CWS iha04 (1.2.70); FILE MERGED
2004/10/29 11:40:36 iha 1.2.70.1: #i34305# make find feature more comfortable
Diffstat (limited to 'sw/source/ui')
| -rw-r--r-- | sw/source/ui/dbui/mmmergepage.hxx | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/sw/source/ui/dbui/mmmergepage.hxx b/sw/source/ui/dbui/mmmergepage.hxx index e053c1d1997d..98ce8dbe7cbe 100644 --- a/sw/source/ui/dbui/mmmergepage.hxx +++ b/sw/source/ui/dbui/mmmergepage.hxx @@ -2,9 +2,9 @@ * * $RCSfile: mmmergepage.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: rt $ $Date: 2004-09-20 13:17:48 $ + * last change: $Author: obo $ $Date: 2004-11-16 16:59:24 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -76,6 +76,9 @@ #ifndef _MAILMERGEHELPER_HXX #include <mailmergehelper.hxx> #endif +#ifndef _ACTCTRL_HXX +#include <actctrl.hxx> +#endif class SwMailMergeWizard; /*-- 02.04.2004 09:21:06--------------------------------------------------- @@ -89,7 +92,7 @@ class SwMailMergeMergePage : public svt::OWizardPage FixedLine m_aFindFL; FixedText m_aFineFT; - Edit m_aFindED; + ReturnActionEdit m_aFindED; PushButton m_aFindPB; CheckBox m_aWholeWordsCB; @@ -100,6 +103,8 @@ class SwMailMergeMergePage : public svt::OWizardPage DECL_LINK(EditDocumentHdl_Impl, PushButton*); DECL_LINK(FindHdl_Impl, PushButton*); + DECL_LINK(EnteredFindStringHdl_Impl, void*); + public: SwMailMergeMergePage( SwMailMergeWizard* _pParent); ~SwMailMergeMergePage(); |