[ooo-build-commit] patches/dev300

[René Engelhard]

 patches/dev300/apply |   20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

New commits:
commit e6771d8c8935b0a63ce0afd0858527f73d0e1f7b
Author: Rene Engelhard <rene at debian.org>
Date:   Wed Jul 1 14:54:05 2009 +0200

    cwses scsheetprotection01, koheiformula03 and impress162 are integrated in dev300, sdk311 is nominated

diff --git a/patches/dev300/apply b/patches/dev300/apply
index c114adb..d25a1bd 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -732,6 +732,7 @@ vba-sc-autoshapes-hyperlinks.diff, i#66550, noelpwer
 #TODO: we need to re-implement this as a separate menu option. (n#500985)
 #sc-delete-rows-columns-remembers-content.diff, i#71921, jholesov
 
+[ CalcFixes < dev300-m52 ]
 # load, store and save the sheet protection options from and to an Excel file,
 # and use that information to constrain cell cursor movement when the sheet is
 # protected.  Also to support encryption on Excel file export.
@@ -739,6 +740,7 @@ cws-scsheetprotection02-sfx2.diff, i#97515, kohei
 cws-scsheetprotection02-svx.diff,  i#97515, kohei
 cws-scsheetprotection02-sc.diff,   i#97515, kohei
 
+[ CalcFixes ]
 # fix a crasher when loading xls doc with unsupported encryption.
 calc-xls-decryption-crash-fix.diff, i#102906, kohei
 
@@ -845,9 +847,11 @@ calc-dp-custom-names-sc-group-fix.diff, n#491637, kohei
 # default output to new sheet, instead of current sheet.
 calc-dp-default-new-sheet.diff, i#50886, kohei
 
+[ CalcFixes < dev300-m52 ]
 # always use OOo address convention when parsing address in DDE function.
 calc-dde-always-ooo-conv.diff, n#442143, i#101041, kohei
 
+[ CalcFixes ]
 # Replace 'Manual Break' with 'Page Break' in menu texts.
 calc-menu-manual-page-break.diff, kohei
 
@@ -998,7 +1002,7 @@ odk-build-force-openjdks-javadoc.diff
 # add JDK paths for MySQL, PostgreSQL, JTDS
 jdbc-driver-classpaths-debian.diff
 
-[ SdkFixes < ooo310-m14 ]
+[ SdkFixes < ooo310-m14 < dev300-m52 ]
 cws-sdk311.diff, i#101883
 
 [ GoOoSplash ]
@@ -1968,12 +1972,14 @@ calc-formula-variable-separators-sc.diff,        n#447164, i#92056, kohei
 calc-formula-variable-separators-svx.diff,       n#447164, i#92056, kohei
 calc-formula-variable-separators-officecfg.diff, n#447164, i#92056, kohei
 
+[ CalcFixes < dev300-m52 ]
 # Display references when entering input mode, even when the separators are not ';'.
 calc-formula-variable-separators-ref-display.diff, n#469395, i#101090, kohei
 
 # Fix chart breakage for non-default formula syntax (Excel A1 and R1C1).
 chart-formula-syntax.diff, n#487350, i#101091, kohei
 
+[ CalcFixes ]
 # Squeeze chart's subtitle into the 2nd line of the main title when exporting
 # to xls.
 chart-subtitle-xls-export.diff, i#92357, kohei
@@ -2008,8 +2014,10 @@ calc-find-replace-empty-cells-svx.diff i#49380, n#415352, kohei
 calc-enhanced-merge-cells-sc.diff,        n#213205, i#67243, i#101042, jholesov/kohei
 calc-enhanced-merge-cells-officecfg.diff, n#213205, i#67243, i#101042, jholesov/kohei
 
+[ CalcFixes < dev300-m52 ]
 calc-named-range-excel-syntax-fix.diff, n#481200, i#101043, kohei
 
+[ CalcFixes ]
 # import/export precision of value cells correctly.
 calc-filter-dbf-precision.diff, n#479025, i#101045, kohei
 
@@ -2025,17 +2033,21 @@ calc-html-import-custom-lang-sc.diff,      n#484272, kohei
 calc-csv-import-custom-lang-sc.diff,        n#510168, i#97416, kohei
 calc-csv-import-custom-lang-officecfg.diff, n#510168, i#97416, kohei
 
+[ CalcFixes < dev300-m52 ]
 # Don't duplicate merge flags when inserting a new row, to avoid merge flag 
 # corruption.
 calc-remove-merge-flags-on-row-insert.diff, n#484599, i#101047, kohei
 
+[ CalcFixes ]
 # quick editing of field member visibilities via popup window.
 calc-dp-hide-list-menu.diff,        n#483379, i#100619, kohei
 calc-dp-hide-list-menu-bugfix.diff, n#483379, i#100619, kohei
 
+[ CalcFixes < dev300-m52 ]
 # disable autofilter within datapilot output.
 calc-dp-disable-autofilter.diff, n#484600, i#101048, kohei
 
+[ CalcFixes ]
 # allow ctrl-[ and ctrl-] to jump to references used in a formula expression.
 calc-jump-on-formula-ref-offapi.diff,    n#464359, i#101018, kohei
 calc-jump-on-formula-ref-officecfg.diff, n#464359, i#101018, kohei
@@ -2043,9 +2055,11 @@ calc-jump-on-formula-ref-sc.diff,        n#464359, i#101018, kohei
 calc-jump-on-formula-ref-sfx2.diff,      n#464359, i#101018, kohei
 calc-jump-on-formula-ref-vcl.diff,       n#464359, i#101018, kohei
 
+[ CalcFixes < dev300-m52 ]
 # extend column range to Calc's max column when the range ends with 256.
 calc-xls-import-maxcol.diff, n#495140, i#101330, kohei
 
+[ CalcFixes ]
 # support custom sort in datapilot tables.
 calc-dp-custom-sort.diff, n#443361, kohei
 
@@ -2909,9 +2923,13 @@ svx-debug-sdrolestreams.diff, thorsten
 instset-macos-langpacks.diff, i#64937, cloph
 sal-disable-backtrace.diff, thorsten
 sw-invert-border-spacing.diff, n#391591, flr
+
+[ Fixes < dev300-m48 ]
 cws-impress162-sd.diff, i#94193, thorsten
 cws-impress162-canvas.diff, i#94193, thorsten
 cws-impress162-slideshow.diff, i#94193, thorsten
+
+[ Fixes ]
 canvas-directx-lostdevice-fix.diff, n#445628, thorsten
 sw-table-join-fix-i99267.diff, n#417814, flr
 svtools-svrtf-token-ignore-case.diff, n#417818, flr