diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-01-26 09:50:06 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-04-03 10:37:51 +0200 |
| commit | 8bc951daf79decbd8a599a409c6d33c5456710e0 (patch) | |
| tree | 61d220d83e90a176fbcbe667827eee4b9631a4ca /avmedia | |
| parent | 10eefdfa6c0250c6069e641e404f34e5a91fe993 (diff) | |
long->sal_Int32 in tools/gen.hxx
which triggered a lot of changes in sw/
Change-Id: Ia2aa22ea3f76463a85ea077a411246fcfed00bf6
Reviewed-on: https://gerrit.libreoffice.org/48806
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'avmedia')
| -rw-r--r-- | avmedia/source/viewer/mediawindow_impl.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/avmedia/source/viewer/mediawindow_impl.cxx b/avmedia/source/viewer/mediawindow_impl.cxx index 1d1f5fe946cb..f8864d92c3ca 100644 --- a/avmedia/source/viewer/mediawindow_impl.cxx +++ b/avmedia/source/viewer/mediawindow_impl.cxx @@ -530,7 +530,7 @@ void MediaWindowImpl::Resize() if (mpMediaWindowControl) { const sal_Int32 nControlHeight = mpMediaWindowControl->GetSizePixel().Height(); - const sal_Int32 nControlY = std::max(aCurSize.Height() - nControlHeight - nOffset, 0L); + const sal_Int32 nControlY = std::max<sal_Int32>(aCurSize.Height() - nControlHeight - nOffset, 0); aPlayerWindowSize.setHeight( nControlY - (nOffset << 1) ); mpMediaWindowControl->SetPosSizePixel(Point(nOffset, nControlY ), Size(aCurSize.Width() - (nOffset << 1), nControlHeight)); |