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 /svx/source/sdr | |
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 'svx/source/sdr')
-rw-r--r-- | svx/source/sdr/animation/animationstate.cxx | 2 | ||||
-rw-r--r-- | svx/source/sdr/animation/scheduler.cxx | 2 | ||||
-rw-r--r-- | svx/source/sdr/event/eventhandler.cxx | 2 | ||||
-rw-r--r-- | svx/source/sdr/overlay/overlaymanagerbuffered.cxx | 8 | ||||
-rw-r--r-- | svx/source/sdr/primitive2d/sdrattributecreator.cxx | 12 | ||||
-rw-r--r-- | svx/source/sdr/primitive3d/sdrattributecreator3d.cxx | 12 |
6 files changed, 19 insertions, 19 deletions
diff --git a/svx/source/sdr/animation/animationstate.cxx b/svx/source/sdr/animation/animationstate.cxx index 6bb9af2d6483..e271e2f586a0 100644 --- a/svx/source/sdr/animation/animationstate.cxx +++ b/svx/source/sdr/animation/animationstate.cxx @@ -93,7 +93,7 @@ namespace sdr // ensure step forward in integer timing, the floating step difference maybe smaller than 1.0. Use // at least 25ms for next step - const sal_uInt32 nMinimumStepTime((sal_uInt32)fCurrentTime + 25L); + const sal_uInt32 nMinimumStepTime((sal_uInt32)fCurrentTime + 25); if(nNextTime <= nMinimumStepTime) { diff --git a/svx/source/sdr/animation/scheduler.cxx b/svx/source/sdr/animation/scheduler.cxx index 5956bce648ff..0d7490850792 100644 --- a/svx/source/sdr/animation/scheduler.cxx +++ b/svx/source/sdr/animation/scheduler.cxx @@ -142,7 +142,7 @@ namespace sdr { // without delta time, init events by triggering them. This will invalidate // painted objects and add them to the scheduler again - mnDeltaTime = 0L; + mnDeltaTime = 0; triggerEvents(); checkTimeout(); } diff --git a/svx/source/sdr/event/eventhandler.cxx b/svx/source/sdr/event/eventhandler.cxx index 8d0e29592c92..1a29a146a606 100644 --- a/svx/source/sdr/event/eventhandler.cxx +++ b/svx/source/sdr/event/eventhandler.cxx @@ -97,7 +97,7 @@ namespace sdr // for control bool TimerEventHandler::IsEmpty() const { - return (0L == maVector.size()); + return (0 == maVector.size()); } // The timer when it is triggered; from class Timer diff --git a/svx/source/sdr/overlay/overlaymanagerbuffered.cxx b/svx/source/sdr/overlay/overlaymanagerbuffered.cxx index 8a7f8d55630c..b16ccbe92aa4 100644 --- a/svx/source/sdr/overlay/overlaymanagerbuffered.cxx +++ b/svx/source/sdr/overlay/overlaymanagerbuffered.cxx @@ -263,14 +263,14 @@ namespace sdr // truncate aRegionRectanglePixel to destination pixel size, more does // not need to be prepared since destination is a buffer for a window. So, // maximum size indirectly shall be limited to getOutputDevice().GetOutputSizePixel() - if(aRegionRectanglePixel.Left() < 0L) + if(aRegionRectanglePixel.Left() < 0) { - aRegionRectanglePixel.Left() = 0L; + aRegionRectanglePixel.Left() = 0; } - if(aRegionRectanglePixel.Top() < 0L) + if(aRegionRectanglePixel.Top() < 0) { - aRegionRectanglePixel.Top() = 0L; + aRegionRectanglePixel.Top() = 0; } if(aRegionRectanglePixel.Right() > aDestinationSizePixel.getWidth()) diff --git a/svx/source/sdr/primitive2d/sdrattributecreator.cxx b/svx/source/sdr/primitive2d/sdrattributecreator.cxx index 1e47b53ddd7c..2d46c999cfed 100644 --- a/svx/source/sdr/primitive2d/sdrattributecreator.cxx +++ b/svx/source/sdr/primitive2d/sdrattributecreator.cxx @@ -276,7 +276,7 @@ namespace drawinglayer if(nTempStartWidth) { - if(nTempStartWidth < 0L) + if(nTempStartWidth < 0) { fStartWidth = ((double)(-nTempStartWidth) * fWidth) * 0.01; } @@ -299,7 +299,7 @@ namespace drawinglayer if(nTempEndWidth) { - if(nTempEndWidth < 0L) + if(nTempEndWidth < 0) { fEndWidth = ((double)(-nTempEndWidth) * fWidth) * 0.01; } @@ -882,7 +882,7 @@ namespace drawinglayer css::drawing::ProjectionMode aProjectionMode(css::drawing::ProjectionMode_PARALLEL); const sal_uInt16 nProjectionValue(static_cast<const Svx3DPerspectiveItem&>(rSet.Get(SDRATTR_3DSCENE_PERSPECTIVE)).GetValue()); - if(1L == nProjectionValue) + if(1 == nProjectionValue) { aProjectionMode = css::drawing::ProjectionMode_PERSPECTIVE; } @@ -897,15 +897,15 @@ namespace drawinglayer css::drawing::ShadeMode aShadeMode(css::drawing::ShadeMode_FLAT); const sal_uInt16 nShadeValue(static_cast<const Svx3DShadeModeItem&>(rSet.Get(SDRATTR_3DSCENE_SHADE_MODE)).GetValue()); - if(1L == nShadeValue) + if(1 == nShadeValue) { aShadeMode = css::drawing::ShadeMode_PHONG; } - else if(2L == nShadeValue) + else if(2 == nShadeValue) { aShadeMode = css::drawing::ShadeMode_SMOOTH; } - else if(3L == nShadeValue) + else if(3 == nShadeValue) { aShadeMode = css::drawing::ShadeMode_DRAFT; } diff --git a/svx/source/sdr/primitive3d/sdrattributecreator3d.cxx b/svx/source/sdr/primitive3d/sdrattributecreator3d.cxx index d8434d62db20..c565f983e8c6 100644 --- a/svx/source/sdr/primitive3d/sdrattributecreator3d.cxx +++ b/svx/source/sdr/primitive3d/sdrattributecreator3d.cxx @@ -39,11 +39,11 @@ namespace drawinglayer css::drawing::NormalsKind aNormalsKind(css::drawing::NormalsKind_SPECIFIC); const sal_uInt16 nNormalsValue(static_cast<const Svx3DNormalsKindItem&>(rSet.Get(SDRATTR_3DOBJ_NORMALS_KIND)).GetValue()); - if(1L == nNormalsValue) + if(1 == nNormalsValue) { aNormalsKind = css::drawing::NormalsKind_FLAT; } - else if(2L == nNormalsValue) + else if(2 == nNormalsValue) { aNormalsKind = css::drawing::NormalsKind_SPHERE; } @@ -55,11 +55,11 @@ namespace drawinglayer css::drawing::TextureProjectionMode aTextureProjectionX(css::drawing::TextureProjectionMode_OBJECTSPECIFIC); const sal_uInt16 nTextureValueX(static_cast<const Svx3DTextureProjectionXItem&>(rSet.Get(SDRATTR_3DOBJ_TEXTURE_PROJ_X)).GetValue()); - if(1L == nTextureValueX) + if(1 == nTextureValueX) { aTextureProjectionX = css::drawing::TextureProjectionMode_PARALLEL; } - else if(2L == nTextureValueX) + else if(2 == nTextureValueX) { aTextureProjectionX = css::drawing::TextureProjectionMode_SPHERE; } @@ -68,11 +68,11 @@ namespace drawinglayer css::drawing::TextureProjectionMode aTextureProjectionY(css::drawing::TextureProjectionMode_OBJECTSPECIFIC); const sal_uInt16 nTextureValueY(static_cast<const Svx3DTextureProjectionYItem&>(rSet.Get(SDRATTR_3DOBJ_TEXTURE_PROJ_Y)).GetValue()); - if(1L == nTextureValueY) + if(1 == nTextureValueY) { aTextureProjectionY = css::drawing::TextureProjectionMode_PARALLEL; } - else if(2L == nTextureValueY) + else if(2 == nTextureValueY) { aTextureProjectionY = css::drawing::TextureProjectionMode_SPHERE; } |