summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--basegfx/inc/basegfx/tools/zoomtools.hxx2
-rw-r--r--basegfx/source/tools/zoomtools.cxx21
-rw-r--r--sw/source/ui/uiview/viewport.cxx6
3 files changed, 3 insertions, 26 deletions
diff --git a/basegfx/inc/basegfx/tools/zoomtools.hxx b/basegfx/inc/basegfx/tools/zoomtools.hxx
index 566418d3a8a8..44d9052a2552 100644
--- a/basegfx/inc/basegfx/tools/zoomtools.hxx
+++ b/basegfx/inc/basegfx/tools/zoomtools.hxx
@@ -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);
}
}
diff --git a/basegfx/source/tools/zoomtools.cxx b/basegfx/source/tools/zoomtools.cxx
index d4b274ce0b01..34b0b8cba3f9 100644
--- a/basegfx/source/tools/zoomtools.cxx
+++ b/basegfx/source/tools/zoomtools.cxx
@@ -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
diff --git a/sw/source/ui/uiview/viewport.cxx b/sw/source/ui/uiview/viewport.cxx
index d6b723d90a84..e28d63e9110f 100644
--- a/sw/source/ui/uiview/viewport.cxx
+++ b/sw/source/ui/uiview/viewport.cxx
@@ -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;