[Libreoffice-commits] core.git: vcl/source vcl/win

[Mike Kaganski]

 vcl/source/filter/jpeg/jpegc.cxx |    4 ++--
 vcl/win/app/salinst.cxx          |    9 ---------
 vcl/win/window/salframe.cxx      |    6 +-----
 3 files changed, 3 insertions(+), 16 deletions(-)

New commits:
commit 0dd48cb94ef2154775d10f79a5b68cfec82d02ba
Author: Mike Kaganski <mike.kaganski at collabora.com>
Date:   Wed Jan 31 22:45:49 2018 +0300

    vcl: MSVC: pragma warning: make more specific, remove obsolete
    
    Change-Id: Ib2d89cfba3ad625779ee501a7caaa94893d8c681
    Reviewed-on: https://gerrit.libreoffice.org/49057
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Mike Kaganski <mike.kaganski at collabora.com>

diff --git a/vcl/source/filter/jpeg/jpegc.cxx b/vcl/source/filter/jpeg/jpegc.cxx
index 98b642e13d82..570c036b3b3a 100644
--- a/vcl/source/filter/jpeg/jpegc.cxx
+++ b/vcl/source/filter/jpeg/jpegc.cxx
@@ -41,8 +41,8 @@ extern "C" {
 #define WarningLimit 1000
 
 #ifdef _MSC_VER
-#pragma warning(push, 1) /* disable to __declspec(align()) aligned warning */
-#pragma warning (disable: 4324)
+#pragma warning(push)
+#pragma warning (disable: 4324) /* disable to __declspec(align()) aligned warning */
 #endif
 
 struct ErrorManagerStruct
diff --git a/vcl/win/app/salinst.cxx b/vcl/win/app/salinst.cxx
index 27f1aa73a57a..c5274364f747 100644
--- a/vcl/win/app/salinst.cxx
+++ b/vcl/win/app/salinst.cxx
@@ -58,11 +58,6 @@
 #endif
 #endif
 
-#if defined _MSC_VER
-#pragma warning(push, 1)
-#pragma warning( disable: 4917 )
-#endif
-
 #include <prewin.h>
 
 #include <gdiplus.h>
@@ -70,10 +65,6 @@
 
 #include <postwin.h>
 
-#if defined _MSC_VER
-#pragma warning(pop)
-#endif
-
 void SalAbort( const OUString& rErrorText, bool )
 {
     ImplFreeSalGDI();
diff --git a/vcl/win/window/salframe.cxx b/vcl/win/window/salframe.cxx
index a61fc5fdefe6..b3da5d53d2d1 100644
--- a/vcl/win/window/salframe.cxx
+++ b/vcl/win/window/salframe.cxx
@@ -51,10 +51,6 @@
 #include <vcl/wrkwin.hxx>
 #include <vcl/svapp.hxx>
 
-// Warning in SDK header
-#ifdef _MSC_VER
-#pragma warning( disable: 4242 )
-#endif
 #include <win/wincomp.hxx>
 #include <win/salids.hrc>
 #include <win/saldata.hxx>
@@ -74,7 +70,7 @@
 
 #define COMPILE_MULTIMON_STUBS
 #pragma warning(push)
-#pragma warning(disable:4996)
+#pragma warning(disable:4996) // 'GetVersionExA': was declared deprecated
 #include <multimon.h>
 #pragma warning(pop)
 #include <vector>