ooo-build r11806 - in trunk: . patches/src680

[rengelhard svn gnome org]

Author: rengelhard
Date: Tue Mar  4 20:25:52 2008
New Revision: 11806
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11806&view=rev

Log:
2008-03-04  Rene Engelhard  <rene debian org>

        * patches/src680/svg-import-filter.diff: add here the gcc 4.3 fixes
          which (bogusly) went into patches/svgimport/svg-filter.diff in my
          last commit


Modified:
   trunk/ChangeLog
   trunk/patches/src680/svg-import-filter.diff

Modified: trunk/patches/src680/svg-import-filter.diff
==============================================================================
--- trunk/patches/src680/svg-import-filter.diff	(original)
+++ trunk/patches/src680/svg-import-filter.diff	Tue Mar  4 20:25:52 2008
@@ -745,7 +745,7 @@
 +
 --- filter/source/svg/parserfragments.cxx	1970-01-01 01:00:00.000000000 +0100
 +++ filter/source/svg/parserfragments.cxx	2008-03-03 12:47:08.000000000 +0100
-@@ -0,0 +1,509 @@
+@@ -0,0 +1,511 @@
 +/*************************************************************************
 + *
 + *    OpenOffice.org - a multi-platform office productivity suite
@@ -772,6 +772,8 @@
 +#include <com/sun/star/geometry/AffineMatrix2D.hpp>
 +
 +#include <boost/bind.hpp>
++// workaround. spirit uses INT_MAX.
++#include <limits.h>
 +#include <boost/spirit.hpp>
 +#include <boost/spirit/dynamic/while.hpp>
 +#include <numeric>
@@ -3615,7 +3617,7 @@
 +yellowgreen
 --- filter/source/svg/units.cxx	1970-01-01 01:00:00.000000000 +0100
 +++ filter/source/svg/units.cxx	2008-02-29 10:27:32.000000000 +0100
-@@ -0,0 +1,110 @@
+@@ -0,0 +1,112 @@
 +/*************************************************************************
 + *
 + *    OpenOffice.org - a multi-platform office productivity suite
@@ -3642,6 +3644,8 @@
 +#include <rtl/ustring.hxx>
 +
 +#include <boost/bind.hpp>
++// workaround. spirit uses INT_MAX.
++#include <limits.h>
 +#include <boost/spirit.hpp>
 +
 +