From 4b510970213fa35bb7f7166ca489dcc97d7eb36a Mon Sep 17 00:00:00 2001
From: Mike Kaganski <mike.kaganski@collabora.com>
Date: Wed, 31 Jan 2018 21:17:23 +0300
Subject: sot: MSVC: pragma warning: make more specific, remove obsolete

Change-Id: I0a0dc82561968cd1ff179c9930525e188060d9b7
Reviewed-on: https://gerrit.libreoffice.org/49050
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
---
 sot/inc/sysformats.hxx       | 7 -------
 sot/source/sdstor/stgole.cxx | 3 ---
 2 files changed, 10 deletions(-)

(limited to 'sot')

diff --git a/sot/inc/sysformats.hxx b/sot/inc/sysformats.hxx
index b54dfd95cf82..d744be74cfae 100644
--- a/sot/inc/sysformats.hxx
+++ b/sot/inc/sysformats.hxx
@@ -21,14 +21,7 @@
 #define INCLUDED_SOT_SYSFORMATS_HXX
 
 #ifdef _WIN32
-#ifdef _MSC_VER
-#pragma warning(push, 1)
-#pragma warning(disable: 4917)
-#endif
 #include <shlobj.h>
-#ifdef _MSC_VER
-#pragma warning(pop)
-#endif
 #endif
 
 #endif // INCLUDED_SOT_SYSFORMATS_HXX
diff --git a/sot/source/sdstor/stgole.cxx b/sot/source/sdstor/stgole.cxx
index f4ca083393eb..0b1aa0d6a80d 100644
--- a/sot/source/sdstor/stgole.cxx
+++ b/sot/source/sdstor/stgole.cxx
@@ -25,9 +25,6 @@
 #include <sot/storinfo.hxx>
 #include <sot/exchange.hxx>
 
-#ifdef _MSC_VER
-#pragma warning(disable: 4342)
-#endif
 ///////////////////////// class StgInternalStream
 
 StgInternalStream::StgInternalStream( BaseStorage& rStg, const OUString& rName, bool bWr )
-- 
cgit v1.2.3