merge the formfield patch from ooo-build
[ooovba.git] / applied_patches / 0517-sd-slideshow-slideshowview-transformation-fix.diff
blob0891ce0e0ee717be05bf9726223e7353feb31f65
1 diff -rup sd/source/ui/slideshow-old/slideshowviewimpl.cxx sd/source/ui/slideshow/slideshowviewimpl.cxx
2 --- sd/source/ui/slideshow-old/slideshowviewimpl.cxx 2008-04-29 14:38:25.000000000 +0200
3 +++ sd/source/ui/slideshow/slideshowviewimpl.cxx 2008-04-29 14:41:31.000000000 +0200
4 @@ -353,11 +353,7 @@ geometry::AffineMatrix2D SAL_CALL SlideS
5 return geometry::AffineMatrix2D (1,0,0,0,1,0);
8 - // Reduce available width by one, as the slides might actually
9 - // render one pixel wider and higher as aPageSize below specifies
10 - // (when shapes of page size have visible border lines)
11 - const Size aWindowSize( rTmpSize.Width()-1,
12 - rTmpSize.Height()-1 );
13 + const Size aWindowSize( mrOutputWindow.GetSizePixel() );
14 Size aOutputSize( aWindowSize );
16 if( meAnimationMode != ANIMATIONMODE_SHOW )
17 @@ -384,6 +380,12 @@ geometry::AffineMatrix2D SAL_CALL SlideS
18 Point aOutputOffset( ( aWindowSize.Width() - aOutputSize.Width() ) >> 1,
19 ( aWindowSize.Height() - aOutputSize.Height() ) >> 1 );
21 + // Reduce available width by one, as the slides might actually
22 + // render one pixel wider and higher as aPageSize below specifies
23 + // (when shapes of page size have visible border lines)
24 + aOutputSize.Width() --;
25 + aOutputSize.Height() --;
27 ::basegfx::B2DHomMatrix aMatrix;
29 maPresentationArea = Rectangle( aOutputOffset, aOutputSize );
30 Only in sd/source/ui/slideshow: slideshowviewimpl.cxx.orig
31 Only in sd/source/ui/slideshow: slideshowviewimpl.cxx.rej