ooo-build r12331 - in trunk: . patches/src680

[tml svn gnome org]

Author: tml
Date: Fri Apr 25 08:34:06 2008
New Revision: 12331
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12331&view=rev

Log:
2008-04-25  Tor Lillqvist  <tml novell com>

	* patches/src680/wmf-pattern-brush.diff
	(svtools/source/filter.vcl/wmf/enhwmf.cxx): Add silly comments in
	the first two chunks to get unique context so that make
	patch.unapply works better.



Modified:
   trunk/ChangeLog
   trunk/patches/src680/wmf-pattern-brush.diff

Modified: trunk/patches/src680/wmf-pattern-brush.diff
==============================================================================
--- trunk/patches/src680/wmf-pattern-brush.diff	(original)
+++ trunk/patches/src680/wmf-pattern-brush.diff	Fri Apr 25 08:34:06 2008
@@ -1,20 +1,24 @@
 diff -rup svtools-clean/source/filter.vcl/wmf/enhwmf.cxx svtools/source/filter.vcl/wmf/enhwmf.cxx
 --- svtools-clean/source/filter.vcl/wmf/enhwmf.cxx	2007-06-04 15:15:09.000000000 +0200
 +++ svtools/source/filter.vcl/wmf/enhwmf.cxx	2007-06-04 17:12:21.000000000 +0200
-@@ -864,7 +1005,7 @@
+@@ -864,7 +1005,10 @@
  						Rectangle aCropRect( Point( xSrc, ySrc ), Size( cxSrc, cySrc ) );
  						aBitmap.Crop( aCropRect );
  					}
 - 					aBmpSaveList.Insert( new BSaveStruct( aBitmap, aRect, dwRop ), LIST_APPEND );
++					/* Pseudocomment to add more context so that make patch.unapply
++					 * works better. Ha!
++					 */
 + 					aBmpSaveList.Insert( new BSaveStruct( aBitmap, aRect, dwRop, pOut->GetFillStyle () ), LIST_APPEND );
  				}
  			}
  			break;
-@@ -915,7 +1056,7 @@
+@@ -915,7 +1056,8 @@
  						Rectangle aCropRect( Point( xSrc, ySrc ), Size( cxSrc, cySrc ) );
  						aBitmap.Crop( aCropRect );
  					}
 -					aBmpSaveList.Insert( new BSaveStruct( aBitmap, aRect, dwRop ), LIST_APPEND );
++					/* Another pseudocomment to make make patch.unapply work better */
 +					aBmpSaveList.Insert( new BSaveStruct( aBitmap, aRect, dwRop, pOut->GetFillStyle () ), LIST_APPEND );
  				}
  			}