[ooo-build-commit] patches/dev300

[Petr Mladek]

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

New commits:
commit f6ab23dd156660a148df5793f9e974a60d36670f
Author: Petr Mladek <pmladek at suse.cz>
Date:   Thu Oct 1 14:28:29 2009 +0200

    Temporary disable svx-ppt-tablerow-height-fix.diff (bnc#483951, i#100275)
    
    * patches/dev300/apply: disable svx-ppt-tablerow-height-fix.diff; same change
      is alteady in dev300-m58 but it is commetned out there; this patch still
      applied but to a wrong place

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 18bc261..a7a50c0 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -3161,8 +3161,10 @@ slideshow-effect-rewind.diff, i#48179, thorsten
 slideshow-effect-rewind-m58.diff, i#48179, thorsten
 
 [ Fixes ]
+# FIXME 2009-10-01: dev300-m58 already includes this change but it is commetned out
+#                   the patch still applies but on a wrong place
 # correctly set table row height during ppt import
-svx-ppt-tablerow-height-fix.diff, n#483951, i#100275, thorsten
+# svx-ppt-tablerow-height-fix.diff, n#483951, i#100275, thorsten
 
 [ ExtensionFixes >= dev300-m60 ]
 # Fix from Andre, allows to step back one animation effect