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>

10 files changed, 2 insertions, 62 deletions

diff --git a/shell/inc/columninfo.hxx b/shell/inc/columninfo.hxx
index 4950ad969b71..105ba7566de5 100644
--- a/shell/inc/columninfo.hxx
+++ b/shell/inc/columninfo.hxx
@@ -20,14 +20,7 @@
 #ifndef INCLUDED_SHELL_INC_INTERNAL_COLUMNINFO_HXX
 #define INCLUDED_SHELL_INC_INTERNAL_COLUMNINFO_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
 
 
 class CColumnInfo : public IColumnProvider
diff --git a/shell/inc/config.hxx b/shell/inc/config.hxx
index a888745ba5cd..58b5dd4bfc3c 100644
--- a/shell/inc/config.hxx
+++ b/shell/inc/config.hxx
@@ -20,10 +20,6 @@
 #ifndef INCLUDED_SHELL_INC_INTERNAL_CONFIG_HXX
 #define INCLUDED_SHELL_INC_INTERNAL_CONFIG_HXX
 
-#ifdef _MSC_VER
-#pragma warning (disable : 4786 4503 4917)
-#endif
-
 #ifdef _AMD64_
 #define MODULE_NAME L"shlxthdl_x64.dll"
 #else
diff --git a/shell/inc/global.hxx b/shell/inc/global.hxx
index 24dd2e0d664c..07b7d5f79e7d 100644
--- a/shell/inc/global.hxx
+++ b/shell/inc/global.hxx
@@ -20,16 +20,10 @@
 #ifndef INCLUDED_SHELL_INC_INTERNAL_GLOBAL_HXX
 #define INCLUDED_SHELL_INC_INTERNAL_GLOBAL_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
 
 extern long g_DllRefCnt;
 
diff --git a/shell/inc/infotips.hxx b/shell/inc/infotips.hxx
index 270250d27f04..a50276b04351 100644
--- a/shell/inc/infotips.hxx
+++ b/shell/inc/infotips.hxx
@@ -20,15 +20,8 @@
 #ifndef INCLUDED_SHELL_INC_INTERNAL_INFOTIPS_HXX
 #define INCLUDED_SHELL_INC_INTERNAL_INFOTIPS_HXX
 
-#if defined _MSC_VER
-#pragma warning(push, 1)
-#pragma warning(disable:4917)
-#endif
 #include <objidl.h>
 #include <shlobj.h>
-#if defined _MSC_VER
-#pragma warning(pop)
-#endif
 #include <string>
 #include "filepath.hxx"
 
diff --git a/shell/inc/propertyhdl.hxx b/shell/inc/propertyhdl.hxx
index 457a896eca18..725885525de6 100644
--- a/shell/inc/propertyhdl.hxx
+++ b/shell/inc/propertyhdl.hxx
@@ -20,14 +20,7 @@
 #ifndef INCLUDED_SHELL_INC_INTERNAL_PROPERTYHDL_HXX
 #define INCLUDED_SHELL_INC_INTERNAL_PROPERTYHDL_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
 
 // {AE424E85-F6DF-4910-A6A9-438797986431}
 const CLSID CLSID_PROPERTY_HANDLER =
diff --git a/shell/inc/propsheets.hxx b/shell/inc/propsheets.hxx
index 920ede7ccff3..20aa1e9e37a4 100644
--- a/shell/inc/propsheets.hxx
+++ b/shell/inc/propsheets.hxx
@@ -22,13 +22,7 @@
 
 #include "metainforeader.hxx"
 
-#if defined _MSC_VER
-#pragma warning(push, 1)
-#endif
 #include <shlobj.h>
-#if defined _MSC_VER
-#pragma warning(pop)
-#endif
 #include <string>
 #include <memory>
 #include "filepath.hxx"
diff --git a/shell/inc/registry.hxx b/shell/inc/registry.hxx
index 3da9eccd40c6..3ea0d85f74b8 100644
--- a/shell/inc/registry.hxx
+++ b/shell/inc/registry.hxx
@@ -24,13 +24,7 @@
 // registry helper functions
 
 
-#if defined _MSC_VER
-#pragma warning(push, 1)
-#endif
 #include <objbase.h>
-#if defined _MSC_VER
-#pragma warning(pop)
-#endif
 #include <string>
 #include "filepath.hxx"
 
diff --git a/shell/inc/shlxthdl.hxx b/shell/inc/shlxthdl.hxx
index 3591ca9cc0cf..2f1c1b1e8146 100644
--- a/shell/inc/shlxthdl.hxx
+++ b/shell/inc/shlxthdl.hxx
@@ -20,13 +20,7 @@
 #ifndef INCLUDED_SHELL_INC_INTERNAL_SHLXTHDL_HXX
 #define INCLUDED_SHELL_INC_INTERNAL_SHLXTHDL_HXX
 
-#if defined _MSC_VER
-#pragma warning(push, 1)
-#endif
 #include <objbase.h>
-#if defined _MSC_VER
-#pragma warning(pop)
-#endif
 
 // {087B3AE3-E237-4467-B8DB-5A38AB959AC9}
 const CLSID CLSID_INFOTIP_HANDLER =
diff --git a/shell/inc/thumbviewer.hxx b/shell/inc/thumbviewer.hxx
index 81698f084871..37e348118b5d 100644
--- a/shell/inc/thumbviewer.hxx
+++ b/shell/inc/thumbviewer.hxx
@@ -20,18 +20,11 @@
 #ifndef INCLUDED_SHELL_INC_INTERNAL_THUMBVIEWER_HXX
 #define INCLUDED_SHELL_INC_INTERNAL_THUMBVIEWER_HXX
 
-#if defined _MSC_VER
-#pragma warning(push, 1)
-#pragma warning(disable:4917)
-#endif
 #include <objidl.h>
 #include <shlobj.h>
 #ifndef DONT_HAVE_GDIPLUS
 #include <gdiplus.h>
 #endif
-#if defined _MSC_VER
-#pragma warning(pop)
-#endif
 #include <string>
 
 class CThumbviewer : public IPersistFile, public IExtractImage
diff --git a/shell/inc/utilities.hxx b/shell/inc/utilities.hxx
index 22f785d3ce62..a199c83db5e9 100644
--- a/shell/inc/utilities.hxx
+++ b/shell/inc/utilities.hxx
@@ -21,16 +21,12 @@
 #define INCLUDED_SHELL_INC_INTERNAL_UTILITIES_HXX
 
 #include <malloc.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>
-#if defined _MSC_VER
-#pragma warning(pop)
-#endif
+
 #include <stdio.h>
 #include <fcntl.h>
 #include <io.h>