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>

11 files changed, 3 insertions, 67 deletions

diff --git a/shell/source/win32/shlxthandler/classfactory.hxx b/shell/source/win32/shlxthandler/classfactory.hxx
index 69a0841b62f5..2b6ab987f279 100644
--- a/shell/source/win32/shlxthandler/classfactory.hxx
+++ b/shell/source/win32/shlxthandler/classfactory.hxx
@@ -20,13 +20,7 @@
 #ifndef INCLUDED_SHELL_SOURCE_WIN32_SHLXTHANDLER_CLASSFACTORY_HXX
 #define INCLUDED_SHELL_SOURCE_WIN32_SHLXTHANDLER_CLASSFACTORY_HXX
 
-#if defined _MSC_VER
-#pragma warning(push, 1)
-#endif
 #include <objidl.h>
-#if defined _MSC_VER
-#pragma warning(pop)
-#endif
 
 class CClassFactory : public IClassFactory
 {
diff --git a/shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx b/shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx
index 318b048c7335..8782704180ad 100644
--- a/shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx
+++ b/shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx
@@ -45,16 +45,11 @@
 //  propspec.hxx    PROPSPEC
 
 
-#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 <string.h>
 #include <filter.h>
 #include <filterr.h>
diff --git a/shell/source/win32/shlxthandler/ooofilt/propspec.cxx b/shell/source/win32/shlxthandler/ooofilt/propspec.cxx
index 222c9342d9ea..ed44bb8b22b9 100644
--- a/shell/source/win32/shlxthandler/ooofilt/propspec.cxx
+++ b/shell/source/win32/shlxthandler/ooofilt/propspec.cxx
@@ -26,17 +26,11 @@
 
 #include <new>
 
-#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 <filter.h>
-#if defined _MSC_VER
-#pragma warning(pop)
-#endif
 
 #include "propspec.hxx"
 
diff --git a/shell/source/win32/shlxthandler/ooofilt/propspec.hxx b/shell/source/win32/shlxthandler/ooofilt/propspec.hxx
index bd771407fedf..7004c9c871f5 100644
--- a/shell/source/win32/shlxthandler/ooofilt/propspec.hxx
+++ b/shell/source/win32/shlxthandler/ooofilt/propspec.hxx
@@ -24,18 +24,12 @@
 //  File:       propspec.hxx
 //  Contents:   C++ wrapper(s) for FULLPROPSPEC
 
-#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 <ole2.h>
 #include <ntquery.h>
-#if defined _MSC_VER
-#pragma warning(pop)
-#endif
 //+-------------------------------------------------------------------------
 //  Declare:    CLSID_SummaryInforation, GUID
 //              CLSID_Storage, GUID
diff --git a/shell/source/win32/shlxthandler/ooofilt/stream_helper.cxx b/shell/source/win32/shlxthandler/ooofilt/stream_helper.cxx
index 0d0e475ef678..2e4bff29995f 100644
--- a/shell/source/win32/shlxthandler/ooofilt/stream_helper.cxx
+++ b/shell/source/win32/shlxthandler/ooofilt/stream_helper.cxx
@@ -18,16 +18,10 @@
  */
 
 
-#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 <objidl.h>
diff --git a/shell/source/win32/shlxthandler/propsheets/document_statistic.cxx b/shell/source/win32/shlxthandler/propsheets/document_statistic.cxx
index a158366f7a46..6a27e1ab1bd0 100644
--- a/shell/source/win32/shlxthandler/propsheets/document_statistic.cxx
+++ b/shell/source/win32/shlxthandler/propsheets/document_statistic.cxx
@@ -18,9 +18,6 @@
  */
 
 
-#ifdef _MSC_VER
-#pragma warning (disable : 4786 4503)
-#endif
 #include "document_statistic.hxx"
 #include <utilities.hxx>
 #include <metainforeader.hxx>
diff --git a/shell/source/win32/shlxthandler/propsheets/listviewbuilder.cxx b/shell/source/win32/shlxthandler/propsheets/listviewbuilder.cxx
index 87a8f591f393..4b5342441cfe 100644
--- a/shell/source/win32/shlxthandler/propsheets/listviewbuilder.cxx
+++ b/shell/source/win32/shlxthandler/propsheets/listviewbuilder.cxx
@@ -18,10 +18,6 @@
  */
 
 
-#ifdef _MSC_VER
-#pragma warning (disable : 4786 4503)
-#endif
-
 #include "listviewbuilder.hxx"
 #include "document_statistic.hxx"
 #include <utilities.hxx>
diff --git a/shell/source/win32/shlxthandler/propsheets/listviewbuilder.hxx b/shell/source/win32/shlxthandler/propsheets/listviewbuilder.hxx
index 7c8b86104bb8..689da439dd15 100644
--- a/shell/source/win32/shlxthandler/propsheets/listviewbuilder.hxx
+++ b/shell/source/win32/shlxthandler/propsheets/listviewbuilder.hxx
@@ -20,16 +20,10 @@
 #ifndef INCLUDED_SHELL_SOURCE_WIN32_SHLXTHANDLER_PROPSHEETS_LISTVIEWBUILDER_HXX
 #define INCLUDED_SHELL_SOURCE_WIN32_SHLXTHANDLER_PROPSHEETS_LISTVIEWBUILDER_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
 
 #include <string>
 #include <memory>
diff --git a/shell/source/win32/shlxthandler/propsheets/propsheets.cxx b/shell/source/win32/shlxthandler/propsheets/propsheets.cxx
index 4f9d7203a6c2..627452ea7da5 100644
--- a/shell/source/win32/shlxthandler/propsheets/propsheets.cxx
+++ b/shell/source/win32/shlxthandler/propsheets/propsheets.cxx
@@ -25,13 +25,7 @@
 #include <resource.h>
 #include "listviewbuilder.hxx"
 
-#if defined _MSC_VER
-#pragma warning(push, 1)
-#endif
 #include <shellapi.h>
-#if defined _MSC_VER
-#pragma warning(pop)
-#endif
 
 #include <memory>
 #include <string>
diff --git a/shell/source/win32/shlxthandler/thumbviewer/thumbviewer.cxx b/shell/source/win32/shlxthandler/thumbviewer/thumbviewer.cxx
index 87a125a21b1a..cdc5d97622ec 100644
--- a/shell/source/win32/shlxthandler/thumbviewer/thumbviewer.cxx
+++ b/shell/source/win32/shlxthandler/thumbviewer/thumbviewer.cxx
@@ -36,13 +36,8 @@
 #include <utility>
 #include <stdlib.h>
 
-#if defined _MSC_VER
-#pragma warning(push, 1)
-#endif
 #include <shellapi.h>
-#if defined _MSC_VER
-#pragma warning(pop)
-#endif
+
 #include <memory>
 
 namespace internal
diff --git a/shell/source/win32/shlxthandler/util/registry.cxx b/shell/source/win32/shlxthandler/util/registry.cxx
index d853ea54b53c..928fb4643f3a 100644
--- a/shell/source/win32/shlxthandler/util/registry.cxx
+++ b/shell/source/win32/shlxthandler/util/registry.cxx
@@ -18,26 +18,15 @@
  */
 
 
-#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 <malloc.h>
 #include <registry.hxx>
 
-#if defined _MSC_VER
-#pragma warning(push, 1)
-#endif
 #include <objbase.h>
-#if defined _MSC_VER
-#pragma warning(pop)
-#endif
 
 bool SetRegistryKey(HKEY RootKey, const wchar_t* KeyName, const wchar_t* ValueName, const wchar_t* Value)
 {