ooo-build r12361 - in trunk: . patches/dev300 patches/src680

[thorstenb svn gnome org]

Author: thorstenb
Date: Mon Apr 28 22:22:29 2008
New Revision: 12361
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12361&view=rev

Log:
	* patches/dev300/apply: removed vcl-dynamic-screens-fix and
	sd-animate-form-default, both are in upstream m9 in improved
	versions, added vcl-xinerama-64bit-fix.diff back, added
	vcl-limited-bmp-subset-fix.diff 

	* patches/dev300/vcl-limited-bmp-subset-fix.diff: added fix for
	printing crash (catch negative sizes)



Added:
   trunk/patches/dev300/vcl-limited-bmp-subset-fix.diff
Removed:
   trunk/patches/dev300/sd-animate-form-default.diff
   trunk/patches/src680/vcl-dynamic-screens-fix.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Mon Apr 28 22:22:29 2008
@@ -14,7 +14,7 @@
 	 Icons, Branding, CalcFixes, WriterFixes, EasterEgg, \
 	 GStreamer, CWSBackports, WPG, Cleanups, WMF, GnomeVFS, \
 	 Layout, VBABits, VBAObjects, CalcErrors, Store, CJK, GCJ, Lwp, \
-	 OOXML, ImpressFixes, SVGImport, AutoCorrectCapsLock, UnitTesting, \
+	 OOXML, SVGImport, AutoCorrectCapsLock, UnitTesting, \
      CalcDataPilotDrillDown
 
 LinuxCommon : Common, LayoutDialogs, Defaults, TangoIcons, FontConfigTemporaryHacks, \
@@ -1137,8 +1137,8 @@
 # enable vcl to load bitmaps when height it negative
 vcl-bitmap2-negative-height.diff
 
-# fixes dynamic screen config bugs (xinerama & multiscreen)
-vcl-dynamic-screens-fix.diff, n#359955, i#76650, rodo+thorsten
+# fixes non-usage of xinerama on 64bit
+vcl-xinerama-64bit-fix.diff, n#359955, rodo
 
 [ SystemBits ]
 # use getopt() and readdir_r() from system glibc
@@ -1552,12 +1552,6 @@
 # navigating through cells.
 sc-skip-overlapped-cells.diff, i#86943, n#362674, kohei
 
-[ ImpressFixes >= dev300-m6 ]
-
-# make the "Animate attached Shape" checkbox in the text animation
-# options behave sensible (i.e. disables it for outline text)
-sd-animate-form-default.diff, n#380036, i#69364, thorsten
-
 #[ OOXSTLport5 ]
 #
 ## oox devs, please reconsider operator[] use,
@@ -2174,6 +2168,7 @@
 
 sd-slideshow-slideshowview-transformation-fix.diff, rodo
 cairocanvas-fix-image-cache.diff, rodo
+vcl-limited-bmp-subset-fix.diff, i#88818, thorsten
 
 [ InternalMesaHeaders ]
 internal-mesa-headers-config_office.diff, fridrich

Added: trunk/patches/dev300/vcl-limited-bmp-subset-fix.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/vcl-limited-bmp-subset-fix.diff	Mon Apr 28 22:22:29 2008
@@ -0,0 +1,30 @@
+--- vcl/source/gdi/outdev2.cxx	18 Jan 2008 14:55:58 -0000	1.38.72.1
++++ vcl/source/gdi/outdev2.cxx	28 Apr 2008 21:45:34 -0000
+@@ -739,7 +739,7 @@ void OutputDevice::ImplDrawBitmap( const
+                         }
+                         if( aPosAry.mnDestX < 0 )
+                         {
+-                            aPosAry.mnDestWidth += aPosAry.mnDestX;
++                            aPosAry.mnDestWidth = Max(long(0),aPosAry.mnDestWidth+aPosAry.mnDestX);
+                             aPosAry.mnSrcX -= sal::static_int_cast<long>(aPosAry.mnDestX / nScaleX);
+                             aPosAry.mnDestX = 0;
+                         }
+@@ -757,7 +757,7 @@ void OutputDevice::ImplDrawBitmap( const
+                         }
+                         if( aPosAry.mnDestY < 0 )
+                         {
+-                            aPosAry.mnDestHeight += aPosAry.mnDestY;
++                            aPosAry.mnDestHeight = Max(long(0),aPosAry.mnDestHeight+aPosAry.mnDestY);
+                             aPosAry.mnSrcY -= sal::static_int_cast<long>(aPosAry.mnDestY / nScaleY);
+                             aPosAry.mnDestY = 0;
+                         }
+@@ -767,7 +767,8 @@ void OutputDevice::ImplDrawBitmap( const
+                 }
+             }
+ 
+-			mpGraphics->DrawBitmap( &aPosAry, *aBmp.ImplGetImpBitmap()->ImplGetSalBitmap(), this );
++            if ( aPosAry.mnSrcWidth && aPosAry.mnSrcHeight && aPosAry.mnDestWidth && aPosAry.mnDestHeight )
++                mpGraphics->DrawBitmap( &aPosAry, *aBmp.ImplGetImpBitmap()->ImplGetSalBitmap(), this );
+ 		}
+ 	}
+ }