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

[rengelhard svn gnome org]

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

Log:
typo

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

Modified: branches/ooo-build-3-0/patches/dev300/sensible-browser.diff
==============================================================================
--- branches/ooo-build-3-0/patches/dev300/sensible-browser.diff	(original)
+++ branches/ooo-build-3-0/patches/dev300/sensible-browser.diff	Wed Nov 12 12:15:15 2008
@@ -30,7 +30,7 @@
  # special handling for mailto: uris
  if echo $1 | grep '^mailto:' > /dev/null; then
 -  kmailservice "$1" &
-+  if which kde-open; typo
++  if which kde-open; then
 +    kde-open "$1" &
 +  else
 +    kmailservice "$1" &

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:15:15 2008
@@ -23,7 +23,7 @@
  				}
  			}
  			break;
-@@ -1152,6 +1153,49 @@ BOOL EnhWMFReader::ReadEnhWMF()
+@@ -1152,6 +1153,52 @@ BOOL EnhWMFReader::ReadEnhWMF()
              }
              break;
  
@@ -48,22 +48,25 @@
 +                    if ( offBmi )
 +                    {
 +                        UINT32	nSize = cbBmi + cbBits + 14;
-+                        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 );
++                        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 );
++                        }
 +                    }
 +				}
 +