ooo-build r12107 - in trunk: . patches/emf+

[thorstenb svn gnome org]

Author: thorstenb
Date: Fri Apr  4 14:26:13 2008
New Revision: 12107
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12107&view=rev

Log:
	* patches/emf+/emf+-canvas-vcl-non-closed-polygons.diff: fixed
	invalid access (n#361059)



Modified:
   trunk/ChangeLog
   trunk/patches/emf+/emf+-canvas-vcl-non-closed-polygons.diff

Modified: trunk/patches/emf+/emf+-canvas-vcl-non-closed-polygons.diff
==============================================================================
--- trunk/patches/emf+/emf+-canvas-vcl-non-closed-polygons.diff	(original)
+++ trunk/patches/emf+/emf+-canvas-vcl-non-closed-polygons.diff	Fri Apr  4 14:26:13 2008
@@ -1,7 +1,7 @@
 diff -rup ../oog680-m5.orig/canvas/source/vcl/canvashelper.cxx canvas/source/vcl/canvashelper.cxx
 --- ../oog680-m5.orig/canvas/source/vcl/canvashelper.cxx	2007-11-13 12:44:32.000000000 +0100
 +++ canvas/source/vcl/canvashelper.cxx	2007-11-20 12:49:03.000000000 +0100
-@@ -415,10 +415,23 @@ namespace vclcanvas
+@@ -415,9 +415,24 @@ namespace vclcanvas
              
              for( USHORT i=0; i<nSize; ++i )
              {
@@ -14,18 +14,20 @@
 +                    if( mp2ndOutDev )
 +                        mp2ndOutDev->getOutDev().DrawPolygon( aVCLPolyPoly[i] );
 +                } else {
-+                    USHORT nPolySize = aVCLPolyPoly[i].GetSize();
-+                    Point rPrevPoint = aVCLPolyPoly[i].GetPoint( 0 );
-+                    Point rPoint;
++                    const USHORT nPolySize = aVCLPolyPoly[i].GetSize();
++                    if( nPolySize ) {
++                        Point rPrevPoint = aVCLPolyPoly[i].GetPoint( 0 );
++                        Point rPoint;
 +
-+                    for( USHORT j=1; j<nPolySize; j++ ) {
-+                        rPoint = aVCLPolyPoly[i].GetPoint( j );
-+                        mpOutDev->getOutDev().DrawLine( rPrevPoint, rPoint );
-+                        if( mp2ndOutDev )
-+                            mp2ndOutDev->getOutDev().DrawLine( rPrevPoint, rPoint );
-+                        rPrevPoint = rPoint;
++                        for( USHORT j=1; j<nPolySize; j++ ) {
++                            rPoint = aVCLPolyPoly[i].GetPoint( j );
++                            mpOutDev->getOutDev().DrawLine( rPrevPoint, rPoint );
++                            if( mp2ndOutDev )
++                                mp2ndOutDev->getOutDev().DrawLine( rPrevPoint, rPoint );
++                            rPrevPoint = rPoint;
++                        }
 +                    }
 +                }
              }
-         }
- 
+         } 
+