windows: warning 4355 is disabled globally in com_MSC_defs.mk

So there is no need to do this locally, too.

Change-Id: I0fa1d0cd3e077ba0985848a9d2cbb061b123e8ad

10 files changed, 1 insertions, 84 deletions

diff --git a/sw/source/ui/dbui/createaddresslistdialog.cxx b/sw/source/ui/dbui/createaddresslistdialog.cxx
index 0995300f89d6..83c9caff651d 100644
--- a/sw/source/ui/dbui/createaddresslistdialog.cxx
+++ b/sw/source/ui/dbui/createaddresslistdialog.cxx
@@ -84,14 +84,8 @@ public:
 
 SwAddressControl_Impl::SwAddressControl_Impl(Window* pParent, const ResId& rResId ) :
     Control(pParent, rResId),
-#ifdef _MSC_VER
-#pragma warning (disable : 4355)
-#endif
     m_aScrollBar(this, ResId(SCR_1,*rResId.GetResMgr())),
     m_aWindow(this, ResId(WIN_DATA,*rResId.GetResMgr())),
-#ifdef _MSC_VER
-#pragma warning (default : 4355)
-#endif
     m_pData(0),
     m_aWinOutputSize( m_aWindow.GetOutputSizePixel() ),
     m_nLineHeight(0),
@@ -351,9 +345,6 @@ long SwAddressControl_Impl::PreNotify( NotifyEvent& rNEvt )
 SwCreateAddressListDialog::SwCreateAddressListDialog(
         Window* pParent, const OUString& rURL, SwMailMergeConfigItem& rConfig) :
     SfxModalDialog(pParent, SW_RES(DLG_MM_CREATEADDRESSLIST)),
-#ifdef _MSC_VER
-#pragma warning (disable : 4355)
-#endif
     m_aAddressInformation( this, SW_RES(  FI_ADDRESSINFORMATION)),
     m_pAddressControl(new SwAddressControl_Impl(this, SW_RES(CT_ADDRESS))),
     m_aNewPB( this, SW_RES(               PB_NEW)),
@@ -373,9 +364,6 @@ SwCreateAddressListDialog::SwCreateAddressListDialog(
     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_sAddressListFilterName( SW_RES(    ST_FILTERNAME)),
     m_sURL(rURL),
     m_pCSVData( new SwCSVData ),
diff --git a/sw/source/ui/dbui/dbtablepreviewdialog.cxx b/sw/source/ui/dbui/dbtablepreviewdialog.cxx
index 593de925d41a..e83673781f34 100644
--- a/sw/source/ui/dbui/dbtablepreviewdialog.cxx
+++ b/sw/source/ui/dbui/dbtablepreviewdialog.cxx
@@ -37,15 +37,9 @@ using namespace ::rtl;
 
 SwDBTablePreviewDialog::SwDBTablePreviewDialog(Window* pParent, uno::Sequence< beans::PropertyValue>& rValues ) :
     SfxModalDialog(pParent, SW_RES(DLG_MM_DBTABLEPREVIEWDIALOG)),
-#ifdef _MSC_VER
-#pragma warning (disable : 4355)
-#endif
     m_aDescriptionFI( this, SW_RES(        FI_DESCRIPTION)),
     m_pBeamerWIN( new Window(this, SW_RES( WIN_BEAMER ))),
     m_aOK( this, SW_RES(                   PB_OK  ))
-#ifdef _MSC_VER
-#pragma warning (default : 4355)
-#endif
 {
     FreeResource();
     const beans::PropertyValue* pValues = rValues.getConstArray();
diff --git a/sw/source/ui/dbui/mailmergechildwindow.cxx b/sw/source/ui/dbui/mailmergechildwindow.cxx
index 9f1bbb53791c..682ab227f87e 100644
--- a/sw/source/ui/dbui/mailmergechildwindow.cxx
+++ b/sw/source/ui/dbui/mailmergechildwindow.cxx
@@ -264,9 +264,6 @@ SwSendWarningBox_Impl::SwSendWarningBox_Impl(Window* pParent, const OUString& rD
 
 SwSendMailDialog::SwSendMailDialog(Window *pParent, SwMailMergeConfigItem& rConfigItem) :
     ModelessDialog /*SfxModalDialog*/(pParent, SW_RES(DLG_MM_SENDMAILS)),
-#ifdef _MSC_VER
-#pragma warning (disable : 4355)
-#endif
     m_aStatusFL( this, SW_RES(             FL_STATUS             )),
     m_aStatusFT( this, SW_RES(             FT_STATUS1            )),
     m_aTransferStatusFL( this, SW_RES(     FL_TRANSFERSTATUS     )),
@@ -280,9 +277,6 @@ SwSendMailDialog::SwSendMailDialog(Window *pParent, SwMailMergeConfigItem& rConf
     m_aSeparatorFL( this, SW_RES(          FL_SEPARATOR          )),
     m_aStopPB( this, SW_RES(               PB_STOP               )),
     m_aClosePB( this, SW_RES(              PB_CLOSE              )),
-#ifdef _MSC_VER
-#pragma warning (default : 4355)
-#endif
     m_sMore(m_aDetailsPB.GetText()),
     m_sLess(SW_RES(ST_LESS)),
     m_sContinue(SW_RES( ST_CONTINUE )),
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)
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;
diff --git a/sw/source/ui/dbui/mmlayoutpage.cxx b/sw/source/ui/dbui/mmlayoutpage.cxx
index a2b04213c2b6..286476cd57d1 100644
--- a/sw/source/ui/dbui/mmlayoutpage.cxx
+++ b/sw/source/ui/dbui/mmlayoutpage.cxx
@@ -74,9 +74,6 @@ using namespace ::com::sun::star::view;
 
 SwMailMergeLayoutPage::SwMailMergeLayoutPage( SwMailMergeWizard* _pParent) :
     svt::OWizardPage( _pParent, SW_RES(DLG_MM_LAYOUT_PAGE)),
-#ifdef _MSC_VER
-#pragma warning (disable : 4355)
-#endif
     m_aHeaderFI( this, SW_RES(         FI_HEADER             )),
     m_aPositionFL( this, SW_RES(       FL_POSITION           )),
     m_aAlignToBodyCB( this, SW_RES(      CB_ALIGN              )),
@@ -92,9 +89,6 @@ SwMailMergeLayoutPage::SwMailMergeLayoutPage( SwMailMergeWizard* _pParent) :
     m_aExampleContainerWIN( this, SW_RES(  WIN_EXAMPLECONTAINER      )),
     m_aZoomFT( this, SW_RES(           FT_ZOOM               )),
     m_aZoomLB( this, SW_RES(           LB_ZOOM               )),
-#ifdef _MSC_VER
-#pragma warning (default : 4355)
-#endif
     m_pExampleFrame(0),
     m_pExampleWrtShell(0),
     m_pAddressBlockFormat(0),
diff --git a/sw/source/ui/dbui/mmmergepage.cxx b/sw/source/ui/dbui/mmmergepage.cxx
index aa3e15cbc459..89fc9df0fede 100644
--- a/sw/source/ui/dbui/mmmergepage.cxx
+++ b/sw/source/ui/dbui/mmmergepage.cxx
@@ -31,9 +31,6 @@
 
 SwMailMergeMergePage::SwMailMergeMergePage( SwMailMergeWizard* _pParent) :
     svt::OWizardPage(_pParent, SW_RES(DLG_MM_MERGE_PAGE)),
-#ifdef _MSC_VER
-#pragma warning (disable : 4355)
-#endif
     m_aHeaderFI(this,           SW_RES(  FI_HEADER           ) ),
     m_aEditFI(this, SW_RES(           FI_EDIT )),
     m_aEditPB(this, SW_RES(           PB_EDIT )),
@@ -44,9 +41,6 @@ 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
-#pragma warning (default : 4355)
-#endif
     m_pWizard(_pParent)
 {
     FreeResource();
diff --git a/sw/source/ui/dbui/mmoutputpage.cxx b/sw/source/ui/dbui/mmoutputpage.cxx
index 6514e5ad4145..13f687a99c9c 100644
--- a/sw/source/ui/dbui/mmoutputpage.cxx
+++ b/sw/source/ui/dbui/mmoutputpage.cxx
@@ -205,9 +205,6 @@ public:
 
 SwMailMergeOutputPage::SwMailMergeOutputPage( SwMailMergeWizard* _pParent) :
     svt::OWizardPage( _pParent, SW_RES(DLG_MM_OUTPUT_PAGE)),
-#ifdef _MSC_VER
-#pragma warning (disable : 4355)
-#endif
     m_aHeaderFI(this,           SW_RES(  FI_HEADER           ) ),
     m_aOptionsFI(this,          SW_RES(  FI_OPTIONS          ) ),
     m_aSaveStartDocRB(this,     SW_RES(  RB_SAVESTARTDOC     ) ),
@@ -255,9 +252,7 @@ SwMailMergeOutputPage::SwMailMergeOutputPage( SwMailMergeWizard* _pParent) :
     m_sDefaultAttachmentST(SW_RES(   ST_DEFAULTATTACHMENT )),
     m_sNoSubjectST(SW_RES(           ST_NOSUBJECT )),
     m_sConfigureMail(SW_RES(         ST_CONFIGUREMAIL)),
-#ifdef _MSC_VER
-#pragma warning (default : 4355)
-#endif
+
     m_bCancelSaving( false ),
     m_pWizard(_pParent),
     m_pTempPrinter( 0 )
diff --git a/sw/source/ui/dbui/mmpreparemergepage.cxx b/sw/source/ui/dbui/mmpreparemergepage.cxx
index 2e146ff66c60..75f7077109d9 100644
--- a/sw/source/ui/dbui/mmpreparemergepage.cxx
+++ b/sw/source/ui/dbui/mmpreparemergepage.cxx
@@ -40,9 +40,6 @@ using namespace ::com::sun::star::sdbc;
 
 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 ) ),
@@ -55,9 +52,6 @@ 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 (default : 4355)
-#endif
     m_pWizard(_pParent)
 {
     FreeResource();
diff --git a/sw/source/ui/dbui/selectdbtabledialog.cxx b/sw/source/ui/dbui/selectdbtabledialog.cxx
index d5b6e385ed5b..927533e8bf4f 100644
--- a/sw/source/ui/dbui/selectdbtabledialog.cxx
+++ b/sw/source/ui/dbui/selectdbtabledialog.cxx
@@ -45,9 +45,6 @@ using namespace ::com::sun::star::beans;
 SwSelectDBTableDialog::SwSelectDBTableDialog(Window* pParent,
         const uno::Reference< sdbc::XConnection>& rConnection) :
     SfxModalDialog(pParent, SW_RES(DLG_MM_SELECTDBTABLEDDIALOG)),
-#ifdef _MSC_VER
-#pragma warning (disable : 4355)
-#endif
     m_aSelectFI( this, SW_RES(       FI_SELECT     )),
     m_aTableHB( this, WB_BUTTONSTYLE | WB_BOTTOMBORDER),
     m_aTableLB( this, SW_RES(        LB_TABLE      )),
@@ -56,9 +53,6 @@ SwSelectDBTableDialog::SwSelectDBTableDialog(Window* pParent,
     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_sName( SW_RES( ST_NAME )),
     m_sType( SW_RES( ST_TYPE )),
     m_sTable( SW_RES( ST_TABLE )),