[ooo-build-commit] patches/dev300

[René Engelhard]

 patches/dev300/apply                      |    3 +++
 patches/dev300/oox-tokenmap.string.h.diff |   10 ++++++++++
 2 files changed, 13 insertions(+)

New commits:
commit a6fe4c9492cbdc62c37e3d9fa2c5698cf341def6
Author: Rene Engelhard <rene at debian.org>
Date:   Tue Sep 29 00:09:23 2009 +0200

    backport gcc 4.4 buildfix from i#105219
    
    * patches/dev300/oox-tokenmap.string.h.diff:

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 23cf828..78870f8 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -1159,6 +1159,9 @@ db4.8.diff, rengelha
 # add ro
 postset-add-ro.diff
 
+[ Gcc44 >= dev300-m60 ]
+oox-tokenmap.string.h.diff, i#105219
+
 [ Java14 ]
 
 # enable build with Java 1.4; can't go upstream
diff --git a/patches/dev300/oox-tokenmap.string.h.diff b/patches/dev300/oox-tokenmap.string.h.diff
new file mode 100644
index 0000000..ef3f23d
--- /dev/null
+++ b/patches/dev300/oox-tokenmap.string.h.diff
@@ -0,0 +1,10 @@
+--- oox/source/token/tokenmap.cxx.orig	2009-09-19 23:23:28.406250000 +0900
++++ oox/source/token/tokenmap.cxx	2009-09-20 21:33:08.484375000 +0900
+@@ -28,6 +28,7 @@
+  *
+  ************************************************************************/
+ 
++#include <string.h>
+ #include "oox/token/tokenmap.hxx"
+ #include <rtl/strbuf.hxx>
+ #include <rtl/string.hxx>