[ooo-build-commit] Branch 'ooo-build-3-1-1' - patches/dev300

[René Engelhard]

 patches/dev300/apply |   11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

New commits:
commit d334a9e1cae8d85942ac2eba6bcd04342608331c
Author: Rene Engelhard <rene at debian.org>
Date:   Fri Aug 21 02:31:49 2009 +0200

    fix apply
    
    * patches/dev300/apply: actually add conditional for cws-ooxml03-... and
      fix typo

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 15e976a..b136a18 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -742,7 +742,7 @@ sc-drwlayer-units.diff, i#83735, jonp
 sc-overwrite-char-font-attrs.diff, n#374580, i#53545, i#96853, kohei
 # When filtering by date, strip off the time element from each value.
 calc-filter-by-date-strip-time.diff, n#414303, i#94695, kohei
-[ CalcFixes < ooo310-m18 ]
+[ CalcFixes < ooo310-m19 ]
 # preserve line breaks when referencing it in formula.
 calc-multiline-formula-ref-m18.diff, i#35913, kohei
 [ CalcFixes >= ooo310-m19 ]
@@ -3071,11 +3071,15 @@ ooop-langpack-policy.diff
 [ NovellOnly ]
 mail-document-subject.diff, n#459176
 
-[ OOXMLExport ]
-SectionOwner => jholesov
+[ OOXMLExport < ooo310-m19 ]
+# OPC changes, and SVX + PPT split
+cws-ooxml03-opc-svx-and-ptt-split-m18.diff
+[ OOXMLExport >= ooo310-m19 ]
 # OPC changes, and SVX + PPT split
 cws-ooxml03-opc-svx-and-ptt-split.diff
 
+[ OOXMLExport ]
+SectionOwner => jholesov
 # Fix output of dates - xsi:type=... should be there only for dcterms
 cws-ooxml03-oox-dcterms.diff
 
@@ -3201,6 +3205,7 @@ calc-xls-import-array-size.diff, kohei
 calc-copy-range-animated-border-sc.diff, kohei
 calc-copy-range-animated-border-svx.diff, kohei
 
+[ CalcFixes < ooo310-m19 ]
 # decode unicode string in external doc URIs when displaying formulas.
 calc-external-ref-decode-unicode-uri.diff, i#103918, kohei