diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2018-01-31 21:13:25 +0300 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2018-02-02 05:59:25 +0100 |
| commit | 4be226b654b40fe9b1fc7843d9dd5742495b1a1f (patch) | |
| tree | 364b4740da7d3f451eef2ecb21f55e8330fdbfeb /shell/source/backends | |
| parent | 5bf8f1827f4a0bd3fa2c8236d80bd1a2a99ed472 (diff) | |
shell: MSVC: pragma warning: make more specific, remove obsolete
Change-Id: Ie2391b1feed31fe9cee7dc097c57ebebab698705
Reviewed-on: https://gerrit.libreoffice.org/49049
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'shell/source/backends')
| -rw-r--r-- | shell/source/backends/localebe/localebackend.cxx | 6 | ||||
| -rw-r--r-- | shell/source/backends/wininetbe/wininetbackend.cxx | 6 |
2 files changed, 0 insertions, 12 deletions
diff --git a/shell/source/backends/localebe/localebackend.cxx b/shell/source/backends/localebe/localebackend.cxx index 056d8a48bb32..218b17212451 100644 --- a/shell/source/backends/localebe/localebackend.cxx +++ b/shell/source/backends/localebe/localebackend.cxx @@ -34,16 +34,10 @@ #include <stdio.h> #ifdef _WIN32 -#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 css::beans::Optional<css::uno::Any> ImplGetLocale(LCID lcid) { diff --git a/shell/source/backends/wininetbe/wininetbackend.cxx b/shell/source/backends/wininetbe/wininetbackend.cxx index bed1e270cf6d..1cfdd63cf114 100644 --- a/shell/source/backends/wininetbe/wininetbackend.cxx +++ b/shell/source/backends/wininetbe/wininetbackend.cxx @@ -22,18 +22,12 @@ #include "wininetbackend.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 <wininet.h> #include <sal/alloca.h> -#if defined _MSC_VER -#pragma warning(pop) -#endif #define WININET_DLL_NAME L"wininet.dll" #define EQUAL_SIGN '=' |