Skip to content

C
core
Kaydet (Commit) 113dca13 authored tarafından Tor Lillqvist's avatar Tor Lillqvist
Dosyalara gözat
Seçenekler

WaE: int and long confusion

üst 51dccd65
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
svx/source/stbctrls/zoomsliderctrl.cxx
Dosyayı görüntüle @ 113dca13
...@@ -359,11 +359,11 @@ sal_Bool SvxZoomSliderControl::MouseButtonDown( const MouseEvent & rEvt ) ...@@ -359,11 +359,11 @@ sal_Bool SvxZoomSliderControl::MouseButtonDown( const MouseEvent & rEvt )
// click to - button // click to - button
if ( nXDiff >= nButtonLeftOffset && nXDiff <= nButtonRightOffset ) if ( nXDiff >= nButtonLeftOffset && nXDiff <= nButtonRightOffset )
mpImpl->mnCurrentZoom = basegfx::zoomtools::zoomOut( mpImpl->mnCurrentZoom ); mpImpl->mnCurrentZoom = basegfx::zoomtools::zoomOut( static_cast<int>(mpImpl->mnCurrentZoom) );
// click to + button // click to + button
else if ( nXDiff >= aControlRect.GetWidth() - nSliderXOffset + nButtonLeftOffset && else if ( nXDiff >= aControlRect.GetWidth() - nSliderXOffset + nButtonLeftOffset &&
nXDiff <= aControlRect.GetWidth() - nSliderXOffset + nButtonRightOffset ) nXDiff <= aControlRect.GetWidth() - nSliderXOffset + nButtonRightOffset )
mpImpl->mnCurrentZoom = basegfx::zoomtools::zoomIn( mpImpl->mnCurrentZoom ); mpImpl->mnCurrentZoom = basegfx::zoomtools::zoomIn( static_cast<int>(mpImpl->mnCurrentZoom) );
// click to slider // click to slider
else if( nXDiff >= nSliderXOffset && nXDiff <= aControlRect.GetWidth() - nSliderXOffset ) else if( nXDiff >= nSliderXOffset && nXDiff <= aControlRect.GetWidth() - nSliderXOffset )
mpImpl->mnCurrentZoom = Offset2Zoom( nXDiff ); mpImpl->mnCurrentZoom = Offset2Zoom( nXDiff );
......
sw/source/ui/uiview/viewport.cxx
Dosyayı görüntüle @ 113dca13
...@@ -1311,9 +1311,9 @@ sal_Bool SwView::HandleWheelCommands( const CommandEvent& rCEvt ) ...@@ -1311,9 +1311,9 @@ sal_Bool SwView::HandleWheelCommands( const CommandEvent& rCEvt )
{ {
sal_uInt16 nFact = pWrtShell->GetViewOptions()->GetZoom(); sal_uInt16 nFact = pWrtShell->GetViewOptions()->GetZoom();
if( 0L > pWData->GetDelta() ) if( 0L > pWData->GetDelta() )
nFact = static_cast< sal_uInt16 >(Max( 20, basegfx::zoomtools::zoomOut( nFact ))); nFact = static_cast< sal_uInt16 >(Max( 20, basegfx::zoomtools::zoomOut( static_cast<int>(nFact) )));
else else
nFact = static_cast< sal_uInt16 >(Min( 600, basegfx::zoomtools::zoomIn( nFact ))); nFact = static_cast< sal_uInt16 >(Min( 600, basegfx::zoomtools::zoomIn( static_cast<int>(nFact) )));
SetZoom( SVX_ZOOM_PERCENT, nFact ); SetZoom( SVX_ZOOM_PERCENT, nFact );
bOk = sal_True; bOk = sal_True;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment