diff options
Diffstat (limited to 'sw/source/ui/dbui/mmaddressblockpage.cxx')
| -rw-r--r-- | sw/source/ui/dbui/mmaddressblockpage.cxx | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/sw/source/ui/dbui/mmaddressblockpage.cxx b/sw/source/ui/dbui/mmaddressblockpage.cxx index 94b9ec966dfa..21e0cf8da34a 100644 --- a/sw/source/ui/dbui/mmaddressblockpage.cxx +++ b/sw/source/ui/dbui/mmaddressblockpage.cxx @@ -54,9 +54,6 @@ static void lcl_Move(Control* pCtrl, long nYOffset) SwMailMergeAddressBlockPage::SwMailMergeAddressBlockPage( SwMailMergeWizard* _pParent) : svt::OWizardPage(_pParent, SW_RES(DLG_MM_ADDRESSBLOCK_PAGE)), -#ifdef _MSC_VER -#pragma warning (disable : 4355) -#endif m_aHeaderFI( this, SW_RES( FI_HEADER ) ), m_aFirstFI( this, SW_RES( FI_FIRST ) ), m_aAddressListFI( this, SW_RES( FI_ADDRESSLIST ) ), @@ -80,9 +77,6 @@ SwMailMergeAddressBlockPage::SwMailMergeAddressBlockPage( SwMailMergeWizard* _pP m_aDocumentIndexFI( this, SW_RES( FI_DOCINDEX ) ), m_aPrevSetIB( this, SW_RES( IB_PREVSET ) ), m_aNextSetIB( this, SW_RES( IB_NEXTSET ) ), -#ifdef _MSC_VER -#pragma warning (default : 4355) -#endif m_sDocument( SW_RES( STR_DOCUMENT ) ), m_sChangeAddress( SW_RES( STR_CHANGEADDRESS )), m_pWizard(_pParent) @@ -872,15 +866,9 @@ public: SwAssignFieldsControl::SwAssignFieldsControl( Window* pParent, const ResId& rResId, SwMailMergeConfigItem& rConfigItem) : Control(pParent, rResId), -#ifdef _MSC_VER -#pragma warning (disable : 4355) -#endif m_aVScroll(this, ResId(SCR_1, *rResId.GetResMgr() )), m_aHeaderHB(this, WB_BUTTONSTYLE | WB_BOTTOMBORDER), m_aWindow(this, ResId(WIN_DATA, *rResId.GetResMgr())), -#ifdef _MSC_VER -#pragma warning (default : 4355) -#endif m_rConfigItem(rConfigItem), m_nLBStartTopPos(0), m_nYOffset(0), @@ -1144,9 +1132,6 @@ SwAssignFieldsDialog::SwAssignFieldsDialog( const OUString& rPreview, bool bIsAddressBlock) : SfxModalDialog(pParent, SW_RES(DLG_MM_ASSIGNFIELDS)), -#ifdef _MSC_VER -#pragma warning (disable : 4355) -#endif m_aMatchingFI( this, SW_RES( FI_MATCHING)), m_pFieldsControl( new SwAssignFieldsControl(this, SW_RES( CT_FIELDS ), rConfigItem)), m_aPreviewFI( this, SW_RES( FI_PREVIEW )), @@ -1155,9 +1140,6 @@ SwAssignFieldsDialog::SwAssignFieldsDialog( 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_sNone(SW_RESSTR(SW_STR_NONE)), m_rPreviewString(rPreview), m_rConfigItem(rConfigItem) |