diff options
| author | Thomas Arnhold <thomas@arnhold.org> | 2013-10-28 01:02:13 +0100 |
|---|---|---|
| committer | Thomas Arnhold <thomas@arnhold.org> | 2013-10-28 01:02:13 +0100 |
| commit | 54a17dd2466ebb9fcda181f5dd02c64a5508f306 (patch) | |
| tree | 904f90e6d0259205958b71a6f20b143e2be366fc /sw/source/ui/dbui/mmgreetingspage.cxx | |
| parent | 71e1c79acebab5fc6a31457416c24c4a33141c33 (diff) | |
windows: warning 4355 is disabled globally in com_MSC_defs.mk
So there is no need to do this locally, too.
Change-Id: I0fa1d0cd3e077ba0985848a9d2cbb061b123e8ad
Diffstat (limited to 'sw/source/ui/dbui/mmgreetingspage.cxx')
| -rw-r--r-- | sw/source/ui/dbui/mmgreetingspage.cxx | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/sw/source/ui/dbui/mmgreetingspage.cxx b/sw/source/ui/dbui/mmgreetingspage.cxx index 08f14ea52c74..d6eb05cec6ac 100644 --- a/sw/source/ui/dbui/mmgreetingspage.cxx +++ b/sw/source/ui/dbui/mmgreetingspage.cxx @@ -230,9 +230,6 @@ void SwGreetingsHandler::Contains(sal_Bool bContainsGreeting) SwMailMergeGreetingsPage::SwMailMergeGreetingsPage( SwMailMergeWizard* _pParent) : svt::OWizardPage(_pParent, SW_RES(DLG_MM_GREETINGS_PAGE)), -#ifdef _MSC_VER -#pragma warning (disable : 4355) -#endif m_aHeaderFI(this, SW_RES( FI_HEADER ) ), m_aGreetingLineCB(this, SW_RES( CB_GREETINGLINE ) ), m_aPersonalizedCB(this, SW_RES( CB_PERSONALIZED ) ), @@ -256,9 +253,6 @@ SwMailMergeGreetingsPage::SwMailMergeGreetingsPage( SwMailMergeWizard* _pParent) m_aPrevSetIB( this, SW_RES( IB_PREVSET ) ), m_aNextSetIB( this, SW_RES( IB_NEXTSET ) ), m_sDocument( SW_RES( STR_DOCUMENT ) ) -#ifdef _MSC_VER -#pragma warning (default : 4355) -#endif { m_pWizard = _pParent; m_pGreetingLineCB = &m_aGreetingLineCB; @@ -432,9 +426,6 @@ IMPL_LINK(SwMailMergeGreetingsPage, InsertDataHdl_Impl, ImageButton*, pButton) SwMailBodyDialog::SwMailBodyDialog(Window* pParent, SwMailMergeWizard* _pWizard) : SfxModalDialog(pParent, SW_RES(DLG_MM_MAILBODY)), -#ifdef _MSC_VER -#pragma warning (disable : 4355) -#endif m_aGreetingLineCB(this, SW_RES( CB_GREETINGLINE ) ), m_aPersonalizedCB(this, SW_RES( CB_PERSONALIZED ) ), m_aFemaleFT(this, SW_RES( FT_FEMALE ) ), @@ -456,9 +447,6 @@ SwMailBodyDialog::SwMailBodyDialog(Window* pParent, SwMailMergeWizard* _pWizard) m_aOK( this, SW_RES( PB_OK ) ), m_aCancel( this, SW_RES( PB_CANCEL ) ), m_aHelp( this, SW_RES( PB_HELP ) ) -#ifdef _MSC_VER -#pragma warning (default : 4355) -#endif { m_pWizard = _pWizard; m_pGreetingLineCB = &m_aGreetingLineCB; |