[Libreoffice-commits] .: patches/dev300

[Katarina Machalkova]

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

New commits:
commit d8bb5aee739e4cee779d29f4f19e6c1f2db8e4de
Author: Katarina Machalkova <kmachalkova at suse.cz>
Date:   Thu Oct 14 14:38:50 2010 +0200

    Most of OOXMLExportDevel is in repos now

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 06d52c7..ef6e04c 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -2110,42 +2110,6 @@ pptx-export-empty-animations-node-and-groupshape-fix.diff, rodo
 # handles case where a connector shape is not connected
 pptx-fix-connector-crash.diff, n#499129, thorsten
 
-[ OOXMLExportDevel ]
-# this is shared binary/ooxml filter
-# doesn't include
-# xlsx-export-row-limit-fix.diff, n#504623, kohei
-
-# Snapshot of the xlsx export filter at the time of creation of ooxml03
-# This is until 0453-Fix-formatted-text-change-tracking.patch, inluding, and
-# should contain all the available changes.
-xlsx-shared-xlsx-snapshot.diff
-
-# Make the xlsx export and import work at the same time
-# (converts the xlsx export to a UNO filter)
-xlsx-shared-xlsx-shared-import-and-export.diff
-
-xlsx-shared-xlsx-arabic-export-crash.diff, n#497419, janneke
-
-xlsx-shared-xlsx-export-set-xml-2007-flavour.diff, n#502090, janneke
-
-xlsx-shared-xlsx-export-simple-autofilter.diff, n#497559, janneke
-
-xlsx-shared-xlsx-export-skip-auto-format.diff, n#497560, janneke
-
-xlsx-shared-xlsx-export-cell-style-max-builtin.diff, n#497563, janneke
-
-xlsx-shared-oox-calc-export-export-pivot-content.diff, n#505917, janneke
-
-xlsx-shared-oox-calc-export-sotstorage-init.diff, n#505917, janneke
-
-#FIXME xlsx-shared-xlsx-export-row-limit-fix.diff, n#504623, kohei
-
-# No more SvStream/SotStorage as they conflict with their UNO counterparts.
-xlsx-shared-xlsx-export-no-more-svstream-sotstorage.diff, n#566581, kohei
-
-# Only process rows with non-empty cells, to improve performance.
-xlsx-shared-xlsx-export-perf-rowbuffer.diff, n#558577, kohei
-
 [ OOXMLExport ]
 # hack to ignore writerfilter when odf-converter is present
 odf-converter-ignore-writerfilter.diff, n#348471, n#502173, jholesov
@@ -2159,27 +2123,6 @@ wmf-mm-text.diff, n#417818, rodo
 wmf-mm-text-1.diff, n#417818, rodo
 sd-create-table-height-fix.diff, i#100275, thorsten
 
-[ OOXML ]
-# FIXME ooo330-m2: disabled some hunks; the files were probably completely
-pptx-autoplay-fix.diff, n#485645, thorsten
-ooxml-filters.diff, cbosdo
-
-[ OOXMLExportDevel ]
-ooxml-filters-calc.diff, muthusuba
-ooxml-sc-page-date.diff, muthusuba
-ooxml-schema.diff, muthusuba
-ooxml-sc-paneexport.diff, muthusuba
-ooxml-sc-showdropdown-fix.diff, muthusuba
-ooxml-sc-docpropsimp.diff, muthusuba
-ooxml-sc-page-date-imp.diff, muthusuba
-ooxml-sc-brk.diff, muthusuba
-ooxml-sc-internal-hlink-export.diff, bnc#594248, bubli
-ooxml-sw-fix-2010-import-crash.diff, bubli
-
-# depends on pptx-autoplay-fix.diff
-ooxml-autoplay-fix.diff, tml
-
-
 [ UbuntuHardyOnly ]
 # Add patch to only show local files needed when gnome-vfs/gio is disabled
 ubuntu-gnome-fpicker-local-only.diff
@@ -2330,6 +2273,9 @@ oox-pptx-export-update-to-ooo320.diff, rodo
 iso-ooxml-sw.diff, cbosdo
 
 [ OOXMLExportDevel ]
+# this s shared binary/ooxml filter
+# mostly merged into git by now, except for
+# xlsx-export-row-limit-fix.diff, n#504623, kohei
 xlsx-shared-oox-chart-export-part1.diff, Fong
 
 [ UnstableLibwpd ]
@@ -2569,8 +2515,6 @@ sfx2-style-edit-greyentry.diff, i#85003, simonaw
 [ Netbook ]
 netbook-window-decoration-update.diff, n#621116, rodo
 
-[ OOXMLExportDevel ]
-oox-sc-notes.diff, muthusuba
 
 [ Fixes ]
 # soffice process doesn't block ( under linux ) connect