Kaydet (Commit) f626ff59 authored tarafından Tim Hardeck's avatar Tim Hardeck Kaydeden (comit) Jan Holesovsky

removed zoomtools int functions

Changed viewport.cxx to use long instead of int like all other zoom
functions and in this succession removed the zoomtools int functions
which where only added for this one exception.
üst 6d1f7fad
...@@ -42,8 +42,6 @@ namespace basegfx ...@@ -42,8 +42,6 @@ namespace basegfx
{ {
BASEGFX_DLLPUBLIC long zoomOut(long nCurrent); BASEGFX_DLLPUBLIC long zoomOut(long nCurrent);
BASEGFX_DLLPUBLIC long zoomIn(long nCurrent); BASEGFX_DLLPUBLIC long zoomIn(long nCurrent);
BASEGFX_DLLPUBLIC int zoomOut(int nCurrent);
BASEGFX_DLLPUBLIC int zoomIn(int nCurrent);
} }
} }
......
...@@ -129,27 +129,6 @@ long zoomOut(long nCurrent) ...@@ -129,27 +129,6 @@ long zoomOut(long nCurrent)
nNew = enforceStep(nNew, nCurrent, 25); nNew = enforceStep(nNew, nCurrent, 25);
return nNew; return nNew;
} }
/**
* Increasing the zoom level.
*
* @param nCurrent current zoom factor
*/
int zoomIn(int nCurrent)
{
return static_cast<int>( zoomIn( long( nCurrent ) ) );
}
/**
* Decreasing the zoom level.
*
* @param nCurrent current zoom factor
*/
int zoomOut(int nCurrent)
{
return static_cast<int>( zoomOut( long( nCurrent ) ) );
}
} // namespace zoomtools } // namespace zoomtools
} // namespace basegfx } // namespace basegfx
......
...@@ -1307,11 +1307,11 @@ sal_Bool SwView::HandleWheelCommands( const CommandEvent& rCEvt ) ...@@ -1307,11 +1307,11 @@ sal_Bool SwView::HandleWheelCommands( const CommandEvent& rCEvt )
const CommandWheelData* pWData = rCEvt.GetWheelData(); const CommandWheelData* pWData = rCEvt.GetWheelData();
if( pWData && COMMAND_WHEEL_ZOOM == pWData->GetMode() ) if( pWData && COMMAND_WHEEL_ZOOM == pWData->GetMode() )
{ {
sal_uInt16 nFact = pWrtShell->GetViewOptions()->GetZoom(); long nFact = pWrtShell->GetViewOptions()->GetZoom();
if( 0L > pWData->GetDelta() ) if( 0L > pWData->GetDelta() )
nFact = static_cast< sal_uInt16 >(Max( 20, basegfx::zoomtools::zoomOut( static_cast<int>(nFact) ))); nFact = Max( (long) 20, basegfx::zoomtools::zoomOut( nFact ));
else else
nFact = static_cast< sal_uInt16 >(Min( 600, basegfx::zoomtools::zoomIn( static_cast<int>(nFact) ))); nFact = Min( (long) 600, basegfx::zoomtools::zoomIn( 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