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

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

8 files changed, 1 insertions, 50 deletions

diff --git a/fpicker/source/win32/filepicker/FPentry.cxx b/fpicker/source/win32/filepicker/FPentry.cxx
index 311186fd355a..2166ba82e6d4 100644
--- a/fpicker/source/win32/filepicker/FPentry.cxx
+++ b/fpicker/source/win32/filepicker/FPentry.cxx
@@ -21,9 +21,6 @@
 #include <com/sun/star/container/XSet.hpp>
 #include "FPServiceInfo.hxx"
 
-#ifdef _MSC_VER
-#pragma warning (disable:4917)
-#endif
 #include "VistaFilePicker.hxx"
 #include "../misc/WinImplHelper.hxx"
 #include <stdio.h>
diff --git a/fpicker/source/win32/filepicker/FilterContainer.cxx b/fpicker/source/win32/filepicker/FilterContainer.cxx
index e518aef377ee..088c4744db05 100644
--- a/fpicker/source/win32/filepicker/FilterContainer.cxx
+++ b/fpicker/source/win32/filepicker/FilterContainer.cxx
@@ -26,16 +26,10 @@
 
 #include <utility>
 
-#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
 
 CFilterContainer::CFilterContainer( sal_Int32 initSize ) :
     m_vFilters( initSize ),
diff --git a/fpicker/source/win32/filepicker/VistaFilePicker.cxx b/fpicker/source/win32/filepicker/VistaFilePicker.cxx
index 4584a1edd3b4..231072c7fbc0 100644
--- a/fpicker/source/win32/filepicker/VistaFilePicker.cxx
+++ b/fpicker/source/win32/filepicker/VistaFilePicker.cxx
@@ -17,10 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifdef _MSC_VER
-#pragma warning (disable:4917)
-#endif
-
 #include "VistaFilePicker.hxx"
 
 #include "../misc/WinImplHelper.hxx"
@@ -40,13 +36,7 @@
 #include <osl/file.hxx>
 #include <officecfg/Office/Common.hxx>
 
-#ifdef _MSC_VER
-#pragma warning (push, 1)
-#endif
 #include <shlobj.h>
-#ifdef _MSC_VER
-#pragma warning (pop)
-#endif
 
 namespace fpicker{
 namespace win32{
diff --git a/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.hxx b/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.hxx
index 0a1f9647a7cc..8e01df71a18c 100644
--- a/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.hxx
+++ b/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.hxx
@@ -20,10 +20,6 @@
 #ifndef INCLUDED_FPICKER_SOURCE_WIN32_FILEPICKER_VISTAFILEPICKEREVENTHANDLER_HXX
 #define INCLUDED_FPICKER_SOURCE_WIN32_FILEPICKER_VISTAFILEPICKEREVENTHANDLER_HXX
 
-#ifdef _MSC_VER
-#pragma warning( disable : 4917 )
-#endif
-
 #include <shobjidl.h>
 
 #include "comptr.hxx"
diff --git a/fpicker/source/win32/filepicker/VistaFilePickerImpl.hxx b/fpicker/source/win32/filepicker/VistaFilePickerImpl.hxx
index 01efd0f58c72..4b51f9162165 100644
--- a/fpicker/source/win32/filepicker/VistaFilePickerImpl.hxx
+++ b/fpicker/source/win32/filepicker/VistaFilePickerImpl.hxx
@@ -20,19 +20,9 @@
 #ifndef INCLUDED_FPICKER_SOURCE_WIN32_FILEPICKER_VISTAFILEPICKERIMPL_HXX
 #define INCLUDED_FPICKER_SOURCE_WIN32_FILEPICKER_VISTAFILEPICKERIMPL_HXX
 
-#ifdef _MSC_VER
-#pragma warning( disable : 4917 )
-#endif
-
 #include "platform_vista.h"
 
-#if defined _MSC_VER
-#pragma warning(push, 1)
-#endif
 #include <shobjidl.h>
-#if defined _MSC_VER
-#pragma warning(pop)
-#endif
 
 #include "asyncrequests.hxx"
 #include "comptr.hxx"
diff --git a/fpicker/source/win32/filepicker/platform_vista.h b/fpicker/source/win32/filepicker/platform_vista.h
index 2a29131c9baa..a6e6d2121dbe 100644
--- a/fpicker/source/win32/filepicker/platform_vista.h
+++ b/fpicker/source/win32/filepicker/platform_vista.h
@@ -20,17 +20,13 @@
 #ifndef INCLUDED_FPICKER_SOURCE_WIN32_FILEPICKER_PLATFORM_VISTA_H
 #define INCLUDED_FPICKER_SOURCE_WIN32_FILEPICKER_PLATFORM_VISTA_H
 
-#pragma once
-
 #undef _WTL_NO_CSTRING
 
 #define _WTL_NO_CSTRING
 
 #if defined _MSC_VER
-#pragma warning(push, 1)
 #include <comip.h>
 #undef RGB
-#pragma warning(pop)
 #endif
 
 #ifdef _MSC_VER
diff --git a/fpicker/source/win32/folderpicker/MtaFop.hxx b/fpicker/source/win32/folderpicker/MtaFop.hxx
index 805c137bcb2b..5d7042e02278 100644
--- a/fpicker/source/win32/folderpicker/MtaFop.hxx
+++ b/fpicker/source/win32/folderpicker/MtaFop.hxx
@@ -29,15 +29,8 @@
 #include <osl/mutex.hxx>
 
 #include <utility>
-#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 "../misc/WinImplHelper.hxx"
 
 // the Mta-Ole clipboard class is for internal use only!
diff --git a/fpicker/source/win32/misc/WinImplHelper.hxx b/fpicker/source/win32/misc/WinImplHelper.hxx
index eee2900dc08c..acac133d3ae6 100644
--- a/fpicker/source/win32/misc/WinImplHelper.hxx
+++ b/fpicker/source/win32/misc/WinImplHelper.hxx
@@ -24,16 +24,11 @@
 #include <sal/types.h>
 #include <rtl/ustring.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 <com/sun/star/uno/Any.hxx>
 #include <com/sun/star/lang/IllegalArgumentException.hpp>