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

[rengelhard svn gnome org]

Author: rengelhard
Date: Wed Jan 23 20:54:08 2008
New Revision: 11386
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11386&view=rev

Log:
          patches/src680/wmf-pattern-brush-m3.diff,
          patches/src680/wmf-pattern-brush.diff: ooh680-m4


Added:
   trunk/patches/src680/wmf-pattern-brush-m3.diff
      - copied unchanged from r11385, /trunk/patches/src680/wmf-pattern-brush.diff
Modified:
   trunk/ChangeLog
   trunk/patches/src680/apply
   trunk/patches/src680/wmf-pattern-brush.diff

Modified: trunk/patches/src680/apply
==============================================================================
--- trunk/patches/src680/apply	(original)
+++ trunk/patches/src680/apply	Wed Jan 23 20:54:08 2008
@@ -1791,7 +1791,9 @@
 novell-win32-avoid-premature-shutdown.diff
 
 
-[ WMF ]
+[ WMF < ooh680-m4 ]
+wmf-pattern-brush-m3.diff, n#232232, rodo
+[ WMF >= ooh680-m4 ]
 wmf-pattern-brush.diff, n#232232, rodo
 
 

Modified: trunk/patches/src680/wmf-pattern-brush.diff
==============================================================================
--- trunk/patches/src680/wmf-pattern-brush.diff	(original)
+++ trunk/patches/src680/wmf-pattern-brush.diff	Wed Jan 23 20:54:08 2008
@@ -1,24 +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
-@@ -857,7 +858,7 @@ BOOL EnhWMFReader::ReadEnhWMF()
-                         aBitmap.Crop( aCropRect );
-                     }
+@@ -864,7 +1005,7 @@
+ 						Rectangle aCropRect( Point( xSrc, ySrc ), Size( cxSrc, cySrc ) );
+ 						aBitmap.Crop( aCropRect );
+ 					}
+- 					aBmpSaveList.Insert( new BSaveStruct( aBitmap, aRect, dwRop ), LIST_APPEND );
++ 					aBmpSaveList.Insert( new BSaveStruct( aBitmap, aRect, dwRop, pOut->GetFillStyle () ), LIST_APPEND );
  				}
--				aBmpSaveList.Insert( new BSaveStruct( aBitmap, aRect, dwRop ), LIST_APPEND );
-+				aBmpSaveList.Insert( new BSaveStruct( aBitmap, aRect, dwRop, pOut->GetFillStyle () ), LIST_APPEND );
  			}
  			break;
- 
-@@ -904,7 +905,7 @@ BOOL EnhWMFReader::ReadEnhWMF()
-                     aBitmap.Crop( aCropRect );
-                 }
- 
--				aBmpSaveList.Insert( new BSaveStruct( aBitmap, aRect, dwRop ), LIST_APPEND );
-+				aBmpSaveList.Insert( new BSaveStruct( aBitmap, aRect, dwRop, pOut->GetFillStyle () ), LIST_APPEND );
+@@ -915,7 +1056,7 @@
+ 						Rectangle aCropRect( Point( xSrc, ySrc ), Size( cxSrc, cySrc ) );
+ 						aBitmap.Crop( aCropRect );
+ 					}
+-					aBmpSaveList.Insert( new BSaveStruct( aBitmap, aRect, dwRop ), LIST_APPEND );
++					aBmpSaveList.Insert( new BSaveStruct( aBitmap, aRect, dwRop, pOut->GetFillStyle () ), LIST_APPEND );
+ 				}
  			}
  			break;
- 
 @@ -1152,6 +1153,49 @@ BOOL EnhWMFReader::ReadEnhWMF()
              }
              break;