diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2018-01-31 21:07:08 +0300 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2018-02-02 13:10:56 +0100 |
| commit | 4e102d6a4b483098e80ca86e19ee8576ae5356f1 (patch) | |
| tree | 242f79e9c260a9e65699e3937bab1b5c88ad82bd /sdext | |
| parent | 974ea04ddd1b82e5d5c0171bd8ad29310e3f2bd7 (diff) | |
sdext: MSVC: pragma warning: make more specific, remove obsolete
Change-Id: I317b952c27fd052d4f19aa0dfc4ee9ce1e4705ad
Reviewed-on: https://gerrit.libreoffice.org/49046
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'sdext')
| -rw-r--r-- | sdext/source/pdfimport/pdfparse/pdfparse.cxx | 13 | ||||
| -rw-r--r-- | sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx | 8 | ||||
| -rw-r--r-- | sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx | 3 |
3 files changed, 2 insertions, 22 deletions
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> |