[ooo-build-commit] .: patches/dev300

[Katarina Machalkova]

 patches/dev300/apply |   51 +++++++++++++++++++++++++++++++++++----------------
 1 file changed, 35 insertions(+), 16 deletions(-)

New commits:
commit 663c2446796abd00269e920100adda703bdd754b
Author: Katarina Machalkova <kmachalkova at suse.cz>
Date:   Mon Apr 19 15:50:14 2010 +0200

    Moving some patches out of main [ OOXMLExportDevel ] section
    
    more downwards to make them apply
    
    * patches/dev300/apply:

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 172aa27..229e369 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -3369,33 +3369,31 @@ xlsx-export-perf-rowbuffer.diff, n#558577, kohei
 # xlsx-export-perf-rowbuffer.diff, n#558577, kohei
 # oox-chart-export-part1.diff, Fong 
 
-xlsx-shared-border-types-dotted-dashed.diff
-xlsx-shared-calc-distributed-cell-text-sc.diff
-xlsx-shared-calc-perf-xls-import-cellstyles.diff
-xlsx-shared-oox-calc-export-export-pivot-content.diff
-xlsx-shared-oox-calc-export-sotstorage-init.diff
-xlsx-shared-oox-chart-export-part1.diff
-xlsx-shared-oox-drawingml-fix-shapes-map-crash.diff
-xlsx-shared-oox-smartart-import-m13.diff
+xlsx-shared-xlsx-snapshot.diff
+xlsx-shared-xlsx-shared-import-and-export.diff
 xlsx-shared-xlsx-arabic-export-crash.diff
-xlsx-shared-xlsx-export-cell-style-max-builtin.diff
-xlsx-shared-xlsx-export-no-more-svstream-sotstorage.diff
-xlsx-shared-xlsx-export-perf-rowbuffer.diff
-xlsx-shared-xlsx-export-row-limit-fix.diff
+xlsx-shared-calc-perf-xls-import-cellstyles.diff
+#xlsx-shared-oox-chart-export-part1.diff
 xlsx-shared-xlsx-export-set-xml-2007-flavour.diff
 xlsx-shared-xlsx-export-simple-autofilter.diff
 xlsx-shared-xlsx-export-skip-auto-format.diff
-xlsx-shared-xlsx-shared-import-and-export.diff
-xlsx-shared-xlsx-snapshot.diff
+xlsx-shared-xlsx-export-cell-style-max-builtin.diff
+xlsx-shared-oox-calc-export-export-pivot-content.diff
+xlsx-shared-oox-calc-export-sotstorage-init.diff
+#xlsx-shared-xlsx-export-row-limit-fix.diff
+xlsx-shared-xlsx-export-no-more-svstream-sotstorage.diff
+#xlsx-shared-xlsx-export-perf-rowbuffer.diff
 
 [ OOXMLExport ]
 # hack to ignore writerfilter when odf-converter is present
 odf-converter-ignore-writerfilter.diff, n#348471, n#502173, jholesov
 
-[ OOXMLExport < ooo320-m14 ]
+[ OOXMLExport321 < ooo320-m14 ]
 oox-smartart-import-m13.diff, thorsten
-[ OOXMLExport >= ooo320-m14 ]
+[ OOXMLExport321 >= ooo320-m14 ]
 oox-smartart-import.diff, thorsten
+[ OOXMLExportDevel ]
+xlsx-shared-oox-smartart-import-m13.diff
 
 [ OOXML ]
 oox-pptx-export-fix-hidden-slides.diff, n#499131, rodo
@@ -3450,11 +3448,18 @@ oox-pptx-export-hyperlinks.diff, n#499124, rodo
 oox-pptx-export-vertical-text.diff, n#498737, rodo
 oox-pptx-export-para-linespacing.diff, n#498737, rodo
 oox-pptx-export-fix-action-button-presets.diff, n#497570, rodo
+
+[ OOXMLExport321 ]
 oox-drawingml-fix-shapes-map-crash.diff, rodo
+[ OOXMLExportDevel ]
+xlsx-shared-oox-drawingml-fix-shapes-map-crash.diff, rodo
+
+[ OOXMLExport ]
 oox-pptx-export-animations-filter.diff, n#497570, rodo
 oox-pptx-export-animations-paragraph-target.diff, n#497570, rodo
 oox-pptx-export-blip-luminance.diff, n#497570, rodo
 
+
 [ Experimental ]
 experimental_ooapi.diff, flr
 desktop-cmd-bulk-conversion.diff, flr
@@ -3809,7 +3814,11 @@ calc-perf-import-dbf-sc.diff,           n#558505, kohei
 # Speed up row height data import from ods documents.
 calc-perf-ods-import-row-height.diff, n#582693, kohei
 calc-perf-ods-import-cellstyles.diff, n#582693, kohei
+
+[ OOXMLExport321 ]
 calc-perf-xls-import-cellstyles.diff, n#582693, kohei
+
+[ CalcRowLimit ]
 calc-perf-xls-import-cellstyles-fix.diff, n#594266, kohei
 calc-perf-xls-import-cellstyles-fix2.diff, n#594235, kohei
 
@@ -3833,7 +3842,13 @@ calc-formula-variable-sep-config-check-sc.diff,   n#556142, i#106959, kohei
 
 # Distributed text alignment support for cell text.
 calc-distributed-cell-text-offapi.diff, kohei
+
+[ OOXMLExport321 ]
 calc-distributed-cell-text-sc.diff,     kohei
+[ OOXMLExportDevel ]
+xlsx-shared-calc-distributed-cell-text-sc.diff
+
+[ CalcFixes ]
 calc-distributed-cell-text-svx.diff,    kohei
 calc-distributed-cell-text-xmloff.diff, kohei
 calc-distributed-cell-text-oox.diff,    kohei
@@ -4007,8 +4022,12 @@ toolbar-decorations-fix.diff
 SectionOwner => cbosdo
 
 #Only adds the dotted / dashed lines
+[ OOXMLExport321 ]
 border-types-dotted-dashed.diff, fate#307731, fate 307730
 
+[ OOXMLExportDevel ]
+xlsx-shared-border-types-dotted-dashed.diff
+
 #Adds some more types, and more of unifying the drawing methods
 #FIXME: Incomplete, not to be included in 3.2.1
 #border-types-more.diff, fate#309127