diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-09-27 10:34:27 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-09-27 10:34:27 +0000 |
| commit | 94e20dd4f00bdaae618e5640e0fd9dc348a9c275 (patch) | |
| tree | 2894f1832c30738a880bd10b679a9fa5b1ba3653 /sw/source/ui/dbui/mmmergepage.cxx | |
| parent | 56dc15d263446c130e9bdb6e7878e6fb5553866c (diff) | |
INTEGRATION: CWS swwarnings (1.7.222); FILE MERGED
2007/05/29 12:18:18 os 1.7.222.2: RESYNC: (1.7-1.9); FILE MERGED
2007/02/26 15:59:12 os 1.7.222.1: #i69287# warnings removed
Diffstat (limited to 'sw/source/ui/dbui/mmmergepage.cxx')
| -rw-r--r-- | sw/source/ui/dbui/mmmergepage.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sw/source/ui/dbui/mmmergepage.cxx b/sw/source/ui/dbui/mmmergepage.cxx index c4f6f668ae..34c1146077 100644 --- a/sw/source/ui/dbui/mmmergepage.cxx +++ b/sw/source/ui/dbui/mmmergepage.cxx @@ -4,9 +4,9 @@ * * $RCSfile: mmmergepage.cxx,v $ * - * $Revision: 1.10 $ + * $Revision: 1.11 $ * - * last change: $Author: kz $ $Date: 2007-09-06 14:06:20 $ + * last change: $Author: hr $ $Date: 2007-09-27 11:34:27 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -74,7 +74,7 @@ -----------------------------------------------------------------------*/ SwMailMergeMergePage::SwMailMergeMergePage( SwMailMergeWizard* _pParent) : svt::OWizardPage(_pParent, SW_RES(DLG_MM_MERGE_PAGE)), -#ifdef _MSC_VER +#ifdef MSC #pragma warning (disable : 4355) #endif m_aHeaderFI(this, SW_RES( FI_HEADER ) ), @@ -87,7 +87,7 @@ SwMailMergeMergePage::SwMailMergeMergePage( SwMailMergeWizard* _pParent) : m_aWholeWordsCB(this, SW_RES( CB_WHOLEWORDS)), m_aBackwardsCB(this, SW_RES( CB_BACKWARDS )), m_aMatchCaseCB(this, SW_RES( CB_MATCHCASE )), -#ifdef _MSC_VER +#ifdef MSC #pragma warning (default : 4355) #endif m_pWizard(_pParent) @@ -111,7 +111,7 @@ SwMailMergeMergePage::~SwMailMergeMergePage() /*-- 25.05.2004 16:14:49--------------------------------------------------- -----------------------------------------------------------------------*/ -IMPL_LINK( SwMailMergeMergePage, EditDocumentHdl_Impl, PushButton*, pButton) +IMPL_LINK( SwMailMergeMergePage, EditDocumentHdl_Impl, PushButton*, EMPTYARG) { m_pWizard->SetRestartPage(MM_MERGEPAGE); m_pWizard->EndDialog(RET_EDIT_RESULT_DOC); @@ -120,7 +120,7 @@ IMPL_LINK( SwMailMergeMergePage, EditDocumentHdl_Impl, PushButton*, pButton) /*-- 25.05.2004 16:14:49--------------------------------------------------- -----------------------------------------------------------------------*/ -IMPL_LINK( SwMailMergeMergePage, FindHdl_Impl, PushButton*, pButton) +IMPL_LINK( SwMailMergeMergePage, FindHdl_Impl, PushButton*, EMPTYARG) { SvxSearchItem aSearchItem( SID_SEARCH_ITEM ); |