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

Change-Id: Ie2391b1feed31fe9cee7dc097c57ebebab698705
Reviewed-on: https://gerrit.libreoffice.org/49049Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>

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

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

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;
 

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"
 

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 =

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"

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"
 

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 =

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

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>

shell/qa/zip/ziptest.cxx

@@ -17,16 +17,10 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#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 <ole2.h>
 #include <stdio.h>
 

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)
 {

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 '='

shell/source/tools/regsvrex/regsvrex.cxx

@@ -18,14 +18,8 @@
  */
 
 
-#if defined _MSC_VER
-#pragma warning(push, 1)
-#endif
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
-#if defined _MSC_VER
-#pragma warning(pop)
-#endif
 
 typedef HRESULT (__stdcall *lpfnDllRegisterServer)();
 typedef HRESULT (__stdcall *lpfnDllUnregisterServer)();

shell/source/win32/SysShExec.cxx

@@ -31,15 +31,9 @@
 #include <o3tl/char16_t2wchar_t.hxx>
 
 #define WIN32_LEAN_AND_MEAN
-#if defined _MSC_VER
-#pragma warning(push, 1)
-#endif
 #include <windows.h>
 #include <shellapi.h>
 #include <objbase.h>
-#if defined _MSC_VER
-#pragma warning(pop)
-#endif
 
 using com::sun::star::uno::Reference;
 using com::sun::star::uno::RuntimeException;

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
 {

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>

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"
 

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

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>

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>

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>

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>

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>

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

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)
 {

shell/source/win32/simplemail/simplemapi.hxx

@@ -21,14 +21,8 @@
 #define INCLUDED_SHELL_SOURCE_WIN32_SIMPLEMAIL_SIMPLEMAPI_HXX
 
 #define WIN32_LEAN_AND_MEAN
-#if defined _MSC_VER
-#pragma warning(push, 1)
-#endif
 #include <windows.h>
 #include <mapi.h>
-#if defined _MSC_VER
-#pragma warning(pop)
-#endif
 
 class CSimpleMapi
 {

shell/source/win32/simplemail/smplmailclient.cxx

@@ -30,14 +30,8 @@
 #include <o3tl/char16_t2wchar_t.hxx>
 
 #define WIN32_LEAN_AND_MEAN
-#if defined _MSC_VER
-#pragma warning(push, 1)
-#endif
 #include <windows.h>
 #include <mapi.h>
-#if defined _MSC_VER
-#pragma warning(pop)
-#endif
 
 #include <process.h>
 #include <vector>

shell/source/win32/workbench/TestSmplMail.cxx

@@ -26,13 +26,8 @@
 #include <osl/diagnose.h>
 
 #include <stdio.h>
-#if defined _MSC_VER
-#pragma warning(push, 1)
-#endif
+
 #include <windows.h>
-#if defined _MSC_VER
-#pragma warning(pop)
-#endif
 
 #include <osl/file.hxx>
 

shell/source/win32/workbench/TestSysShExec.cxx

@@ -30,13 +30,7 @@
 
 #include <stdio.h>
 
-#if defined _MSC_VER
-#pragma warning(push, 1)
-#endif
 #include <windows.h>
-#if defined _MSC_VER
-#pragma warning(pop)
-#endif
 
 
 //  namespaces