diff -urN ooo_DEV300_m87_src.orig/sd/source/ui/slidesorter/controller/SlsAnimationFunction.cxx ooo_DEV300_m87_src/sd/source/ui/slidesorter/controller/SlsAnimationFunction.cxx --- ooo_DEV300_m87_src.orig/sd/source/ui/slidesorter/controller/SlsAnimationFunction.cxx 2010-09-01 17:50:46.000000000 +0200 +++ ooo_DEV300_m87_src/sd/source/ui/slidesorter/controller/SlsAnimationFunction.cxx 2010-09-01 17:51:15.000000000 +0200 @@ -276,7 +276,7 @@ double AnimationParametricFunction::operator() (const double nX) { - const sal_Int32 nIndex0 (nX * maY.size()); + const sal_Int32 nIndex0 (static_cast(nX * maY.size())); const double nX0 (nIndex0 / double(maY.size()-1)); const sal_uInt32 nIndex1 (nIndex0 + 1); const double nX1 (nIndex1 / double(maY.size()-1)); diff -urN ooo_DEV300_m87_src.orig/sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx ooo_DEV300_m87_src/sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx --- ooo_DEV300_m87_src.orig/sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx 2010-09-01 17:50:46.000000000 +0200 +++ ooo_DEV300_m87_src/sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx 2010-09-01 17:51:02.000000000 +0200 @@ -185,7 +185,7 @@ void ScrollBarManager::PlaceVerticalScrollBar (const Rectangle& aArea) { - const double nThumbPosition (mpVerticalScrollBar->GetThumbPos()); + const sal_Int32 nThumbPosition (mpVerticalScrollBar->GetThumbPos()); // Place the scroll bar. Size aScrollBarSize (mpVerticalScrollBar->GetSizePixel()); diff -urN ooo_DEV300_m87_src.orig/sd/source/ui/slidesorter/view/SlsButtonBar.cxx ooo_DEV300_m87_src/sd/source/ui/slidesorter/view/SlsButtonBar.cxx --- ooo_DEV300_m87_src.orig/sd/source/ui/slidesorter/view/SlsButtonBar.cxx 2010-09-01 17:50:46.000000000 +0200 +++ ooo_DEV300_m87_src/sd/source/ui/slidesorter/view/SlsButtonBar.cxx 2010-09-01 17:51:15.000000000 +0200 @@ -49,6 +49,7 @@ #include #include #include +#include #include #include @@ -155,8 +156,11 @@ for (sal_Int32 nX = 0; nXGetPixel(nY, nX).GetBlueOrIndex()); - const BYTE nNewValue (nValue * (1-nAlpha)); - pBitmap->SetPixel(nY, nX, 255-nNewValue); + const sal_Int32 nNewValue (::basegfx::clamp( + static_cast(nValue * (1-nAlpha)), + 0, + 255)); + pBitmap->SetPixel(nY, nX, 255-BYTE(nNewValue)); } } } @@ -740,12 +744,12 @@ // all so that we do not leave a trail of half-visible buttons when the // mouse is moved across the screen. No delay on fade out or when the // buttons are already showing. Fade out is faster than fade in. - const double nDelay (nCurrentButtonBarAlpha>0 && nCurrentButtonBarAlpha<1 + const sal_Int32 nDelay (nCurrentButtonBarAlpha>0 && nCurrentButtonBarAlpha<1 ? 0 : (mrSlideSorter.GetTheme()->GetIntegerValue(bFadeIn ? Theme::Integer_ButtonFadeInDelay : Theme::Integer_ButtonFadeOutDelay))); - const double nDuration (mrSlideSorter.GetTheme()->GetIntegerValue(bFadeIn + const sal_Int32 nDuration (mrSlideSorter.GetTheme()->GetIntegerValue(bFadeIn ? Theme::Integer_ButtonFadeInDuration : Theme::Integer_ButtonFadeOutDuration)); pDescriptor->GetVisualState().SetButtonAlphaAnimationId(