cppcanvas/source/mtfrenderer/implrenderer.cxx | 8 ++++----
drawinglayer/source/primitive2d/animatedprimitive2d.cxx | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
New commits:
commit 8ae33b1652cb1e654c426350169d3bb9fa031a4f
Author: Rosen <ro...@live.com>
Date: Fri Sep 23 07:29:44 2016 +0530
tdf#96505 Get rid of cargo cult "long" integer literals
fixed all long integer literals in file
Change-Id: Ib557d88d4e4f17d5c334c92d611d002fe163f2f6
Reviewed-on: https://gerrit.libreoffice.org/29235
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: jan iversen <j...@documentfoundation.org>
diff --git a/cppcanvas/source/mtfrenderer/implrenderer.cxx
b/cppcanvas/source/mtfrenderer/implrenderer.cxx
index 0491553..2a2bcc2 100644
--- a/cppcanvas/source/mtfrenderer/implrenderer.cxx
+++ b/cppcanvas/source/mtfrenderer/implrenderer.cxx
@@ -1577,8 +1577,8 @@ namespace cppcanvas
// #i44110# correct null-sized output - there
// are metafiles which have zero size in at
// least one dimension
- const Size aMtfSizePix( ::std::max(
aMtfSizePixPre.Width(), 1L ),
- ::std::max(
aMtfSizePixPre.Height(), 1L ) );
+ const Size aMtfSizePix( ::std::max(
(int)aMtfSizePixPre.Width(), 1 ),
+ ::std::max(
(int)aMtfSizePixPre.Height(), 1 ) );
// Setup local transform, such that the
// metafile renders itself into the given
@@ -2914,8 +2914,8 @@ namespace cppcanvas
// #i44110# correct null-sized output - there are shapes
// which have zero size in at least one dimension
- const Size aMtfSizePix( ::std::max( aMtfSizePixPre.Width(), 1L ),
- ::std::max( aMtfSizePixPre.Height(), 1L )
);
+ const Size aMtfSizePix( ::std::max( (int)aMtfSizePixPre.Width(), 1
),
+ ::std::max( (int)aMtfSizePixPre.Height(),
1 ) );
sal_Int32 nCurrActions(0);
ActionFactoryParameters aParms(aStateStack,
diff --git a/drawinglayer/source/primitive2d/animatedprimitive2d.cxx
b/drawinglayer/source/primitive2d/animatedprimitive2d.cxx
index 2fa2916..2ea970a 100644
--- a/drawinglayer/source/primitive2d/animatedprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/animatedprimitive2d.cxx
@@ -80,7 +80,7 @@ namespace drawinglayer
if(nIndex >= nLen)
{
- nIndex = nLen - 1L;
+ nIndex = nLen - 1;
}
const Primitive2DReference xRef(getChildren()[nIndex],
uno::UNO_QUERY_THROW);
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
