summaryrefslogtreecommitdiff
path: root/sd
diff options
context:
space:
mode:
authorNoel <noelgrandin@gmail.com>2020-10-26 14:17:32 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2020-10-28 07:21:59 +0100
commit6436302f40252bc6619e304e2051115fee902e20 (patch)
treea32659b4fecc9fbf8fad3e379ddd8645a2a52e0b /sd
parent35f16614ee7ddf518d4c01de6b1d800f5ff1ba7e (diff)
convert some more long -> tools::Long
grepping for stuff in template params this time Change-Id: Ia37bfd85480b3a72c3c465489581d56ad8dde851 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104855 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sd')
-rw-r--r--sd/source/ui/view/drtxtob1.cxx10
-rw-r--r--sd/source/ui/view/drviewse.cxx4
-rw-r--r--sd/source/ui/view/outlnvs2.cxx4
-rw-r--r--sd/source/ui/view/viewshel.cxx4
4 files changed, 11 insertions, 11 deletions
diff --git a/sd/source/ui/view/drtxtob1.cxx b/sd/source/ui/view/drtxtob1.cxx
index 22f2eaf81d55..996265c3c9ea 100644
--- a/sd/source/ui/view/drtxtob1.cxx
+++ b/sd/source/ui/view/drtxtob1.cxx
@@ -196,7 +196,7 @@ void TextObjectBar::Execute( SfxRequest &rReq )
else
{
nLeft -= 1000;
- nLeft = std::max<long>( nLeft, 0 );
+ nLeft = std::max<::tools::Long>( nLeft, 0 );
}
pNewItem->SetLeftValue( static_cast<sal_uInt16>(nLeft) );
@@ -253,7 +253,7 @@ void TextObjectBar::Execute( SfxRequest &rReq )
else
{
nUpper -= 100;
- nUpper = std::max<long>( nUpper, 0 );
+ nUpper = std::max<::tools::Long>( nUpper, 0 );
}
pNewItem->SetUpper( static_cast<sal_uInt16>(nUpper) );
@@ -263,7 +263,7 @@ void TextObjectBar::Execute( SfxRequest &rReq )
else
{
nLower -= 100;
- nLower = std::max<long>( nLower, 0 );
+ nLower = std::max<::tools::Long>( nLower, 0 );
}
pNewItem->SetLower( static_cast<sal_uInt16>(nLower) );
@@ -296,7 +296,7 @@ void TextObjectBar::Execute( SfxRequest &rReq )
else
{
nUpper -= 100;
- nUpper = std::max<long>( nUpper, 0 );
+ nUpper = std::max<::tools::Long>( nUpper, 0 );
}
pNewItem->SetUpper( static_cast<sal_uInt16>(nUpper) );
@@ -306,7 +306,7 @@ void TextObjectBar::Execute( SfxRequest &rReq )
else
{
nLower -= 100;
- nLower = std::max<long>( nLower, 0 );
+ nLower = std::max<::tools::Long>( nLower, 0 );
}
pNewItem->SetLower( static_cast<sal_uInt16>(nLower) );
diff --git a/sd/source/ui/view/drviewse.cxx b/sd/source/ui/view/drviewse.cxx
index 33ed1a0ff2d6..bde926aef869 100644
--- a/sd/source/ui/view/drviewse.cxx
+++ b/sd/source/ui/view/drviewse.cxx
@@ -1179,7 +1179,7 @@ void DrawViewShell::FuSupport(SfxRequest& rReq)
case SID_ZOOM_IN: // BASIC
{
mbZoomOnPage = false;
- SetZoom( std::max<long>( GetActiveWindow()->GetZoom() / 2, GetActiveWindow()->GetMinZoom() ) );
+ SetZoom( std::max<::tools::Long>( GetActiveWindow()->GetZoom() / 2, GetActiveWindow()->GetMinZoom() ) );
::tools::Rectangle aVisAreaWin = GetActiveWindow()->PixelToLogic( ::tools::Rectangle( Point(0,0),
GetActiveWindow()->GetOutputSizePixel()) );
mpZoomList->InsertZoomRect(aVisAreaWin);
@@ -1193,7 +1193,7 @@ void DrawViewShell::FuSupport(SfxRequest& rReq)
case SID_ZOOM_OUT:
{
mbZoomOnPage = false;
- SetZoom( std::min<long>( GetActiveWindow()->GetZoom() * 2, GetActiveWindow()->GetMaxZoom() ) );
+ SetZoom( std::min<::tools::Long>( GetActiveWindow()->GetZoom() * 2, GetActiveWindow()->GetMaxZoom() ) );
::tools::Rectangle aVisAreaWin = GetActiveWindow()->PixelToLogic( ::tools::Rectangle( Point(0,0),
GetActiveWindow()->GetOutputSizePixel()) );
mpZoomList->InsertZoomRect(aVisAreaWin);
diff --git a/sd/source/ui/view/outlnvs2.cxx b/sd/source/ui/view/outlnvs2.cxx
index 72626b9654ed..4acabdf2dbf7 100644
--- a/sd/source/ui/view/outlnvs2.cxx
+++ b/sd/source/ui/view/outlnvs2.cxx
@@ -127,7 +127,7 @@ void OutlineViewShell::FuTemporary(SfxRequest &rReq)
case SID_ZOOM_OUT:
{
- SetZoom( std::min<long>( GetActiveWindow()->GetZoom() * 2, GetActiveWindow()->GetMaxZoom() ) );
+ SetZoom( std::min<::tools::Long>( GetActiveWindow()->GetZoom() * 2, GetActiveWindow()->GetMaxZoom() ) );
::tools::Rectangle aVisAreaWin = GetActiveWindow()->PixelToLogic( ::tools::Rectangle( Point(0,0),
GetActiveWindow()->GetOutputSizePixel()) );
mpZoomList->InsertZoomRect(aVisAreaWin);
@@ -154,7 +154,7 @@ void OutlineViewShell::FuTemporary(SfxRequest &rReq)
case SID_ZOOM_IN:
{
- SetZoom( std::max<long>( GetActiveWindow()->GetZoom() / 2, GetActiveWindow()->GetMinZoom() ) );
+ SetZoom( std::max<::tools::Long>( GetActiveWindow()->GetZoom() / 2, GetActiveWindow()->GetMinZoom() ) );
::tools::Rectangle aVisAreaWin = GetActiveWindow()->PixelToLogic( ::tools::Rectangle( Point(0,0),
GetActiveWindow()->GetOutputSizePixel()) );
mpZoomList->InsertZoomRect(aVisAreaWin);
diff --git a/sd/source/ui/view/viewshel.cxx b/sd/source/ui/view/viewshel.cxx
index 691e5f8a0963..f97c26ea5ece 100644
--- a/sd/source/ui/view/viewshel.cxx
+++ b/sd/source/ui/view/viewshel.cxx
@@ -721,9 +721,9 @@ bool ViewShell::HandleScrollCommand(const CommandEvent& rCEvt, ::sd::Window* pWi
Point aOldMousePos = GetActiveWindow()->PixelToLogic(rCEvt.GetMousePosPixel());
if( pData->GetDelta() < 0 )
- nNewZoom = std::max<long>( pWin->GetMinZoom(), basegfx::zoomtools::zoomOut( nOldZoom ));
+ nNewZoom = std::max<::tools::Long>( pWin->GetMinZoom(), basegfx::zoomtools::zoomOut( nOldZoom ));
else
- nNewZoom = std::min<long>( pWin->GetMaxZoom(), basegfx::zoomtools::zoomIn( nOldZoom ));
+ nNewZoom = std::min<::tools::Long>( pWin->GetMaxZoom(), basegfx::zoomtools::zoomIn( nOldZoom ));
SetZoom( nNewZoom );
// Keep mouse at same doc point before zoom