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 /cppcanvas | |
| 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 'cppcanvas')
| -rw-r--r-- | cppcanvas/source/mtfrenderer/implrenderer.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/cppcanvas/source/mtfrenderer/implrenderer.cxx b/cppcanvas/source/mtfrenderer/implrenderer.cxx index 806353dbe543..01d479a27449 100644 --- a/cppcanvas/source/mtfrenderer/implrenderer.cxx +++ b/cppcanvas/source/mtfrenderer/implrenderer.cxx @@ -1564,8 +1564,8 @@ namespace cppcanvas // least one dimension // Remark the 1L cannot be replaced, that would cause max to compare long/int - const Size aMtfSizePix( std::max( aMtfSizePixPre.Width(), 1L ), - std::max( aMtfSizePixPre.Height(), 1L ) ); + const Size aMtfSizePix( std::max<sal_Int32>( aMtfSizePixPre.Width(), 1 ), + std::max<sal_Int32>( aMtfSizePixPre.Height(), 1 ) ); // Setup local transform, such that the // metafile renders itself into the given @@ -2878,8 +2878,8 @@ namespace cppcanvas // #i44110# correct null-sized output - there are shapes // which have zero size in at least one dimension // Remark the 1L cannot be replaced, that would cause max to compare long/int - const Size aMtfSizePix( std::max( aMtfSizePixPre.Width(), 1L ), - std::max( aMtfSizePixPre.Height(), 1L ) ); + const Size aMtfSizePix( std::max<sal_Int32>( aMtfSizePixPre.Width(), 1 ), + std::max<sal_Int32>( aMtfSizePixPre.Height(), 1 ) ); sal_Int32 nCurrActions(0); ActionFactoryParameters aParms(aStateStack, |