[Libreoffice-commits] core.git: sfx2/source

[Mike Kaganski]

 sfx2/source/appl/shutdowniconw32.cxx |    5 -----
 sfx2/source/doc/syspath.hxx          |    1 -
 sfx2/source/doc/syspathw32.cxx       |    3 ---
 3 files changed, 9 deletions(-)

New commits:
commit 5bf8f1827f4a0bd3fa2c8236d80bd1a2a99ed472
Author: Mike Kaganski <mike.kaganski at collabora.com>
Date:   Wed Jan 31 21:11:34 2018 +0300

    sfx2: MSVC: pragma warning: make more specific, remove obsolete
    
    Change-Id: If4cd747826307e1050eaf4ba38e6201c1e08e84e
    Reviewed-on: https://gerrit.libreoffice.org/49048
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Mike Kaganski <mike.kaganski at collabora.com>

diff --git a/sfx2/source/appl/shutdowniconw32.cxx b/sfx2/source/appl/shutdowniconw32.cxx
index 01db07340973..c5c4fe7f7dcf 100644
--- a/sfx2/source/appl/shutdowniconw32.cxx
+++ b/sfx2/source/appl/shutdowniconw32.cxx
@@ -22,11 +22,6 @@
 
 #include <sal/macros.h>
 
-// necessary to include system headers without warnings
-#ifdef _MSC_VER
-#pragma warning(disable:4668 4917)
-#endif
-
 #include <unotools/moduleoptions.hxx>
 #include <unotools/dynamicmenuoptions.hxx>
 
diff --git a/sfx2/source/doc/syspath.hxx b/sfx2/source/doc/syspath.hxx
index 169c85a27817..04d56218f79f 100644
--- a/sfx2/source/doc/syspath.hxx
+++ b/sfx2/source/doc/syspath.hxx
@@ -19,7 +19,6 @@
 
 #ifndef INCLUDED_SFX2_SOURCE_DOC_SYSPATH_HXX
 #define INCLUDED_SFX2_SOURCE_DOC_SYSPATH_HXX
-//#pragma warning(disable:4917)
 
 #include <sfx2/dllapi.h>
 
diff --git a/sfx2/source/doc/syspathw32.cxx b/sfx2/source/doc/syspathw32.cxx
index 2a61f1a1cdb5..f60f459829d7 100644
--- a/sfx2/source/doc/syspathw32.cxx
+++ b/sfx2/source/doc/syspathw32.cxx
@@ -22,9 +22,6 @@
 #include <o3tl/char16_t2wchar_t.hxx>
 
 #ifdef _WIN32
-#ifdef _MSC_VER
-#pragma warning(disable:4917)
-#endif
 
 #undef WB_LEFT
 #undef WB_RIGHT