From 417c85bf582e0d1dbabb7b0f16d60a394d537e61 Mon Sep 17 00:00:00 2001 From: Jelle van der Waa Date: Mon, 16 Dec 2013 22:27:05 +0100 Subject: fdo#72598 Remove SunStudio cruft from code base Change-Id: I6f75d0df0ddafc892fef0ce1bfdcdd6c70151afc Reviewed-on: https://gerrit.libreoffice.org/7104 Reviewed-by: Noel Grandin Tested-by: Noel Grandin --- sdext/source/pdfimport/pdfparse/pdfparse.cxx | 12 +++--------- sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx | 8 ++------ 2 files changed, 5 insertions(+), 15 deletions(-) (limited to 'sdext/source') diff --git a/sdext/source/pdfimport/pdfparse/pdfparse.cxx b/sdext/source/pdfimport/pdfparse/pdfparse.cxx index 69aa4d8f783b..ec8b6439dd10 100644 --- a/sdext/source/pdfimport/pdfparse/pdfparse.cxx +++ b/sdext/source/pdfimport/pdfparse/pdfparse.cxx @@ -18,9 +18,7 @@ */ -#if defined __SUNPRO_CC -#pragma disable_warn -#elif defined _MSC_VER +#if defined _MSC_VER #pragma warning(push, 1) #endif @@ -38,9 +36,7 @@ #include // disable warnings again because someone along the line has enabled them -#if defined __SUNPRO_CC -#pragma disable_warn -#elif defined _MSC_VER +#if defined _MSC_VER #pragma warning(push, 1) #endif @@ -681,9 +677,7 @@ PDFEntry* PDFReader::read( const char* pFileName ) #endif // WIN32 } -#if defined __SUNPRO_CC -#pragma enable_warn -#elif defined _MSC_VER +#if defined _MSC_VER #pragma warning(pop) #endif diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx index b4b66a3f6dc3..7f14192f8ece 100644 --- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx +++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx @@ -27,9 +27,7 @@ #include -#if defined __SUNPRO_CC -#pragma disable_warn -#elif defined _MSC_VER +#if defined _MSC_VER #pragma warning(push, 1) #endif @@ -44,9 +42,7 @@ #include "UTF8.h" #endif -#if defined __SUNPRO_CC -#pragma enable_warn -#elif defined _MSC_VER +#if defined _MSC_VER #pragma warning(pop) #endif -- cgit