ooo-build r11698 - in trunk: . patches/emf+ patches/src680

[rodo svn gnome org]

Author: rodo
Date: Mon Feb 25 11:50:35 2008
New Revision: 11698
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11698&view=rev

Log:
2008-02-25  Radek Doulik  <rodo novell com>

	* build/ooh680-m7/cppcanvas/source/mtfrenderer/emfplus.cxx
	handle objects with 0x8000 bit set, not sure yet what
	it means
	give up in case the brush is not availbe



Added:
   trunk/patches/emf+/emf+-crash-fix.diff
Modified:
   trunk/ChangeLog
   trunk/patches/src680/apply

Added: trunk/patches/emf+/emf+-crash-fix.diff
==============================================================================
--- (empty file)
+++ trunk/patches/emf+/emf+-crash-fix.diff	Mon Feb 25 11:50:35 2008
@@ -0,0 +1,24 @@
+diff -rup cppcanvas-orig/source/mtfrenderer/emfplus.cxx cppcanvas/source/mtfrenderer/emfplus.cxx
+--- cppcanvas-orig/source/mtfrenderer/emfplus.cxx	2008-02-25 12:21:51.000000000 +0100
++++ cppcanvas/source/mtfrenderer/emfplus.cxx	2008-02-25 12:42:45.000000000 +0100
+@@ -783,6 +783,10 @@ namespace cppcanvas
+                 EMFPBrush* brush = (EMFPBrush*) aObjects [brushIndexOrColor];
+                 EMFP_DEBUG (printf ("EMF+\tbrush fill slot: %d (type: %d)\n", brushIndexOrColor, brush->GetType ()));
+ 
++                // give up in case something wrong happened
++                if( !brush )
++                    return;
++
+                 rState.isFillColorSet = false;
+                 rState.isLineColorSet = false;
+ 
+@@ -992,7 +996,8 @@ namespace cppcanvas
+                             aObjects [index] = NULL;
+                         }
+ 
+-                        switch (flags & 0xff00) {
++                        // not sure yet, what 0x8000 means
++                        switch (flags & 0x7f00) {
+                         case EmfPlusObjectTypeBrush:
+                             {
+                                 EMFPBrush *brush;

Modified: trunk/patches/src680/apply
==============================================================================
--- trunk/patches/src680/apply	(original)
+++ trunk/patches/src680/apply	Mon Feb 25 11:50:35 2008
@@ -2154,6 +2154,7 @@
 emf+-svtools.diff
 emf+-scp2-renderer.diff
 emf+-dxcanvas.diff
+emf+-crash-fix.diff, n#361534, rodo
 
 [ OxygenOfficeDefaultSettings ]
 # Always enable extended tips