sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-)
New commits: commit d6d896a121c0bab3ac27fafa5a4e810e48ec96c6 Author: Tor Lillqvist <[email protected]> Date: Tue Apr 30 08:30:00 2013 +0300 WaE: 'SAL_OVERRIDE' macro redefined Change-Id: Ic8af47b52b06ef440b3fdaa966075780fb7a609b diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx index 7599adb..2daa5b8 100644 --- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx +++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx @@ -20,6 +20,8 @@ #ifndef INCLUDED_PDFI_OUTDEV_HXX #define INCLUDED_PDFI_OUTDEV_HXX +#include <sal/types.h> + #if defined __GNUC__ #pragma GCC system_header #elif defined __SUNPRO_CC @@ -46,12 +48,6 @@ #pragma warning(pop) #endif -#if HAVE_CXX11_OVERRIDE -#define SAL_OVERRIDE override -#else -#define SAL_OVERRIDE -#endif - #include <boost/unordered_map.hpp> #include <vector> _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
