[Libreoffice-commits] .: Branch 'libreoffice-3-4' - sd/source

[Petr Mladek]

 sd/source/ui/slideshow/slideshowviewimpl.cxx |   12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

New commits:
commit 091315b8a5c1c321aa3daa321194c860fe1cbc7a
Author: Radek Doulik <rodo at novell.com>
Date:   Wed Apr 27 20:47:52 2011 +0200

    sd-slideshow-slideshowview-transformation-fix.diff
    
    decrease the width and height after the aspect ratio was corrected

diff --git a/sd/source/ui/slideshow/slideshowviewimpl.cxx b/sd/source/ui/slideshow/slideshowviewimpl.cxx
index fa293b2..0a829e0 100644
--- a/sd/source/ui/slideshow/slideshowviewimpl.cxx
+++ b/sd/source/ui/slideshow/slideshowviewimpl.cxx
@@ -353,11 +353,7 @@ geometry::AffineMatrix2D SAL_CALL SlideShowView::getTransformation(  ) throw (Ru
         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() );
     Size aOutputSize( aWindowSize );
 
     if( meAnimationMode != ANIMATIONMODE_SHOW )
@@ -384,6 +380,12 @@ geometry::AffineMatrix2D SAL_CALL SlideShowView::getTransformation(  ) throw (Ru
     Point aOutputOffset( ( aWindowSize.Width() - aOutputSize.Width() ) >> 1,
                             ( aWindowSize.Height() - aOutputSize.Height() ) >> 1 );
 
+    // 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)
+    aOutputSize.Width() --;
+    aOutputSize.Height() --;
+
     maPresentationArea = Rectangle( aOutputOffset, aOutputSize );
     mrOutputWindow.SetPresentationArea( maPresentationArea );