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

[René Engelhard]

 patches/dev300/apply |   28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

New commits:
commit 73b909e337380059a1c811558222946c9d7724ce
Author: Rene Engelhard <rene at debian.org>
Date:   Mon Aug 23 14:21:14 2010 +0200

    change various < / >= ooo330-m4s to ooo330-m3 to make patches apply on m3
    
    * patches/dev300/apply:

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 818fc6e..4775581 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -1566,9 +1566,9 @@ mono-climaker-bridgetest.diff
 SectionOwner => noelpwer
 # FIXME: half of the diff is somehow fixed to apply by pmladek
 #        few things need double checking
-[ VBAObjects < ooo330-m4 ]
+[ VBAObjects < ooo330-m3 ]
 cws-vbasupportdev300-m2.diff
-[ VBAObjects >= ooo330-m4 ]
+[ VBAObjects >= ooo330-m3 ]
 cws-vbasupportdev300.diff
 # FIXME ooo330-m2 old version (m83) of the diff cws-vbasupportdev300_m83.diff, noelpwer
 
@@ -1576,11 +1576,11 @@ cws-vbasupportdev300.diff
 # is disabled in vbasupportdev300 upstream )
 cws-vbasupportdev300_m83-fix.diff, cbosdo
 vba-enable-fieldrelatedbits.diff
-[ VBAObjects < ooo330-m4 ]
+[ VBAObjects < ooo330-m3 ]
 vba-container-controls-m2.diff
 # need to adapt ooo-build wrt the changes intorduced into container_controls
 oox-projectname-oobuild-specifix-m2.diff
-[ VBAObjects >= ooo330-m4 ]
+[ VBAObjects >= ooo330-m3 ]
 vba-container-controls.diff
 # need to adapt ooo-build wrt the changes intorduced into container_controls
 oox-projectname-oobuild-specifix.diff
@@ -1589,12 +1589,12 @@ oox-projectname-oobuild-specifix.diff
 oox-insert-module-bug.diff
 # tweak oox filter to handle any passed generated code names 
 # there is a strange scenario with one cust doc where a code module is missing
-[ VBAObjects < ooo330-m4 ]
+[ VBAObjects < ooo330-m3 ]
 vba-oox-autocodename-m2.diff,  n#507768
 # tweak oox filter to handle strange scenario where there might be some
 # missing codenmames in excel
 vba-oox-olenameoverride-m2.diff, n#359933, n#403974 
-[ VBAObjects >= ooo330-m4 ]
+[ VBAObjects >= ooo330-m3 ]
 vba-oox-autocodename.diff,  n#507768
 # tweak oox filter to handle strange scenario where there might be some
 # missing codenmames in excel
@@ -1607,16 +1607,16 @@ vbahelper-no-oox.diff
 # misc changes to modify strange upstream changes
 vba-misc-tweakupstream-m2.diff
 # unoize msvbahelper to solve some dependency issues for split build
-# #FIXME disabled for m4
-[ VBAObjects < ooo330-m4 ]
+# #FIXME disabled for m3f
+[ VBAObjects < ooo330-m3 ]
 vba-msvbahelper-splitbuilt.diff
 [VBAObjects]
 # fix upstream introduced Application::Intersection problem
 vba-fix-interesection.diff
 # use oox filter exclusively for import of controls  ( excel/word )
-[ VBAObjects < ooo330-m4 ]
+[ VBAObjects < ooo330-m3 ]
 vba-use-ooxfilter-forcontrols-m2.diff
-[ VBAObjects >= ooo330-m4 ]
+[ VBAObjects >= ooo330-m3 ]
 vba-use-ooxfilter-forcontrols.diff
 # fix hlink & macro import/export for autoshapes and pictures
 vba-fix-shapepic-hlinkmacro.diff
@@ -3183,8 +3183,8 @@ emf+-driver-string.diff, n#519715, rodo
 [ Fixes ]
 # FIXME dev300-m77 sd-print-fix-pageoffset.diff, n#537931, rodo # the code has moved to sd/source/ui/view/DocumentRenderer.cxx
 svx-ppt-import-fix-bullet-size.diff, n#515972, rodo
-[ Fixes < ooo330-m4 ]
-# #FIXME ooo3330-m4: doesn't apply in m4
+[ Fixes < ooo330-m3 ]
+# #FIXME ooo3330-m4: doesn't apply in m3f
 # correctly import connector style attribute.
 svx-msdff-import-connector-style-fix.diff, n#631804, kohei
 
@@ -3532,8 +3532,8 @@ calc-perf-outlining-with-notes.diff, kohei
 calc-formula-r1c1-parser-fix.diff, n#604903, kohei
 
 # Fix poor performance on saving document with hidden rows.
-# #FIXME ooo330-m4: doesn't apply in m4
-[ CalcFixes < ooo330-m4 ]
+# #FIXME ooo330-m4: doesn't apply in m3f
+[ CalcFixes < ooo330-m3 ]
 calc-perf-ods-export-hidden-rows.diff, deb#582785, kohei
 [ CalcFixes ]