[ooo-build-commit] 2 commits - patches/dev300

[Tor Lillqvist]

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

New commits:
commit d1141fe5dc9723ae3f867e2c04d090298e56b96b
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Thu Aug 20 19:47:28 2009 +0300

    Bypass two more diffs
    
    * patches/dev300/apply: Bypass oox-smartart-import.diff and
      xlsx-export-cell-style-max-builtin.diff for now.

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 4e995e3..7a61abc 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -3082,9 +3082,13 @@ unoxml-fast-sax-serializable.diff, thorsten
 # autodoc-two-template-types.diff, i#103005, pmladek
 
 # this here depends on oox changes in OOXMLExport
-oox-smartart-import.diff, thorsten
+# FIXME: 2009-08-20: Parts do not apply to dev300-m54, some do, but presumably
+# best to let thorsten look into it . --tml
+# oox-smartart-import.diff, thorsten
 
-xlsx-export-cell-style-max-builtin.diff, n#497563, janneke
+# FIXME: 2009-08-20: Depends on xlsx-filter-as-a-separate-lib.diff
+# which is commented out. --tml
+# xlsx-export-cell-style-max-builtin.diff, n#497563, janneke
 
 [ OOXML ]
 oox-pptx-export-fix-hidden-slides.diff, n#499131, rodo
commit 4b42504aecc0714f48538b6535c3fbcbf86f37fd
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Mon Aug 17 17:02:02 2009 +0300

    Bypass autodoc-two-template-types.diff
    
    * patches/dev300/apply: Bypass autodoc-two-template-types.diff, does
      not apply, maybe upstream already has fixed whatever the problem
      here, in a different way. i#103005 is said to be invalid,
      though.

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 28600bf..4e995e3 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -3077,7 +3077,10 @@ unoxml-fast-sax-serializable.diff, thorsten
 # it is needed to process the new XFastSAXSerializable.idl
 # the patch fixes the semantic analyze but not the output
 # the output of template types seems to be incomplete anyway
-autodoc-two-template-types.diff, i#103005, pmladek
+
+# FIXME: 2009-08-17: indeed, does not even apply to dev300-m54. --tml
+# autodoc-two-template-types.diff, i#103005, pmladek
+
 # this here depends on oox changes in OOXMLExport
 oox-smartart-import.diff, thorsten