diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-08-16 16:27:55 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-08-17 11:25:21 +0200 |
commit | 2e8acde112e1c6754df26902e79a78346ba45a2d (patch) | |
tree | 2d836747a7aafdd0b64ab9aabf01be59e94745d4 /drawinglayer/source/primitive2d | |
parent | 006a7b50546c57e260245d4630de565705f2fc38 (diff) |
remove UL/L suffixes from integer constants on the RHS of expressions
Change-Id: I899a8126c9d971601fea6c77eca165718aea0ac5
Reviewed-on: https://gerrit.libreoffice.org/41237
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'drawinglayer/source/primitive2d')
4 files changed, 7 insertions, 7 deletions
diff --git a/drawinglayer/source/primitive2d/animatedprimitive2d.cxx b/drawinglayer/source/primitive2d/animatedprimitive2d.cxx index 509ef9c6039e..6110013366e3 100644 --- a/drawinglayer/source/primitive2d/animatedprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/animatedprimitive2d.cxx @@ -158,7 +158,7 @@ namespace drawinglayer fState = 1.0; } - const double fIndex(fState * (double)(nSize - 1L)); + const double fIndex(fState * (double)(nSize - 1)); const sal_uInt32 nIndA(sal_uInt32(floor(fIndex))); const double fOffset(fIndex - (double)nIndA); basegfx::B2DHomMatrix aTargetTransform; @@ -172,7 +172,7 @@ namespace drawinglayer else { // interpolate. Get involved buffered decomposed matrices - const sal_uInt32 nIndB((nIndA + 1L) % nSize); + const sal_uInt32 nIndB((nIndA + 1) % nSize); std::vector< basegfx::tools::B2DHomMatrixBufferedDecompose >::const_iterator aMatB(maMatrixStack.begin() + nIndB); // interpolate for fOffset [0.0 .. 1.0[ diff --git a/drawinglayer/source/primitive2d/graphicprimitive2d.cxx b/drawinglayer/source/primitive2d/graphicprimitive2d.cxx index fc4629b4ee21..35ec935ab9a7 100644 --- a/drawinglayer/source/primitive2d/graphicprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/graphicprimitive2d.cxx @@ -34,7 +34,7 @@ namespace drawinglayer { void GraphicPrimitive2D::create2DDecomposition(Primitive2DContainer& rContainer, const geometry::ViewInformation2D& ) const { - if(255L == getGraphicAttr().GetTransparency()) + if(255 == getGraphicAttr().GetTransparency()) { // content is invisible, done return; diff --git a/drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx b/drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx index f78b53b101be..f557a5f7226d 100644 --- a/drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx +++ b/drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx @@ -121,9 +121,9 @@ namespace drawinglayer // Bad trap: There are animated gifs with no set WaitTime (!). // In that case use a default value. - if (0L == nWaitTime) + if (0 == nWaitTime) { - nWaitTime = 100L; + nWaitTime = 100; } return nWaitTime; @@ -409,7 +409,7 @@ namespace drawinglayer // create frame representation in VirtualDevices if (nIndex >= nLen) { - nIndex = nLen - 1L; + nIndex = nLen - 1; } // check buffering shortcuts, may already be created diff --git a/drawinglayer/source/primitive2d/textlayoutdevice.cxx b/drawinglayer/source/primitive2d/textlayoutdevice.cxx index 2b1d09a70709..f3f95c7d82d1 100644 --- a/drawinglayer/source/primitive2d/textlayoutdevice.cxx +++ b/drawinglayer/source/primitive2d/textlayoutdevice.cxx @@ -84,7 +84,7 @@ namespace ImpTimedRefDev::~ImpTimedRefDev() { - OSL_ENSURE(0L == mnUseCount, "destruction of a still used ImpTimedRefDev (!)"); + OSL_ENSURE(0 == mnUseCount, "destruction of a still used ImpTimedRefDev (!)"); const SolarMutexGuard aSolarGuard; mpVirDev.disposeAndClear(); } |