diff options
| author | Kurt Zenker <kz@openoffice.org> | 2007-09-06 13:05:36 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2007-09-06 13:05:36 +0000 |
| commit | 514b7a99dcbdab72ab994b528defa49cfb395ee3 (patch) | |
| tree | 49d7e5e5e25d462bc2f85e41f34fc834ffbb2f29 /sw/source/ui/dbui/mmdocselectpage.cxx | |
| parent | 60e06c25699f42a6d296f7a18e5168512dd8c58a (diff) | |
INTEGRATION: CWS mingwport06 (1.11.164); FILE MERGED
2007/08/27 14:33:42 vg 1.11.164.1: #i75499# pragma for MSVC
Diffstat (limited to 'sw/source/ui/dbui/mmdocselectpage.cxx')
| -rw-r--r-- | sw/source/ui/dbui/mmdocselectpage.cxx | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/sw/source/ui/dbui/mmdocselectpage.cxx b/sw/source/ui/dbui/mmdocselectpage.cxx index dbcb5a909535..1a96e5766810 100644 --- a/sw/source/ui/dbui/mmdocselectpage.cxx +++ b/sw/source/ui/dbui/mmdocselectpage.cxx @@ -4,9 +4,9 @@ * * $RCSfile: mmdocselectpage.cxx,v $ * - * $Revision: 1.11 $ + * $Revision: 1.12 $ * - * last change: $Author: rt $ $Date: 2007-04-26 09:03:19 $ + * last change: $Author: kz $ $Date: 2007-09-06 14:05:36 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -104,7 +104,9 @@ using namespace svt; -----------------------------------------------------------------------*/ SwMailMergeDocSelectPage::SwMailMergeDocSelectPage( SwMailMergeWizard* _pParent ) : svt::OWizardPage(_pParent, SW_RES(DLG_MM_DOCSELECT_PAGE)), +#ifdef _MSC_VER #pragma warning (disable : 4355) +#endif m_aHeaderFI(this, SW_RES( FI_HEADER ) ), m_aHowToFT (this, SW_RES( FT_HOWTO )), m_aCurrentDocRB (this, SW_RES( RB_CURRENTDOC )), @@ -115,7 +117,9 @@ SwMailMergeDocSelectPage::SwMailMergeDocSelectPage( SwMailMergeWizard* _pParent m_aBrowseTemplatePB (this, SW_RES( PB_BROWSETEMPLATE )), m_aRecentDocRB (this, SW_RES( RB_RECENTDOC )), m_aRecentDocLB (this, SW_RES( LB_RECENTDOC )), +#ifdef _MSC_VER #pragma warning (default : 4355) +#endif m_pWizard(_pParent) { FreeResource(); |