Update to DEV300_m15.

8 files changed, 52 insertions, 42 deletions

diff --git a/editors/openoffice-3-devel/Makefile b/editors/openoffice-3-devel/Makefile
index b051f23473c4..b19940864685 100644
--- a/editors/openoffice-3-devel/Makefile
+++ b/editors/openoffice-3-devel/Makefile
@@ -75,11 +75,11 @@ FREEBSD_ENV_SET=	FreeBSDAMDEnv.Set
 FREEBSD_ENV_SET=	FreeBSDX86Env.Set
 .endif
 
-MILESTONE?=		14
+MILESTONE?=		15
 OOOTAG?=		DEV300_m${MILESTONE}
 OOOSRC?=		OOo_${OOOTAG}_source${EXTRACT_SUFX}
 OOODIR=			openoffice.org3
-SNAPDATE=		20080524
+SNAPDATE=		20080601
 INSTALLATION_BASEDIR?=	openoffice.org-${OOOTAG}
 EXECBASE?=		openoffice.org-${OOOTAG}
 .if defined(WITH_CWS)
diff --git a/editors/openoffice-3-devel/distinfo b/editors/openoffice-3-devel/distinfo
index bb8d2cf0cf8d..6a4e3de9a57f 100644
--- a/editors/openoffice-3-devel/distinfo
+++ b/editors/openoffice-3-devel/distinfo
@@ -1,6 +1,6 @@
-MD5 (openoffice.org3/OOo_DEV300_m14_source.tar.bz2) = a9093c10ae68717719880c6de51d0bdc
-SHA256 (openoffice.org3/OOo_DEV300_m14_source.tar.bz2) = 7774f4266928fcb365a6b199b6ce5508afc22a728bc88210bc77c73ef69ce7fa
-SIZE (openoffice.org3/OOo_DEV300_m14_source.tar.bz2) = 300267688
+MD5 (openoffice.org3/OOo_DEV300_m15_source.tar.bz2) = 00ce7e97d6e606dcadb394325c2b53f7
+SHA256 (openoffice.org3/OOo_DEV300_m15_source.tar.bz2) = 9744b5547b87e6b961dd1212cb1a140472716cc38bd94f608d0b1537f605e717
+SIZE (openoffice.org3/OOo_DEV300_m15_source.tar.bz2) = 299206798
 MD5 (openoffice.org3/unowinreg.dll) = e3a0b76dcd876f3d721ee7183729153d
 SHA256 (openoffice.org3/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
 SIZE (openoffice.org3/unowinreg.dll) = 6144
diff --git a/editors/openoffice-3-devel/files/patch-i88160 b/editors/openoffice-3-devel/files/patch-i88160
deleted file mode 100644
index fc21b222aa2c..000000000000
--- a/editors/openoffice-3-devel/files/patch-i88160
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: sw/source/core/doc/dbgoutsw.cxx
-===================================================================
-RCS file: /cvs/sw/sw/source/core/doc/dbgoutsw.cxx,v
-retrieving revision 1.23
-diff -u -r1.23 dbgoutsw.cxx
---- sw/source/core/doc/dbgoutsw.cxx	19 Feb 2008 13:40:02 -0000	1.23
-+++ sw/source/core/doc/dbgoutsw.cxx	12 Apr 2008 00:17:46 -0000
-@@ -296,7 +296,7 @@
-         if (!bFirst)
-             aStr += String(", ", RTL_TEXTENCODING_ASCII_US);
- 
--        if ((sal_uInt32)pItem != 0xffffffff)
-+        if (! pItem->IsInvalidItem())
-             aStr += lcl_dbg_out(*pItem);
-         else
-             aStr += String("invalid", RTL_TEXTENCODING_ASCII_US);
diff --git a/editors/openoffice-3-devel/files/patch-i89921 b/editors/openoffice-3-devel/files/patch-i89921
new file mode 100644
index 000000000000..207e827c5c32
--- /dev/null
+++ b/editors/openoffice-3-devel/files/patch-i89921
@@ -0,0 +1,21 @@
+Index: source/token/makefile.mk
+===================================================================
+RCS file: /cvs/xml/oox/source/token/makefile.mk,v
+retrieving revision 1.7
+diff -u -r1.7 makefile.mk
+--- oox/source/token/makefile.mk	18 Apr 2008 14:33:38 -0000	1.7
++++ oox/source/token/makefile.mk	25 May 2008 10:07:00 -0000
+@@ -50,11 +50,11 @@
+ 
+ .INCLUDE :  target.mk
+ 
+-$(INCCOM)$/tokens.hxx $(INCCOM)$/tokenwords.inc $(MISC)$/tokens.gperf : tokens.txt gentoken.pl
++$(MISC)$/tokens.gperf : tokens.txt gentoken.pl
+ 		$(PERL) gentoken.pl tokens.txt $(INCCOM)$/tokens.hxx $(INCCOM)$/tokenwords.inc $(MISC)$/tokens.gperf
+ 
+ $(INCCOM)$/tokens.inc : $(MISC)$/tokens.gperf
+ 		gperf --compare-strncmp $(MISC)$/tokens.gperf | $(SED) -e "s/(char\*)0/(char\*)0, 0/g" >$(INCCOM)$/tokens.inc
+ 
+-$(SLO)$/tokenmap.obj : $(INCCOM)$/tokens.inc $(INCCOM)$/tokenwords.inc $(INCCOM)$/tokens.hxx
++$(SLO)$/tokenmap.obj : $(INCCOM)$/tokens.inc
+ 
diff --git a/editors/openoffice.org-3-devel/Makefile b/editors/openoffice.org-3-devel/Makefile
index b051f23473c4..b19940864685 100644
--- a/editors/openoffice.org-3-devel/Makefile
+++ b/editors/openoffice.org-3-devel/Makefile
@@ -75,11 +75,11 @@ FREEBSD_ENV_SET=	FreeBSDAMDEnv.Set
 FREEBSD_ENV_SET=	FreeBSDX86Env.Set
 .endif
 
-MILESTONE?=		14
+MILESTONE?=		15
 OOOTAG?=		DEV300_m${MILESTONE}
 OOOSRC?=		OOo_${OOOTAG}_source${EXTRACT_SUFX}
 OOODIR=			openoffice.org3
-SNAPDATE=		20080524
+SNAPDATE=		20080601
 INSTALLATION_BASEDIR?=	openoffice.org-${OOOTAG}
 EXECBASE?=		openoffice.org-${OOOTAG}
 .if defined(WITH_CWS)
diff --git a/editors/openoffice.org-3-devel/distinfo b/editors/openoffice.org-3-devel/distinfo
index bb8d2cf0cf8d..6a4e3de9a57f 100644
--- a/editors/openoffice.org-3-devel/distinfo
+++ b/editors/openoffice.org-3-devel/distinfo
@@ -1,6 +1,6 @@
-MD5 (openoffice.org3/OOo_DEV300_m14_source.tar.bz2) = a9093c10ae68717719880c6de51d0bdc
-SHA256 (openoffice.org3/OOo_DEV300_m14_source.tar.bz2) = 7774f4266928fcb365a6b199b6ce5508afc22a728bc88210bc77c73ef69ce7fa
-SIZE (openoffice.org3/OOo_DEV300_m14_source.tar.bz2) = 300267688
+MD5 (openoffice.org3/OOo_DEV300_m15_source.tar.bz2) = 00ce7e97d6e606dcadb394325c2b53f7
+SHA256 (openoffice.org3/OOo_DEV300_m15_source.tar.bz2) = 9744b5547b87e6b961dd1212cb1a140472716cc38bd94f608d0b1537f605e717
+SIZE (openoffice.org3/OOo_DEV300_m15_source.tar.bz2) = 299206798
 MD5 (openoffice.org3/unowinreg.dll) = e3a0b76dcd876f3d721ee7183729153d
 SHA256 (openoffice.org3/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
 SIZE (openoffice.org3/unowinreg.dll) = 6144
diff --git a/editors/openoffice.org-3-devel/files/patch-i88160 b/editors/openoffice.org-3-devel/files/patch-i88160
deleted file mode 100644
index fc21b222aa2c..000000000000
--- a/editors/openoffice.org-3-devel/files/patch-i88160
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: sw/source/core/doc/dbgoutsw.cxx
-===================================================================
-RCS file: /cvs/sw/sw/source/core/doc/dbgoutsw.cxx,v
-retrieving revision 1.23
-diff -u -r1.23 dbgoutsw.cxx
---- sw/source/core/doc/dbgoutsw.cxx	19 Feb 2008 13:40:02 -0000	1.23
-+++ sw/source/core/doc/dbgoutsw.cxx	12 Apr 2008 00:17:46 -0000
-@@ -296,7 +296,7 @@
-         if (!bFirst)
-             aStr += String(", ", RTL_TEXTENCODING_ASCII_US);
- 
--        if ((sal_uInt32)pItem != 0xffffffff)
-+        if (! pItem->IsInvalidItem())
-             aStr += lcl_dbg_out(*pItem);
-         else
-             aStr += String("invalid", RTL_TEXTENCODING_ASCII_US);
diff --git a/editors/openoffice.org-3-devel/files/patch-i89921 b/editors/openoffice.org-3-devel/files/patch-i89921
new file mode 100644
index 000000000000..207e827c5c32
--- /dev/null
+++ b/editors/openoffice.org-3-devel/files/patch-i89921
@@ -0,0 +1,21 @@
+Index: source/token/makefile.mk
+===================================================================
+RCS file: /cvs/xml/oox/source/token/makefile.mk,v
+retrieving revision 1.7
+diff -u -r1.7 makefile.mk
+--- oox/source/token/makefile.mk	18 Apr 2008 14:33:38 -0000	1.7
++++ oox/source/token/makefile.mk	25 May 2008 10:07:00 -0000
+@@ -50,11 +50,11 @@
+ 
+ .INCLUDE :  target.mk
+ 
+-$(INCCOM)$/tokens.hxx $(INCCOM)$/tokenwords.inc $(MISC)$/tokens.gperf : tokens.txt gentoken.pl
++$(MISC)$/tokens.gperf : tokens.txt gentoken.pl
+ 		$(PERL) gentoken.pl tokens.txt $(INCCOM)$/tokens.hxx $(INCCOM)$/tokenwords.inc $(MISC)$/tokens.gperf
+ 
+ $(INCCOM)$/tokens.inc : $(MISC)$/tokens.gperf
+ 		gperf --compare-strncmp $(MISC)$/tokens.gperf | $(SED) -e "s/(char\*)0/(char\*)0, 0/g" >$(INCCOM)$/tokens.inc
+ 
+-$(SLO)$/tokenmap.obj : $(INCCOM)$/tokens.inc $(INCCOM)$/tokenwords.inc $(INCCOM)$/tokens.hxx
++$(SLO)$/tokenmap.obj : $(INCCOM)$/tokens.inc
+