[Libreoffice-commits] core.git: 2 commits - sdext/source sot/inc sot/source

[Mike Kaganski]

 sdext/source/pdfimport/pdfparse/pdfparse.cxx          |   13 -------------
 sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx |    8 --------
 sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx |    3 ++-
 sot/inc/sysformats.hxx                                |    7 -------
 sot/source/sdstor/stgole.cxx                          |    3 ---
 5 files changed, 2 insertions(+), 32 deletions(-)

New commits:
commit 4b510970213fa35bb7f7166ca489dcc97d7eb36a
Author: Mike Kaganski <mike.kaganski at collabora.com>
Date:   Wed Jan 31 21:17:23 2018 +0300

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

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 )
commit 4e102d6a4b483098e80ca86e19ee8576ae5356f1
Author: Mike Kaganski <mike.kaganski at collabora.com>
Date:   Wed Jan 31 21:07:08 2018 +0300

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

diff --git a/sdext/source/pdfimport/pdfparse/pdfparse.cxx b/sdext/source/pdfimport/pdfparse/pdfparse.cxx
index d943f5af9a38..1ce4c366a408 100644
--- a/sdext/source/pdfimport/pdfparse/pdfparse.cxx
+++ b/sdext/source/pdfimport/pdfparse/pdfparse.cxx
@@ -18,10 +18,6 @@
  */
 
 
-#if defined _MSC_VER
-#pragma warning(push, 1)
-#endif
-
 #include <pdfparse.hxx>
 
 // workaround windows compiler: do not include multi_pass.hpp
@@ -35,11 +31,6 @@
 #include <rtl/strbuf.hxx>
 #include <rtl/alloc.h>
 
-// disable warnings again because someone along the line has enabled them
-#if defined _MSC_VER
-#pragma warning(push, 1)
-#endif
-
 using namespace boost::spirit;
 using namespace pdfparse;
 
@@ -677,9 +668,5 @@ PDFEntry* PDFReader::read( const char* pFileName )
 #endif // WIN32
 }
 
-#if defined _MSC_VER
-#pragma warning(pop)
-#endif
-
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
index d55bd9ed1171..0e12aaede331 100644
--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
@@ -28,10 +28,6 @@
 #include <memory>
 #include <vector>
 
-#if defined _MSC_VER
-#pragma warning(push, 1)
-#endif
-
 // sigh, UTF8.h was removed in poppler-0.21.0 and put back in 0.21.1, then renamed to UnicodeMapFuncs.h in 0.62.0
 // FIXME: we can't use #if POPPLER_CHECK_VERSION(0, 21, 0) && !POPPLER_CHECK_VERSION(0, 21, 1)
 //        because the internal poppler does not provide poppler-version.h and the macro always returns 0
@@ -45,10 +41,6 @@
 #include "UTF8.h"
 #endif
 
-#if defined _MSC_VER
-#pragma warning(pop)
-#endif
-
 #ifdef _WIN32
 # define snprintf _snprintf
 
diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
index 922c513ff86b..c3367aa6ddf2 100644
--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
@@ -28,7 +28,8 @@
 # pragma GCC diagnostic ignored "-Wundef"
 # pragma GCC diagnostic ignored "-Wunused-parameter"
 #elif defined _MSC_VER
-#pragma warning(push, 1)
+#pragma warning(push)
+#pragma warning(disable : 4100) // unreferenced formal parameter
 #endif
 
 #include <GfxState.h>