diff options
| author | Kurt Zenker <kz@openoffice.org> | 2007-09-06 13:07:17 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2007-09-06 13:07:17 +0000 |
| commit | d12253b415b68b2b6455349d77bfb600577105e0 (patch) | |
| tree | 19c4b46e2141c01de4e2dc86cee742d85d032d88 /sw/source/ui/dbui/mmpreparemergepage.cxx | |
| parent | 5fd157eb0d9f6b856056fb3cfe254b955c9b6c21 (diff) | |
INTEGRATION: CWS mingwport06 (1.8.166); FILE MERGED
2007/08/27 14:33:42 vg 1.8.166.1: #i75499# pragma for MSVC
Diffstat (limited to 'sw/source/ui/dbui/mmpreparemergepage.cxx')
| -rw-r--r-- | sw/source/ui/dbui/mmpreparemergepage.cxx | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/sw/source/ui/dbui/mmpreparemergepage.cxx b/sw/source/ui/dbui/mmpreparemergepage.cxx index e9cc5d7226a4..2ffdd2975d1e 100644 --- a/sw/source/ui/dbui/mmpreparemergepage.cxx +++ b/sw/source/ui/dbui/mmpreparemergepage.cxx @@ -4,9 +4,9 @@ * * $RCSfile: mmpreparemergepage.cxx,v $ * - * $Revision: 1.8 $ + * $Revision: 1.9 $ * - * last change: $Author: rt $ $Date: 2007-04-26 09:04:47 $ + * last change: $Author: kz $ $Date: 2007-09-06 14:07:03 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -89,7 +89,9 @@ using namespace ::rtl; -----------------------------------------------------------------------*/ SwMailMergePrepareMergePage::SwMailMergePrepareMergePage( SwMailMergeWizard* _pParent) : svt::OWizardPage( _pParent, SW_RES(DLG_MM_PREPAREMERGE_PAGE)), +#ifdef _MSC_VER #pragma warning (disable : 4355) +#endif m_aHeaderFI(this, SW_RES( FI_HEADER ) ), m_aPreviewFI(this, SW_RES( FI_PREVIEW ) ), m_aRecipientFT(this, SW_RES( FT_RECIPIENT ) ), @@ -102,7 +104,9 @@ SwMailMergePrepareMergePage::SwMailMergePrepareMergePage( SwMailMergeWizard* _pP m_aNoteHeaderFL(this, SW_RES( FL_NOTEHEADER ) ), m_aEditFI(this, SW_RES( FI_EDIT ) ), m_aEditPB(this, SW_RES( PB_EDIT ) ), +#ifdef _MSC_VER #pragma warning (disable : 4355) +#endif m_pWizard(_pParent) { FreeResource(); |