ooo-build r14485 - branches/ooo-build-3-0/patches/dev300

[rengelhard svn gnome org]

Author: rengelhard
Date: Wed Nov 12 12:16:33 2008
New Revision: 14485
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14485&view=rev

Log:
oops

Modified:
   branches/ooo-build-3-0/patches/dev300/wmf-pattern-brush.diff

Modified: branches/ooo-build-3-0/patches/dev300/wmf-pattern-brush.diff
==============================================================================
--- branches/ooo-build-3-0/patches/dev300/wmf-pattern-brush.diff	(original)
+++ branches/ooo-build-3-0/patches/dev300/wmf-pattern-brush.diff	Wed Nov 12 12:16:33 2008
@@ -23,7 +23,7 @@
  				}
  			}
  			break;
-@@ -1152,6 +1153,52 @@ BOOL EnhWMFReader::ReadEnhWMF()
+@@ -1152,6 +1153,49 @@ BOOL EnhWMFReader::ReadEnhWMF()
              }
              break;
  
@@ -48,25 +48,22 @@
 +                    if ( offBmi )
 +                    {
 +                        UINT32	nSize = cbBmi + cbBits + 14;
-+                        if ( nSize <= ( nEndPos - nStartPos ) )
-+                        {
-+                            char*	pBuf = new char[ nSize ];
-+
-+                            SvMemoryStream aTmp( pBuf, nSize, STREAM_READ | STREAM_WRITE );
-+                            aTmp.ObjectOwnsMemory( TRUE );
-+                            aTmp << (BYTE)'B'
-+                                 << (BYTE)'M'
-+                                 << (UINT32)cbBits
-+                                 << (UINT16)0
-+                                 << (UINT16)0
-+                                 << (UINT32)cbBmi + 14;
-+                            pWMF->Seek( nStart + offBmi );
-+                            pWMF->Read( pBuf + 14, cbBmi );
-+                            pWMF->Seek( nStart + offBits );
-+                            pWMF->Read( pBuf + 14 + cbBmi, cbBits );
-+                            aTmp.Seek( 0 );
-+                            aBitmap.Read( aTmp, TRUE );
-+                        }
++                        char*	pBuf = new char[ nSize ];
++
++                        SvMemoryStream aTmp( pBuf, nSize, STREAM_READ | STREAM_WRITE );
++                        aTmp.ObjectOwnsMemory( TRUE );
++                        aTmp << (BYTE)'B'
++                             << (BYTE)'M'
++                             << (UINT32)cbBits
++                             << (UINT16)0
++                             << (UINT16)0
++                             << (UINT32)cbBmi + 14;
++                        pWMF->Seek( nStart + offBmi );
++                        pWMF->Read( pBuf + 14, cbBmi );
++                        pWMF->Seek( nStart + offBits );
++                        pWMF->Read( pBuf + 14 + cbBmi, cbBits );
++                        aTmp.Seek( 0 );
++                        aBitmap.Read( aTmp, TRUE );
 +                    }
 +				}
 +