[ooo-build-commit] patches/dev300

[René Engelhard]

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

New commits:
commit 09d19c1b312fc249a7de597290349d54c3b82bf8
Author: Rene Engelhard <rene at debian.org>
Date:   Thu Dec 17 14:26:56 2009 +0100

    disable xmlhelp-build-without-java.diff for m8
    
    * patches/dev300/apply:

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 5ee54f4..be489bf 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -2732,10 +2732,10 @@ sd-custom-show-fix.diff, n#355638, i#90145, thorsten
 
 # have Impress outline text boxes shrink font automatically when text
 # starts to overflow
-fit-list-to-size.diff, i#94086, thorsten
+#fit-list-to-size.diff, i#94086, thorsten
 
-fit-list-to-size-style-defaults.diff, i#94086, thorsten
-fit-list-to-size-popup.diff, i#94086, thorsten
+#fit-list-to-size-style-defaults.diff, i#94086, thorsten
+#fit-list-to-size-popup.diff, i#94086, thorsten
 
 # apply this patch if you need to disable vcl grabbing your mouse -
 # after applying the patch, set SAL_NO_MOUSEGRABS in your env
@@ -2866,7 +2866,7 @@ piece-jfreereport.diff
 piece-reportbuilder.diff
 
 [ BFFixes ]
-fit-list-to-size-binfilter.diff, i#94086, thorsten
+#fit-list-to-size-binfilter.diff, i#94086, thorsten
 
 [ ArkOnly ]
 SectionOwner => brosenk
@@ -2949,7 +2949,7 @@ win32-interix.diff, tml
 # fix problem with calling private and protected members in layout code
 sfx2-privateprotectedpublic.diff
 # UI + core to make OLE editing optionally outplace
-optional-outplace-ole.diff, i#98970, thorsten
+#optional-outplace-ole.diff, i#98970, thorsten
 # UI + core to have in-slideshow user drawing configurable (color &
 # stroke width)
 slideshow-configurable-paintoverlay.diff, i#97972, fredus
@@ -3208,8 +3208,10 @@ sd-no-macro-recorder-in-ui.diff, fridrich
 starmath-no-macro-recorder-in-ui.diff, fridrich
 sw-no-macro-recorder-in-ui.diff, fridrich
 
-[ Fixes ]
+[ Fixes < ooo320-m8 ]
 xmlhelp-build-without-java.diff, rodo
+
+[ Fixes ]
 filter-fix-build-FCFGMerge.cfg.diff, rodo
 store-crash-fix.diff, thorsten
 sd-ppt-fix-document-summary-reading.diff, n#546758, rodo