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

[rodo svn gnome org]

Author: rodo
Date: Tue Apr 29 12:44:43 2008
New Revision: 12378
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12378&view=rev

Log:
2008-04-29  Radek Doulik  <rodo novell com>

	* patches/dev300/apply: added
	cairocanvas-fix-after-win32-removeval.diff, fixed build problem
	after win32 cairo patches
	
	* updated and reenabled
	sd-slideshow-slideshowview-transformation-fix.diff



Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply
   trunk/patches/src680/sd-slideshow-slideshowview-transformation-fix.diff

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Tue Apr 29 12:44:43 2008
@@ -2130,7 +2130,7 @@
 sw-section-import-fix.diff, n#364533, freuter
 sw-allow-negative-spacing.diff, n#364534, freuter
 
-#FIXME dev300-m10: sd-slideshow-slideshowview-transformation-fix.diff, rodo
+sd-slideshow-slideshowview-transformation-fix.diff, rodo
 cairocanvas-fix-image-cache.diff, rodo
 vcl-limited-bmp-subset-fix.diff, i#88818, thorsten
 

Modified: trunk/patches/src680/sd-slideshow-slideshowview-transformation-fix.diff
==============================================================================
--- trunk/patches/src680/sd-slideshow-slideshowview-transformation-fix.diff	(original)
+++ trunk/patches/src680/sd-slideshow-slideshowview-transformation-fix.diff	Tue Apr 29 12:44:43 2008
@@ -1,22 +1,20 @@
-diff -rup sd/source/ui/slideshow-orig/slideshowviewimpl.cxx sd/source/ui/slideshow/slideshowviewimpl.cxx
---- sd/source/ui/slideshow-orig/slideshowviewimpl.cxx	2008-02-22 15:31:52.000000000 +0100
-+++ sd/source/ui/slideshow/slideshowviewimpl.cxx	2008-02-22 15:31:26.000000000 +0100
-@@ -368,13 +368,7 @@ geometry::AffineMatrix2D SAL_CALL SlideS
-     ::osl::MutexGuard aGuard( m_aMutex );
- 	::vos::OGuard aSolarGuard( Application::GetSolarMutex() );
- 
--	const Size& rTmpSize( mrOutputWindow.GetSizePixel() );
--    
+diff -rup sd/source/ui/slideshow-old/slideshowviewimpl.cxx sd/source/ui/slideshow/slideshowviewimpl.cxx
+--- sd/source/ui/slideshow-old/slideshowviewimpl.cxx	2008-04-29 14:38:25.000000000 +0200
++++ sd/source/ui/slideshow/slideshowviewimpl.cxx	2008-04-29 14:41:31.000000000 +0200
+@@ -353,11 +353,7 @@ geometry::AffineMatrix2D SAL_CALL SlideS
+         return geometry::AffineMatrix2D (1,0,0,0,1,0);
+     }
+     
 -    // Reduce available width by one, as the slides might actually
 -    // render one pixel wider and higher as aPageSize below specifies
 -    // (when shapes of page size have visible border lines)
 -	const Size  aWindowSize( rTmpSize.Width()-1, 
 -                             rTmpSize.Height()-1 );
-+	const Size aWindowSize( mrOutputWindow.GetSizePixel() );
++ 	const Size aWindowSize( mrOutputWindow.GetSizePixel() );
      Size aOutputSize( aWindowSize );
  
  	if( meAnimationMode != ANIMATIONMODE_SHOW )
-@@ -401,6 +395,12 @@ geometry::AffineMatrix2D SAL_CALL SlideS
+@@ -384,6 +380,12 @@ geometry::AffineMatrix2D SAL_CALL SlideS
  	Point aOutputOffset( ( aWindowSize.Width() - aOutputSize.Width() ) >> 1,
  							( aWindowSize.Height() - aOutputSize.Height() ) >> 1 );
  
@@ -29,3 +27,5 @@
      ::basegfx::B2DHomMatrix aMatrix;
  
  	maPresentationArea = Rectangle( aOutputOffset, aOutputSize );
+Only in sd/source/ui/slideshow: slideshowviewimpl.cxx.orig
+Only in sd/source/ui/slideshow: slideshowviewimpl.cxx.rej