[Libreoffice-commits] .: Branch 'libreoffice-3-4' - patches/dev300

[Petr Mladek]

 patches/dev300/apply                                              |    2 
 patches/dev300/sd-slideshow-slideshowview-transformation-fix.diff |   37 ----------
 2 files changed, 39 deletions(-)

New commits:
commit b3a9c82b398573b5f7554c5d2403b105102f5156
Author: Petr Mladek <pmladek at suse.cz>
Date:   Wed Apr 27 20:53:35 2011 +0200

    pushed sd-slideshow-slideshowview-transformation-fix.diff into git

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 0ed324b..3687a54 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -1125,8 +1125,6 @@ always_default_iconset.diff
 
 svx-hacky-htmlselect-control-import.diff, n#523191, noelpwer
 
-sd-slideshow-slideshowview-transformation-fix.diff, rodo
-
 # controversial fix - closer to ppt97 behaviour than to 2k7 - need
 # version compat distinction?
 sd-custom-show-fix.diff, n#355638, i#90145, thorsten
diff --git a/patches/dev300/sd-slideshow-slideshowview-transformation-fix.diff b/patches/dev300/sd-slideshow-slideshowview-transformation-fix.diff
deleted file mode 100644
index f7057b2..0000000
--- a/patches/dev300/sd-slideshow-slideshowview-transformation-fix.diff
+++ /dev/null
@@ -1,37 +0,0 @@
----
- sd/source/ui/slideshow/slideshowviewimpl.cxx |   12 +++++++-----
- 1 files changed, 7 insertions(+), 5 deletions(-)
-
-diff --git sd/source/ui/slideshow/slideshowviewimpl.cxx sd/source/ui/slideshow/slideshowviewimpl.cxx
-index adb0dc8..4e16512 100644
---- sd/source/ui/slideshow/slideshowviewimpl.cxx
-+++ sd/source/ui/slideshow/slideshowviewimpl.cxx
-@@ -352,11 +352,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 )
-@@ -383,6 +379,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 );
- 
--- 
-1.7.0.1
-