mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "tdf#96505 Get rid of cargo cult "long" integer literals"

Browse Source 
This partly reverts commit 8ae33b1652.

Added a comment why 1L is needed in this file.

Change-Id: I92349b42decb964a45d4dc9c50b89cd22766acb9
Reviewed-on: https://gerrit.libreoffice.org/30259
Reviewed-by: jan iversen <jani@documentfoundation.org>
Tested-by: jan iversen <jani@documentfoundation.org>
This commit is contained in:
jan iversen
2016-10-25 08:29:47 +00:00
parent 13d7023486
commit 9183e2cec0
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
cppcanvas/source/mtfrenderer/implrenderer.cxx
View File

@@ -1577,8 +1577,10 @@ namespace cppcanvas
// #i44110# correct null-sized output - there // #i44110# correct null-sized output - there
// are metafiles which have zero size in at // are metafiles which have zero size in at
// least one dimension // least one dimension
const Size aMtfSizePix( ::std::max( (int)aMtfSizePixPre.Width(), 1 ),
::std::max( (int)aMtfSizePixPre.Height(), 1 ) ); // 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 ) );
// Setup local transform, such that the // Setup local transform, such that the
// metafile renders itself into the given // metafile renders itself into the given
@@ -2914,8 +2916,9 @@ namespace cppcanvas
// #i44110# correct null-sized output - there are shapes // #i44110# correct null-sized output - there are shapes
// which have zero size in at least one dimension // which have zero size in at least one dimension
const Size aMtfSizePix( ::std::max( (int)aMtfSizePixPre.Width(), 1 ), // Remark the 1L cannot be replaced, that would cause max to compare long/int
::std::max( (int)aMtfSizePixPre.Height(), 1 ) ); const Size aMtfSizePix( ::std::max( aMtfSizePixPre.Width(), 1L ),
::std::max( aMtfSizePixPre.Height(), 1L ) );
sal_Int32 nCurrActions(0); sal_Int32 nCurrActions(0);
ActionFactoryParameters aParms(aStateStack, ActionFactoryParameters aParms(aStateStack,