diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-08-16 14:45:49 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-08-17 08:14:31 +0200 |
commit | ff1f6a5fc25db062e9a83521a657062f62f03ba6 (patch) | |
tree | 272dfa9af5ead31b61c1be34afcaf4402ff4ad77 /svx/source/sdr | |
parent | 224b770fa77fe12ad5dc543ce020aca316b6558d (diff) |
remove UL/L suffixes from integer constants in initialiser/call expressions
Change-Id: Iae081567c4fa5b88edbd12cf2fbafd2b8f31b300
Reviewed-on: https://gerrit.libreoffice.org/41214
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 | 4 | ||||
-rw-r--r-- | svx/source/sdr/contact/objectcontactofobjlistpainter.cxx | 2 | ||||
-rw-r--r-- | svx/source/sdr/contact/viewcontactofe3dpolygon.cxx | 4 | ||||
-rw-r--r-- | svx/source/sdr/contact/viewcontactofe3dscene.cxx | 6 | ||||
-rw-r--r-- | svx/source/sdr/contact/viewcontactofsdrmediaobj.cxx | 2 | ||||
-rw-r--r-- | svx/source/sdr/contact/viewcontactofsdrobj.cxx | 2 | ||||
-rw-r--r-- | svx/source/sdr/contact/viewobjectcontactofsdrpage.cxx | 2 | ||||
-rw-r--r-- | svx/source/sdr/primitive2d/sdrattributecreator.cxx | 4 | ||||
-rw-r--r-- | svx/source/sdr/primitive2d/sdrgrafprimitive2d.cxx | 2 | ||||
-rw-r--r-- | svx/source/sdr/properties/properties.cxx | 2 | ||||
-rw-r--r-- | svx/source/sdr/properties/textproperties.cxx | 4 |
12 files changed, 18 insertions, 18 deletions
diff --git a/svx/source/sdr/animation/animationstate.cxx b/svx/source/sdr/animation/animationstate.cxx index 85b94a664000..6bb9af2d6483 100644 --- a/svx/source/sdr/animation/animationstate.cxx +++ b/svx/source/sdr/animation/animationstate.cxx @@ -39,7 +39,7 @@ namespace sdr { const sal_Int32 nCount(maAnimatedPrimitives.size()); - for(sal_Int32 a(0L); a < nCount; a++) + for(sal_Int32 a(0); a < nCount; a++) { const drawinglayer::primitive2d::Primitive2DReference xRef(maAnimatedPrimitives[a]); const drawinglayer::primitive2d::AnimatedSwitchPrimitive2D* pCandidate = dynamic_cast< const drawinglayer::primitive2d::AnimatedSwitchPrimitive2D* >(xRef.get()); diff --git a/svx/source/sdr/animation/scheduler.cxx b/svx/source/sdr/animation/scheduler.cxx index 9936dfdb4be6..5956bce648ff 100644 --- a/svx/source/sdr/animation/scheduler.cxx +++ b/svx/source/sdr/animation/scheduler.cxx @@ -52,8 +52,8 @@ namespace sdr Scheduler::Scheduler() - : mnTime(0L), - mnDeltaTime(0L), + : mnTime(0), + mnDeltaTime(0), mbIsPaused(false) { } diff --git a/svx/source/sdr/contact/objectcontactofobjlistpainter.cxx b/svx/source/sdr/contact/objectcontactofobjlistpainter.cxx index 8af2e51a36f2..f3362376fac1 100644 --- a/svx/source/sdr/contact/objectcontactofobjlistpainter.cxx +++ b/svx/source/sdr/contact/objectcontactofobjlistpainter.cxx @@ -105,7 +105,7 @@ void ObjectContactOfObjListPainter::ProcessDisplay(DisplayInfo& rDisplayInfo) // collect primitive data in a sequence; this will already use the updated ViewInformation2D drawinglayer::primitive2d::Primitive2DContainer xPrimitiveSequence; - for(sal_uInt32 a(0L); a < nCount; a++) + for(sal_uInt32 a(0); a < nCount; a++) { const ViewObjectContact& rViewObjectContact = GetPaintObjectViewContact(a).GetViewObjectContact(*this); diff --git a/svx/source/sdr/contact/viewcontactofe3dpolygon.cxx b/svx/source/sdr/contact/viewcontactofe3dpolygon.cxx index ae3f5719dadf..76e2b49d5fd6 100644 --- a/svx/source/sdr/contact/viewcontactofe3dpolygon.cxx +++ b/svx/source/sdr/contact/viewcontactofe3dpolygon.cxx @@ -58,7 +58,7 @@ namespace sdr if(bNormals || bTexture) { - for(sal_uInt32 a(0L); a < aPolyPolygon3D.count(); a++) + for(sal_uInt32 a(0); a < aPolyPolygon3D.count(); a++) { basegfx::B3DPolygon aCandidate3D(aPolyPolygon3D.getB3DPolygon(a)); basegfx::B3DPolygon aNormals3D; @@ -74,7 +74,7 @@ namespace sdr aTexture2D = aPolyTexture2D.getB2DPolygon(a); } - for(sal_uInt32 b(0L); b < aCandidate3D.count(); b++) + for(sal_uInt32 b(0); b < aCandidate3D.count(); b++) { if(bNormals) { diff --git a/svx/source/sdr/contact/viewcontactofe3dscene.cxx b/svx/source/sdr/contact/viewcontactofe3dscene.cxx index f3e2a366a0f2..591db03619fb 100644 --- a/svx/source/sdr/contact/viewcontactofe3dscene.cxx +++ b/svx/source/sdr/contact/viewcontactofe3dscene.cxx @@ -58,7 +58,7 @@ void createSubPrimitive3DVector( drawinglayer::primitive3d::Primitive3DContainer aNewVisibleTarget; // add children recursively - for(sal_uInt32 a(0L); a < nChildrenCount; a++) + for(sal_uInt32 a(0); a < nChildrenCount; a++) { createSubPrimitive3DVector( rCandidate.GetViewContact(a), @@ -286,7 +286,7 @@ drawinglayer::primitive2d::Primitive2DContainer ViewContactOfE3dScene::createSce // a 3D transformPrimitive for the start scene. While this is theoretically not // a bad thing, for historical reasons the transformation of the outmost scene // is seen as part of the ViewTransformation (see text in createViewInformation3D) - for(sal_uInt32 a(0L); a < nChildrenCount; a++) + for(sal_uInt32 a(0); a < nChildrenCount; a++) { createSubPrimitive3DVector( GetViewContact(a), @@ -429,7 +429,7 @@ drawinglayer::primitive3d::Primitive3DContainer ViewContactOfE3dScene::getAllPri // a 3D transformPrimitive for the start scene. While this is theoretically not // a bad thing, for historical reasons the transformation of the outmost scene // is seen as part of the ViewTransformation (see text in createViewInformation3D) - for(sal_uInt32 a(0L); a < nChildrenCount; a++) + for(sal_uInt32 a(0); a < nChildrenCount; a++) { createSubPrimitive3DVector(GetViewContact(a), aAllPrimitive3DContainer, nullptr, nullptr, false); } diff --git a/svx/source/sdr/contact/viewcontactofsdrmediaobj.cxx b/svx/source/sdr/contact/viewcontactofsdrmediaobj.cxx index 47b55fd16ffc..90403799d53a 100644 --- a/svx/source/sdr/contact/viewcontactofsdrmediaobj.cxx +++ b/svx/source/sdr/contact/viewcontactofsdrmediaobj.cxx @@ -121,7 +121,7 @@ drawinglayer::primitive2d::Primitive2DContainer ViewContactOfSdrMediaObj::create // and/or BoundRect const basegfx::BColor aBackgroundColor(67.0 / 255.0, 67.0 / 255.0, 67.0 / 255.0); const OUString& rURL(GetSdrMediaObj().getURL()); - const sal_uInt32 nPixelBorder(4L); + const sal_uInt32 nPixelBorder(4); const drawinglayer::primitive2d::Primitive2DReference xRetval( new drawinglayer::primitive2d::MediaPrimitive2D( aTransform, rURL, aBackgroundColor, nPixelBorder, diff --git a/svx/source/sdr/contact/viewcontactofsdrobj.cxx b/svx/source/sdr/contact/viewcontactofsdrobj.cxx index a62241cc0f32..6cd40b3b56de 100644 --- a/svx/source/sdr/contact/viewcontactofsdrobj.cxx +++ b/svx/source/sdr/contact/viewcontactofsdrobj.cxx @@ -153,7 +153,7 @@ drawinglayer::primitive2d::Primitive2DContainer ViewContactOfSdrObj::createGlueP std::vector< basegfx::B2DPoint > aGluepointVector; // create GluePoint primitives. ATM these are relative to the SnapRect - for(sal_uInt32 a(0L); a < nCount; a++) + for(sal_uInt32 a(0); a < nCount; a++) { const SdrGluePoint& rCandidate = (*pGluePointList)[(sal_uInt16)a]; const Point aPosition(rCandidate.GetAbsolutePos(GetSdrObject())); diff --git a/svx/source/sdr/contact/viewobjectcontactofsdrpage.cxx b/svx/source/sdr/contact/viewobjectcontactofsdrpage.cxx index 83ae5011d5cc..1a57043194df 100644 --- a/svx/source/sdr/contact/viewobjectcontactofsdrpage.cxx +++ b/svx/source/sdr/contact/viewobjectcontactofsdrpage.cxx @@ -535,7 +535,7 @@ drawinglayer::primitive2d::Primitive2DContainer ViewObjectContactOfPageHelplines const basegfx::BColor aRGBColorB(0.0, 0.0, 0.0); xRetval.resize(nCount); - for(sal_uInt32 a(0L); a < nCount; a++) + for(sal_uInt32 a(0); a < nCount; a++) { const SdrHelpLine& rHelpLine = rHelpLineList[(sal_uInt16)a]; const basegfx::B2DPoint aPosition((double)rHelpLine.GetPos().X(), (double)rHelpLine.GetPos().Y()); diff --git a/svx/source/sdr/primitive2d/sdrattributecreator.cxx b/svx/source/sdr/primitive2d/sdrattributecreator.cxx index d04fdf41579f..1e47b53ddd7c 100644 --- a/svx/source/sdr/primitive2d/sdrattributecreator.cxx +++ b/svx/source/sdr/primitive2d/sdrattributecreator.cxx @@ -289,7 +289,7 @@ namespace drawinglayer { aStartPolyPolygon = basegfx::B2DPolyPolygon(static_cast<const XLineStartItem&>(rSet.Get(XATTR_LINESTART)).GetLineStartValue()); - if(aStartPolyPolygon.count() && aStartPolyPolygon.getB2DPolygon(0L).count()) + if(aStartPolyPolygon.count() && aStartPolyPolygon.getB2DPolygon(0).count()) { bStartActive = true; bStartCentered = static_cast<const XLineStartCenterItem&>(rSet.Get(XATTR_LINESTARTCENTER)).GetValue(); @@ -312,7 +312,7 @@ namespace drawinglayer { aEndPolyPolygon = basegfx::B2DPolyPolygon(static_cast<const XLineEndItem&>(rSet.Get(XATTR_LINEEND)).GetLineEndValue()); - if(aEndPolyPolygon.count() && aEndPolyPolygon.getB2DPolygon(0L).count()) + if(aEndPolyPolygon.count() && aEndPolyPolygon.getB2DPolygon(0).count()) { bEndActive = true; bEndCentered = static_cast<const XLineEndCenterItem&>(rSet.Get(XATTR_LINEENDCENTER)).GetValue(); diff --git a/svx/source/sdr/primitive2d/sdrgrafprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrgrafprimitive2d.cxx index 54411079b657..a4d82ac87483 100644 --- a/svx/source/sdr/primitive2d/sdrgrafprimitive2d.cxx +++ b/svx/source/sdr/primitive2d/sdrgrafprimitive2d.cxx @@ -141,7 +141,7 @@ namespace drawinglayer maGraphicAttr(rGraphicAttr) { // reset some values from GraphicAttr which are part of transformation already - maGraphicAttr.SetRotation(0L); + maGraphicAttr.SetRotation(0); } bool SdrGrafPrimitive2D::operator==(const BasePrimitive2D& rPrimitive) const diff --git a/svx/source/sdr/properties/properties.cxx b/svx/source/sdr/properties/properties.cxx index 482af2ecdfb9..e419ea44b50f 100644 --- a/svx/source/sdr/properties/properties.cxx +++ b/svx/source/sdr/properties/properties.cxx @@ -144,7 +144,7 @@ namespace sdr } // also send the user calls - for(sal_uInt32 a(0L); a < nCount; a++) + for(sal_uInt32 a(0); a < nCount; a++) { GetSdrObject().SendUserCall(SdrUserCallType::ChangeAttr, rChange.GetRectangle(a)); } diff --git a/svx/source/sdr/properties/textproperties.cxx b/svx/source/sdr/properties/textproperties.cxx index 1b7c7fca711a..706950690277 100644 --- a/svx/source/sdr/properties/textproperties.cxx +++ b/svx/source/sdr/properties/textproperties.cxx @@ -124,7 +124,7 @@ namespace sdr // force ItemSet GetObjectItemSet(); - SfxItemSet aNewSet(pOutliner->GetParaAttribs(0L)); + SfxItemSet aNewSet(pOutliner->GetParaAttribs(0)); mpItemSet->Put(aNewSet); } @@ -153,7 +153,7 @@ namespace sdr SdrTextObj& rObj = static_cast<SdrTextObj&>(GetSdrObject()); // #i25616# - sal_Int32 nOldLineWidth(0L); + sal_Int32 nOldLineWidth(0); if(XATTR_LINEWIDTH == nWhich && rObj.DoesSupportTextIndentingOnLineWidthChange()) { |