diff options
| author | Noel <noelgrandin@gmail.com> | 2020-10-26 14:17:32 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-10-28 07:21:59 +0100 |
| commit | 6436302f40252bc6619e304e2051115fee902e20 (patch) | |
| tree | a32659b4fecc9fbf8fad3e379ddd8645a2a52e0b /vcl/unx | |
| parent | 35f16614ee7ddf518d4c01de6b1d800f5ff1ba7e (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 'vcl/unx')
| -rw-r--r-- | vcl/unx/generic/gdi/salbmp.cxx | 2 | ||||
| -rw-r--r-- | vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/vcl/unx/generic/gdi/salbmp.cxx b/vcl/unx/generic/gdi/salbmp.cxx index 9e76a48c08e2..ac3b704f870b 100644 --- a/vcl/unx/generic/gdi/salbmp.cxx +++ b/vcl/unx/generic/gdi/salbmp.cxx @@ -169,7 +169,7 @@ std::unique_ptr<BitmapBuffer> X11SalBitmap::ImplCreateDIB( pDIB->mnWidth = rSize.Width(); pDIB->mnHeight = rSize.Height(); tools::Long nScanlineBase; - bool bFail = o3tl::checked_multiply<long>(pDIB->mnWidth, nBitCount, nScanlineBase); + bool bFail = o3tl::checked_multiply<tools::Long>(pDIB->mnWidth, nBitCount, nScanlineBase); if (bFail) { SAL_WARN("vcl.gdi", "checked multiply failed"); diff --git a/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx b/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx index 64096f805065..57b26ca65c98 100644 --- a/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx +++ b/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx @@ -239,7 +239,7 @@ namespace nMinWidth += margin.left + margin.right + border.left + border.right + padding.left + padding.right; nMinHeight += margin.top + margin.bottom + border.top + border.bottom + padding.top + padding.bottom; - rSize = Size(std::max<long>(rSize.Width(), nMinWidth), std::max<long>(rSize.Height(), nMinHeight)); + rSize = Size(std::max<tools::Long>(rSize.Width(), nMinWidth), std::max<tools::Long>(rSize.Height(), nMinHeight)); } } @@ -1935,7 +1935,7 @@ static tools::Rectangle GetWidgetSize(const tools::Rectangle& rControlRegion, Gt { GtkRequisition aReq; gtk_widget_get_preferred_size(widget, nullptr, &aReq); - tools::Long nHeight = std::max<long>(rControlRegion.GetHeight(), aReq.height); + tools::Long nHeight = std::max<tools::Long>(rControlRegion.GetHeight(), aReq.height); return tools::Rectangle(rControlRegion.TopLeft(), Size(rControlRegion.GetWidth(), nHeight)); } |