mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Change-Id: I61ed9700c904b7499166d32e4ffda69811d64a8b
Reviewed-on: https://gerrit.libreoffice.org/48973
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
This commit is contained in:
Mike Kaganski
2018-01-31 12:39:29 +03:00
parent b23e4d2bac
commit be13e756d6
6 changed files with 0 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
desktop/source/app/app.cxx
View File

@@ -130,16 +130,9 @@
#endif #endif
#ifdef _WIN32 #ifdef _WIN32
#ifdef _MSC_VER
#pragma warning(push, 1) /* disable warnings within system headers */
#pragma warning (disable: 4005)
#endif
#define WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN
#include <windows.h> #include <windows.h>
#ifdef _MSC_VER
#pragma warning(pop)
#endif #endif
#endif //WNT
#if defined(_WIN32) #if defined(_WIN32)
#include <process.h> #include <process.h>

7
desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx
View File

@@ -81,17 +81,10 @@
#include <memory> #include <memory>
#ifdef _WIN32 #ifdef _WIN32
#if defined _MSC_VER
#pragma warning (push, 1)
#pragma warning (disable: 4005)
#endif
#if !defined WIN32_LEAN_AND_MEAN #if !defined WIN32_LEAN_AND_MEAN
# define WIN32_LEAN_AND_MEAN # define WIN32_LEAN_AND_MEAN
#endif #endif
#include <windows.h> #include <windows.h>
#if defined _MSC_VER
#pragma warning (pop)
#endif
#include <objbase.h> #include <objbase.h>
#endif #endif

7
desktop/source/lib/init.cxx
View File

@@ -201,10 +201,6 @@ static const ExtensionMap aDrawExtensionMap[] =
* by css, it might turn out to be worth mapping some of these missing cursors * by css, it might turn out to be worth mapping some of these missing cursors
* to available cursors? * to available cursors?
*/ */
#ifdef _MSC_VER
#pragma warning(push)
#pragma warning( disable : 4592)
#endif
static const std::map <PointerStyle, OString> aPointerMap { static const std::map <PointerStyle, OString> aPointerMap {
{ PointerStyle::Arrow, "default" }, { PointerStyle::Arrow, "default" },
// PointerStyle::Null ? // PointerStyle::Null ?
@@ -246,9 +242,6 @@ static const std::map <PointerStyle, OString> aPointerMap {
// Pivot Delete, TabSelectS through TabSelectSW // Pivot Delete, TabSelectS through TabSelectSW
// PaintBrush, HideWhiteSpace, ShowWhiteSpace // PaintBrush, HideWhiteSpace, ShowWhiteSpace
}; };
#ifdef _MSC_VER
#pragma warning(pop)
#endif
static OUString getUString(const char* pString) static OUString getUString(const char* pString)
{ {

6
desktop/win32/source/QuickStart/QuickStart.cxx
View File

@@ -21,15 +21,9 @@
#include <sal/config.h> #include <sal/config.h>
#if defined _MSC_VER
#pragma warning(push, 1)
#endif
#define WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN
#include <windows.h> #include <windows.h>
#include <shellapi.h> #include <shellapi.h>
#if defined _MSC_VER
#pragma warning(pop)
#endif
#include "resource.h" #include "resource.h"
#include <systools/win32/uwinapi.h> #include <systools/win32/uwinapi.h>

6
desktop/win32/source/guistdio/guistdio.inc
View File

@@ -18,13 +18,7 @@
*/ */
#define WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN
#ifdef _MSC_VER
#pragma warning(push,1) // disable warnings within system headers
#endif
#include <windows.h> #include <windows.h>
#ifdef _MSC_VER
#pragma warning(pop)
#endif
#include <string.h> #include <string.h>
#include <stdlib.h> #include <stdlib.h>

6
desktop/win32/source/unoinfo.cxx
View File

@@ -23,13 +23,7 @@
#include <wchar.h> #include <wchar.h>
#define WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN
#if defined _MSC_VER
#pragma warning(push, 1)
#endif
#include <windows.h> #include <windows.h>
#if defined _MSC_VER
#pragma warning(pop)
#endif
#include <tools/pathutils.hxx> #include <tools/pathutils.hxx>