[Libreoffice-commits] core.git: 2 commits - basic/source chart2/source connectivity/source cui/source editeng/source idlc/source sal/qa sd/source svx/source sw/source uui/source xmlsecurity/source
Thomas Arnhold
thomas at arnhold.org
Sun Oct 27 17:15:45 PDT 2013
basic/source/comp/parser.cxx | 5 -
chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx | 1
chart2/source/controller/dialogs/dlg_InsertLegend.cxx | 1
chart2/source/controller/dialogs/dlg_InsertTitle.cxx | 1
chart2/source/controller/dialogs/dlg_View3D.cxx | 1
chart2/source/controller/dialogs/res_DataLabel.cxx | 1
chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx | 1
chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx | 1
chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx | 1
chart2/source/controller/dialogs/tp_AxisLabel.cxx | 1
chart2/source/controller/dialogs/tp_AxisPositions.cxx | 1
chart2/source/controller/dialogs/tp_ChartType.cxx | 1
chart2/source/controller/dialogs/tp_LegendPosition.cxx | 1
chart2/source/controller/dialogs/tp_PolarOptions.cxx | 1
chart2/source/controller/dialogs/tp_RangeChooser.cxx | 1
chart2/source/controller/dialogs/tp_Scale.cxx | 1
chart2/source/controller/dialogs/tp_SeriesToAxis.cxx | 1
chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx | 1
chart2/source/inc/NoWarningThisInCTOR.hxx | 40 ----------
chart2/source/model/main/ChartModel.cxx | 1
connectivity/source/parse/sqlbison.y | 2
cui/source/customize/cfg.cxx | 4 -
editeng/source/misc/svxacorr.cxx | 7 -
idlc/source/parser.y | 2
sal/qa/OStringBuffer/rtl_String_Utils.cxx | 5 -
sd/source/ui/remotecontrol/mDNSResponder/CommonServices.h | 5 -
svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx | 5 -
svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx | 5 -
sw/source/ui/dbui/createaddresslistdialog.cxx | 12 ---
sw/source/ui/dbui/dbtablepreviewdialog.cxx | 6 -
sw/source/ui/dbui/mailmergechildwindow.cxx | 6 -
sw/source/ui/dbui/mmaddressblockpage.cxx | 18 ----
sw/source/ui/dbui/mmgreetingspage.cxx | 12 ---
sw/source/ui/dbui/mmlayoutpage.cxx | 6 -
sw/source/ui/dbui/mmmergepage.cxx | 6 -
sw/source/ui/dbui/mmoutputpage.cxx | 7 -
sw/source/ui/dbui/mmpreparemergepage.cxx | 6 -
sw/source/ui/dbui/selectdbtabledialog.cxx | 6 -
uui/source/secmacrowarnings.cxx | 4 -
xmlsecurity/source/dialogs/certificateviewer.cxx | 5 -
xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx | 6 -
xmlsecurity/source/dialogs/macrosecurity.cxx | 5 -
xmlsecurity/source/dialogs/warnings.cxx | 5 -
43 files changed, 4 insertions(+), 204 deletions(-)
New commits:
commit 7eb42bddb3a1ae99215387ca189eba7e85110344
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Mon Oct 28 01:08:27 2013 +0100
windows: warning 4706 is disabled globally in com_MSC_defs.mk
So there is no need to do this locally, too.
Change-Id: Ibc623235cae07a86dfd0dbc1d7672ca4273facec
diff --git a/connectivity/source/parse/sqlbison.y b/connectivity/source/parse/sqlbison.y
index de0d7b7..8ff9b0c 100644
--- a/connectivity/source/parse/sqlbison.y
+++ b/connectivity/source/parse/sqlbison.y
@@ -50,7 +50,7 @@
#pragma disable_warn
#elif defined _MSC_VER
#pragma warning(push, 1)
-#pragma warning(disable:4273 4701 4706)
+#pragma warning(disable:4273 4701)
#endif
#if HAVE_GCC_PRAGMA_DIAGNOSTIC_MODIFY
diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx
index 99addf5..2777137 100644
--- a/editeng/source/misc/svxacorr.cxx
+++ b/editeng/source/misc/svxacorr.cxx
@@ -607,10 +607,6 @@ sal_Bool SvxAutoCorrect::FnChgToEnEmDash(
return bRet;
}
-#ifdef _MSC_VER
-#pragma warning(push)
-#pragma warning(disable: 4706) // assignment within conditional expression
-#endif
sal_Bool SvxAutoCorrect::FnAddNonBrkSpace(
SvxAutoCorrDoc& rDoc, const OUString& rTxt,
@@ -697,9 +693,6 @@ sal_Bool SvxAutoCorrect::FnAddNonBrkSpace(
return bRet;
}
-#ifdef _MSC_VER
-#pragma warning(pop)
-#endif
sal_Bool SvxAutoCorrect::FnSetINetAttr( SvxAutoCorrDoc& rDoc, const OUString& rTxt,
xub_StrLen nSttPos, xub_StrLen nEndPos,
diff --git a/idlc/source/parser.y b/idlc/source/parser.y
index d7fba7e..da3853e 100644
--- a/idlc/source/parser.y
+++ b/idlc/source/parser.y
@@ -214,7 +214,7 @@ bool includes(AstDeclaration const * type1, AstDeclaration const * type2) {
#pragma disable_warn
#elif defined _MSC_VER
#pragma warning(push, 1)
-#pragma warning(disable: 4273 4701 4702 4706)
+#pragma warning(disable: 4273 4701 4702)
#endif
%}
/*
diff --git a/sal/qa/OStringBuffer/rtl_String_Utils.cxx b/sal/qa/OStringBuffer/rtl_String_Utils.cxx
index 0ab5112..53a1f18 100644
--- a/sal/qa/OStringBuffer/rtl_String_Utils.cxx
+++ b/sal/qa/OStringBuffer/rtl_String_Utils.cxx
@@ -45,10 +45,7 @@ sal_uInt32 AStringLen( const sal_Char *pAStr )
return nStrLen;
} // AStringLen
-/* disable assignment within condition expression */
-#if defined WNT && defined _MSC_VER
-#pragma warning( disable : 4706 )
-#endif
+
sal_Char* cpystr( sal_Char* dst, const sal_Char* src )
{
const sal_Char* psrc = src;
diff --git a/sd/source/ui/remotecontrol/mDNSResponder/CommonServices.h b/sd/source/ui/remotecontrol/mDNSResponder/CommonServices.h
index 2ed2e32..defa6b7 100755
--- a/sd/source/ui/remotecontrol/mDNSResponder/CommonServices.h
+++ b/sd/source/ui/remotecontrol/mDNSResponder/CommonServices.h
@@ -258,7 +258,6 @@ extern "C" {
#elif ( defined( _MSC_VER ) )
#pragma warning( disable:4127 ) // Disable "conditional expression is constant" warning for debug macros.
- #pragma warning( disable:4706 ) // Disable "assignment within conditional expression" for Microsoft headers.
#endif
@@ -266,10 +265,6 @@ extern "C" {
#include <winsock2.h>
#include <ws2tcpip.h>
- #if ( defined( _MSC_VER ) )
- #pragma warning( default:4706 )
- #endif
-
#else
#error unknown OS - update this file to support your OS
#endif
commit 54a17dd2466ebb9fcda181f5dd02c64a5508f306
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Mon Oct 28 01:02:13 2013 +0100
windows: warning 4355 is disabled globally in com_MSC_defs.mk
So there is no need to do this locally, too.
Change-Id: I0fa1d0cd3e077ba0985848a9d2cbb061b123e8ad
diff --git a/basic/source/comp/parser.cxx b/basic/source/comp/parser.cxx
index 6c31a12..da4420b 100644
--- a/basic/source/comp/parser.cxx
+++ b/basic/source/comp/parser.cxx
@@ -108,11 +108,6 @@ static const SbiStatement StmntTable [] = {
};
-#ifdef _MSC_VER
-// 'this' : used in base member initializer list
-#pragma warning( disable: 4355 )
-#endif
-
SbiParser::SbiParser( StarBASIC* pb, SbModule* pm )
: SbiTokenizer( pm->GetSource32(), pb ),
aGblStrings( this ),
diff --git a/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx b/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx
index 5889541..2eeb6cd 100644
--- a/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx
+++ b/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx
@@ -22,7 +22,6 @@
#include "ResId.hxx"
#include "chartview/ChartSfxItemIds.hxx"
#include "HelpIds.hrc"
-#include "NoWarningThisInCTOR.hxx"
#include "ObjectNameProvider.hxx"
// header for class SfxBoolItem
diff --git a/chart2/source/controller/dialogs/dlg_InsertLegend.cxx b/chart2/source/controller/dialogs/dlg_InsertLegend.cxx
index 44d6ab1..e291771 100644
--- a/chart2/source/controller/dialogs/dlg_InsertLegend.cxx
+++ b/chart2/source/controller/dialogs/dlg_InsertLegend.cxx
@@ -22,7 +22,6 @@
#include "res_LegendPosition.hxx"
#include "ObjectNameProvider.hxx"
#include "ResId.hxx"
-#include "NoWarningThisInCTOR.hxx"
namespace chart
{
diff --git a/chart2/source/controller/dialogs/dlg_InsertTitle.cxx b/chart2/source/controller/dialogs/dlg_InsertTitle.cxx
index 334e413..7b484ea 100644
--- a/chart2/source/controller/dialogs/dlg_InsertTitle.cxx
+++ b/chart2/source/controller/dialogs/dlg_InsertTitle.cxx
@@ -21,7 +21,6 @@
#include "dlg_InsertTitle.hrc"
#include "res_Titles.hxx"
#include "ResId.hxx"
-#include "NoWarningThisInCTOR.hxx"
#include "ObjectNameProvider.hxx"
namespace chart
diff --git a/chart2/source/controller/dialogs/dlg_View3D.cxx b/chart2/source/controller/dialogs/dlg_View3D.cxx
index 6d7ee35..7eda837 100644
--- a/chart2/source/controller/dialogs/dlg_View3D.cxx
+++ b/chart2/source/controller/dialogs/dlg_View3D.cxx
@@ -22,7 +22,6 @@
#include "Strings.hrc"
#include "TabPages.hrc"
#include "ResId.hxx"
-#include "NoWarningThisInCTOR.hxx"
#include "tp_3D_SceneGeometry.hxx"
#include "tp_3D_SceneAppearance.hxx"
#include "tp_3D_SceneIllumination.hxx"
diff --git a/chart2/source/controller/dialogs/res_DataLabel.cxx b/chart2/source/controller/dialogs/res_DataLabel.cxx
index 48d5589..b69a9e3 100644
--- a/chart2/source/controller/dialogs/res_DataLabel.cxx
+++ b/chart2/source/controller/dialogs/res_DataLabel.cxx
@@ -23,7 +23,6 @@
#include "Strings.hrc"
#include "ResId.hxx"
#include "chartview/ChartSfxItemIds.hxx"
-#include "NoWarningThisInCTOR.hxx"
#include "dlg_NumberFormat.hxx"
// header for class SvxNumberInfoItem
diff --git a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx
index 0e7804e..dc74f71 100644
--- a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx
+++ b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx
@@ -21,7 +21,6 @@
#include "tp_3D_SceneAppearance.hrc"
#include "ResId.hxx"
#include "Strings.hrc"
-#include "NoWarningThisInCTOR.hxx"
#include "ChartModelHelper.hxx"
#include "ThreeDHelper.hxx"
#include "macros.hxx"
diff --git a/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx b/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx
index 3635d50..b73205f 100644
--- a/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx
+++ b/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx
@@ -20,7 +20,6 @@
#include "tp_3D_SceneGeometry.hxx"
#include "tp_3D_SceneGeometry.hrc"
#include "ResId.hxx"
-#include "NoWarningThisInCTOR.hxx"
#include "BaseGFXHelper.hxx"
#include "macros.hxx"
#include "DiagramHelper.hxx"
diff --git a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx
index 65b69b4..3235fa7 100644
--- a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx
+++ b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx
@@ -23,7 +23,6 @@
#include "Strings.hrc"
#include "Bitmaps.hrc"
#include "CommonConverters.hxx"
-#include "NoWarningThisInCTOR.hxx"
#include "svx/dialogs.hrc"
// header for define SVX_RES
diff --git a/chart2/source/controller/dialogs/tp_AxisLabel.cxx b/chart2/source/controller/dialogs/tp_AxisLabel.cxx
index 59ad0b5..f16490f 100644
--- a/chart2/source/controller/dialogs/tp_AxisLabel.cxx
+++ b/chart2/source/controller/dialogs/tp_AxisLabel.cxx
@@ -22,7 +22,6 @@
#include "ResId.hxx"
#include "TabPages.hrc"
#include "chartview/ChartSfxItemIds.hxx"
-#include "NoWarningThisInCTOR.hxx"
// header for SvxChartTextOrientItem / SvxChartTextOrderItem
#include <svx/chrtitem.hxx>
diff --git a/chart2/source/controller/dialogs/tp_AxisPositions.cxx b/chart2/source/controller/dialogs/tp_AxisPositions.cxx
index e97bcc8..46b7f7c 100644
--- a/chart2/source/controller/dialogs/tp_AxisPositions.cxx
+++ b/chart2/source/controller/dialogs/tp_AxisPositions.cxx
@@ -23,7 +23,6 @@
#include "TabPages.hrc"
#include "Strings.hrc"
#include "chartview/ChartSfxItemIds.hxx"
-#include "NoWarningThisInCTOR.hxx"
#include "AxisHelper.hxx"
#include <svx/svxids.hrc>
diff --git a/chart2/source/controller/dialogs/tp_ChartType.cxx b/chart2/source/controller/dialogs/tp_ChartType.cxx
index cb5311b..bec737d 100644
--- a/chart2/source/controller/dialogs/tp_ChartType.cxx
+++ b/chart2/source/controller/dialogs/tp_ChartType.cxx
@@ -23,7 +23,6 @@
#include "ResId.hxx"
#include "ChartModelHelper.hxx"
#include "DiagramHelper.hxx"
-#include "NoWarningThisInCTOR.hxx"
#include "res_BarGeometry.hxx"
#include "ControllerLockGuard.hxx"
#include "macros.hxx"
diff --git a/chart2/source/controller/dialogs/tp_LegendPosition.cxx b/chart2/source/controller/dialogs/tp_LegendPosition.cxx
index cdd2db7..0de7587 100644
--- a/chart2/source/controller/dialogs/tp_LegendPosition.cxx
+++ b/chart2/source/controller/dialogs/tp_LegendPosition.cxx
@@ -22,7 +22,6 @@
#include "TabPages.hrc"
#include "res_LegendPosition.hxx"
#include "chartview/ChartSfxItemIds.hxx"
-#include "NoWarningThisInCTOR.hxx"
#include <svx/chrtitem.hxx>
#include <editeng/eeitem.hxx>
#include <editeng/frmdiritem.hxx>
diff --git a/chart2/source/controller/dialogs/tp_PolarOptions.cxx b/chart2/source/controller/dialogs/tp_PolarOptions.cxx
index 5ac89c1..6f5ac96 100644
--- a/chart2/source/controller/dialogs/tp_PolarOptions.cxx
+++ b/chart2/source/controller/dialogs/tp_PolarOptions.cxx
@@ -21,7 +21,6 @@
#include "tp_PolarOptions.hrc"
#include "ResId.hxx"
#include "chartview/ChartSfxItemIds.hxx"
-#include "NoWarningThisInCTOR.hxx"
#include <svl/eitem.hxx>
#include <svl/intitem.hxx>
diff --git a/chart2/source/controller/dialogs/tp_RangeChooser.cxx b/chart2/source/controller/dialogs/tp_RangeChooser.cxx
index 897deb8..2eb5f5e 100644
--- a/chart2/source/controller/dialogs/tp_RangeChooser.cxx
+++ b/chart2/source/controller/dialogs/tp_RangeChooser.cxx
@@ -22,7 +22,6 @@
#include "Strings.hrc"
#include "ResId.hxx"
#include "macros.hxx"
-#include "NoWarningThisInCTOR.hxx"
#include "DataSourceHelper.hxx"
#include "DiagramHelper.hxx"
#include "ChartTypeTemplateProvider.hxx"
diff --git a/chart2/source/controller/dialogs/tp_Scale.cxx b/chart2/source/controller/dialogs/tp_Scale.cxx
index 409cfd8..d0d0c6c 100644
--- a/chart2/source/controller/dialogs/tp_Scale.cxx
+++ b/chart2/source/controller/dialogs/tp_Scale.cxx
@@ -23,7 +23,6 @@
#include "ResId.hxx"
#include "Strings.hrc"
#include "chartview/ChartSfxItemIds.hxx"
-#include "NoWarningThisInCTOR.hxx"
#include "AxisHelper.hxx"
#include <svx/svxids.hrc>
diff --git a/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx b/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx
index efebb43..1dfa50d 100644
--- a/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx
+++ b/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx
@@ -21,7 +21,6 @@
#include "ResId.hxx"
#include "chartview/ChartSfxItemIds.hxx"
-#include "NoWarningThisInCTOR.hxx"
// header for class SfxBoolItem
#include <svl/eitem.hxx>
diff --git a/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx b/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx
index 515b200..1dc6a98 100644
--- a/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx
+++ b/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx
@@ -28,7 +28,6 @@
#include "ChartModelHelper.hxx"
#include "AxisHelper.hxx"
#include "LegendHelper.hxx"
-#include "NoWarningThisInCTOR.hxx"
#include "ControllerLockGuard.hxx"
namespace chart
diff --git a/chart2/source/inc/NoWarningThisInCTOR.hxx b/chart2/source/inc/NoWarningThisInCTOR.hxx
deleted file mode 100644
index 7e34066..0000000
--- a/chart2/source/inc/NoWarningThisInCTOR.hxx
+++ /dev/null
@@ -1,40 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-#ifndef INCLUDED_CHART2_SOURCE_INC_NOWARNINGTHISINCTOR_HXX
-#define INCLUDED_CHART2_SOURCE_INC_NOWARNINGTHISINCTOR_HXX
-
-/** Include this file, if you have to use "this" in the base initializer list of
- a constructor.
-
- Include it only, if the usage of this is unavoidable, like in the
- initialization of controls in a dialog.
-
- Do not include this header in other header files, because this might result
- in unintended suppression of the warning via indirect inclusion.
- */
-
-#ifdef _MSC_VER
-// warning C4355: 'this' : used in base member initializer list
-# pragma warning (disable : 4355)
-#endif
-
-// INCLUDED_CHART2_SOURCE_INC_NOWARNINGTHISINCTOR_HXX
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/model/main/ChartModel.cxx b/chart2/source/model/main/ChartModel.cxx
index ee1c0e2..4741d8c 100644
--- a/chart2/source/model/main/ChartModel.cxx
+++ b/chart2/source/model/main/ChartModel.cxx
@@ -21,7 +21,6 @@
#include "servicenames.hxx"
#include "MediaDescriptorHelper.hxx"
#include "macros.hxx"
-#include "NoWarningThisInCTOR.hxx"
#include "DataSourceHelper.hxx"
#include "ChartModelHelper.hxx"
#include "DiagramHelper.hxx"
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index a635865..35da4cc 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -116,10 +116,6 @@ static const char CUSTOM_MENU_STR[] = "vnd.openoffice.org:CustomMenu";
static const char aSeparatorStr[] = "----------------------------------";
static const char aMenuSeparatorStr[] = " | ";
-#ifdef _MSC_VER
-#pragma warning (disable:4355)
-#endif
-
namespace uno = com::sun::star::uno;
namespace frame = com::sun::star::frame;
namespace lang = com::sun::star::lang;
diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx
index 5f2d138..bee7d66 100644
--- a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx
+++ b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx
@@ -45,11 +45,6 @@
#include <vcl/svapp.hxx>
#include "helpid.hrc"
-//disable compiler warning C4355: 'this' : used in base member initializer list
-#ifdef _MSC_VER
-# pragma warning (disable : 4355)
-#endif
-
//.............................................................................
namespace textconversiondlgs
{
diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx b/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx
index bf6ecc8..b7d3272 100644
--- a/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx
+++ b/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx
@@ -29,11 +29,6 @@
#include <unotools/linguprops.hxx>
#include "helpid.hrc"
-//disable compiler warning C4355: 'this' : used in base member initializer list
-#ifdef _MSC_VER
-# pragma warning (disable : 4355)
-#endif
-
//.............................................................................
namespace textconversiondlgs
{
diff --git a/sw/source/ui/dbui/createaddresslistdialog.cxx b/sw/source/ui/dbui/createaddresslistdialog.cxx
index 0995300..83c9caf 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 593de92..e836737 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 9f1bbb5..682ab22 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 94b9ec9..21e0cf8 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 08f14ea..d6eb05c 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 a2b0421..286476c 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 aa3e15c..89fc9df 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 6514e5a..13f687a 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 2e146ff..75f7077 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 d5b6e38..927533e8 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 )),
diff --git a/uui/source/secmacrowarnings.cxx b/uui/source/secmacrowarnings.cxx
index 57f3839..1f3cd13 100644
--- a/uui/source/secmacrowarnings.cxx
+++ b/uui/source/secmacrowarnings.cxx
@@ -34,10 +34,6 @@ using namespace ::com::sun::star::security;
#include "secmacrowarnings.hxx"
#include "secmacrowarnings.hrc"
-#ifdef _MSC_VER
-#pragma warning (disable : 4355) // 4355: this used in initializer-list
-#endif
-
using namespace ::com::sun::star;
diff --git a/xmlsecurity/source/dialogs/certificateviewer.cxx b/xmlsecurity/source/dialogs/certificateviewer.cxx
index 1f7c4f7..52d8307 100644
--- a/xmlsecurity/source/dialogs/certificateviewer.cxx
+++ b/xmlsecurity/source/dialogs/certificateviewer.cxx
@@ -31,11 +31,6 @@
#include "dialogs.hrc"
#include "resourcemanager.hxx"
-/* HACK: disable some warnings for MS-C */
-#ifdef _MSC_VER
-#pragma warning (disable : 4355) // 4355: this used in initializer-list
-#endif
-
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
diff --git a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
index 6f6963a..a0de939 100644
--- a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
+++ b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
@@ -57,12 +57,6 @@
#include <vcl/msgbox.hxx>
#include <unotools/configitem.hxx>
-
-/* HACK: disable some warnings for MS-C */
-#ifdef _MSC_VER
-#pragma warning (disable : 4355) // 4355: this used in initializer-list
-#endif
-
using namespace ::com::sun::star::security;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star;
diff --git a/xmlsecurity/source/dialogs/macrosecurity.cxx b/xmlsecurity/source/dialogs/macrosecurity.cxx
index 70d03c7..1e06c98 100644
--- a/xmlsecurity/source/dialogs/macrosecurity.cxx
+++ b/xmlsecurity/source/dialogs/macrosecurity.cxx
@@ -45,11 +45,6 @@
#include "dialogs.hrc"
#include "resourcemanager.hxx"
-/* HACK: disable some warnings for MS-C */
-#ifdef _MSC_VER
-#pragma warning (disable : 4355) // 4355: this used in initializer-list
-#endif
-
using namespace ::com::sun::star;
diff --git a/xmlsecurity/source/dialogs/warnings.cxx b/xmlsecurity/source/dialogs/warnings.cxx
index ac441dc..e0a3f86 100644
--- a/xmlsecurity/source/dialogs/warnings.cxx
+++ b/xmlsecurity/source/dialogs/warnings.cxx
@@ -32,11 +32,6 @@ using namespace ::com::sun::star::security;
#include "dialogs.hrc"
#include "resourcemanager.hxx"
-/* HACK: disable some warnings for MS-C */
-#ifdef _MSC_VER
-#pragma warning (disable : 4355) // 4355: this used in initializer-list
-#endif
-
using namespace ::com::sun::star;
More information about the Libreoffice-commits
mailing list