Kaydet (Commit) be13e756 authored tarafından Mike Kaganski's avatar Mike Kaganski

desktop: MSVC: pragma warning: make more specific, remove obsolete

Change-Id: I61ed9700c904b7499166d32e4ffda69811d64a8b
Reviewed-on: https://gerrit.libreoffice.org/48973Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarMike Kaganski <mike.kaganski@collabora.com>
üst b23e4d2b
......@@ -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>
......
......@@ -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
......
......@@ -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)
{
......
......@@ -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>
......
......@@ -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>
......
......@@ -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>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment