strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

removed zoomtools int functions

Browse source 
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.
This commit is contained in:
Tim Hardeck 2012-02-23 19:59:34 +01:00 committed by Jan Holesovsky
parent 6d1f7fadc0
commit f626ff59b2
3 changed files with 3 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
basegfx/inc/basegfx/tools/zoomtools.hxx
View file

@ -42,8 +42,6 @@ namespace basegfx
{
BASEGFX_DLLPUBLIC long zoomOut(long nCurrent);
BASEGFX_DLLPUBLIC long zoomIn(long nCurrent);
BASEGFX_DLLPUBLIC int zoomOut(int nCurrent);
BASEGFX_DLLPUBLIC int zoomIn(int nCurrent);
}
}

21
basegfx/source/tools/zoomtools.cxx
View file

@ -129,27 +129,6 @@ long zoomOut(long nCurrent)
nNew = enforceStep(nNew, nCurrent, 25);
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 basegfx

6
sw/source/ui/uiview/viewport.cxx
View file

@ -1307,11 +1307,11 @@ sal_Bool SwView::HandleWheelCommands( const CommandEvent& rCEvt )
const CommandWheelData* pWData = rCEvt.GetWheelData();
if( pWData && COMMAND_WHEEL_ZOOM == pWData->GetMode() )
{
sal_uInt16 nFact = pWrtShell->GetViewOptions()->GetZoom();
long nFact = pWrtShell->GetViewOptions()->GetZoom();
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
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 );
bOk = sal_True;