[ooo-build-commit] patches/dev300

[Tor Lillqvist]

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

New commits:
commit 1f67afcd6f65d158663df69ec88813f6ada265d5
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Wed Sep 9 14:34:36 2009 +0300

    Bypass zoom-combobox.diff
    
    * patches/dev300/apply: Comment out zoom-combobox.diff. Michael says
      we should drop it. Delete completely once verified.

diff --git a/patches/dev300/apply b/patches/dev300/apply
index bb4d480..bc37667 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -580,9 +580,10 @@ csv-import-preserve-options-sc.diff,        i#3687, i#97416, n#433378, muthusub/
 csv-import-preserve-options-officecfg.diff, i#3687, i#97416, n#433378, muthusub/kohei
 
 # Replace usability numb Zoom dialog with a Combo Box
-# FIXME: this conflicts with Sun's duplication of this work,
-# eg. print preview
-zoom-combobox.diff, michael
+# FIXME: 2009-09-09: Michael says we should drop this patch.
+# Just comment out for now, but delete completely once sure
+# that it indeed is the right thing to do. --tml
+# zoom-combobox.diff, michael
 
 # make some symbols from sc visible when compiling with gcc4, necessary since m121
 gcc4-visibility-sc.diff, i#53261, pmladek