[Libreoffice-commits] core.git: 5 commits - canvas/source cppuhelper/source desktop/source desktop/win32 dtrans/source embeddedobj/source include/cppuhelper
Mike Kaganski
mike.kaganski at collabora.com
Thu Feb 1 05:53:25 UTC 2018
canvas/source/directx/dx_winstuff.hxx | 5 -----
cppuhelper/source/interfacecontainer.cxx | 4 ----
desktop/source/app/app.cxx | 7 -------
desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx | 7 -------
desktop/source/lib/init.cxx | 7 -------
desktop/win32/source/QuickStart/QuickStart.cxx | 6 ------
desktop/win32/source/guistdio/guistdio.inc | 6 ------
desktop/win32/source/unoinfo.cxx | 6 ------
dtrans/source/win32/clipb/MtaOleClipb.cxx | 5 -----
dtrans/source/win32/clipb/MtaOleClipb.hxx | 6 ------
dtrans/source/win32/clipb/WinClipbImpl.cxx | 6 ------
dtrans/source/win32/clipb/WinClipbImpl.hxx | 6 ------
dtrans/source/win32/dnd/globals.hxx | 6 ------
dtrans/source/win32/dnd/target.hxx | 6 ------
dtrans/source/win32/dtobj/DTransHelper.hxx | 6 ------
dtrans/source/win32/dtobj/DataFmtTransl.cxx | 7 -------
dtrans/source/win32/dtobj/DataFmtTransl.hxx | 6 ------
dtrans/source/win32/dtobj/Fetc.hxx | 6 ------
dtrans/source/win32/dtobj/FetcList.hxx | 7 +------
dtrans/source/win32/dtobj/FmtFilter.cxx | 7 -------
dtrans/source/win32/dtobj/FmtFilter.hxx | 6 ------
dtrans/source/win32/dtobj/TxtCnvtHlp.hxx | 6 ------
dtrans/source/win32/dtobj/XNotifyingDataObject.hxx | 6 ------
dtrans/source/win32/dtobj/XTDataObject.cxx | 7 -------
dtrans/source/win32/dtobj/XTDataObject.hxx | 6 ------
dtrans/source/win32/ftransl/ftransl.cxx | 7 -------
dtrans/source/win32/misc/ImplHelper.cxx | 6 ------
dtrans/source/win32/misc/ImplHelper.hxx | 6 ------
embeddedobj/source/msole/platform.h | 9 ---------
include/cppuhelper/propertysetmixin.hxx | 10 ----------
include/cppuhelper/propshlp.hxx | 3 ---
31 files changed, 1 insertion(+), 193 deletions(-)
New commits:
commit dad539c0ddeb7bd721c04450138ef2acb934809e
Author: Mike Kaganski <mike.kaganski at collabora.com>
Date: Wed Jan 31 12:43:50 2018 +0300
embeddedobj: MSVC: pragma warning: make more specific, remove obsolete
Change-Id: Iefcaf1f5ae73050300879fff0855f709c5f8a30d
Reviewed-on: https://gerrit.libreoffice.org/48975
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Mike Kaganski <mike.kaganski at collabora.com>
diff --git a/embeddedobj/source/msole/platform.h b/embeddedobj/source/msole/platform.h
index 59557a7cf5c0..b93afd79030c 100644
--- a/embeddedobj/source/msole/platform.h
+++ b/embeddedobj/source/msole/platform.h
@@ -23,21 +23,12 @@
#define STRICT
#define _ATL_APARTMENT_THREADED
-#if defined _MSC_VER
-#pragma warning(push, 1)
-#pragma warning(disable: 4548 4555 4917)
-#endif
-
#if !defined WIN32_LEAN_AND_MEAN
# define WIN32_LEAN_AND_MEAN
#endif
#include <windows.h>
#include <ole2.h>
-#if defined _MSC_VER
-#pragma warning(pop)
-#endif
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit f901bc5ac0d5812e7f2ec3fd68a266297cb41255
Author: Mike Kaganski <mike.kaganski at collabora.com>
Date: Wed Jan 31 12:41:45 2018 +0300
dtrans: MSVC: pragma warning: make more specific, remove obsolete
Change-Id: I7a043bc152373e98635bf2bd3513113a8ea45958
Reviewed-on: https://gerrit.libreoffice.org/48974
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Mike Kaganski <mike.kaganski at collabora.com>
diff --git a/dtrans/source/win32/clipb/MtaOleClipb.cxx b/dtrans/source/win32/clipb/MtaOleClipb.cxx
index 145ae4e739c0..36afcbe99a49 100644
--- a/dtrans/source/win32/clipb/MtaOleClipb.cxx
+++ b/dtrans/source/win32/clipb/MtaOleClipb.cxx
@@ -30,11 +30,6 @@
hidden window and forward these requests via window messages.
*/
-#ifdef _MSC_VER
-#pragma warning( disable : 4786 ) // identifier was truncated to 'number'
- // characters in the debug information
-#endif
-
#if !defined WINVER
#define WINVER 0x0400
#endif
diff --git a/dtrans/source/win32/clipb/MtaOleClipb.hxx b/dtrans/source/win32/clipb/MtaOleClipb.hxx
index 5c7dbfa5c6f5..abab29bf9717 100644
--- a/dtrans/source/win32/clipb/MtaOleClipb.hxx
+++ b/dtrans/source/win32/clipb/MtaOleClipb.hxx
@@ -23,13 +23,7 @@
#include <sal/types.h>
#include <osl/mutex.hxx>
-#if defined _MSC_VER
-#pragma warning(push,1)
-#endif
#include <objidl.h>
-#if defined _MSC_VER
-#pragma warning(pop)
-#endif
// the Mta-Ole clipboard class is for internal use only!
// only one instance of this class should be created, the
diff --git a/dtrans/source/win32/clipb/WinClipbImpl.cxx b/dtrans/source/win32/clipb/WinClipbImpl.cxx
index a3267942a050..8df5db4a7d03 100644
--- a/dtrans/source/win32/clipb/WinClipbImpl.cxx
+++ b/dtrans/source/win32/clipb/WinClipbImpl.cxx
@@ -28,18 +28,12 @@
#include <com/sun/star/datatransfer/clipboard/RenderingCapabilities.hpp>
#include "../dtobj/XNotifyingDataObject.hxx"
-#if defined _MSC_VER
-#pragma warning(push,1)
-#endif
#if !defined WIN32_LEAN_AND_MEAN
# define WIN32_LEAN_AND_MEAN
#endif
#include <windows.h>
#include <ole2.h>
#include <objidl.h>
-#if defined _MSC_VER
-#pragma warning(pop)
-#endif
using namespace osl;
using namespace std;
diff --git a/dtrans/source/win32/clipb/WinClipbImpl.hxx b/dtrans/source/win32/clipb/WinClipbImpl.hxx
index e062d5557546..55a9d8d600bc 100644
--- a/dtrans/source/win32/clipb/WinClipbImpl.hxx
+++ b/dtrans/source/win32/clipb/WinClipbImpl.hxx
@@ -27,16 +27,10 @@
#include <com/sun/star/datatransfer/clipboard/XClipboardOwner.hpp>
#include "MtaOleClipb.hxx"
-#if defined _MSC_VER
-#pragma warning(push,1)
-#endif
#if !defined WIN32_LEAN_AND_MEAN
# define WIN32_LEAN_AND_MEAN
#endif
#include <windows.h>
-#if defined _MSC_VER
-#pragma warning(pop)
-#endif
class CWinClipboard;
class CXNotifyingDataObject;
diff --git a/dtrans/source/win32/dnd/globals.hxx b/dtrans/source/win32/dnd/globals.hxx
index 01a218dd4fcc..373270358d5c 100644
--- a/dtrans/source/win32/dnd/globals.hxx
+++ b/dtrans/source/win32/dnd/globals.hxx
@@ -28,13 +28,7 @@ namespace com { namespace sun { namespace star { namespace datatransfer {
class XTransferable;
} } } }
-#if defined _MSC_VER
-#pragma warning(push,1)
-#endif
#include <wtypes.h>
-#if defined _MSC_VER
-#pragma warning(pop)
-#endif
#include <sal/types.h>
#define DNDSOURCE_SERVICE_NAME "com.sun.star.datatransfer.dnd.OleDragSource"
diff --git a/dtrans/source/win32/dnd/target.hxx b/dtrans/source/win32/dnd/target.hxx
index 49fde8e0c914..09200f9e2094 100644
--- a/dtrans/source/win32/dnd/target.hxx
+++ b/dtrans/source/win32/dnd/target.hxx
@@ -28,13 +28,7 @@
#include <cppuhelper/interfacecontainer.hxx>
#include <osl/mutex.hxx>
-#if defined _MSC_VER
-#pragma warning(push,1)
-#endif
#include <oleidl.h>
-#if defined _MSC_VER
-#pragma warning(pop)
-#endif
#include "globals.hxx"
namespace com { namespace sun { namespace star { namespace uno {
diff --git a/dtrans/source/win32/dtobj/DTransHelper.hxx b/dtrans/source/win32/dtobj/DTransHelper.hxx
index 5657cbe981e6..e003c2a70629 100644
--- a/dtrans/source/win32/dtobj/DTransHelper.hxx
+++ b/dtrans/source/win32/dtobj/DTransHelper.hxx
@@ -20,17 +20,11 @@
#ifndef INCLUDED_DTRANS_SOURCE_WIN32_DTOBJ_DTRANSHELPER_HXX
#define INCLUDED_DTRANS_SOURCE_WIN32_DTOBJ_DTRANSHELPER_HXX
-#if defined _MSC_VER
-#pragma warning(push,1)
-#endif
#if !defined WIN32_LEAN_AND_MEAN
# define WIN32_LEAN_AND_MEAN
#endif
#include <windows.h>
#include <objidl.h>
-#if defined _MSC_VER
-#pragma warning(pop)
-#endif
#include <WinClip.hxx>
#define AUTO_INIT TRUE
diff --git a/dtrans/source/win32/dtobj/DataFmtTransl.cxx b/dtrans/source/win32/dtobj/DataFmtTransl.cxx
index 7462e01e6aff..b8513c6e75d4 100644
--- a/dtrans/source/win32/dtobj/DataFmtTransl.cxx
+++ b/dtrans/source/win32/dtobj/DataFmtTransl.cxx
@@ -30,18 +30,11 @@
#include "Fetc.hxx"
#include <com/sun/star/datatransfer/DataFormatTranslator.hpp>
-#if defined _MSC_VER
-#pragma warning(push,1)
-#pragma warning(disable:4917)
-#endif
#if !defined WIN32_LEAN_AND_MEAN
# define WIN32_LEAN_AND_MEAN
#endif
#include <windows.h>
#include <shlobj.h>
-#if defined _MSC_VER
-#pragma warning(pop)
-#endif
using namespace std;
using namespace com::sun::star::uno;
diff --git a/dtrans/source/win32/dtobj/DataFmtTransl.hxx b/dtrans/source/win32/dtobj/DataFmtTransl.hxx
index c4f8f4d20329..3fad9bbdc89a 100644
--- a/dtrans/source/win32/dtobj/DataFmtTransl.hxx
+++ b/dtrans/source/win32/dtobj/DataFmtTransl.hxx
@@ -26,17 +26,11 @@
#include <sal/types.h>
#include <rtl/ustring.hxx>
-#if defined _MSC_VER
-#pragma warning(push,1)
-#endif
#if !defined WIN32_LEAN_AND_MEAN
# define WIN32_LEAN_AND_MEAN
#endif
#include <windows.h>
#include <objidl.h>
-#if defined _MSC_VER
-#pragma warning(pop)
-#endif
// declaration
diff --git a/dtrans/source/win32/dtobj/Fetc.hxx b/dtrans/source/win32/dtobj/Fetc.hxx
index 7a6106d247f9..5ec3e4b9459e 100644
--- a/dtrans/source/win32/dtobj/Fetc.hxx
+++ b/dtrans/source/win32/dtobj/Fetc.hxx
@@ -22,17 +22,11 @@
#include <sal/types.h>
-#if defined _MSC_VER
-#pragma warning(push,1)
-#endif
#if !defined WIN32_LEAN_AND_MEAN
# define WIN32_LEAN_AND_MEAN
#endif
#include <windows.h>
#include <objidl.h>
-#if defined _MSC_VER
-#pragma warning(pop)
-#endif
/**********************************************************************
stl container elements must fulfill the following requirements:
diff --git a/dtrans/source/win32/dtobj/FetcList.hxx b/dtrans/source/win32/dtobj/FetcList.hxx
index 707ad4dd094b..cf7697e1ba1e 100644
--- a/dtrans/source/win32/dtobj/FetcList.hxx
+++ b/dtrans/source/win32/dtobj/FetcList.hxx
@@ -25,16 +25,11 @@
#include <com/sun/star/uno/XComponentContext.hpp>
#include "Fetc.hxx"
-#if defined _MSC_VER
-#pragma warning(push,1)
-#endif
#if !defined WIN32_LEAN_AND_MEAN
# define WIN32_LEAN_AND_MEAN
#endif
#include <windows.h>
-#if defined _MSC_VER
-#pragma warning(pop)
-#endif
+
#include <vector>
/*****************************************************************
diff --git a/dtrans/source/win32/dtobj/FmtFilter.cxx b/dtrans/source/win32/dtobj/FmtFilter.cxx
index 1dcc089c7b9d..c4580337a9bf 100644
--- a/dtrans/source/win32/dtobj/FmtFilter.cxx
+++ b/dtrans/source/win32/dtobj/FmtFilter.cxx
@@ -23,17 +23,10 @@
#include <osl/diagnose.h>
#include <comphelper/sequence.hxx>
-#if defined _MSC_VER
-#pragma warning(push,1)
-#pragma warning(disable:4917)
-#endif
#include <shobjidl.h>
#include <shlguid.h>
#include <objidl.h>
#include <shellapi.h>
-#if defined _MSC_VER
-#pragma warning(pop)
-#endif
#include <string>
#include <sstream>
diff --git a/dtrans/source/win32/dtobj/FmtFilter.hxx b/dtrans/source/win32/dtobj/FmtFilter.hxx
index bcc028f8248a..8906154d3aca 100644
--- a/dtrans/source/win32/dtobj/FmtFilter.hxx
+++ b/dtrans/source/win32/dtobj/FmtFilter.hxx
@@ -24,17 +24,11 @@
#include <com/sun/star/uno/Sequence.hxx>
-#if defined _MSC_VER
-#pragma warning(push,1)
-#endif
#if !defined WIN32_LEAN_AND_MEAN
# define WIN32_LEAN_AND_MEAN
#endif
#include <windows.h>
#include <objidl.h>
-#if defined _MSC_VER
-#pragma warning(pop)
-#endif
/*------------------------------------------------------------------------
input:
diff --git a/dtrans/source/win32/dtobj/TxtCnvtHlp.hxx b/dtrans/source/win32/dtobj/TxtCnvtHlp.hxx
index 4ac0e29e96d2..9f8d47209d9c 100644
--- a/dtrans/source/win32/dtobj/TxtCnvtHlp.hxx
+++ b/dtrans/source/win32/dtobj/TxtCnvtHlp.hxx
@@ -24,14 +24,8 @@
#include "DTransHelper.hxx"
-#if defined _MSC_VER
-#pragma warning(push,1)
-#endif
#define WIN32_LEAN_AND_MEAN
#include <windows.h>
-#if defined _MSC_VER
-#pragma warning(pop)
-#endif
int MultiByteToWideCharEx( UINT cp_src,
LPCSTR lpMultiByteString,
diff --git a/dtrans/source/win32/dtobj/XNotifyingDataObject.hxx b/dtrans/source/win32/dtobj/XNotifyingDataObject.hxx
index 0a1f4a04d2c7..b6439f0641af 100644
--- a/dtrans/source/win32/dtobj/XNotifyingDataObject.hxx
+++ b/dtrans/source/win32/dtobj/XNotifyingDataObject.hxx
@@ -23,17 +23,11 @@
#include <com/sun/star/datatransfer/XTransferable.hpp>
#include <com/sun/star/datatransfer/clipboard/XClipboardOwner.hpp>
-#if defined _MSC_VER
-#pragma warning(push,1)
-#endif
#if !defined WIN32_LEAN_AND_MEAN
# define WIN32_LEAN_AND_MEAN
#endif
#include <windows.h>
#include <objidl.h>
-#if defined _MSC_VER
-#pragma warning(pop)
-#endif
#include <systools/win32/comtools.hxx>
diff --git a/dtrans/source/win32/dtobj/XTDataObject.cxx b/dtrans/source/win32/dtobj/XTDataObject.cxx
index 075f3871c5f3..c825d96f1df8 100644
--- a/dtrans/source/win32/dtobj/XTDataObject.cxx
+++ b/dtrans/source/win32/dtobj/XTDataObject.cxx
@@ -33,18 +33,11 @@
#include <comphelper/processfactory.hxx>
#include <cppuhelper/implbase.hxx>
-#if defined _MSC_VER
-#pragma warning(push,1)
-#pragma warning(disable:4917)
-#endif
#if !defined WIN32_LEAN_AND_MEAN
# define WIN32_LEAN_AND_MEAN
#endif
#include <windows.h>
#include <shlobj.h>
-#if defined _MSC_VER
-#pragma warning(pop)
-#endif
using namespace com::sun::star::datatransfer;
using namespace com::sun::star::datatransfer::clipboard;
diff --git a/dtrans/source/win32/dtobj/XTDataObject.hxx b/dtrans/source/win32/dtobj/XTDataObject.hxx
index 80be647b7265..3a6a0d49c5c3 100644
--- a/dtrans/source/win32/dtobj/XTDataObject.hxx
+++ b/dtrans/source/win32/dtobj/XTDataObject.hxx
@@ -27,18 +27,12 @@
#include "FetcList.hxx"
-#if defined _MSC_VER
-#pragma warning(push,1)
-#endif
#if !defined WIN32_LEAN_AND_MEAN
# define WIN32_LEAN_AND_MEAN
#endif
#include <windows.h>
#include <ole2.h>
#include <objidl.h>
-#if defined _MSC_VER
-#pragma warning(pop)
-#endif
/*--------------------------------------------------------------------------
- the function principle of the windows clipboard:
diff --git a/dtrans/source/win32/ftransl/ftransl.cxx b/dtrans/source/win32/ftransl/ftransl.cxx
index 9eec3d23742a..2223d3af6db5 100644
--- a/dtrans/source/win32/ftransl/ftransl.cxx
+++ b/dtrans/source/win32/ftransl/ftransl.cxx
@@ -28,14 +28,7 @@
#include <cppuhelper/supportsservice.hxx>
#include "../misc/ImplHelper.hxx"
-#if defined _MSC_VER
-#pragma warning(push,1)
-#pragma warning(disable:4917)
-#endif
#include <shlobj.h>
-#if defined _MSC_VER
-#pragma warning(pop)
-#endif
#define IMPL_NAME "com.sun.star.datatransfer.DataFormatTranslator"
diff --git a/dtrans/source/win32/misc/ImplHelper.cxx b/dtrans/source/win32/misc/ImplHelper.cxx
index 04ef70787539..4b98b4850006 100644
--- a/dtrans/source/win32/misc/ImplHelper.cxx
+++ b/dtrans/source/win32/misc/ImplHelper.cxx
@@ -24,16 +24,10 @@
#include <string.h>
#include <memory>
-#if defined _MSC_VER
-#pragma warning(push,1)
-#endif
#if !defined WIN32_LEAN_AND_MEAN
# define WIN32_LEAN_AND_MEAN
#endif
#include <windows.h>
-#if defined _MSC_VER
-#pragma warning(pop)
-#endif
#include <vector>
diff --git a/dtrans/source/win32/misc/ImplHelper.hxx b/dtrans/source/win32/misc/ImplHelper.hxx
index a6121bb34d12..2d39e0727551 100644
--- a/dtrans/source/win32/misc/ImplHelper.hxx
+++ b/dtrans/source/win32/misc/ImplHelper.hxx
@@ -23,17 +23,11 @@
#include <sal/types.h>
#include <rtl/ustring.hxx>
-#if defined _MSC_VER
-#pragma warning(push,1)
-#endif
#if !defined WIN32_LEAN_AND_MEAN
# define WIN32_LEAN_AND_MEAN
#endif
#include <windows.h>
#include <objidl.h>
-#if defined _MSC_VER
-#pragma warning(pop)
-#endif
// target device and formatetc helper
void DeleteTargetDevice(DVTARGETDEVICE* ptd);
commit be13e756d64c461681c79457b5de4a22b6ec00d4
Author: Mike Kaganski <mike.kaganski at collabora.com>
Date: Wed Jan 31 12:39:29 2018 +0300
desktop: MSVC: pragma warning: make more specific, remove obsolete
Change-Id: I61ed9700c904b7499166d32e4ffda69811d64a8b
Reviewed-on: https://gerrit.libreoffice.org/48973
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Mike Kaganski <mike.kaganski at collabora.com>
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index da71a0aae2b7..d3eadd1d4987 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -130,16 +130,9 @@
#endif
#ifdef _WIN32
-#ifdef _MSC_VER
-#pragma warning(push, 1) /* disable warnings within system headers */
-#pragma warning (disable: 4005)
-#endif
#define WIN32_LEAN_AND_MEAN
#include <windows.h>
-#ifdef _MSC_VER
-#pragma warning(pop)
#endif
-#endif //WNT
#if defined(_WIN32)
#include <process.h>
diff --git a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx
index 928ac82ff81d..84246cd046db 100644
--- a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx
+++ b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx
@@ -81,17 +81,10 @@
#include <memory>
#ifdef _WIN32
-#if defined _MSC_VER
-#pragma warning (push, 1)
-#pragma warning (disable: 4005)
-#endif
#if !defined WIN32_LEAN_AND_MEAN
# define WIN32_LEAN_AND_MEAN
#endif
#include <windows.h>
-#if defined _MSC_VER
-#pragma warning (pop)
-#endif
#include <objbase.h>
#endif
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 54f81663517b..ab7b72d526dc 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -201,10 +201,6 @@ static const ExtensionMap aDrawExtensionMap[] =
* by css, it might turn out to be worth mapping some of these missing cursors
* to available cursors?
*/
-#ifdef _MSC_VER
-#pragma warning(push)
-#pragma warning( disable : 4592)
-#endif
static const std::map <PointerStyle, OString> aPointerMap {
{ PointerStyle::Arrow, "default" },
// PointerStyle::Null ?
@@ -246,9 +242,6 @@ static const std::map <PointerStyle, OString> aPointerMap {
// Pivot Delete, TabSelectS through TabSelectSW
// PaintBrush, HideWhiteSpace, ShowWhiteSpace
};
-#ifdef _MSC_VER
-#pragma warning(pop)
-#endif
static OUString getUString(const char* pString)
{
diff --git a/desktop/win32/source/QuickStart/QuickStart.cxx b/desktop/win32/source/QuickStart/QuickStart.cxx
index 0cc673c77191..476f6533d530 100644
--- a/desktop/win32/source/QuickStart/QuickStart.cxx
+++ b/desktop/win32/source/QuickStart/QuickStart.cxx
@@ -21,15 +21,9 @@
#include <sal/config.h>
-#if defined _MSC_VER
-#pragma warning(push, 1)
-#endif
#define WIN32_LEAN_AND_MEAN
#include <windows.h>
#include <shellapi.h>
-#if defined _MSC_VER
-#pragma warning(pop)
-#endif
#include "resource.h"
#include <systools/win32/uwinapi.h>
diff --git a/desktop/win32/source/guistdio/guistdio.inc b/desktop/win32/source/guistdio/guistdio.inc
index 5d6634bb9c5c..eb1b9cda1639 100644
--- a/desktop/win32/source/guistdio/guistdio.inc
+++ b/desktop/win32/source/guistdio/guistdio.inc
@@ -18,13 +18,7 @@
*/
#define WIN32_LEAN_AND_MEAN
-#ifdef _MSC_VER
-#pragma warning(push,1) // disable warnings within system headers
-#endif
#include <windows.h>
-#ifdef _MSC_VER
-#pragma warning(pop)
-#endif
#include <string.h>
#include <stdlib.h>
diff --git a/desktop/win32/source/unoinfo.cxx b/desktop/win32/source/unoinfo.cxx
index 3ee7e7750335..3a41b6e0985e 100644
--- a/desktop/win32/source/unoinfo.cxx
+++ b/desktop/win32/source/unoinfo.cxx
@@ -23,13 +23,7 @@
#include <wchar.h>
#define WIN32_LEAN_AND_MEAN
-#if defined _MSC_VER
-#pragma warning(push, 1)
-#endif
#include <windows.h>
-#if defined _MSC_VER
-#pragma warning(pop)
-#endif
#include <tools/pathutils.hxx>
commit b23e4d2bace6eb4729d58fbb7cad4e99ce1aad94
Author: Mike Kaganski <mike.kaganski at collabora.com>
Date: Wed Jan 31 12:32:51 2018 +0300
cppuhelper: MSVC: pragma warning: make more specific, remove obsolete
Change-Id: Ib097ea1764d275a3123d0dccf05d52315b4858a1
Reviewed-on: https://gerrit.libreoffice.org/48971
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Mike Kaganski <mike.kaganski at collabora.com>
diff --git a/cppuhelper/source/interfacecontainer.cxx b/cppuhelper/source/interfacecontainer.cxx
index d4d60b634d99..d4627ff94399 100644
--- a/cppuhelper/source/interfacecontainer.cxx
+++ b/cppuhelper/source/interfacecontainer.cxx
@@ -55,10 +55,6 @@ static void sequenceRemoveElementAt( Sequence< Reference< XInterface > > & rSeq,
rSeq = aDestSeq;
}
-#ifdef _MSC_VER
-#pragma warning( disable: 4786 )
-#endif
-
OInterfaceIteratorHelper::OInterfaceIteratorHelper( OInterfaceContainerHelper & rCont_ )
: rCont( rCont_ )
{
diff --git a/include/cppuhelper/propertysetmixin.hxx b/include/cppuhelper/propertysetmixin.hxx
index c50da4591b70..287ef7dd1fc7 100644
--- a/include/cppuhelper/propertysetmixin.hxx
+++ b/include/cppuhelper/propertysetmixin.hxx
@@ -56,12 +56,6 @@ namespace cppu {
template< typename T > class PropertySetMixin;
-// Suppress warnings about virtual functions but non-virtual destructor:
-#if defined _MSC_VER
-#pragma warning(push)
-#pragma warning(disable: 4265)
-#endif
-
/**
@short A helper base class for <code>cppu::PropertySetMixin</code>.
@@ -429,10 +423,6 @@ private:
#pragma GCC diagnostic pop
#endif
-#if defined _MSC_VER
-#pragma warning(pop)
-#endif
-
}
#endif
diff --git a/include/cppuhelper/propshlp.hxx b/include/cppuhelper/propshlp.hxx
index d9eb0c493741..4c102148a9f7 100644
--- a/include/cppuhelper/propshlp.hxx
+++ b/include/cppuhelper/propshlp.hxx
@@ -661,8 +661,6 @@ protected:
#endif
// Suppress warning about virtual functions but non-virtual destructor:
#if defined _MSC_VER
-#pragma warning(push)
-#pragma warning(disable: 4265)
#if defined __clang__
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wnon-virtual-dtor"
@@ -677,7 +675,6 @@ protected:
#if defined __clang__
#pragma clang diagnostic pop
#endif
-#pragma warning(pop)
#endif
/**
commit 3c879be2407a511717b74259f99575bf3c675764
Author: Mike Kaganski <mike.kaganski at collabora.com>
Date: Wed Jan 31 11:38:14 2018 +0300
canvas: MSVC: pragma warning: make more specific, remove obsolete
Change-Id: I0d23c789dd3cbb21a18383988dd6b24318fda225
Reviewed-on: https://gerrit.libreoffice.org/48959
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Mike Kaganski <mike.kaganski at collabora.com>
diff --git a/canvas/source/directx/dx_winstuff.hxx b/canvas/source/directx/dx_winstuff.hxx
index c2c4fd4fe4e3..c585071796e7 100644
--- a/canvas/source/directx/dx_winstuff.hxx
+++ b/canvas/source/directx/dx_winstuff.hxx
@@ -49,13 +49,8 @@ typedef IDirect3DSurface9 surface_type;
#define min(a,b) (((a) < (b)) ? (a) : (b))
#endif
-#pragma warning(push, 1)
-#pragma warning(disable: 4458)
-
#include <gdiplus.h>
-#pragma warning(pop)
-
#undef max
#undef min
More information about the Libreoffice-commits
mailing list