ooo-build r13206 - in trunk: . patches/dev300

[rengelhard svn gnome org]

Author: rengelhard
Date: Mon Jul 14 21:36:42 2008
New Revision: 13206
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13206&view=rev

Log:
2008-07-14  Rene Engelhard  <rene debian org>

        * patches/dev300/apply: some dev300-m24 stuff (integrated patches in
          m23/m24)


Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Mon Jul 14 21:36:42 2008
@@ -310,8 +310,9 @@
 #webdav-locking-refresh-lock.diff, n#403724, jholesov
 
 #basic runtime fixes
-[ CWSBackports >= dev300-m22 < beb300-m0 ]
+[ CWSBackports == dev300-m22 < beb300-m0 ]
 cws-npower10.diff
+[ CWSBackports >= dev300-m22 < beb300-m0 ]
 basic-add-missing-includes-after-cws-npower10.diff
 
 [ CWSBackports < dev300-m22 >= beb300-m1 ]
@@ -330,6 +331,7 @@
 
 cws-cmcfixes47-sw.diff, i#90306
 
+[ CWSBackports < dev300-m24 ]
 cws-impress146.diff
 
 [ WPG ]
@@ -405,10 +407,12 @@
 # sd printing fixes
 printing-bugfix-254573.diff, n#254573, rodo
 
+[ Fixes < dev300-m23 ]
 # add some shortcuts to Impress + needed fixes. bug n#352330
 sd-text-shortcut-n352330.diff, i#85247, n#352330, hub
 svx-text-move-fix-i59061.diff, i#59061, hub
 
+[ Fixes ]
 # more intelligent nsplugin seeking
 nsplugin-path.diff, i#49590, michael
 
@@ -437,9 +441,11 @@
 # lang code instead of en-US
 helpcontent2-auxiliary-cfg.diff, pmladek
 
+[ Fixes < dev300-m23 ]
 # Better Hungarian font setting
 helpcontent2-hungarian-fonts.diff, i#71452, n#244488, pmladek
 
+[ Fixes ]
 # more secure permissions for the user directory by default
 desktop-safer-user-dir-perm.diff, i#62858, pmladek
 
@@ -457,9 +463,11 @@
 # fix that allows OOo to work with a standard (unpatched) libjpeg,
 jpegc.c.diff, i#80674, n#272574, flr
 
+[ Fixes < dev300-m24 ]
 # When there's no scheme in the hyperlink, it's probably a file
 sw-hyperlinks-without-scheme.diff, n#376389, i#91105, jholesov
 
+[ Fixes ]
 # handle hyperlinks to files better
 sw-hyperlinks-relative.diff, n#405712, i#91522, jholesov
 
@@ -490,6 +498,7 @@
 # prevent some array out of bounds in ww8 exporter
 sw-source-filter-ww8-wrtw8nds-out_of_bounds.diff, n#391197, i#91396, fridrich
 
+[ Fixes < dev300-m23 ]
 # don't use freed memory in slidesorter
 sd-slidesorter-dead-ptr.diff, i#88002, thorsten
 
@@ -497,14 +506,17 @@
 # screws things up
 userform-scrollleftandtop.diff, i#87007, noelpwer
 
+[ Fixes ]
 # adds fixes for printing transparent content
 vcl-transparent-printing.diff, i#88536, thorsten
 
 localize-pl-cygwin-paths.diff, tml
 
+[ Fixes < dev300-m24 ]
 # init a bool member in SbUnoObject's ctor initializer.
 basic-initialize-member.diff, i#88930, kohei
 
+[ Fixes ]
 # import/export form control's visibility
 form-control-visibility.diff, i#88878, jianhua
 
@@ -529,7 +541,7 @@
 # ensure that ant can do regexp matches.
 ant-regexp-test.diff, i#89383, michael
 
-[ Fixes >= dev300-m23 >= beb300-m2 ]
+[ Fixes < dev300-m0 >= beb300-m2 ]
 # fix installation with --without-myspell-dicts
 scp2-without-myspell-dicts.diff, i#91319, rengelha
 
@@ -738,10 +750,12 @@
 # Dynyamically resize filtered range when new data rows are present.
 sc-dbrange-dynamic-resize.diff, n#352662, i#85305, kohei
 
+[ CalcFixes < dev300-m23 ]
 # When importing an Excel file, skip un-supported pivot charts altogether
 # instead of importing them as an empty chart object.
 sc-skip-pivot-charts.diff, n#355300, i#85658, kohei
 
+[ CalcFixes ]
 # Have cell background paint over the gridlines.
 sc-cellbackground-over-gridlines.diff, n#361360, i#3907, kohei
 
@@ -988,11 +1002,11 @@
 # even worse, the direcotry had the rights 444
 installer-get-path-correctly.diff, pmladek
 
-[ BuildBits < beb300-m1 ]
+[ BuildBits < dev300-m23 < beb300-m1 ]
 # fix reportdesign build
 buildfix-system-jfreereport.diff, i#90952, rengelha
 
-[ BuildBits >= dev300-m22 < beb300-m0 ]
+[ BuildBits >= dev300-m22 < dev300-m24 < beb300-m0 ]
 # system lucene
 system-lucene.diff
 
@@ -1547,10 +1561,11 @@
 # fix userform activate event re-compute
 vba-userform-activate-fix.diff, Jianhua
 
-[ VBAObjects ]
+[ VBAObjects < dev300-m24 ]
 # another bug with event bindings for dialogs ( awaiting iz id from andreas )
 vba-dialogs-fixsmoketest.diff
 
+[ VBAObjects ]
 vbaevents-services-sources.diff, i#68893
 #merged into vba-workbook-worksheet-events-dev300.diff
 #vba-workbook-worksheet-events-buildfix.diff, 
@@ -1647,9 +1662,11 @@
 
 sc-formula-syntax-ui.diff, n#358558, kohei
 
+[ CalcFixes < dev300-m24 ]
 # allow special characters in a sheet name.
 sc-sheet-name-special-chars.diff, i#6087, kohei
 
+[ CalcFixes ]
 # Toggle gridline display per sheet.
 sc-sheet-gridline-toggle.diff, i#14893, kohei
 
@@ -2318,6 +2335,7 @@
 [ Fixes ]
 sc-xclimpchangetrack-discard-bogus-formula-size.diff, n#355304, tml
 
+[ Fixes < dev300-m23 ]
 # Fix pasting with middle button in Calc
 sc-middle-button-should-paste-text.diff, n#282767, i#86734, jholesov
 
@@ -2420,7 +2438,11 @@
 [ Fixes ]
 vcl-png-import-fix.diff, n#397128, i#90913, thorsten
 sd-macro-nudges.diff, i#91249, n#188199, thorsten
+
+[ Fixes < dev300-m24 ]
 slideshow-animated-bmp-fix.diff, i#73914, jlcheng
+
+[ Fixes ]
 sd-more-title-styles.diff, i#23221, thorsten
 
 sw-source-filter-ww8-continous-section-break-fix.diff, n#405071, i#91395, fridrich