diff options
221 files changed, 900 insertions, 900 deletions
diff --git a/basegfx/source/curve/b2dcubicbezier.cxx b/basegfx/source/curve/b2dcubicbezier.cxx index 2b9394e0ff70..446d976b1c02 100644 --- a/basegfx/source/curve/b2dcubicbezier.cxx +++ b/basegfx/source/curve/b2dcubicbezier.cxx @@ -668,7 +668,7 @@ namespace basegfx const sal_uInt32 nInitialDivisions(3); B2DPolygon aInitialPolygon; - // as start make a fix division, creates nInitialDivisions + 2L points + // as start make a fix division, creates nInitialDivisions + 2 points aInitialPolygon.append(getStartPoint()); adaptiveSubdivideByCount(aInitialPolygon, nInitialDivisions); diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx index f1b5b7d3365e..16e3d225be33 100644 --- a/basic/source/runtime/methods.cxx +++ b/basic/source/runtime/methods.cxx @@ -210,7 +210,7 @@ void SbRtl_Error(StarBASIC * pBasic, SbxArray & rPar, bool) else { nCode = rPar.Get( 1 )->GetLong(); - if( nCode > 65535L ) + if( nCode > 65535 ) { StarBASIC::Error( ERRCODE_BASIC_CONVERSION ); } diff --git a/basic/source/runtime/props.cxx b/basic/source/runtime/props.cxx index bd967f3ffd4e..a6bd4be345a4 100644 --- a/basic/source/runtime/props.cxx +++ b/basic/source/runtime/props.cxx @@ -45,7 +45,7 @@ void SbRtl_Err(StarBASIC *, SbxArray & rPar, bool bWrite) if( bWrite ) { sal_Int32 nVal = rPar.Get( 0 )->GetLong(); - if( nVal <= 65535L ) + if( nVal <= 65535 ) StarBASIC::Error( StarBASIC::GetSfxFromVBError( (sal_uInt16) nVal ) ); } else diff --git a/chart2/source/controller/main/SelectionHelper.cxx b/chart2/source/controller/main/SelectionHelper.cxx index 41fc20e8fa46..1e365924e8d5 100644 --- a/chart2/source/controller/main/SelectionHelper.cxx +++ b/chart2/source/controller/main/SelectionHelper.cxx @@ -591,10 +591,10 @@ bool SelectionHelper::getMarkHandles( SdrHdlList& rHdlList ) //if th object is a polygon //from each point a handle is generated const ::basegfx::B2DPolyPolygon& rPolyPolygon = static_cast<SdrPathObj*>(m_pMarkObj)->GetPathPoly(); - for( sal_uInt32 nN = 0L; nN < rPolyPolygon.count(); nN++) + for( sal_uInt32 nN = 0; nN < rPolyPolygon.count(); nN++) { const ::basegfx::B2DPolygon aPolygon(rPolyPolygon.getB2DPolygon(nN)); - for( sal_uInt32 nM = 0L; nM < aPolygon.count(); nM++) + for( sal_uInt32 nM = 0; nM < aPolygon.count(); nM++) { const ::basegfx::B2DPoint aPoint(aPolygon.getB2DPoint(nM)); SdrHdl* pHdl = new SdrHdl(Point(basegfx::fround(aPoint.getX()), basegfx::fround(aPoint.getY())), SdrHdlKind::Poly); diff --git a/connectivity/source/drivers/firebird/ResultSet.cxx b/connectivity/source/drivers/firebird/ResultSet.cxx index 6d28111c36e4..3923ccedd1d5 100644 --- a/connectivity/source/drivers/firebird/ResultSet.cxx +++ b/connectivity/source/drivers/firebird/ResultSet.cxx @@ -136,7 +136,7 @@ sal_Bool SAL_CALL OResultSet::next() { return true; } - else if (fetchStat == 100L) // END OF DATASET + else if (fetchStat == 100) // END OF DATASET { m_bIsAfterLastRow = true; return false; diff --git a/cui/source/options/optchart.cxx b/cui/source/options/optchart.cxx index 975f1d64e3ec..1c8958452dd9 100644 --- a/cui/source/options/optchart.cxx +++ b/cui/source/options/optchart.cxx @@ -240,7 +240,7 @@ long SvxDefaultColorOptPage::GetColorIndex( const Color& rCol ) return pColorList->GetIndex( pColorEntry->GetName() ); } } - return -1L; + return -1; } 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(); } diff --git a/drawinglayer/source/primitive3d/polygontubeprimitive3d.cxx b/drawinglayer/source/primitive3d/polygontubeprimitive3d.cxx index 5551694e41db..f89e10858449 100644 --- a/drawinglayer/source/primitive3d/polygontubeprimitive3d.cxx +++ b/drawinglayer/source/primitive3d/polygontubeprimitive3d.cxx @@ -362,8 +362,8 @@ namespace drawinglayer for(sal_uInt32 a(0); a < nVerSeg; a++) { - const bool bFirst(0L == a); - const bool bLast(a + 1L == nVerSeg); + const bool bFirst(0 == a); + const bool bLast(a + 1 == nVerSeg); if(bFirst || !bLast) { diff --git a/drawinglayer/source/primitive3d/sdrcubeprimitive3d.cxx b/drawinglayer/source/primitive3d/sdrcubeprimitive3d.cxx index 2ad004a69676..b546d8b0c544 100644 --- a/drawinglayer/source/primitive3d/sdrcubeprimitive3d.cxx +++ b/drawinglayer/source/primitive3d/sdrcubeprimitive3d.cxx @@ -95,20 +95,20 @@ namespace drawinglayer { basegfx::B3DPolygon aTmpPoly(aFill.getB3DPolygon(a)); - if(aTmpPoly.count() >= 4L) + if(aTmpPoly.count() >= 4) { - for(sal_uInt32 b(0); b < 4L; b++) + for(sal_uInt32 b(0); b < 4; b++) { basegfx::B2DPoint aPoint(aTmpPoly.getTextureCoordinate(b)); if(bObjectSpecificX) { - aPoint.setX((1L == b || 2L == b) ? 1.0 : 0.0); + aPoint.setX((1 == b || 2 == b) ? 1.0 : 0.0); } if(bObjectSpecificY) { - aPoint.setY((2L == b || 3L == b) ? 1.0 : 0.0); + aPoint.setY((2 == b || 3 == b) ? 1.0 : 0.0); } aTmpPoly.setTextureCoordinate(b, aPoint); diff --git a/drawinglayer/source/primitive3d/sdrextrudelathetools3d.cxx b/drawinglayer/source/primitive3d/sdrextrudelathetools3d.cxx index f3a6d3dc9a74..e8d75ee49879 100644 --- a/drawinglayer/source/primitive3d/sdrextrudelathetools3d.cxx +++ b/drawinglayer/source/primitive3d/sdrextrudelathetools3d.cxx @@ -122,7 +122,7 @@ namespace if(nPointCount) { - const sal_uInt32 nEdgeCount(aSubA.isClosed() ? nPointCount : nPointCount - 1L); + const sal_uInt32 nEdgeCount(aSubA.isClosed() ? nPointCount : nPointCount - 1); double fTexHorMultiplicatorA(0.0), fTexHorMultiplicatorB(0.0); double fPolygonPosA(0.0), fPolygonPosB(0.0); @@ -138,7 +138,7 @@ namespace for(sal_uInt32 b(0); b < nEdgeCount; b++) { const sal_uInt32 nIndexA(b); - const sal_uInt32 nIndexB((b + 1L) % nPointCount); + const sal_uInt32 nIndexB((b + 1) % nPointCount); const basegfx::B3DPoint aStartA(aSubA.getB3DPoint(nIndexA)); const basegfx::B3DPoint aEndA(aSubA.getB3DPoint(nIndexB)); @@ -219,13 +219,13 @@ namespace if(nPointCount) { - basegfx::B3DPoint aPrevA(aSubA.getB3DPoint(nPointCount - 1L)); + basegfx::B3DPoint aPrevA(aSubA.getB3DPoint(nPointCount - 1)); basegfx::B3DPoint aCurrA(aSubA.getB3DPoint(0)); const bool bClosed(aSubA.isClosed()); for(sal_uInt32 b(0); b < nPointCount; b++) { - const sal_uInt32 nIndNext((b + 1L) % nPointCount); + const sal_uInt32 nIndNext((b + 1) % nPointCount); const basegfx::B3DPoint aNextA(aSubA.getB3DPoint(nIndNext)); const basegfx::B3DPoint aCurrB(aSubB.getB3DPoint(b)); @@ -242,7 +242,7 @@ namespace } // vector to left (correct for non-closed lines) - const bool bFirstAndNotClosed(!bClosed && 0L == b); + const bool bFirstAndNotClosed(!bClosed && 0 == b); basegfx::B3DVector aLeft(bFirstAndNotClosed ? aCurrA - aNextA : aPrevA - aCurrA); aLeft.normalize(); @@ -252,7 +252,7 @@ namespace if(bSmoothHorizontalNormals) { // vector to right (correct for non-closed lines) - const bool bLastAndNotClosed(!bClosed && b + 1L == nPointCount); + const bool bLastAndNotClosed(!bClosed && b + 1 == nPointCount); basegfx::B3DVector aRight(bLastAndNotClosed ? aCurrA - aPrevA : aNextA - aCurrA); aRight.normalize(); @@ -361,7 +361,7 @@ namespace drawinglayer bool bCloseFront, bool bCloseBack) { - if(basegfx::fTools::equalZero(fRotation) || 0L == nSteps) + if(basegfx::fTools::equalZero(fRotation) || 0 == nSteps) { // no rotation or no steps, just one plane rSliceVector.push_back(Slice3D(rSource, basegfx::B3DHomMatrix())); @@ -418,7 +418,7 @@ namespace drawinglayer } } - // add start polygon (a = 0L) + // add start polygon (a = 0) if(!bClosedRotation) { rSliceVector.push_back(Slice3D(aFront, basegfx::B3DHomMatrix())); @@ -429,7 +429,7 @@ namespace drawinglayer for(sal_uInt32 a(0); a < nSteps; a++) { - const double fStep((double)(a + 1L) * fStepSize); + const double fStep((double)(a + 1) * fStepSize); basegfx::B2DPolyPolygon aNewPoly(bBackScale ? basegfx::tools::interpolate(aFront, aBack, fStep) : aFront); basegfx::B3DHomMatrix aNewMat; aNewMat.rotate(0.0, fRotation * fStep, 0.0); @@ -589,7 +589,7 @@ namespace drawinglayer if(nNumSlices) { // common parameters - const sal_uInt32 nLoopCount(bClosed ? nNumSlices : nNumSlices - 1L); + const sal_uInt32 nLoopCount(bClosed ? nNumSlices : nNumSlices - 1); basegfx::B3DPolyPolygon aEdgeRounding; sal_uInt32 a; @@ -602,7 +602,7 @@ namespace drawinglayer if(bCreateTextureCoordinates) { aTexRangeFront = basegfx::tools::getRange(rSliceVector[0L].getB3DPolyPolygon()); - aTexRangeBack = basegfx::tools::getRange(rSliceVector[nNumSlices - 1L].getB3DPolyPolygon()); + aTexRangeBack = basegfx::tools::getRange(rSliceVector[nNumSlices - 1].getB3DPolyPolygon()); if(aTexRangeBack.getDepth() > aTexRangeBack.getWidth()) { @@ -616,9 +616,9 @@ namespace drawinglayer basegfx::B3DPoint aCenter(basegfx::tools::getRange(rSliceVector[0L].getB3DPolyPolygon()).getCenter()); - for(a = 0L; a < nLoopCount; a++) + for(a = 0; a < nLoopCount; a++) { - const basegfx::B3DPoint aNextCenter(basegfx::tools::getRange(rSliceVector[(a + 1L) % nNumSlices].getB3DPolyPolygon()).getCenter()); + const basegfx::B3DPoint aNextCenter(basegfx::tools::getRange(rSliceVector[(a + 1) % nNumSlices].getB3DPolyPolygon()).getCenter()); const double fLength(basegfx::B3DVector(aNextCenter - aCenter).getLength()); aTexHeightArray.push_back(fLength); aCenter = aNextCenter; @@ -635,10 +635,10 @@ namespace drawinglayer if(nLoopCount) { double fTexHeightPos(0.0); - for(a = 0L; a < nLoopCount; a++) + for(a = 0; a < nLoopCount; a++) { const Slice3D& rSliceA(rSliceVector[a]); - const Slice3D& rSliceB(rSliceVector[(a + 1L) % nNumSlices]); + const Slice3D& rSliceB(rSliceVector[(a + 1) % nNumSlices]); const bool bAcceptPair(SLICETYPE3D_REGULAR == rSliceA.getSliceType() && SLICETYPE3D_REGULAR == rSliceB.getSliceType()); basegfx::B3DPolyPolygon aPolA(rSliceA.getB3DPolyPolygon()); basegfx::B3DPolyPolygon aPolB(rSliceB.getB3DPolyPolygon()); @@ -651,7 +651,7 @@ namespace drawinglayer } { - const sal_uInt32 nIndPrev((a + nNumSlices - 1L) % nNumSlices); + const sal_uInt32 nIndPrev((a + nNumSlices - 1) % nNumSlices); const Slice3D& rSlicePrev(rSliceVector[nIndPrev]); basegfx::B3DPolyPolygon aPrev(rSlicePrev.getB3DPolyPolygon()); basegfx::B3DPolyPolygon aPolAA(rSliceA.getB3DPolyPolygon()); @@ -729,7 +729,7 @@ namespace drawinglayer if(bCreateTextureCoordinates) { fTexStart = fTexHeightPos * fInvTexHeight; - fTexStop = (fTexHeightPos - aTexHeightArray[(a + nLoopCount - 1L) % nLoopCount]) * fInvTexHeight; + fTexStop = (fTexHeightPos - aTexHeightArray[(a + nLoopCount - 1) % nLoopCount]) * fInvTexHeight; } impAddInBetweenFill(aEdgeRounding, aPolAA, aPrev, fTexStart, fTexStop, bCreateNormals, bCreateTextureCoordinates); @@ -740,7 +740,7 @@ namespace drawinglayer } else { - if(bCreateNormals && bSmoothNormals && (nIndPrev != a + 1L)) + if(bCreateNormals && bSmoothNormals && (nIndPrev != a + 1)) { impCreateInBetweenNormals(aPolAA, aPrev, bSmoothHorizontalNormals); impMixNormals(aPolA, aPolAA, 0.5); @@ -749,7 +749,7 @@ namespace drawinglayer } { - const sal_uInt32 nIndNext((a + 2L) % nNumSlices); + const sal_uInt32 nIndNext((a + 2) % nNumSlices); const Slice3D& rSliceNext(rSliceVector[nIndNext]); basegfx::B3DPolyPolygon aNext(rSliceNext.getB3DPolyPolygon()); basegfx::B3DPolyPolygon aPolBB(rSliceB.getB3DPolyPolygon()); @@ -820,7 +820,7 @@ namespace drawinglayer double fTexStop{}; if(bCreateTextureCoordinates) { - fTexStart = (fTexHeightPos + aTexHeightArray[a] + aTexHeightArray[(a + 1L) % nLoopCount]) * fInvTexHeight; + fTexStart = (fTexHeightPos + aTexHeightArray[a] + aTexHeightArray[(a + 1) % nLoopCount]) * fInvTexHeight; fTexStop = (fTexHeightPos + aTexHeightArray[a]) * fInvTexHeight; } @@ -889,7 +889,7 @@ namespace drawinglayer aEdgeRounding.transformTextureCoordinates(rTexTransform); } - for(a = 0L; a < aEdgeRounding.count(); a++) + for(a = 0; a < aEdgeRounding.count(); a++) { rFill.push_back(basegfx::B3DPolyPolygon(aEdgeRounding.getB3DPolygon(a))); } diff --git a/drawinglayer/source/primitive3d/sdrlatheprimitive3d.cxx b/drawinglayer/source/primitive3d/sdrlatheprimitive3d.cxx index a84aa999dcad..b592c74b0d90 100644 --- a/drawinglayer/source/primitive3d/sdrlatheprimitive3d.cxx +++ b/drawinglayer/source/primitive3d/sdrlatheprimitive3d.cxx @@ -214,7 +214,7 @@ namespace drawinglayer // that for polyPolygons, the subPolys 1..n only get reSegmented when polygon 0L is different // at all (and not always) const basegfx::B2DPolygon aSubCandidate(maCorrectedPolyPolygon.getB2DPolygon(0)); - const sal_uInt32 nSubEdgeCount(aSubCandidate.isClosed() ? aSubCandidate.count() : (aSubCandidate.count() ? aSubCandidate.count() - 1L : 0L)); + const sal_uInt32 nSubEdgeCount(aSubCandidate.isClosed() ? aSubCandidate.count() : (aSubCandidate.count() ? aSubCandidate.count() - 1 : 0L)); if(nSubEdgeCount != getVerticalSegments()) { diff --git a/drawinglayer/source/primitive3d/sdrsphereprimitive3d.cxx b/drawinglayer/source/primitive3d/sdrsphereprimitive3d.cxx index 2b3cbdd4ad0a..ee3b419ef146 100644 --- a/drawinglayer/source/primitive3d/sdrsphereprimitive3d.cxx +++ b/drawinglayer/source/primitive3d/sdrsphereprimitive3d.cxx @@ -87,7 +87,7 @@ namespace drawinglayer // different from forced to sphere texture coordinates, // create a old version from it by rotating to old state before applying // the texture coordinates to emulate old behaviour - fRelativeAngle = F_2PI * ((double)((getHorizontalSegments() >> 1) - 1L) / (double)getHorizontalSegments()); + fRelativeAngle = F_2PI * ((double)((getHorizontalSegments() >> 1) - 1) / (double)getHorizontalSegments()); basegfx::B3DHomMatrix aRot; aRot.rotate(0.0, fRelativeAngle, 0.0); aFill.transform(aRot); diff --git a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx index c8ec56088085..3c554bb8f05e 100644 --- a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx +++ b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx @@ -135,7 +135,7 @@ namespace if(aCandidate.areControlPointsUsed()) { // compare with the maximum for bezier curved polygons - bNeedToSplit = nPointCount > ((MAX_POLYGON_POINT_COUNT_METAFILE / 3L) - 1L); + bNeedToSplit = nPointCount > ((MAX_POLYGON_POINT_COUNT_METAFILE / 3L) - 1); } else { diff --git a/drawinglayer/source/processor3d/defaultprocessor3d.cxx b/drawinglayer/source/processor3d/defaultprocessor3d.cxx index 7e1dff308ee3..bd584eae9a93 100644 --- a/drawinglayer/source/processor3d/defaultprocessor3d.cxx +++ b/drawinglayer/source/processor3d/defaultprocessor3d.cxx @@ -70,14 +70,14 @@ namespace drawinglayer if(nMaxSteps) { // there IS a color distance - if(nSteps == 0L) + if(nSteps == 0) { nSteps = nMaxSteps; } - if(nSteps < 2L) + if(nSteps < 2) { - nSteps = 2L; + nSteps = 2; } if(nSteps > nMaxSteps) diff --git a/drawinglayer/source/texture/texture3d.cxx b/drawinglayer/source/texture/texture3d.cxx index a1ba4cb39ce0..dda8e6b73d87 100644 --- a/drawinglayer/source/texture/texture3d.cxx +++ b/drawinglayer/source/texture/texture3d.cxx @@ -158,11 +158,11 @@ namespace drawinglayer { rX = (sal_Int32)((rUV.getX() - maTopLeft.getX()) * mfMulX); - if(rX >= 0L && rX < mpReadBitmap->Width()) + if(rX >= 0 && rX < mpReadBitmap->Width()) { rY = (sal_Int32)((rUV.getY() - maTopLeft.getY()) * mfMulY); - return (rY >= 0L && rY < mpReadBitmap->Height()); + return (rY >= 0 && rY < mpReadBitmap->Height()); } } diff --git a/editeng/source/editeng/editeng.cxx b/editeng/source/editeng/editeng.cxx index f3a1abd2df5e..ed915b09a15f 100644 --- a/editeng/source/editeng/editeng.cxx +++ b/editeng/source/editeng/editeng.cxx @@ -513,7 +513,7 @@ void EditEngine::SetPolygon(const basegfx::B2DPolyPolygon& rPolyPolygon, const b { bool bSimple(false); - if(pLinePolyPolygon && 1L == rPolyPolygon.count()) + if(pLinePolyPolygon && 1 == rPolyPolygon.count()) { if(rPolyPolygon.getB2DPolygon(0).isClosed()) { diff --git a/extensions/source/scanner/grid.cxx b/extensions/source/scanner/grid.cxx index ca51e40f32bb..30568ae94f51 100644 --- a/extensions/source/scanner/grid.cxx +++ b/extensions/source/scanner/grid.cxx @@ -611,7 +611,7 @@ void GridWindow::MouseButtonDown( const MouseEvent& rEvt ) // user wants to add/delete a button if( nMarkerIndex != npos ) { - if( nMarkerIndex != 0 && nMarkerIndex != m_aHandles.size() - 1L) + if( nMarkerIndex != 0 && nMarkerIndex != m_aHandles.size() - 1) { // delete marker under mouse if( m_nDragIndex == nMarkerIndex ) diff --git a/filter/source/graphicfilter/egif/egif.cxx b/filter/source/graphicfilter/egif/egif.cxx index 64552a354d24..66778e06369d 100644 --- a/filter/source/graphicfilter/egif/egif.cxx +++ b/filter/source/graphicfilter/egif/egif.cxx @@ -210,7 +210,7 @@ void GIFWriter::WriteAnimation( const Animation& rAnimation ) { const double fStep = 100. / nCount; - nMinPercent = 0L; + nMinPercent = 0; nMaxPercent = (sal_uLong) fStep; for( sal_uInt16 i = 0; i < nCount; i++ ) @@ -506,7 +506,7 @@ void GIFWriter::WriteAccess() aCompressor.Compress( m_pAcc->GetScanline( nY ), nWidth ); else { - for( long nX = 0L; nX < nWidth; nX++ ) + for( long nX = 0; nX < nWidth; nX++ ) pBuffer[ nX ] = m_pAcc->GetPixelIndex( nY, nX ); aCompressor.Compress( pBuffer.get(), nWidth ); diff --git a/filter/source/graphicfilter/ipcd/ipcd.cxx b/filter/source/graphicfilter/ipcd/ipcd.cxx index 77ab89ddedb7..e1fc4e6fc756 100644 --- a/filter/source/graphicfilter/ipcd/ipcd.cxx +++ b/filter/source/graphicfilter/ipcd/ipcd.cxx @@ -305,7 +305,7 @@ void PCDReader::ReadImage() } } // conversion of nL,nCb,nCr in nRed,nGreen,nBlue: - nL *= 89024L; + nL *= 89024; nCb -= 156; nCr -= 137; nRed = ( nL + nCr * 119374L + 0x8000 ) >> 16; diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx index 763614d12645..eb68f70ede18 100644 --- a/filter/source/msfilter/svdfppt.cxx +++ b/filter/source/msfilter/svdfppt.cxx @@ -5689,9 +5689,9 @@ void PPTPortionObj::ApplyTo( SfxItemSet& rSet, SdrPowerPointImport& rManager, T if( pAcc->HasPalette() ) { - for( long nY = 0L; nY < nHeight; nY++ ) + for( long nY = 0; nY < nHeight; nY++ ) { - for( long nX = 0L; nX < nWidth; nX++ ) + for( long nX = 0; nX < nWidth; nX++ ) { const BitmapColor& rCol = pAcc->GetPaletteColor( pAcc->GetPixelIndex( nY, nX ) ); nRt+=rCol.GetRed(); nGn+=rCol.GetGreen(); nBl+=rCol.GetBlue(); @@ -5700,9 +5700,9 @@ void PPTPortionObj::ApplyTo( SfxItemSet& rSet, SdrPowerPointImport& rManager, T } else { - for( long nY = 0L; nY < nHeight; nY++ ) + for( long nY = 0; nY < nHeight; nY++ ) { - for( long nX = 0L; nX < nWidth; nX++ ) + for( long nX = 0; nX < nWidth; nX++ ) { const BitmapColor aCol( pAcc->GetPixel( nY, nX ) ); nRt+=aCol.GetRed(); nGn+=aCol.GetGreen(); nBl+=aCol.GetBlue(); diff --git a/forms/source/component/imgprod.cxx b/forms/source/component/imgprod.cxx index 6dbb07227314..1f7eb6045500 100644 --- a/forms/source/component/imgprod.cxx +++ b/forms/source/component/imgprod.cxx @@ -105,7 +105,7 @@ ErrCode ImgProdLockBytes::ReadAt(sal_uInt64 const nPos, *pRead = nCount; } else - *pRead = 0UL; + *pRead = 0; return ERRCODE_NONE; } @@ -418,10 +418,10 @@ void ImageProducer::ImplUpdateConsumer( const Graphic& rGraphic ) BitmapReadAccess* pMskAcc = !!aMask ? aMask.AcquireReadAccess() : nullptr; const long nWidth = pBmpAcc->Width(); const long nHeight = pBmpAcc->Height(); - const long nStartX = 0L; - const long nEndX = nWidth - 1L; - const long nStartY = 0L; - const long nEndY = nHeight - 1L; + const long nStartX = 0; + const long nEndX = nWidth - 1; + const long nStartY = 0; + const long nEndY = nHeight - 1; const long nPartWidth = nEndX - nStartX + 1; const long nPartHeight = nEndY - nStartY + 1; diff --git a/include/basegfx/pixel/bpixel.hxx b/include/basegfx/pixel/bpixel.hxx index 5ac2e22b2e81..ed1dadc06a09 100644 --- a/include/basegfx/pixel/bpixel.hxx +++ b/include/basegfx/pixel/bpixel.hxx @@ -49,7 +49,7 @@ namespace basegfx public: BPixel() { - maPixelUnion.maCombinedRGBO.mnValue = 0L; + maPixelUnion.maCombinedRGBO.mnValue = 0; } // use explicit here to make sure everyone knows what he is doing. Values range from diff --git a/include/basegfx/polygon/b3dpolypolygontools.hxx b/include/basegfx/polygon/b3dpolypolygontools.hxx index f88c28340a31..142058362193 100644 --- a/include/basegfx/polygon/b3dpolypolygontools.hxx +++ b/include/basegfx/polygon/b3dpolypolygontools.hxx @@ -64,7 +64,7 @@ namespace basegfx With VerStart, VerStop and hor range in cartesian may be specified to create a partial sphere only. */ BASEGFX_DLLPUBLIC B3DPolyPolygon createUnitSpherePolyPolygon( - sal_uInt32 nHorSeg, sal_uInt32 nVerSeg = 0L, + sal_uInt32 nHorSeg, sal_uInt32 nVerSeg = 0, double fVerStart = F_PI2, double fVerStop = -F_PI2, double fHorStart = 0.0, double fHorStop = F_2PI); @@ -74,7 +74,7 @@ namespace basegfx */ BASEGFX_DLLPUBLIC B3DPolyPolygon createSpherePolyPolygonFromB3DRange( const B3DRange& rRange, - sal_uInt32 nHorSeg, sal_uInt32 nVerSeg = 0L, + sal_uInt32 nHorSeg, sal_uInt32 nVerSeg = 0, double fVerStart = F_PI2, double fVerStop = -F_PI2, double fHorStart = 0.0, double fHorStop = F_2PI); @@ -82,7 +82,7 @@ namespace basegfx There is one extra, the bool bNormals defines if normals will be set, default is false */ BASEGFX_DLLPUBLIC B3DPolyPolygon createUnitSphereFillPolyPolygon( - sal_uInt32 nHorSeg, sal_uInt32 nVerSeg = 0L, + sal_uInt32 nHorSeg, sal_uInt32 nVerSeg = 0, bool bNormals = false, double fVerStart = F_PI2, double fVerStop = -F_PI2, double fHorStart = 0.0, double fHorStop = F_2PI); @@ -92,7 +92,7 @@ namespace basegfx */ BASEGFX_DLLPUBLIC B3DPolyPolygon createSphereFillPolyPolygonFromB3DRange( const B3DRange& rRange, - sal_uInt32 nHorSeg, sal_uInt32 nVerSeg = 0L, + sal_uInt32 nHorSeg, sal_uInt32 nVerSeg = 0, bool bNormals = false, double fVerStart = F_PI2, double fVerStop = -F_PI2, double fHorStart = 0.0, double fHorStop = F_2PI); diff --git a/include/basic/sberrors.hxx b/include/basic/sberrors.hxx index a3a10da70f65..d63012a1381a 100644 --- a/include/basic/sberrors.hxx +++ b/include/basic/sberrors.hxx @@ -54,227 +54,227 @@ #define ERRCODE_BASIC_NOT_A_COLL ERRCODE_SBX_NOT_A_COLL // Object not a collection // Append Basic specific error messages to ERRCODE_AREA_SBX -#define ERRCODE_BASIC_NO_GOSUB ErrCode((LAST_SBX_ERROR_ID+1UL) | ERRCODE_AREA_SBX | \ +#define ERRCODE_BASIC_NO_GOSUB ErrCode((LAST_SBX_ERROR_ID+1) | ERRCODE_AREA_SBX | \ ERRCODE_CLASS_RUNTIME) // Return without Gosub -#define ERRCODE_BASIC_REDO_FROM_START ErrCode((LAST_SBX_ERROR_ID+2UL) | ERRCODE_AREA_SBX | \ +#define ERRCODE_BASIC_REDO_FROM_START ErrCode((LAST_SBX_ERROR_ID+2) | ERRCODE_AREA_SBX | \ ERRCODE_CLASS_RUNTIME) // Redo form start (SB internal) -#define ERRCODE_BASIC_NO_MEMORY ErrCode((LAST_SBX_ERROR_ID+3UL) | ERRCODE_AREA_SBX | \ +#define ERRCODE_BASIC_NO_MEMORY ErrCode((LAST_SBX_ERROR_ID+3) | ERRCODE_AREA_SBX | \ ERRCODE_CLASS_RUNTIME) // Out of memory -#define ERRCODE_BASIC_ALREADY_DIM ErrCode((LAST_SBX_ERROR_ID+4UL) | ERRCODE_AREA_SBX | \ +#define ERRCODE_BASIC_ALREADY_DIM ErrCode((LAST_SBX_ERROR_ID+4) | ERRCODE_AREA_SBX | \ ERRCODE_CLASS_RUNTIME) // Array already dimensioned -#define ERRCODE_BASIC_DUPLICATE_DEF ErrCode((LAST_SBX_ERROR_ID+5UL) | ERRCODE_AREA_SBX | \ +#define ERRCODE_BASIC_DUPLICATE_DEF ErrCode((LAST_SBX_ERROR_ID+5) | ERRCODE_AREA_SBX | \ ERRCODE_CLASS_RUNTIME) // Duplicate definition -#define ERRCODE_BASIC_VAR_UNDEFINED ErrCode((LAST_SBX_ERROR_ID+6UL) | ERRCODE_AREA_SBX | \ +#define ERRCODE_BASIC_VAR_UNDEFINED ErrCode((LAST_SBX_ERROR_ID+6) | ERRCODE_AREA_SBX | \ ERRCODE_CLASS_RUNTIME) // Variable undefined (SB) -#define ERRCODE_BASIC_USER_ABORT ErrCode((LAST_SBX_ERROR_ID+7UL) | ERRCODE_AREA_SBX | \ +#define ERRCODE_BASIC_USER_ABORT ErrCode((LAST_SBX_ERROR_ID+7) | ERRCODE_AREA_SBX | \ ERRCODE_CLASS_RUNTIME) // User interrupt occurred -#define ERRCODE_BASIC_BAD_RESUME ErrCode((LAST_SBX_ERROR_ID+8UL) | ERRCODE_AREA_SBX | \ +#define ERRCODE_BASIC_BAD_RESUME ErrCode((LAST_SBX_ERROR_ID+8) | ERRCODE_AREA_SBX | \ ERRCODE_CLASS_RUNTIME) // Resume without error -#define ERRCODE_BASIC_STACK_OVERFLOW ErrCode((LAST_SBX_ERROR_ID+9UL) | ERRCODE_AREA_SBX | \ +#define ERRCODE_BASIC_STACK_OVERFLOW ErrCode((LAST_SBX_ERROR_ID+9) | ERRCODE_AREA_SBX | \ ERRCODE_CLASS_RUNTIME) // Out of stack space -#define ERRCODE_BASIC_BAD_DLL_LOAD ErrCode((LAST_SBX_ERROR_ID+10UL) | ERRCODE_AREA_SBX | \ +#define ERRCODE_BASIC_BAD_DLL_LOAD ErrCode((LAST_SBX_ERROR_ID+10) | ERRCODE_AREA_SBX | \ ERRCODE_CLASS_RUNTIME) // Error in loading DLL -#define ERRCODE_BASIC_BAD_DLL_CALL ErrCode((LAST_SBX_ERROR_ID+11UL) | ERRCODE_AREA_SBX | \ +#define ERRCODE_BASIC_BAD_DLL_CALL ErrCode((LAST_SBX_ERROR_ID+11) | ERRCODE_AREA_SBX | \ ERRCODE_CLASS_RUNTIME) // Bad DLL calling convention -#define ERRCODE_BASIC_BAD_CHANNEL ErrCode((LAST_SBX_ERROR_ID+12UL) | ERRCODE_AREA_SBX | \ +#define ERRCODE_BASIC_BAD_CHANNEL ErrCode((LAST_SBX_ERROR_ID+12) | ERRCODE_AREA_SBX | \ ERRCODE_CLASS_RUNTIME) // Bad file name or number -#define ERRCODE_BASIC_FILE_NOT_FOUND ErrCode((LAST_SBX_ERROR_ID+13UL) | ERRCODE_AREA_SBX | \ +#define ERRCODE_BASIC_FILE_NOT_FOUND ErrCode((LAST_SBX_ERROR_ID+13) | ERRCODE_AREA_SBX | \ ERRCODE_CLASS_RUNTIME) // File not found -#define ERRCODE_BASIC_BAD_FILE_MODE ErrCode((LAST_SBX_ERROR_ID+14UL) | ERRCODE_AREA_SBX | \ +#define ERRCODE_BASIC_BAD_FILE_MODE ErrCode((LAST_SBX_ERROR_ID+14) | ERRCODE_AREA_SBX | \ ERRCODE_CLASS_RUNTIME) // Bad file mode -#define ERRCODE_BASIC_FILE_ALREADY_OPEN ErrCode((LAST_SBX_ERROR_ID+15UL) | ERRCODE_AREA_SBX | \ +#define ERRCODE_BASIC_FILE_ALREADY_OPEN ErrCode((LAST_SBX_ERROR_ID+15) | ERRCODE_AREA_SBX | \ ERRCODE_CLASS_RUNTIME) // File already open -#define ERRCODE_BASIC_IO_ERROR ErrCode((LAST_SBX_ERROR_ID+16UL) | ERRCODE_AREA_SBX | \ +#define ERRCODE_BASIC_IO_ERROR ErrCode((LAST_SBX_ERROR_ID+16) | ERRCODE_AREA_SBX | \ ERRCODE_CLASS_RUNTIME) // Device I/O error -#define ERRCODE_BASIC_FILE_EXISTS ErrCode((LAST_SBX_ERROR_ID+17UL) | ERRCODE_AREA_SBX | \ +#define ERRCODE_BASIC_FILE_EXISTS ErrCode((LAST_SBX_ERROR_ID+17) | ERRCODE_AREA_SBX | \ ERRCODE_CLASS_RUNTIME) // File already exists -#define ERRCODE_BASIC_BAD_RECORD_LENGTH ErrCode((LAST_SBX_ERROR_ID+18UL) | ERRCODE_AREA_SBX | \ +#define ERRCODE_BASIC_BAD_RECORD_LENGTH ErrCode((LAST_SBX_ERROR_ID+18) | ERRCODE_AREA_SBX | \ ERRCODE_CLASS_RUNTIME) // bad record length -#define ERRCODE_BASIC_DISK_FULL ErrCode((LAST_SBX_ERROR_ID+19UL) | ERRCODE_AREA_SBX | \ +#define ERRCODE_BASIC_DISK_FULL ErrCode((LAST_SBX_ERROR_ID+19) | ERRCODE_AREA_SBX | \ ERRCODE_CLASS_RUNTIME) // disk full -#define ERRCODE_BASIC_READ_PAST_EOF ErrCode((LAST_SBX_ERROR_ID+20UL) | ERRCODE_AREA_SBX | \ +#define ERRCODE_BASIC_READ_PAST_EOF ErrCode((LAST_SBX_ERROR_ID+20) | ERRCODE_AREA_SBX | \ ERRCODE_CLASS_RUNTIME) // Input past end of file -#define ERRCODE_BASIC_BAD_RECORD_NUMBER ErrCode((LAST_SBX_ERROR_ID+21UL) | ERRCODE_AREA_SBX | \ +#define ERRCODE_BASIC_BAD_RECORD_NUMBER ErrCode((LAST_SBX_ERROR_ID+21) | ERRCODE_AREA_SBX | \ ERRCODE_CLASS_RUNTIME) // Bad record number -#define ERRCODE_BASIC_TOO_MANY_FILES ErrCode((LAST_SBX_ERROR_ID+22UL) | ERRCODE_AREA_SBX | \ +#define ERRCODE_BASIC_TOO_MANY_FILES ErrCode((LAST_SBX_ERROR_ID+22) | ERRCODE_AREA_SBX | \ ERRCODE_CLASS_RUNTIME) // Too many files -#define ERRCODE_BASIC_NO_DEVICE ErrCode((LAST_SBX_ERROR_ID+23UL) | ERRCODE_AREA_SBX | \ +#define ERRCODE_BASIC_NO_DEVICE ErrCode((LAST_SBX_ERROR_ID+23) | ERRCODE_AREA_SBX | \ ERRCODE_CLASS_RUNTIME) // Device not available -#define ERRCODE_BASIC_ACCESS_DENIED ErrCode((LAST_SBX_ERROR_ID+24UL) | ERRCODE_AREA_SBX | \ +#define ERRCODE_BASIC_ACCESS_DENIED ErrCode((LAST_SBX_ERROR_ID+24) | ERRCODE_AREA_SBX | \ ERRCODE_CLASS_RUNTIME) // Permission denied -#define ERRCODE_BASIC_NOT_READY ErrCode((LAST_SBX_ERROR_ID+25UL) | ERRCODE_AREA_SBX | \ +#define ERRCODE_BASIC_NOT_READY ErrCode((LAST_SBX_ERROR_ID+25) | ERRCODE_AREA_SBX | \ ERRCODE_CLASS_RUNTIME) // Disk not ready -#define ERRCODE_BASIC_NOT_IMPLEMENTED ErrCode((LAST_SBX_ERROR_ID+26UL) | ERRCODE_AREA_SBX | \ +#define ERRCODE_BASIC_NOT_IMPLEMENTED ErrCode((LAST_SBX_ERROR_ID+26) | ERRCODE_AREA_SBX | \ ERRCODE_CLASS_RUNTIME) // Feature not implemented -#define ERRCODE_BASIC_DIFFERENT_DRIVE ErrCode((LAST_SBX_ERROR_ID+27UL) | ERRCODE_AREA_SBX | \ +#define ERRCODE_BASIC_DIFFERENT_DRIVE ErrCode((LAST_SBX_ERROR_ID+27) | ERRCODE_AREA_SBX | \ ERRCODE_CLASS_RUNTIME) // No rename with different drive -#define ERRCODE_BASIC_ACCESS_ERROR ErrCode((LAST_SBX_ERROR_ID+28UL) | ERRCODE_AREA_SBX | \ +#define ERRCODE_BASIC_ACCESS_ERROR ErrCode((LAST_SBX_ERROR_ID+28) | ERRCODE_AREA_SBX | \ ERRCODE_CLASS_RUNTIME) // Path/File access error -#define ERRCODE_BASIC_PATH_NOT_FOUND ErrCode((LAST_SBX_ERROR_ID+29UL) | ERRCODE_AREA_SBX | \ +#define ERRCODE_BASIC_PATH_NOT_FOUND ErrCode((LAST_SBX_ERROR_ID+29) | ERRCODE_AREA_SBX | \ ERRCODE_CLASS_RUNTIME) // Path not found -#define ERRCODE_BASIC_BAD_PATTERN ErrCode((LAST_SBX_ERROR_ID+30UL) | ERRCODE_AREA_SBX | \ +#define ERRCODE_BASIC_BAD_PATTERN ErrCode((LAST_SBX_ERROR_ID+30) | ERRCODE_AREA_SBX | \ ERRCODE_CLASS_RUNTIME) // Invalid pattern string -#define ERRCODE_BASIC_IS_NULL ErrCode((LAST_SBX_ERROR_ID+31UL) | ERRCODE_AREA_SBX | \ +#define ERRCODE_BASIC_IS_NULL ErrCode((LAST_SBX_ERROR_ID+31) | ERRCODE_AREA_SBX | \ ERRCODE_CLASS_RUNTIME) // Invalid use of Null // DDE messages from 250-299 -#define ERRCODE_BASIC_DDE_ERROR ErrCode((LAST_SBX_ERROR_ID+32UL) | ERRCODE_AREA_SBX | \ +#define ERRCODE_BASIC_DDE_ERROR ErrCode((LAST_SBX_ERROR_ID+32) | ERRCODE_AREA_SBX | \ ERRCODE_CLASS_RUNTIME) -#define ERRCODE_BASIC_DDE_WAITINGACK ErrCode((LAST_SBX_ERROR_ID+33UL) | ERRCODE_AREA_SBX | \ +#define ERRCODE_BASIC_DDE_WAITINGACK ErrCode((LAST_SBX_ERROR_ID+33) | ERRCODE_AREA_SBX | \ ERRCODE_CLASS_RUNTIME) -#define ERRCODE_BASIC_DDE_OUTOFCHANNELS ErrCode((LAST_SBX_ERROR_ID+34UL) | ERRCODE_AREA_SBX | \ +#define ERRCODE_BASIC_DDE_OUTOFCHANNELS ErrCode((LAST_SBX_ERROR_ID+34) | ERRCODE_AREA_SBX | \ ERRCODE_CLASS_RUNTIME) -#define ERRCODE_BASIC_DDE_NO_RESPONSE ErrCode((LAST_SBX_ERROR_ID+35UL) | ERRCODE_AREA_SBX | \ +#define ERRCODE_BASIC_DDE_NO_RESPONSE ErrCode((LAST_SBX_ERROR_ID+35) | ERRCODE_AREA_SBX | \ ERRCODE_CLASS_RUNTIME) -#define ERRCODE_BASIC_DDE_MULT_RESPONSES ErrCode((LAST_SBX_ERROR_ID+36UL) | ERRCODE_AREA_SBX | \ +#define ERRCODE_BASIC_DDE_MULT_RESPONSES ErrCode((LAST_SBX_ERROR_ID+36) | ERRCODE_AREA_SBX | \ ERRCODE_CLASS_RUNTIME) -#define ERRCODE_BASIC_DDE_CHANNEL_LOCKED ErrCode((LAST_SBX_ERROR_ID+37UL) | ERRCODE_AREA_SBX | \ +#define ERRCODE_BASIC_DDE_CHANNEL_LOCKED ErrCode((LAST_SBX_ERROR_ID+37) | ERRCODE_AREA_SBX | \ ERRCODE_CLASS_RUNTIME) -#define ERRCODE_BASIC_DDE_NOTPROCESSED ErrCode((LAST_SBX_ERROR_ID+38UL) | ERRCODE_AREA_SBX | \ +#define ERRCODE_BASIC_DDE_NOTPROCESSED ErrCode((LAST_SBX_ERROR_ID+38) | ERRCODE_AREA_SBX | \ ERRCODE_CLASS_RUNTIME) -#define ERRCODE_BASIC_DDE_TIMEOUT ErrCode((LAST_SBX_ERROR_ID+39UL) | ERRCODE_AREA_SBX | \ +#define ERRCODE_BASIC_DDE_TIMEOUT ErrCode((LAST_SBX_ERROR_ID+39) | ERRCODE_AREA_SBX | \ ERRCODE_CLASS_RUNTIME) -#define ERRCODE_BASIC_DDE_USER_INTERRUPT ErrCode((LAST_SBX_ERROR_ID+40UL) | ERRCODE_AREA_SBX | \ +#define ERRCODE_BASIC_DDE_USER_INTERRUPT ErrCode((LAST_SBX_ERROR_ID+40) | ERRCODE_AREA_SBX | \ ERRCODE_CLASS_RUNTIME) -#define ERRCODE_BASIC_DDE_BUSY ErrCode((LAST_SBX_ERROR_ID+41UL) | ERRCODE_AREA_SBX | \ +#define ERRCODE_BASIC_DDE_BUSY ErrCode((LAST_SBX_ERROR_ID+41) | ERRCODE_AREA_SBX | \ ERRCODE_CLASS_RUNTIME) -#define ERRCODE_BASIC_DDE_NO_DATA ErrCode((LAST_SBX_ERROR_ID+42UL) | ERRCODE_AREA_SBX | \ +#define ERRCODE_BASIC_DDE_NO_DATA ErrCode((LAST_SBX_ERROR_ID+42) | ERRCODE_AREA_SBX | \ ERRCODE_CLASS_RUNTIME) -#define ERRCODE_BASIC_DDE_WRONG_DATA_FORMAT ErrCode((LAST_SBX_ERROR_ID+43UL) | ERRCODE_AREA_SBX | \ +#define ERRCODE_BASIC_DDE_WRONG_DATA_FORMAT ErrCode((LAST_SBX_ERROR_ID+43) | ERRCODE_AREA_SBX | \ ERRCODE_CLASS_RUNTIME) -#define ERRCODE_BASIC_DDE_PARTNER_QUIT ErrCode((LAST_SBX_ERROR_ID+44UL) | ERRCODE_AREA_SBX | \ +#define ERRCODE_BASIC_DDE_PARTNER_QUIT ErrCode((LAST_SBX_ERROR_ID+44) | ERRCODE_AREA_SBX | \ ERRCODE_CLASS_RUNTIME) -#define ERRCODE_BASIC_DDE_CONV_CLOSED ErrCode((LAST_SBX_ERROR_ID+45UL) | ERRCODE_AREA_SBX | \ +#define ERRCODE_BASIC_DDE_CONV_CLOSED ErrCode((LAST_SBX_ERROR_ID+45) | ERRCODE_AREA_SBX | \ ERRCODE_CLASS_RUNTIME) -#define ERRCODE_BASIC_DDE_NO_CHANNEL ErrCode((LAST_SBX_ERROR_ID+46UL) | ERRCODE_AREA_SBX | \ +#define ERRCODE_BASIC_DDE_NO_CHANNEL ErrCode((LAST_SBX_ERROR_ID+46) | ERRCODE_AREA_SBX | \ ERRCODE_CLASS_RUNTIME) -#define ERRCODE_BASIC_DDE_INVALID_LINK ErrCode((LAST_SBX_ERROR_ID+47UL) | ERRCODE_AREA_SBX | \ +#define ERRCODE_BASIC_DDE_INVALID_LINK ErrCode((LAST_SBX_ERROR_ID+47) | ERRCODE_AREA_SBX | \ ERRCODE_CLASS_RUNTIME) -#define ERRCODE_BASIC_DDE_QUEUE_OVERFLOW ErrCode((LAST_SBX_ERROR_ID+48UL) | ERRCODE_AREA_SBX | \ +#define ERRCODE_BASIC_DDE_QUEUE_OVERFLOW ErrCode((LAST_SBX_ERROR_ID+48) | ERRCODE_AREA_SBX | \ ERRCODE_CLASS_RUNTIME) -#define ERRCODE_BASIC_DDE_LINK_ALREADY_EST ErrCode((LAST_SBX_ERROR_ID+49UL) | ERRCODE_AREA_SBX | \ +#define ERRCODE_BASIC_DDE_LINK_ALREADY_EST ErrCode((LAST_SBX_ERROR_ID+49) | ERRCODE_AREA_SBX | \ ERRCODE_CLASS_RUNTIME) -#define ERRCODE_BASIC_DDE_LINK_INV_TOPIC ErrCode((LAST_SBX_ERROR_ID+50UL) | ERRCODE_AREA_SBX | \ +#define ERRCODE_BASIC_DDE_LINK_INV_TOPIC ErrCode((LAST_SBX_ERROR_ID+50) | ERRCODE_AREA_SBX | \ ERRCODE_CLASS_RUNTIME) -#define ERRCODE_BASIC_DDE_DLL_NOT_FOUND ErrCode((LAST_SBX_ERROR_ID+51UL) | ERRCODE_AREA_SBX | \ +#define ERRCODE_BASIC_DDE_DLL_NOT_FOUND ErrCode((LAST_SBX_ERROR_ID+51) | ERRCODE_AREA_SBX | \ ERRCODE_CLASS_RUNTIME) -#define ERRCODE_BASIC_NEEDS_OBJECT ErrCode((LAST_SBX_ERROR_ID+52UL) | ERRCODE_AREA_SBX | \ +#define ERRCODE_BASIC_NEEDS_OBJECT ErrCode((LAST_SBX_ERROR_ID+52) | ERRCODE_AREA_SBX | \ ERRCODE_CLASS_RUNTIME) // Object required -#define ERRCODE_BASIC_BAD_ORDINAL ErrCode((LAST_SBX_ERROR_ID+53UL) | ERRCODE_AREA_SBX | \ +#define ERRCODE_BASIC_BAD_ORDINAL ErrCode((LAST_SBX_ERROR_ID+53) | ERRCODE_AREA_SBX | \ ERRCODE_CLASS_RUNTIME) // Invalid ordinal -#define ERRCODE_BASIC_DLLPROC_NOT_FOUND ErrCode((LAST_SBX_ERROR_ID+54UL) | ERRCODE_AREA_SBX | \ +#define ERRCODE_BASIC_DLLPROC_NOT_FOUND ErrCode((LAST_SBX_ERROR_ID+54) | ERRCODE_AREA_SBX | \ ERRCODE_CLASS_RUNTIME) // Specified DLL function not found -#define ERRCODE_BASIC_BAD_CLIPBD_FORMAT ErrCode((LAST_SBX_ERROR_ID+55UL) | ERRCODE_AREA_SBX | \ +#define ERRCODE_BASIC_BAD_CLIPBD_FORMAT ErrCode((LAST_SBX_ERROR_ID+55) | ERRCODE_AREA_SBX | \ ERRCODE_CLASS_RUNTIME) // Invalid clipboard format // Debugger messages from 700-799 -#define ERRCODE_BASIC_PROPERTY_NOT_FOUND ErrCode((LAST_SBX_ERROR_ID+56UL) | ERRCODE_AREA_SBX | \ +#define ERRCODE_BASIC_PROPERTY_NOT_FOUND ErrCode((LAST_SBX_ERROR_ID+56) | ERRCODE_AREA_SBX | \ ERRCODE_CLASS_RUNTIME) // Class not have property -#define ERRCODE_BASIC_METHOD_NOT_FOUND ErrCode((LAST_SBX_ERROR_ID+57UL) | ERRCODE_AREA_SBX | \ +#define ERRCODE_BASIC_METHOD_NOT_FOUND ErrCode((LAST_SBX_ERROR_ID+57) | ERRCODE_AREA_SBX | \ ERRCODE_CLASS_RUNTIME) // Class does not have method -#define ERRCODE_BASIC_ARG_MISSING ErrCode((LAST_SBX_ERROR_ID+58UL) | ERRCODE_AREA_SBX | \ +#define ERRCODE_BASIC_ARG_MISSING ErrCode((LAST_SBX_ERROR_ID+58) | ERRCODE_AREA_SBX | \ ERRCODE_CLASS_RUNTIME) // Missing required argument -#define ERRCODE_BASIC_BAD_NUMBER_OF_ARGS ErrCode((LAST_SBX_ERROR_ID+59UL) | ERRCODE_AREA_SBX | \ +#define ERRCODE_BASIC_BAD_NUMBER_OF_ARGS ErrCode((LAST_SBX_ERROR_ID+59) | ERRCODE_AREA_SBX | \ ERRCODE_CLASS_RUNTIME) // Bad number of arguments -#define ERRCODE_BASIC_METHOD_FAILED ErrCode((LAST_SBX_ERROR_ID+60UL) | ERRCODE_AREA_SBX | \ +#define ERRCODE_BASIC_METHOD_FAILED ErrCode((LAST_SBX_ERROR_ID+60) | ERRCODE_AREA_SBX | \ ERRCODE_CLASS_RUNTIME) // Method failed -#define ERRCODE_BASIC_SETPROP_FAILED ErrCode((LAST_SBX_ERROR_ID+61UL) | ERRCODE_AREA_SBX | \ +#define ERRCODE_BASIC_SETPROP_FAILED ErrCode((LAST_SBX_ERROR_ID+61) | ERRCODE_AREA_SBX | \ ERRCODE_CLASS_RUNTIME) // Unable to set property -#define ERRCODE_BASIC_GETPROP_FAILED ErrCode((LAST_SBX_ERROR_ID+62UL) | ERRCODE_AREA_SBX | \ +#define ERRCODE_BASIC_GETPROP_FAILED ErrCode((LAST_SBX_ERROR_ID+62) | ERRCODE_AREA_SBX | \ ERRCODE_CLASS_RUNTIME) // Unable to get property // Compiler Errors (do not occur at runtime) // These IDs can shift at any time -#define ERRCODE_BASIC_UNEXPECTED ErrCode((LAST_SBX_ERROR_ID+63UL) | ERRCODE_AREA_SBX | \ +#define ERRCODE_BASIC_UNEXPECTED ErrCode((LAST_SBX_ERROR_ID+63) | ERRCODE_AREA_SBX | \ ERRCODE_CLASS_COMPILER) // Unexpected symbol: xx -#define ERRCODE_BASIC_EXPECTED ErrCode((LAST_SBX_ERROR_ID+64UL) | ERRCODE_AREA_SBX | \ +#define ERRCODE_BASIC_EXPECTED ErrCode((LAST_SBX_ERROR_ID+64) | ERRCODE_AREA_SBX | \ ERRCODE_CLASS_COMPILER) // Expected: xx -#define ERRCODE_BASIC_SYMBOL_EXPECTED ErrCode((LAST_SBX_ERROR_ID+65UL) | ERRCODE_AREA_SBX | \ +#define ERRCODE_BASIC_SYMBOL_EXPECTED ErrCode((LAST_SBX_ERROR_ID+65) | ERRCODE_AREA_SBX | \ ERRCODE_CLASS_COMPILER) // Symbol expected -#define ERRCODE_BASIC_VAR_EXPECTED ErrCode((LAST_SBX_ERROR_ID+66UL) | ERRCODE_AREA_SBX | \ +#define ERRCODE_BASIC_VAR_EXPECTED ErrCode((LAST_SBX_ERROR_ID+66) | ERRCODE_AREA_SBX | \ ERRCODE_CLASS_COMPILER) // Variable expected -#define ERRCODE_BASIC_LABEL_EXPECTED ErrCode((LAST_SBX_ERROR_ID+67UL) | ERRCODE_AREA_SBX | \ +#define ERRCODE_BASIC_LABEL_EXPECTED ErrCode((LAST_SBX_ERROR_ID+67) | ERRCODE_AREA_SBX | \ ERRCODE_CLASS_COMPILER) // Label expected -#define ERRCODE_BASIC_LVALUE_EXPECTED ErrCode((LAST_SBX_ERROR_ID+68UL) | ERRCODE_AREA_SBX | \ +#define ERRCODE_BASIC_LVALUE_EXPECTED ErrCode((LAST_SBX_ERROR_ID+68) | ERRCODE_AREA_SBX | \ ERRCODE_CLASS_COMPILER) // Lvalue expected -#define ERRCODE_BASIC_VAR_DEFINED ErrCode((LAST_SBX_ERROR_ID+69UL) | ERRCODE_AREA_SBX | \ +#define ERRCODE_BASIC_VAR_DEFINED ErrCode((LAST_SBX_ERROR_ID+69) | ERRCODE_AREA_SBX | \ ERRCODE_CLASS_COMPILER) // Variable xxx already defined -#define ERRCODE_BASIC_PROC_DEFINED ErrCode((LAST_SBX_ERROR_ID+70UL) | ERRCODE_AREA_SBX | \ +#define ERRCODE_BASIC_PROC_DEFINED ErrCode((LAST_SBX_ERROR_ID+70) | ERRCODE_AREA_SBX | \ ERRCODE_CLASS_COMPILER) // Procedure xx already defined -#define ERRCODE_BASIC_LABEL_DEFINED ErrCode((LAST_SBX_ERROR_ID+71UL) | ERRCODE_AREA_SBX | \ +#define ERRCODE_BASIC_LABEL_DEFINED ErrCode((LAST_SBX_ERROR_ID+71) | ERRCODE_AREA_SBX | \ ERRCODE_CLASS_COMPILER) // Label xxx already defined -#define ERRCODE_BASIC_UNDEF_VAR ErrCode((LAST_SBX_ERROR_ID+72UL) | ERRCODE_AREA_SBX | \ +#define ERRCODE_BASIC_UNDEF_VAR ErrCode((LAST_SBX_ERROR_ID+72) | ERRCODE_AREA_SBX | \ ERRCODE_CLASS_COMPILER) // Variable xx undefined -#define ERRCODE_BASIC_UNDEF_ARRAY ErrCode((LAST_SBX_ERROR_ID+73UL) | ERRCODE_AREA_SBX | \ +#define ERRCODE_BASIC_UNDEF_ARRAY ErrCode((LAST_SBX_ERROR_ID+73) | ERRCODE_AREA_SBX | \ ERRCODE_CLASS_COMPILER) // Array or function xx undefined -#define ERRCODE_BASIC_UNDEF_PROC ErrCode((LAST_SBX_ERROR_ID+74UL) | ERRCODE_AREA_SBX | \ +#define ERRCODE_BASIC_UNDEF_PROC ErrCode((LAST_SBX_ERROR_ID+74) | ERRCODE_AREA_SBX | \ ERRCODE_CLASS_COMPILER) // Procedure xxx undefined -#define ERRCODE_BASIC_UNDEF_LABEL ErrCode((LAST_SBX_ERROR_ID+75UL) | ERRCODE_AREA_SBX | \ +#define ERRCODE_BASIC_UNDEF_LABEL ErrCode((LAST_SBX_ERROR_ID+75) | ERRCODE_AREA_SBX | \ ERRCODE_CLASS_COMPILER) // Label xxx undefined -#define ERRCODE_BASIC_UNDEF_TYPE ErrCode((LAST_SBX_ERROR_ID+76UL) | ERRCODE_AREA_SBX | \ +#define ERRCODE_BASIC_UNDEF_TYPE ErrCode((LAST_SBX_ERROR_ID+76) | ERRCODE_AREA_SBX | \ ERRCODE_CLASS_COMPILER) // Unknown user defined type xxx -#define ERRCODE_BASIC_BAD_EXIT ErrCode((LAST_SBX_ERROR_ID+77UL) | ERRCODE_AREA_SBX | \ +#define ERRCODE_BASIC_BAD_EXIT ErrCode((LAST_SBX_ERROR_ID+77) | ERRCODE_AREA_SBX | \ ERRCODE_CLASS_COMPILER) // Exit XXX expected -#define ERRCODE_BASIC_BAD_BLOCK ErrCode((LAST_SBX_ERROR_ID+78UL) | ERRCODE_AREA_SBX | \ +#define ERRCODE_BASIC_BAD_BLOCK ErrCode((LAST_SBX_ERROR_ID+78) | ERRCODE_AREA_SBX | \ ERRCODE_CLASS_COMPILER) // Unterminated statement block: missing XX -#define ERRCODE_BASIC_BAD_BRACKETS ErrCode((LAST_SBX_ERROR_ID+79UL) | ERRCODE_AREA_SBX | \ +#define ERRCODE_BASIC_BAD_BRACKETS ErrCode((LAST_SBX_ERROR_ID+79) | ERRCODE_AREA_SBX | \ ERRCODE_CLASS_COMPILER) // Parentheses do not match -#define ERRCODE_BASIC_BAD_DECLARATION ErrCode((LAST_SBX_ERROR_ID+80UL) | ERRCODE_AREA_SBX | \ +#define ERRCODE_BASIC_BAD_DECLARATION ErrCode((LAST_SBX_ERROR_ID+80) | ERRCODE_AREA_SBX | \ ERRCODE_CLASS_COMPILER) // Symbol xx defined differently -#define ERRCODE_BASIC_BAD_PARAMETERS ErrCode((LAST_SBX_ERROR_ID+81UL) | ERRCODE_AREA_SBX | \ +#define ERRCODE_BASIC_BAD_PARAMETERS ErrCode((LAST_SBX_ERROR_ID+81) | ERRCODE_AREA_SBX | \ ERRCODE_CLASS_COMPILER) // Parameters do not match -#define ERRCODE_BASIC_BAD_CHAR_IN_NUMBER ErrCode((LAST_SBX_ERROR_ID+82UL) | ERRCODE_AREA_SBX | \ +#define ERRCODE_BASIC_BAD_CHAR_IN_NUMBER ErrCode((LAST_SBX_ERROR_ID+82) | ERRCODE_AREA_SBX | \ ERRCODE_CLASS_COMPILER) // Bad character in number -#define ERRCODE_BASIC_MUST_HAVE_DIMS ErrCode((LAST_SBX_ERROR_ID+83UL) | ERRCODE_AREA_SBX | \ +#define ERRCODE_BASIC_MUST_HAVE_DIMS ErrCode((LAST_SBX_ERROR_ID+83) | ERRCODE_AREA_SBX | \ ERRCODE_CLASS_COMPILER) // Array needs dimensioning -#define ERRCODE_BASIC_NO_IF ErrCode((LAST_SBX_ERROR_ID+84UL) | ERRCODE_AREA_SBX | \ +#define ERRCODE_BASIC_NO_IF ErrCode((LAST_SBX_ERROR_ID+84) | ERRCODE_AREA_SBX | \ ERRCODE_CLASS_COMPILER) // Else/Endif without If -#define ERRCODE_BASIC_NOT_IN_SUBR ErrCode((LAST_SBX_ERROR_ID+85UL) | ERRCODE_AREA_SBX | \ +#define ERRCODE_BASIC_NOT_IN_SUBR ErrCode((LAST_SBX_ERROR_ID+85) | ERRCODE_AREA_SBX | \ ERRCODE_CLASS_COMPILER) // xxx not allowed within a sub -#define ERRCODE_BASIC_NOT_IN_MAIN ErrCode((LAST_SBX_ERROR_ID+86UL) | ERRCODE_AREA_SBX | \ +#define ERRCODE_BASIC_NOT_IN_MAIN ErrCode((LAST_SBX_ERROR_ID+86) | ERRCODE_AREA_SBX | \ ERRCODE_CLASS_COMPILER) // xxx not allowed outside a sub -#define ERRCODE_BASIC_WRONG_DIMS ErrCode((LAST_SBX_ERROR_ID+87UL) | ERRCODE_AREA_SBX | \ +#define ERRCODE_BASIC_WRONG_DIMS ErrCode((LAST_SBX_ERROR_ID+87) | ERRCODE_AREA_SBX | \ ERRCODE_CLASS_COMPILER) // Dimensions do not match -#define ERRCODE_BASIC_BAD_OPTION ErrCode((LAST_SBX_ERROR_ID+88UL) | ERRCODE_AREA_SBX | \ +#define ERRCODE_BASIC_BAD_OPTION ErrCode((LAST_SBX_ERROR_ID+88) | ERRCODE_AREA_SBX | \ ERRCODE_CLASS_COMPILER) // Unknown option: xxx -#define ERRCODE_BASIC_CONSTANT_REDECLARED ErrCode((LAST_SBX_ERROR_ID+89UL) | ERRCODE_AREA_SBX | \ +#define ERRCODE_BASIC_CONSTANT_REDECLARED ErrCode((LAST_SBX_ERROR_ID+89) | ERRCODE_AREA_SBX | \ ERRCODE_CLASS_COMPILER) // Constant xx redeclared -#define ERRCODE_BASIC_PROG_TOO_LARGE ErrCode((LAST_SBX_ERROR_ID+90UL) | ERRCODE_AREA_SBX | \ +#define ERRCODE_BASIC_PROG_TOO_LARGE ErrCode((LAST_SBX_ERROR_ID+90) | ERRCODE_AREA_SBX | \ ERRCODE_CLASS_COMPILER) // Program is too large -#define ERRCODE_BASIC_NO_STRINGS_ARRAYS ErrCode((LAST_SBX_ERROR_ID+91UL) | ERRCODE_AREA_SBX | \ +#define ERRCODE_BASIC_NO_STRINGS_ARRAYS ErrCode((LAST_SBX_ERROR_ID+91) | ERRCODE_AREA_SBX | \ ERRCODE_CLASS_COMPILER) -#define ERRCODE_BASIC_EXCEPTION ErrCode((LAST_SBX_ERROR_ID+92UL) | ERRCODE_AREA_SBX | \ +#define ERRCODE_BASIC_EXCEPTION ErrCode((LAST_SBX_ERROR_ID+92) | ERRCODE_AREA_SBX | \ ERRCODE_CLASS_RUNTIME) -#define ERRCODE_BASMGR_STDLIBOPEN ErrCode((LAST_SBX_ERROR_ID+93UL) | ERRCODE_AREA_SBX) -#define ERRCODE_BASMGR_STDLIBSAVE ErrCode((LAST_SBX_ERROR_ID+94UL) | ERRCODE_AREA_SBX) -#define ERRCODE_BASMGR_LIBLOAD ErrCode((LAST_SBX_ERROR_ID+95UL) | ERRCODE_AREA_SBX) -#define ERRCODE_BASMGR_LIBCREATE ErrCode((LAST_SBX_ERROR_ID+96UL) | ERRCODE_AREA_SBX) -#define ERRCODE_BASMGR_LIBSAVE ErrCode((LAST_SBX_ERROR_ID+97UL) | ERRCODE_AREA_SBX) -#define ERRCODE_BASMGR_LIBDEL ErrCode((LAST_SBX_ERROR_ID+98UL) | ERRCODE_AREA_SBX) -#define ERRCODE_BASMGR_MGROPEN ErrCode((LAST_SBX_ERROR_ID+99UL) | ERRCODE_AREA_SBX) -#define ERRCODE_BASMGR_MGRSAVE ErrCode((LAST_SBX_ERROR_ID+100UL) | ERRCODE_AREA_SBX) -#define ERRCODE_BASMGR_REMOVELIB ErrCode((LAST_SBX_ERROR_ID+101UL) | ERRCODE_AREA_SBX) -#define ERRCODE_BASMGR_UNLOADLIB ErrCode((LAST_SBX_ERROR_ID+102UL) | ERRCODE_AREA_SBX) +#define ERRCODE_BASMGR_STDLIBOPEN ErrCode((LAST_SBX_ERROR_ID+93) | ERRCODE_AREA_SBX) +#define ERRCODE_BASMGR_STDLIBSAVE ErrCode((LAST_SBX_ERROR_ID+94) | ERRCODE_AREA_SBX) +#define ERRCODE_BASMGR_LIBLOAD ErrCode((LAST_SBX_ERROR_ID+95) | ERRCODE_AREA_SBX) +#define ERRCODE_BASMGR_LIBCREATE ErrCode((LAST_SBX_ERROR_ID+96) | ERRCODE_AREA_SBX) +#define ERRCODE_BASMGR_LIBSAVE ErrCode((LAST_SBX_ERROR_ID+97) | ERRCODE_AREA_SBX) +#define ERRCODE_BASMGR_LIBDEL ErrCode((LAST_SBX_ERROR_ID+98) | ERRCODE_AREA_SBX) +#define ERRCODE_BASMGR_MGROPEN ErrCode((LAST_SBX_ERROR_ID+99) | ERRCODE_AREA_SBX) +#define ERRCODE_BASMGR_MGRSAVE ErrCode((LAST_SBX_ERROR_ID+100) | ERRCODE_AREA_SBX) +#define ERRCODE_BASMGR_REMOVELIB ErrCode((LAST_SBX_ERROR_ID+101) | ERRCODE_AREA_SBX) +#define ERRCODE_BASMGR_UNLOADLIB ErrCode((LAST_SBX_ERROR_ID+102) | ERRCODE_AREA_SBX) -#define ERRCODE_BASIC_ARRAY_FIX ErrCode((LAST_SBX_ERROR_ID+104UL) | ERRCODE_AREA_SBX | \ +#define ERRCODE_BASIC_ARRAY_FIX ErrCode((LAST_SBX_ERROR_ID+104) | ERRCODE_AREA_SBX | \ ERRCODE_CLASS_COMPILER) // This array is fixed -#define ERRCODE_BASIC_STRING_OVERFLOW ErrCode((LAST_SBX_ERROR_ID+105UL) | ERRCODE_AREA_SBX | \ +#define ERRCODE_BASIC_STRING_OVERFLOW ErrCode((LAST_SBX_ERROR_ID+105) | ERRCODE_AREA_SBX | \ ERRCODE_CLASS_COMPILER) // Out of string space -#define ERRCODE_BASIC_EXPR_TOO_COMPLEX ErrCode((LAST_SBX_ERROR_ID+106UL) | ERRCODE_AREA_SBX | \ +#define ERRCODE_BASIC_EXPR_TOO_COMPLEX ErrCode((LAST_SBX_ERROR_ID+106) | ERRCODE_AREA_SBX | \ ERRCODE_CLASS_COMPILER) // Expression too complex -#define ERRCODE_BASIC_OPER_NOT_PERFORM ErrCode((LAST_SBX_ERROR_ID+107UL) | ERRCODE_AREA_SBX | \ +#define ERRCODE_BASIC_OPER_NOT_PERFORM ErrCode((LAST_SBX_ERROR_ID+107) | ERRCODE_AREA_SBX | \ ERRCODE_CLASS_COMPILER) // Can't perform requested operation -#define ERRCODE_BASIC_TOO_MANY_DLL ErrCode((LAST_SBX_ERROR_ID+108UL) | ERRCODE_AREA_SBX | \ +#define ERRCODE_BASIC_TOO_MANY_DLL ErrCode((LAST_SBX_ERROR_ID+108) | ERRCODE_AREA_SBX | \ ERRCODE_CLASS_COMPILER) // Too many dll application clients -#define ERRCODE_BASIC_LOOP_NOT_INIT ErrCode((LAST_SBX_ERROR_ID+109UL) | ERRCODE_AREA_SBX | \ +#define ERRCODE_BASIC_LOOP_NOT_INIT ErrCode((LAST_SBX_ERROR_ID+109) | ERRCODE_AREA_SBX | \ ERRCODE_CLASS_COMPILER) // For loop not initialized -#define ERRCODE_BASIC_COMPAT ErrCode((LAST_SBX_ERROR_ID+103UL)| ERRCODE_AREA_SBX | ERRCODE_CLASS_RUNTIME) +#define ERRCODE_BASIC_COMPAT ErrCode((LAST_SBX_ERROR_ID+103)| ERRCODE_AREA_SBX | ERRCODE_CLASS_RUNTIME) // Grid messages from 30000-30999 // OLE messages from 31000-31999 diff --git a/include/svtools/grfmgr.hxx b/include/svtools/grfmgr.hxx index f4a8bb5e9420..772d8a823eb7 100644 --- a/include/svtools/grfmgr.hxx +++ b/include/svtools/grfmgr.hxx @@ -459,11 +459,11 @@ public: OutputDevice* pOut, const Point& rPt, const Size& rSz, - long nExtraData = 0L, + long nExtraData = 0, OutputDevice* pFirstFrameOutDev = nullptr ); - void StopAnimation( OutputDevice* pOut = nullptr, long nExtraData = 0L ); + void StopAnimation( OutputDevice* pOut = nullptr, long nExtraData = 0 ); static GraphicObject CreateGraphicObjectFromURL( const OUString &rURL ); // will inspect an object ( e.g. a control ) for any 'ImageURL' diff --git a/include/svtools/parhtml.hxx b/include/svtools/parhtml.hxx index 8ffa953ad58c..e8a94f896f1f 100644 --- a/include/svtools/parhtml.hxx +++ b/include/svtools/parhtml.hxx @@ -268,21 +268,21 @@ inline void HTMLParser::StartPRE() { bReadPRE = true; bPre_IgnoreNewPara = true; - nPre_LinePos = 0UL; + nPre_LinePos = 0; } inline void HTMLParser::StartListing() { bReadListing = true; bPre_IgnoreNewPara = true; - nPre_LinePos = 0UL; + nPre_LinePos = 0; } inline void HTMLParser::StartXMP() { bReadXMP = true; bPre_IgnoreNewPara = true; - nPre_LinePos = 0UL; + nPre_LinePos = 0; } #endif diff --git a/include/svx/contdlg.hxx b/include/svx/contdlg.hxx index 2664a656f002..ab0e8c95355c 100644 --- a/include/svx/contdlg.hxx +++ b/include/svx/contdlg.hxx @@ -81,7 +81,7 @@ public: static tools::PolyPolygon CreateAutoContour( const Graphic& rGraphic, const tools::Rectangle* pRect = nullptr, - const sal_uIntPtr nFlags = 0L ); + const sal_uIntPtr nFlags = 0 ); }; #endif // INCLUDED_SVX_CONTDLG_HXX diff --git a/include/svx/galmisc.hxx b/include/svx/galmisc.hxx index b74f7f7e2061..e3a8f86fbb10 100644 --- a/include/svx/galmisc.hxx +++ b/include/svx/galmisc.hxx @@ -188,10 +188,10 @@ private: public: - GalleryHint( GalleryHintType nType, const OUString& rThemeName, sal_uIntPtr nData1 = 0UL ) : + GalleryHint( GalleryHintType nType, const OUString& rThemeName, sal_uIntPtr nData1 = 0 ) : mnType( nType ), maThemeName( rThemeName ), mnData1( nData1 ) {} - GalleryHint( GalleryHintType nType, const OUString& rThemeName, const OUString& rStringData, sal_uIntPtr nData1 = 0UL ) : + GalleryHint( GalleryHintType nType, const OUString& rThemeName, const OUString& rStringData, sal_uIntPtr nData1 = 0 ) : mnType( nType ), maThemeName( rThemeName ), maStringData( rStringData ), mnData1( nData1 ) {} GalleryHintType GetType() const { return mnType; } diff --git a/include/svx/svdmark.hxx b/include/svx/svdmark.hxx index 0c438930bb45..1ad4b7e937aa 100644 --- a/include/svx/svdmark.hxx +++ b/include/svx/svdmark.hxx @@ -216,7 +216,7 @@ public: return GetPointMarkDescription(true); } - // pPage=0L: Selection of everything! Respect Pages + // pPage=0: Selection of everything! Respect Pages bool TakeBoundRect(SdrPageView const * pPageView, tools::Rectangle& rRect) const; bool TakeSnapRect(SdrPageView const * pPageView, tools::Rectangle& rRect) const; diff --git a/include/tools/stream.hxx b/include/tools/stream.hxx index b3dece37e83b..3a0b44594618 100644 --- a/include/tools/stream.hxx +++ b/include/tools/stream.hxx @@ -650,7 +650,7 @@ protected: /// ReAllocateMemory must update the following variables: /// - pBuf: Address of new block - /// - nEndOfData: Set to nNewSize-1L , if outside of block + /// - nEndOfData: Set to nNewSize-1 , if outside of block /// Set to 0 , if new block size is 0 bytes /// - nSize: New block size /// - nPos: Set to 0 if position outside of block diff --git a/include/vcl/animate.hxx b/include/vcl/animate.hxx index bb8cc968c3ac..06222cf35415 100644 --- a/include/vcl/animate.hxx +++ b/include/vcl/animate.hxx @@ -53,7 +53,7 @@ struct VCL_DLLPUBLIC AnimationBitmap const BitmapEx& rBmpEx, const Point& rPosPix, const Size& rSizePix, - long _nWait = 0L, + long _nWait = 0, Disposal _eDisposal = Disposal::Not ) : aBmpEx ( rBmpEx ), diff --git a/include/vcl/bitmap.hxx b/include/vcl/bitmap.hxx index f1ba07085e37..98bd21ded439 100644 --- a/include/vcl/bitmap.hxx +++ b/include/vcl/bitmap.hxx @@ -495,7 +495,7 @@ public: @return the resulting bitmask. */ - Bitmap CreateMask( const Color& rTransColor, sal_uLong nTol = 0UL ) const; + Bitmap CreateMask( const Color& rTransColor, sal_uLong nTol = 0 ) const; /** Create region of similar colors in a given rectangle diff --git a/include/vcl/graph.hxx b/include/vcl/graph.hxx index 626b11bcddca..ad5471ca439e 100644 --- a/include/vcl/graph.hxx +++ b/include/vcl/graph.hxx @@ -179,7 +179,7 @@ public: void StartAnimation( OutputDevice* pOutDev, const Point& rDestPt, const Size& rDestSize, - long nExtraData = 0L, + long nExtraData = 0, OutputDevice* pFirstFrameOutDev = nullptr ); void StopAnimation( OutputDevice* pOutputDevice, long nExtraData ); diff --git a/include/vcl/lineinfo.hxx b/include/vcl/lineinfo.hxx index 99dda6242cf8..4bfa3df339ff 100644 --- a/include/vcl/lineinfo.hxx +++ b/include/vcl/lineinfo.hxx @@ -53,7 +53,7 @@ struct ImplLineInfo class VCL_DLLPUBLIC LineInfo { public: - LineInfo( LineStyle eLineStyle = LineStyle::Solid, long nWidth = 0L ); + LineInfo( LineStyle eLineStyle = LineStyle::Solid, long nWidth = 0 ); LineInfo( const LineInfo& rLineInfo ); LineInfo( LineInfo&& rLineInfo ); ~LineInfo(); diff --git a/include/vcl/metaact.hxx b/include/vcl/metaact.hxx index a5e939e4fd72..9fac991ac19e 100644 --- a/include/vcl/metaact.hxx +++ b/include/vcl/metaact.hxx @@ -1444,7 +1444,7 @@ protected: public: explicit MetaCommentAction(); explicit MetaCommentAction( const MetaCommentAction& rAct ); - explicit MetaCommentAction( const OString& rComment, sal_Int32 nValue = 0L, const sal_uInt8* pData = nullptr, sal_uInt32 nDataSize = 0UL ); + explicit MetaCommentAction( const OString& rComment, sal_Int32 nValue = 0, const sal_uInt8* pData = nullptr, sal_uInt32 nDataSize = 0 ); virtual void Move( long nHorzMove, long nVertMove ) override; virtual void Scale( double fScaleX, double fScaleY ) override; diff --git a/include/vcl/salbtype.hxx b/include/vcl/salbtype.hxx index 47d51e00b799..97b0b213ba11 100644 --- a/include/vcl/salbtype.hxx +++ b/include/vcl/salbtype.hxx @@ -75,11 +75,11 @@ d_Col = BitmapColor( (sal_uInt8) ( _def_cR | ( ( _def_cR & maR.mnOr ) >> maR.mnO #define COLOR_TO_MASK( d_rCol, d_RM, d_GM, d_BM, d_RS, d_GS, d_BS, d_ALPHA ) \ -( ( ( ( d_RS < 0L ) ? ( (sal_uInt32) (d_rCol).GetRed() >> -d_RS ) : \ +( ( ( ( d_RS < 0 ) ? ( (sal_uInt32) (d_rCol).GetRed() >> -d_RS ) : \ ( (sal_uInt32) (d_rCol).GetRed() << d_RS ) ) & d_RM ) | \ - ( ( ( d_GS < 0L ) ? ( (sal_uInt32) (d_rCol).GetGreen() >> -d_GS ) : \ + ( ( ( d_GS < 0 ) ? ( (sal_uInt32) (d_rCol).GetGreen() >> -d_GS ) : \ ( (sal_uInt32) (d_rCol).GetGreen() << d_GS ) ) & d_GM ) | \ - ( ( ( d_BS < 0L ) ? ( (sal_uInt32) (d_rCol).GetBlue() >> -d_BS ) : \ + ( ( ( d_BS < 0 ) ? ( (sal_uInt32) (d_rCol).GetBlue() >> -d_BS ) : \ ( (sal_uInt32) (d_rCol).GetBlue() << d_BS ) ) & d_BM ) | \ d_ALPHA ) diff --git a/include/xmloff/styleexp.hxx b/include/xmloff/styleexp.hxx index fbe6b5107e59..fb48166e14df 100644 --- a/include/xmloff/styleexp.hxx +++ b/include/xmloff/styleexp.hxx @@ -85,13 +85,13 @@ public: // const OUString& rFamily, const OUString& rXMLFamily, // const rtl::Reference < XMLPropertySetMapper >& rPropMapper, // bool bUsed, sal_uInt16 nFamily = 0, -// const OUString* pPrefix = 0L); +// const OUString* pPrefix = 0); // void exportStyleFamily( // const sal_Char *pFamily, const OUString& rXMLFamily, // const rtl::Reference < XMLPropertySetMapper >& rPropMapper, // bool bUsed, sal_uInt16 nFamily = 0, -// const OUString* pPrefix = 0L); +// const OUString* pPrefix = 0); bool exportDefaultStyle( const css::uno::Reference< css::beans::XPropertySet > & xPropSet, diff --git a/lotuswordpro/source/filter/lwpbasetype.cxx b/lotuswordpro/source/filter/lwpbasetype.cxx index 879094dc095b..8f26a6acf11d 100644 --- a/lotuswordpro/source/filter/lwpbasetype.cxx +++ b/lotuswordpro/source/filter/lwpbasetype.cxx @@ -90,8 +90,8 @@ void LwpPoint::Read(LwpObjectStream *pStrm) */ void LwpPoint::Reset() { - m_nX=0L; - m_nY=0L; + m_nX=0; + m_nY=0; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx b/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx index 921962a3114b..b32ca0fa1ab5 100644 --- a/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx +++ b/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx @@ -169,10 +169,10 @@ void SAL_CALL ImportDocumentHandler::startElement(const OUString & _sName, const OUString sLocalName; const OUString sAttrName = _xAttrList->getNameByIndex( i ); const sal_Int32 nColonPos = sAttrName.indexOf( ':' ); - if( -1L == nColonPos ) + if( -1 == nColonPos ) sLocalName = sAttrName; else - sLocalName = sAttrName.copy( nColonPos + 1L ); + sLocalName = sAttrName.copy( nColonPos + 1 ); const OUString sValue = _xAttrList->getValueByIndex( i ); switch( m_pReportElemTokenMap->Get( XML_NAMESPACE_REPORT, sLocalName ) ) @@ -218,10 +218,10 @@ void SAL_CALL ImportDocumentHandler::startElement(const OUString & _sName, const OUString sLocalName; const OUString sAttrName = _xAttrList->getNameByIndex( i ); const sal_Int32 nColonPos = sAttrName.indexOf( ':' ); - if( -1L == nColonPos ) + if( -1 == nColonPos ) sLocalName = sAttrName; else - sLocalName = sAttrName.copy( nColonPos + 1L ); + sLocalName = sAttrName.copy( nColonPos + 1 ); const OUString sValue = _xAttrList->getValueByIndex( i ); switch( pMasterElemTokenMap->Get( XML_NAMESPACE_REPORT, sLocalName ) ) @@ -261,10 +261,10 @@ void SAL_CALL ImportDocumentHandler::startElement(const OUString & _sName, const OUString sLocalName; const OUString sAttrName = _xAttrList->getNameByIndex( i ); const sal_Int32 nColonPos = sAttrName.indexOf( ':' ); - if( -1L == nColonPos ) + if( -1 == nColonPos ) sLocalName = sAttrName; else - sLocalName = sAttrName.copy( nColonPos + 1L ); + sLocalName = sAttrName.copy( nColonPos + 1 ); if ( sLocalName == "data-source-has-labels" ) { const OUString sValue = _xAttrList->getValueByIndex( i ); diff --git a/sal/osl/unx/profile.cxx b/sal/osl/unx/profile.cxx index 1ff9ed0a1865..a3d029e94da2 100644 --- a/sal/osl/unx/profile.cxx +++ b/sal/osl/unx/profile.cxx @@ -1023,7 +1023,7 @@ static bool OslProfile_rewindFile(osl_TFile* pFile, bool bTruncate) { pFile->m_pReadPtr = pFile->m_ReadBuf + sizeof(pFile->m_ReadBuf); - bRet = (lseek(pFile->m_Handle, SEEK_SET, 0L) == 0L); + bRet = (lseek(pFile->m_Handle, SEEK_SET, 0L) == 0); if (bTruncate) { diff --git a/sal/rtl/cipher.cxx b/sal/rtl/cipher.cxx index 557ff7fdeccb..38470fbb1326 100644 --- a/sal/rtl/cipher.cxx +++ b/sal/rtl/cipher.cxx @@ -26,13 +26,13 @@ #define RTL_CIPHER_NTOHL(c, l) \ ((l) = ((sal_uInt32)(*((c)++))) << 24, \ (l) |= ((sal_uInt32)(*((c)++))) << 16, \ - (l) |= ((sal_uInt32)(*((c)++))) << 8L, \ + (l) |= ((sal_uInt32)(*((c)++))) << 8, \ (l) |= ((sal_uInt32)(*((c)++)))) #define RTL_CIPHER_HTONL(l, c) \ (*((c)++) = (sal_uInt8)(((l) >> 24) & 0xff), \ *((c)++) = (sal_uInt8)(((l) >> 16) & 0xff), \ - *((c)++) = (sal_uInt8)(((l) >> 8L) & 0xff), \ + *((c)++) = (sal_uInt8)(((l) >> 8) & 0xff), \ *((c)++) = (sal_uInt8)(((l) ) & 0xff)) #define RTL_CIPHER_NTOHL64(c, xl, xr, n) \ @@ -43,7 +43,7 @@ { \ case 8: (xr) = ((sal_uInt32)(*(--(c)))); \ SAL_FALLTHROUGH; \ - case 7: (xr) |= ((sal_uInt32)(*(--(c)))) << 8L; \ + case 7: (xr) |= ((sal_uInt32)(*(--(c)))) << 8; \ SAL_FALLTHROUGH; \ case 6: (xr) |= ((sal_uInt32)(*(--(c)))) << 16; \ SAL_FALLTHROUGH; \ @@ -51,7 +51,7 @@ SAL_FALLTHROUGH; \ case 4: (xl) = ((sal_uInt32)(*(--(c)))); \ SAL_FALLTHROUGH; \ - case 3: (xl) |= ((sal_uInt32)(*(--(c)))) << 8L; \ + case 3: (xl) |= ((sal_uInt32)(*(--(c)))) << 8; \ SAL_FALLTHROUGH; \ case 2: (xl) |= ((sal_uInt32)(*(--(c)))) << 16; \ SAL_FALLTHROUGH; \ @@ -66,7 +66,7 @@ { \ case 8: *(--(c)) = (sal_uInt8)(((xr) ) & 0xff); \ SAL_FALLTHROUGH; \ - case 7: *(--(c)) = (sal_uInt8)(((xr) >> 8L) & 0xff); \ + case 7: *(--(c)) = (sal_uInt8)(((xr) >> 8) & 0xff); \ SAL_FALLTHROUGH; \ case 6: *(--(c)) = (sal_uInt8)(((xr) >> 16) & 0xff); \ SAL_FALLTHROUGH; \ @@ -74,7 +74,7 @@ SAL_FALLTHROUGH; \ case 4: *(--(c)) = (sal_uInt8)(((xl) ) & 0xff); \ SAL_FALLTHROUGH; \ - case 3: *(--(c)) = (sal_uInt8)(((xl) >> 8L) & 0xff); \ + case 3: *(--(c)) = (sal_uInt8)(((xl) >> 8) & 0xff); \ SAL_FALLTHROUGH; \ case 2: *(--(c)) = (sal_uInt8)(((xl) >> 16) & 0xff); \ SAL_FALLTHROUGH; \ diff --git a/sal/rtl/digest.cxx b/sal/rtl/digest.cxx index 178bfaa34d6d..e784c4d13de3 100644 --- a/sal/rtl/digest.cxx +++ b/sal/rtl/digest.cxx @@ -31,12 +31,12 @@ #define RTL_DIGEST_HTONL(l,c) \ (*((c)++) = (sal_uInt8)(((l) >> 24) & 0xff), \ *((c)++) = (sal_uInt8)(((l) >> 16) & 0xff), \ - *((c)++) = (sal_uInt8)(((l) >> 8L) & 0xff), \ + *((c)++) = (sal_uInt8)(((l) >> 8) & 0xff), \ *((c)++) = (sal_uInt8)(((l) ) & 0xff)) #define RTL_DIGEST_LTOC(l,c) \ (*((c)++) = (sal_uInt8)(((l) ) & 0xff), \ - *((c)++) = (sal_uInt8)(((l) >> 8L) & 0xff), \ + *((c)++) = (sal_uInt8)(((l) >> 8) & 0xff), \ *((c)++) = (sal_uInt8)(((l) >> 16) & 0xff), \ *((c)++) = (sal_uInt8)(((l) >> 24) & 0xff)) @@ -612,9 +612,9 @@ static void endMD5(DigestContextMD5 *ctx) switch (ctx->m_nDatLen & 0x03) { - case 0: X[i] = ((sal_uInt32)(*(p++))) << 0L; + case 0: X[i] = ((sal_uInt32)(*(p++))) << 0; SAL_FALLTHROUGH; - case 1: X[i] |= ((sal_uInt32)(*(p++))) << 8L; + case 1: X[i] |= ((sal_uInt32)(*(p++))) << 8; SAL_FALLTHROUGH; case 2: X[i] |= ((sal_uInt32)(*(p++))) << 16; SAL_FALLTHROUGH; @@ -1034,9 +1034,9 @@ static void endSHA(DigestContextSHA *ctx) switch (ctx->m_nDatLen & 0x03) { - case 0: X[i] = ((sal_uInt32)(*(p++))) << 0L; + case 0: X[i] = ((sal_uInt32)(*(p++))) << 0; SAL_FALLTHROUGH; - case 1: X[i] |= ((sal_uInt32)(*(p++))) << 8L; + case 1: X[i] |= ((sal_uInt32)(*(p++))) << 8; SAL_FALLTHROUGH; case 2: X[i] |= ((sal_uInt32)(*(p++))) << 16; SAL_FALLTHROUGH; diff --git a/sal/rtl/random.cxx b/sal/rtl/random.cxx index 96978ffdfbc7..4fe8b049196f 100644 --- a/sal/rtl/random.cxx +++ b/sal/rtl/random.cxx @@ -32,13 +32,13 @@ #define RTL_RANDOM_RNG(x, y, z) \ { \ (x) = 170 * ((x) % 178) - 63 * ((x) / 178); \ - if ((x) < 0) (x) += 30328L; \ + if ((x) < 0) (x) += 30328; \ \ (y) = 171 * ((y) % 177) - 2 * ((y) / 177); \ - if ((y) < 0) (y) += 30269L; \ + if ((y) < 0) (y) += 30269; \ \ (z) = 172 * ((z) % 176) - 35 * ((z) / 176); \ - if ((z) < 0) (z) += 30307L; \ + if ((z) < 0) (z) += 30307; \ } struct RandomData_Impl diff --git a/salhelper/source/timer.cxx b/salhelper/source/timer.cxx index 3b669d97a2b5..f3dcc508a0a2 100644 --- a/salhelper/source/timer.cxx +++ b/salhelper/source/timer.cxx @@ -193,7 +193,7 @@ TTimeValue Timer::getRemainingTime() const if (secs > 0) { secs -= 1; - nsecs += 1000000000L; + nsecs += 1000000000; } else return TTimeValue(0, 0); diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx index fcd05c554135..f7f29794aed5 100644 --- a/sc/source/core/data/document.cxx +++ b/sc/source/core/data/document.cxx @@ -6042,7 +6042,7 @@ void ScDocument::StylesToNames() sal_uLong ScDocument::GetCellCount() const { - sal_uLong nCellCount = 0L; + sal_uLong nCellCount = 0; TableContainer::const_iterator it = maTabs.begin(); for (; it != maTabs.end(); ++it) @@ -6054,7 +6054,7 @@ sal_uLong ScDocument::GetCellCount() const sal_uLong ScDocument::GetFormulaGroupCount() const { - sal_uLong nFormulaGroupCount = 0L; + sal_uLong nFormulaGroupCount = 0; ScFormulaGroupIterator aIter( const_cast<ScDocument*>(this) ); for ( sc::FormulaGroupEntry* ptr = aIter.first(); ptr; ptr = aIter.next()) diff --git a/sc/source/filter/excel/xltools.cxx b/sc/source/filter/excel/xltools.cxx index 176e1da6162c..ff0d03c0fe84 100644 --- a/sc/source/filter/excel/xltools.cxx +++ b/sc/source/filter/excel/xltools.cxx @@ -316,7 +316,7 @@ sal_uInt16 XclTools::GetXclColumnWidth( sal_uInt16 nScWidth, long nScCharWidth ) double XclTools::GetXclDefColWidthCorrection( long nXclDefFontHeight ) { - return 40960.0 / ::std::max( nXclDefFontHeight - 15L, 60L ) + 50.0; + return 40960.0 / ::std::max( nXclDefFontHeight - 15, 60L ) + 50.0; } // formatting diff --git a/sc/source/filter/lotus/lotread.cxx b/sc/source/filter/lotus/lotread.cxx index 0a3da04e1218..a029a9ed43b8 100644 --- a/sc/source/filter/lotus/lotread.cxx +++ b/sc/source/filter/lotus/lotread.cxx @@ -43,7 +43,7 @@ ErrCode ImportLotus::Read() sal_uInt16 nOp; sal_uInt16 nSubType; sal_uInt16 nRecLen; - sal_uInt32 nNextRec = 0UL; + sal_uInt32 nNextRec = 0; ErrCode eRet = ERRCODE_NONE; // ScFormulaCell *pLastFormCell; @@ -230,7 +230,7 @@ ErrCode ImportLotus::Read(SvStream& rIn) bool bRead = true; sal_uInt16 nOp; sal_uInt16 nRecLen; - sal_uInt32 nNextRec = 0UL; + sal_uInt32 nNextRec = 0; ErrCode eRet = ERRCODE_NONE; nTab = 0; diff --git a/sc/source/ui/Accessibility/AccessibleCsvControl.cxx b/sc/source/ui/Accessibility/AccessibleCsvControl.cxx index 91f6f29ae956..55a82e67e49d 100644 --- a/sc/source/ui/Accessibility/AccessibleCsvControl.cxx +++ b/sc/source/ui/Accessibility/AccessibleCsvControl.cxx @@ -292,7 +292,7 @@ static sal_Int32 lcl_GetRulerPos( sal_Int32 nApiPos ) nApiLimit = lcl_GetApiPos( nExp ); } sal_Int32 nRelPos = nApiPos - nApiBase; - return nRulerPos + nRelPos / nDiv * 10 + ::std::max( nRelPos % nDiv - nDiv + 10L, 0L ); + return nRulerPos + nRelPos / nDiv * 10 + ::std::max<sal_Int32>( nRelPos % nDiv - nDiv + 10, 0 ); } /** Expands the sequence's size and returns the base index of the new inserted elements. */ diff --git a/sc/source/ui/cctrl/dpcontrol.cxx b/sc/source/ui/cctrl/dpcontrol.cxx index 55e8785e514c..0a16734757f5 100644 --- a/sc/source/ui/cctrl/dpcontrol.cxx +++ b/sc/source/ui/cctrl/dpcontrol.cxx @@ -147,7 +147,7 @@ void ScDPFieldButton::getPopupBoundingBox(Point& rPos, Size& rSize) const { float fScaleFactor = mpOutDev->GetDPIScaleFactor(); - long nMaxSize = 18L * fScaleFactor; // Button max size in either dimension + long nMaxSize = 18 * fScaleFactor; // Button max size in either dimension long nW = std::min(maSize.getWidth() / 2, nMaxSize); long nH = std::min(maSize.getHeight(), nMaxSize); diff --git a/sc/source/ui/dbgui/csvcontrol.cxx b/sc/source/ui/dbgui/csvcontrol.cxx index 4d0fa54d66c7..40aee4e35444 100644 --- a/sc/source/ui/dbgui/csvcontrol.cxx +++ b/sc/source/ui/dbgui/csvcontrol.cxx @@ -181,7 +181,7 @@ sal_Int32 ScCsvControl::GetVisPosCount() const sal_Int32 ScCsvControl::GetMaxPosOffset() const { - return std::max( GetPosCount() - GetVisPosCount() + 2L, 0L ); + return std::max<sal_Int32>( GetPosCount() - GetVisPosCount() + 2, 0 ); } bool ScCsvControl::IsValidSplitPos( sal_Int32 nPos ) const @@ -231,7 +231,7 @@ sal_Int32 ScCsvControl::GetLastVisLine() const sal_Int32 ScCsvControl::GetMaxLineOffset() const { - return std::max( GetLineCount() - GetVisLineCount() + 1L, 0L ); + return std::max<sal_Int32>( GetLineCount() - GetVisLineCount() + 1, 0 ); } bool ScCsvControl::IsValidLine( sal_Int32 nLine ) const diff --git a/sc/source/ui/dbgui/csvgrid.cxx b/sc/source/ui/dbgui/csvgrid.cxx index 1a13fe7fd3b2..3d68c95bdb99 100644 --- a/sc/source/ui/dbgui/csvgrid.cxx +++ b/sc/source/ui/dbgui/csvgrid.cxx @@ -196,7 +196,7 @@ sal_Int32 ScCsvGrid::GetNoScrollCol( sal_Int32 nPos ) const sal_Int32 nScroll = (GetFirstVisPos() > 0) ? CSV_SCROLL_DIST : 0; nNewPos = GetFirstVisPos() + nScroll; } - else if( nNewPos > GetLastVisPos() - CSV_SCROLL_DIST - 1L ) + else if( nNewPos > GetLastVisPos() - CSV_SCROLL_DIST - 1 ) { sal_Int32 nScroll = (GetFirstVisPos() < GetMaxPosOffset()) ? CSV_SCROLL_DIST : 0; nNewPos = GetLastVisPos() - nScroll - 1; diff --git a/sc/source/ui/dbgui/csvruler.cxx b/sc/source/ui/dbgui/csvruler.cxx index 2ddcb309b920..be4b48ba9763 100644 --- a/sc/source/ui/dbgui/csvruler.cxx +++ b/sc/source/ui/dbgui/csvruler.cxx @@ -256,7 +256,7 @@ sal_Int32 ScCsvRuler::GetNoScrollPos( sal_Int32 nPos ) const sal_Int32 nScroll = (GetFirstVisPos() > 0) ? CSV_SCROLL_DIST : 0; nNewPos = std::max( nPos, GetFirstVisPos() + nScroll ); } - else if( nNewPos > GetLastVisPos() - CSV_SCROLL_DIST - 1L ) + else if( nNewPos > GetLastVisPos() - CSV_SCROLL_DIST - 1 ) { sal_Int32 nScroll = (GetFirstVisPos() < GetMaxPosOffset()) ? CSV_SCROLL_DIST : 0; nNewPos = std::min( nNewPos, GetLastVisPos() - nScroll - sal_Int32( 1 ) ); diff --git a/sc/source/ui/drawfunc/fuconrec.cxx b/sc/source/ui/drawfunc/fuconrec.cxx index 9646401a3dc9..dce2e752d041 100644 --- a/sc/source/ui/drawfunc/fuconrec.cxx +++ b/sc/source/ui/drawfunc/fuconrec.cxx @@ -68,7 +68,7 @@ namespace { OUString aArrowName( SvxResId(pResId) ); long nCount = pLineEndList->Count(); long nIndex; - for( nIndex = 0L; nIndex < nCount; nIndex++ ) + for( nIndex = 0; nIndex < nCount; nIndex++ ) { const XLineEndEntry* pEntry = pLineEndList->GetLineEnd(nIndex); if( pEntry->GetName() == aArrowName ) diff --git a/sc/source/ui/view/gridwin4.cxx b/sc/source/ui/view/gridwin4.cxx index a0ea195f3e14..b7f319135f88 100644 --- a/sc/source/ui/view/gridwin4.cxx +++ b/sc/source/ui/view/gridwin4.cxx @@ -608,7 +608,7 @@ void ScGridWindow::DrawContent(OutputDevice &rDevice, const ScTableInfo& rTableI { if(bLayoutRTL) { - aDrawingRectPixel.Left() = 0L; + aDrawingRectPixel.Left() = 0; } else { diff --git a/sd/source/core/PageListWatcher.cxx b/sd/source/core/PageListWatcher.cxx index 283a798020e7..e0158d5b04d9 100644 --- a/sd/source/core/PageListWatcher.cxx +++ b/sd/source/core/PageListWatcher.cxx @@ -110,12 +110,12 @@ SdPage* ImpPageListWatcher::GetSdPage(PageKind ePgKind, sal_uInt32 nPgNum) case PageKind::Handout: { // #11420# for models used to transfer drawing shapes via clipboard it's ok to not have a handout page - DBG_ASSERT(nPgNum == 0L, "ImpPageListWatcher::GetSdPage: access to non existing handout page (!)"); + DBG_ASSERT(nPgNum == 0, "ImpPageListWatcher::GetSdPage: access to non existing handout page (!)"); if (nPgNum == 0) pRetval = mpHandoutPage; else { - DBG_ASSERT(nPgNum == 0L, + DBG_ASSERT(nPgNum == 0, "ImpPageListWatcher::GetSdPage: access to non existing handout page (!)"); } break; @@ -150,7 +150,7 @@ sal_uInt32 ImpPageListWatcher::GetSdPageCount(PageKind ePgKind) { if(mpHandoutPage) { - nRetval = 1L; + nRetval = 1; } break; diff --git a/sd/source/filter/html/htmlex.cxx b/sd/source/filter/html/htmlex.cxx index 766bd0d46d15..1e4bfb87a9e5 100644 --- a/sd/source/filter/html/htmlex.cxx +++ b/sd/source/filter/html/htmlex.cxx @@ -2796,14 +2796,14 @@ OUString HtmlExport::CreateHTMLPolygonArea( const ::basegfx::B2DPolyPolygon& rPo OUStringBuffer aStr; const sal_uInt32 nNoOfPolygons(rPolyPolygon.count()); - for ( sal_uInt32 nXPoly = 0L; nXPoly < nNoOfPolygons; nXPoly++ ) + for ( sal_uInt32 nXPoly = 0; nXPoly < nNoOfPolygons; nXPoly++ ) { const ::basegfx::B2DPolygon& aPolygon = rPolyPolygon.getB2DPolygon(nXPoly); const sal_uInt32 nNoOfPoints(aPolygon.count()); aStr.append("<area shape=\"polygon\" alt=\"\" coords=\""); - for ( sal_uInt32 nPoint = 0L; nPoint < nNoOfPoints; nPoint++ ) + for ( sal_uInt32 nPoint = 0; nPoint < nNoOfPoints; nPoint++ ) { const ::basegfx::B2DPoint aB2DPoint(aPolygon.getB2DPoint(nPoint)); Point aPnt(FRound(aB2DPoint.getX()), FRound(aB2DPoint.getY())); diff --git a/sd/source/ui/app/sdmod2.cxx b/sd/source/ui/app/sdmod2.cxx index 6a2cf38a53c8..1e95727d4a64 100644 --- a/sd/source/ui/app/sdmod2.cxx +++ b/sd/source/ui/app/sdmod2.cxx @@ -487,8 +487,8 @@ std::unique_ptr<SfxItemSet> SdModule::CreateItemSet( sal_uInt16 nSlot ) pRet->Put( SdOptionsSnapItem( pOptions, pFrameView ) ); // TP_SCALE: - sal_uInt32 nW = 10L; - sal_uInt32 nH = 10L; + sal_uInt32 nW = 10; + sal_uInt32 nH = 10; sal_Int32 nX; sal_Int32 nY; if( pDocSh ) diff --git a/sd/source/ui/dlg/copydlg.cxx b/sd/source/ui/dlg/copydlg.cxx index 288612d7cad3..69a8e7e6922b 100644 --- a/sd/source/ui/dlg/copydlg.cxx +++ b/sd/source/ui/dlg/copydlg.cxx @@ -153,12 +153,12 @@ void CopyDlg::Reset() else m_pNumFldCopies->SetValue( 1 ); - long nMoveX = 500L; + long nMoveX = 500; if( SfxItemState::SET == mrOutAttrs.GetItemState( ATTR_COPY_MOVE_X, true, &pPoolItem ) ) nMoveX = static_cast<const SfxInt32Item*>( pPoolItem )->GetValue(); SetMetricValue( *m_pMtrFldMoveX, Fraction(nMoveX) / maUIScale, MapUnit::Map100thMM); - long nMoveY = 500L; + long nMoveY = 500; if( SfxItemState::SET == mrOutAttrs.GetItemState( ATTR_COPY_MOVE_Y, true, &pPoolItem ) ) nMoveY = static_cast<const SfxInt32Item*>( pPoolItem )->GetValue(); SetMetricValue( *m_pMtrFldMoveY, Fraction(nMoveY) / maUIScale, MapUnit::Map100thMM); @@ -168,12 +168,12 @@ void CopyDlg::Reset() else m_pMtrFldAngle->SetValue( 0 ); - long nWidth = 0L; + long nWidth = 0; if( SfxItemState::SET == mrOutAttrs.GetItemState( ATTR_COPY_WIDTH, true, &pPoolItem ) ) nWidth = static_cast<const SfxInt32Item*>( pPoolItem )->GetValue(); SetMetricValue( *m_pMtrFldWidth, Fraction(nWidth) / maUIScale, MapUnit::Map100thMM); - long nHeight = 0L; + long nHeight = 0; if( SfxItemState::SET == mrOutAttrs.GetItemState( ATTR_COPY_HEIGHT, true, &pPoolItem ) ) nHeight = static_cast<const SfxInt32Item*>( pPoolItem )->GetValue(); SetMetricValue( *m_pMtrFldHeight, Fraction(nHeight) / maUIScale, MapUnit::Map100thMM); @@ -288,11 +288,11 @@ IMPL_LINK_NOARG(CopyDlg, SetDefault, Button*, void) { m_pNumFldCopies->SetValue( 1 ); - long nValue = 500L; + long nValue = 500; SetMetricValue( *m_pMtrFldMoveX, Fraction(nValue) / maUIScale, MapUnit::Map100thMM); SetMetricValue( *m_pMtrFldMoveY, Fraction(nValue) / maUIScale, MapUnit::Map100thMM); - nValue = 0L; + nValue = 0; m_pMtrFldAngle->SetValue( nValue ); SetMetricValue( *m_pMtrFldWidth, Fraction(nValue) / maUIScale, MapUnit::Map100thMM); SetMetricValue( *m_pMtrFldHeight, Fraction(nValue) / maUIScale, MapUnit::Map100thMM); diff --git a/sd/source/ui/dlg/custsdlg.cxx b/sd/source/ui/dlg/custsdlg.cxx index fbb407396bca..63d09eab7188 100644 --- a/sd/source/ui/dlg/custsdlg.cxx +++ b/sd/source/ui/dlg/custsdlg.cxx @@ -313,7 +313,7 @@ SdDefineCustomShowDlg::SdDefineCustomShowDlg( vcl::Window* pWindow, m_pLbPages->SetDropDownLineCount(10); // fill Listbox with page names of Docs - for( long nPage = 0L; + for( long nPage = 0; nPage < rDoc.GetSdPageCount( PageKind::Standard ); nPage++ ) { @@ -409,7 +409,7 @@ void SdDefineCustomShowDlg::ClickButtonHdl2(void const * p) sal_uLong nPosCP = TREELIST_APPEND; SvTreeListEntry* pEntry = m_pLbCustomPages->FirstSelected(); if( pEntry ) - nPosCP = m_pLbCustomPages->GetModel()->GetAbsPos( pEntry ) + 1L; + nPosCP = m_pLbCustomPages->GetModel()->GetAbsPos( pEntry ) + 1; for( sal_Int32 i = 0; i < nCount; i++ ) { diff --git a/sd/source/ui/dlg/vectdlg.cxx b/sd/source/ui/dlg/vectdlg.cxx index e9b511cc9db6..5392226605fc 100644 --- a/sd/source/ui/dlg/vectdlg.cxx +++ b/sd/source/ui/dlg/vectdlg.cxx @@ -223,9 +223,9 @@ void SdVectorizeDlg::Calculate( Bitmap const & rBmp, GDIMetaFile& rMtf ) void SdVectorizeDlg::AddTile( BitmapReadAccess const * pRAcc, GDIMetaFile& rMtf, long nPosX, long nPosY, long nWidth, long nHeight ) { - sal_uLong nSumR = 0UL, nSumG = 0UL, nSumB = 0UL; - const long nRight = nPosX + nWidth - 1L; - const long nBottom = nPosY + nHeight - 1L; + sal_uLong nSumR = 0, nSumG = 0, nSumB = 0; + const long nRight = nPosX + nWidth - 1; + const long nBottom = nPosY + nHeight - 1; const double fMult = 1.0 / ( nWidth * nHeight ); for( long nY = nPosY; nY <= nBottom; nY++ ) @@ -249,11 +249,11 @@ void SdVectorizeDlg::AddTile( BitmapReadAccess const * pRAcc, GDIMetaFile& rMtf, aRect = PixelToLogic( aRect, rMtf.GetPrefMapMode() ); - if( aRect.Right() > ( rMaxSize.Width() - 1L ) ) - aRect.Right() = rMaxSize.Width() - 1L; + if( aRect.Right() > ( rMaxSize.Width() - 1 ) ) + aRect.Right() = rMaxSize.Width() - 1; - if( aRect.Bottom() > ( rMaxSize.Height() - 1L ) ) - aRect.Bottom() = rMaxSize.Height() - 1L; + if( aRect.Bottom() > ( rMaxSize.Height() - 1 ) ) + aRect.Bottom() = rMaxSize.Height() - 1; rMtf.AddAction( new MetaLineColorAction( aColor, true ) ); rMtf.AddAction( new MetaFillColorAction( aColor, true ) ); diff --git a/sd/source/ui/func/fuconrec.cxx b/sd/source/ui/func/fuconrec.cxx index 5b6173deba0a..a78f7fbbd2e2 100644 --- a/sd/source/ui/func/fuconrec.cxx +++ b/sd/source/ui/func/fuconrec.cxx @@ -509,7 +509,7 @@ void FuConstructRectangle::SetAttributes(SfxItemSet& rAttr, SdrObject* pObj) OUString aArrowName(SvxResId(pResId)); long nCount = pLineEndList->Count(); long nIndex; - for( nIndex = 0L; nIndex < nCount; nIndex++ ) + for( nIndex = 0; nIndex < nCount; nIndex++ ) { const XLineEndEntry* pEntry = pLineEndList->GetLineEnd(nIndex); if( pEntry->GetName() == aArrowName ) diff --git a/sd/source/ui/func/fucopy.cxx b/sd/source/ui/func/fucopy.cxx index 505521b48ccb..8f82ab7339cd 100644 --- a/sd/source/ui/func/fucopy.cxx +++ b/sd/source/ui/func/fucopy.cxx @@ -127,7 +127,7 @@ void FuCopy::DoExecute( SfxRequest& rReq ) } ::tools::Rectangle aRect; - sal_Int32 lWidth = 0, lHeight = 0, lSizeX = 0L, lSizeY = 0L, lAngle = 0L; + sal_Int32 lWidth = 0, lHeight = 0, lSizeX = 0, lSizeY = 0, lAngle = 0; sal_uInt16 nNumber = 0; Color aStartColor, aEndColor; bool bColor = false; @@ -189,13 +189,13 @@ void FuCopy::DoExecute( SfxRequest& rReq ) // calculate number of possible copies aRect = mpView->GetAllMarkedRect(); - if( lWidth < 0L ) + if( lWidth < 0 ) { long nTmp = ( aRect.Right() - aRect.Left() ) / -lWidth; nNumber = (sal_uInt16) std::min( nTmp, (long)nNumber ); } - if( lHeight < 0L ) + if( lHeight < 0 ) { long nTmp = ( aRect.Bottom() - aRect.Top() ) / -lHeight; nNumber = (sal_uInt16) std::min( nTmp, (long)nNumber ); diff --git a/sd/source/ui/func/fumorph.cxx b/sd/source/ui/func/fumorph.cxx index 1808a75f0597..b287cdd38dec 100644 --- a/sd/source/ui/func/fumorph.cxx +++ b/sd/source/ui/func/fumorph.cxx @@ -195,11 +195,11 @@ void FuMorph::DoExecute( SfxRequest& ) { // length of step in dest poly ::basegfx::B2DPolygon aRetval; - const double fStep(::basegfx::tools::getLength(rCandidate) / (double)(rCandidate.isClosed() ? nNum : nNum - 1L)); + const double fStep(::basegfx::tools::getLength(rCandidate) / (double)(rCandidate.isClosed() ? nNum : nNum - 1)); double fDestPos(0.0); double fSrcPos(0.0); sal_uInt32 nSrcPos(0); - sal_uInt32 nSrcPosNext((nSrcPos + 1L == rCandidate.count()) ? 0L : nSrcPos + 1L); + sal_uInt32 nSrcPosNext((nSrcPos + 1 == rCandidate.count()) ? 0L : nSrcPos + 1); double fNextSrcLen(::basegfx::B2DVector(rCandidate.getB2DPoint(nSrcPos) - rCandidate.getB2DPoint(nSrcPosNext)).getLength()); for(sal_uInt32 b(0); b < nNum; b++) @@ -209,7 +209,7 @@ void FuMorph::DoExecute( SfxRequest& ) { fSrcPos += fNextSrcLen; nSrcPos++; - nSrcPosNext = (nSrcPos + 1L == rCandidate.count()) ? 0L : nSrcPos + 1L; + nSrcPosNext = (nSrcPos + 1 == rCandidate.count()) ? 0L : nSrcPos + 1; fNextSrcLen = ::basegfx::B2DVector(rCandidate.getB2DPoint(nSrcPos) - rCandidate.getB2DPoint(nSrcPosNext)).getLength(); } @@ -224,7 +224,7 @@ void FuMorph::DoExecute( SfxRequest& ) fDestPos += fStep; } - if(aRetval.count() >= 3L) + if(aRetval.count() >= 3) { aRetval.setClosed(rCandidate.isClosed()); } diff --git a/sd/source/ui/func/fuoaprms.cxx b/sd/source/ui/func/fuoaprms.cxx index 57dce3e5f3b0..55d66a5bbc87 100644 --- a/sd/source/ui/func/fuoaprms.cxx +++ b/sd/source/ui/func/fuoaprms.cxx @@ -663,9 +663,9 @@ void FuObjectAnimationParameters::DoExecute( SfxRequest& rReq ) Point aCurCenter(aCurRect.Center()); const ::basegfx::B2DPolyPolygon& rPolyPolygon = pPath->GetPathPoly(); sal_uInt32 nNoOfPolygons(rPolyPolygon.count()); - const ::basegfx::B2DPolygon aPolygon(rPolyPolygon.getB2DPolygon(nNoOfPolygons - 1L)); + const ::basegfx::B2DPolygon aPolygon(rPolyPolygon.getB2DPolygon(nNoOfPolygons - 1)); sal_uInt32 nPoints(aPolygon.count()); - const ::basegfx::B2DPoint aNewB2DCenter(aPolygon.getB2DPoint(nPoints - 1L)); + const ::basegfx::B2DPoint aNewB2DCenter(aPolygon.getB2DPoint(nPoints - 1)); const Point aNewCenter(FRound(aNewB2DCenter.getX()), FRound(aNewB2DCenter.getY())); Size aDistance(aNewCenter.X() - aCurCenter.X(), aNewCenter.Y() - aCurCenter.Y()); pRunningObj->Move(aDistance); diff --git a/sd/source/ui/func/fupoor.cxx b/sd/source/ui/func/fupoor.cxx index b572027769d8..eeb1fe58a60d 100644 --- a/sd/source/ui/func/fupoor.cxx +++ b/sd/source/ui/func/fupoor.cxx @@ -627,14 +627,14 @@ bool FuPoor::KeyInput(const KeyEvent& rKEvt) { pEdgeObj = static_cast<SdrEdgeObj*>(pHdl->GetObj()); - if(0L == pHdl->GetPointNum()) + if(0 == pHdl->GetPointNum()) { if(pEdgeObj->GetConnection(true).GetObject()) { bIsMoveOfConnectedHandle = true; } } - if(1L == pHdl->GetPointNum()) + if(1 == pHdl->GetPointNum()) { if(pEdgeObj->GetConnection(false).GetObject()) { diff --git a/sd/source/ui/func/fusel.cxx b/sd/source/ui/func/fusel.cxx index 8907eb159326..9c130112d2ed 100644 --- a/sd/source/ui/func/fusel.cxx +++ b/sd/source/ui/func/fusel.cxx @@ -176,7 +176,7 @@ bool FuSelection::MouseButtonDown(const MouseEvent& rMEvt) long nAngle0 = GetAngle(aMDPos - mpView->GetRef1()); nAngle0 -= 27000; nAngle0 = NormAngle360(nAngle0); - bMirrorSide0 = nAngle0 < 18000L; + bMirrorSide0 = nAngle0 < 18000; if (!pHdl && mpView->Is3DRotationCreationActive()) { @@ -731,7 +731,7 @@ bool FuSelection::MouseButtonUp(const MouseEvent& rMEvt) long nAngle1 = GetAngle(aPnt - mpView->GetRef1()); nAngle1 -= 27000; nAngle1 = NormAngle360(nAngle1); - bool bMirrorSide1 = nAngle1 < 18000L; + bool bMirrorSide1 = nAngle1 < 18000; if (bMirrorSide0 != bMirrorSide1) { diff --git a/sd/source/ui/func/fusldlg.cxx b/sd/source/ui/func/fusldlg.cxx index 43788b23b29a..867762358edd 100644 --- a/sd/source/ui/func/fusldlg.cxx +++ b/sd/source/ui/func/fusldlg.cxx @@ -66,7 +66,7 @@ void FuSlideShowDlg::DoExecute( SfxRequest& ) SdPage* pPage = nullptr; long nPage; - for( nPage = mpDoc->GetSdPageCount( PageKind::Standard ) - 1L; nPage >= 0L; nPage-- ) + for( nPage = mpDoc->GetSdPageCount( PageKind::Standard ) - 1; nPage >= 0; nPage-- ) { pPage = mpDoc->GetSdPage( (sal_uInt16) nPage, PageKind::Standard ); OUString aStr( pPage->GetName() ); diff --git a/sd/source/ui/inc/DrawViewShell.hxx b/sd/source/ui/inc/DrawViewShell.hxx index b99ede785a99..9c9d67a890aa 100644 --- a/sd/source/ui/inc/DrawViewShell.hxx +++ b/sd/source/ui/inc/DrawViewShell.hxx @@ -268,7 +268,7 @@ public: void LockInput(); void UnlockInput(); - bool IsInputLocked() const { return mnLockCount > 0UL; } + bool IsInputLocked() const { return mnLockCount > 0; } sal_uInt16 GetCurPagePos() { return maTabControl->GetCurPagePos(); } diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx index 007b445fa862..9b0e78166dcf 100644 --- a/sd/source/ui/slideshow/slideshowimpl.cxx +++ b/sd/source/ui/slideshow/slideshowimpl.cxx @@ -653,7 +653,7 @@ void SAL_CALL SlideshowImpl::disposing() Help::EnableExtHelp(); showChildWindows(); - mnChildMask = 0UL; + mnChildMask = 0; } // show current window again @@ -2321,7 +2321,7 @@ static const FncGetChildWindowId aShowChildren[] = void SlideshowImpl::hideChildWindows() { - mnChildMask = 0UL; + mnChildMask = 0; if( ANIMATIONMODE_SHOW == meAnimationMode ) { diff --git a/sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx b/sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx index 2a5b300410df..ba9e1686bd76 100644 --- a/sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx +++ b/sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx @@ -30,7 +30,7 @@ // previews that are currently not visible. The visible previews are all // held in memory at all times. This default is used only when the // configuration does not have a value. -static const sal_Int32 MAXIMAL_CACHE_SIZE = 4L*1024L*1024L; +static const sal_Int32 MAXIMAL_CACHE_SIZE = 4*1024L*1024L; using namespace ::com::sun::star::uno; diff --git a/sd/source/ui/view/drawview.cxx b/sd/source/ui/view/drawview.cxx index 8e7a6adec83f..a8b4f44d4c27 100644 --- a/sd/source/ui/view/drawview.cxx +++ b/sd/source/ui/view/drawview.cxx @@ -453,7 +453,7 @@ bool DrawView::SetStyleSheet(SfxStyleSheet* pStyleSheet, bool bDontRemoveHardAtt * Paint-method: Redirect event to the view */ -void DrawView::CompleteRedraw(OutputDevice* pOutDev, const vcl::Region& rReg, sdr::contact::ViewObjectContactRedirector* pRedirector /*=0L*/) +void DrawView::CompleteRedraw(OutputDevice* pOutDev, const vcl::Region& rReg, sdr::contact::ViewObjectContactRedirector* pRedirector /*=0*/) { if( mpVDev ) { diff --git a/sd/source/ui/view/drtxtob.cxx b/sd/source/ui/view/drtxtob.cxx index 26334b02f4b5..4fdb5570c5cb 100644 --- a/sd/source/ui/view/drtxtob.cxx +++ b/sd/source/ui/view/drtxtob.cxx @@ -459,14 +459,14 @@ void TextObjectBar::GetAttrState( SfxItemSet& rSet ) nStartPara = 0; nEndPara = pOLV->GetOutliner()->GetParagraphCount() - 1; } - long nUpper = 0L; + long nUpper = 0; for( sal_Int32 nPara = nStartPara; nPara <= nEndPara; nPara++ ) { const SfxItemSet& rItems = pOLV->GetOutliner()->GetParaAttribs( nPara ); const SvxULSpaceItem& rItem = static_cast<const SvxULSpaceItem&>( rItems.Get( EE_PARA_ULSPACE ) ); nUpper = std::max( nUpper, (long)rItem.GetUpper() ); } - if( nUpper == 0L ) + if( nUpper == 0 ) rSet.DisableItem( SID_PARASPACE_DECREASE ); } else diff --git a/sd/source/ui/view/drviews4.cxx b/sd/source/ui/view/drviews4.cxx index a74c0e9ad0a9..c05fe79aeb24 100644 --- a/sd/source/ui/view/drviews4.cxx +++ b/sd/source/ui/view/drviews4.cxx @@ -785,8 +785,8 @@ void DrawViewShell::ShowMousePosInfo(const ::tools::Rectangle& rRect, { RulerLine pHLines[2]; RulerLine pVLines[2]; - long nHOffs = 0L; - long nVOffs = 0L; + long nHOffs = 0; + long nVOffs = 0; sal_uInt16 nCnt; if (mpHorizontalRuler.get() != nullptr) diff --git a/sd/source/ui/view/drviewsa.cxx b/sd/source/ui/view/drviewsa.cxx index 6973b324ec45..596c6ba84f35 100644 --- a/sd/source/ui/view/drviewsa.cxx +++ b/sd/source/ui/view/drviewsa.cxx @@ -315,7 +315,7 @@ void DrawViewShell::Construct(DrawDocShell* pDocSh, PageKind eInitialPageKind) SetName ("DrawViewShell"); - mnLockCount = 0UL; + mnLockCount = 0; uno::Reference< uno::XComponentContext > xContext( ::comphelper::getProcessComponentContext() ); diff --git a/sd/source/ui/view/outlnvsh.cxx b/sd/source/ui/view/outlnvsh.cxx index 5e921c5fdd13..46bbd2c88591 100644 --- a/sd/source/ui/view/outlnvsh.cxx +++ b/sd/source/ui/view/outlnvsh.cxx @@ -1319,7 +1319,7 @@ void OutlineViewShell::GetStatusBarState(SfxItemSet& rSet) if( pFirstPara == pLastPara ) { // how many pages are we before the selected page? - sal_uLong nPos = 0L; + sal_uLong nPos = 0; while( pFirstPara ) { pFirstPara = pOlView->GetPrevTitle( pFirstPara ); @@ -1670,7 +1670,7 @@ void OutlineViewShell::UpdateOutlineObject( SdPage* pPage, Paragraph* pPara ) // how many paragraphs in the outline? sal_Int32 nTitlePara = rOutliner.GetAbsPos( pPara ); sal_Int32 nPara = nTitlePara + 1; - sal_Int32 nParasInLayout = 0L; + sal_Int32 nParasInLayout = 0; pPara = rOutliner.GetParagraph( nPara ); while( pPara && !::Outliner::HasParaFlag(pPara, ParaFlag::ISPAGE) ) { diff --git a/sd/source/ui/view/outlview.cxx b/sd/source/ui/view/outlview.cxx index 931949bcd3e8..34af4ff3d0df 100644 --- a/sd/source/ui/view/outlview.cxx +++ b/sd/source/ui/view/outlview.cxx @@ -383,8 +383,8 @@ SdPage* OutlineView::InsertSlideForParagraph( Paragraph* pPara ) mrOutliner.SetParaFlag( pPara, ParaFlag::ISPAGE ); // how many titles are there before the new title paragraph? - sal_uLong nExample = 0L; // position of the "example" page - sal_uLong nTarget = 0L; // position of insertion + sal_uLong nExample = 0; // position of the "example" page + sal_uLong nTarget = 0; // position of insertion while(pPara) { pPara = GetPrevTitle(pPara); @@ -501,7 +501,7 @@ IMPL_LINK( OutlineView, ParagraphRemovingHdl, ::Outliner::ParagraphHdlParam, aPa if( ::Outliner::HasParaFlag( pPara, ParaFlag::ISPAGE ) ) { // how many titles are in front of the title paragraph in question? - sal_uLong nPos = 0L; + sal_uLong nPos = 0; while(pPara) { pPara = GetPrevTitle(pPara); @@ -629,7 +629,7 @@ IMPL_LINK( OutlineView, DepthChangedHdl, ::Outliner::DepthChangeHdlParam, aParam // the paragraph was a page but now becomes a normal paragraph // how many titles are before the title paragraph in question? - sal_uLong nPos = 0L; + sal_uLong nPos = 0; Paragraph* pParagraph = pPara; while(pParagraph) { @@ -678,7 +678,7 @@ IMPL_LINK( OutlineView, DepthChangedHdl, ::Outliner::DepthChangeHdlParam, aParam else if ( (pOutliner->GetPrevDepth() == 1) && ( pOutliner->GetDepth( pOutliner->GetAbsPos( pPara ) ) == 2 ) ) { // how many titles are in front of the title paragraph in question? - sal_Int32 nPos = -1L; + sal_Int32 nPos = -1; Paragraph* pParagraph = pPara; while(pParagraph) @@ -698,7 +698,7 @@ IMPL_LINK( OutlineView, DepthChangedHdl, ::Outliner::DepthChangeHdlParam, aParam } // how many titles are in front of the title paragraph in question? - sal_Int32 nPos = -1L; + sal_Int32 nPos = -1; Paragraph* pTempPara = pPara; while(pTempPara) diff --git a/sd/source/ui/view/sdview.cxx b/sd/source/ui/view/sdview.cxx index 7035d9f9c2ca..016206429c1c 100644 --- a/sd/source/ui/view/sdview.cxx +++ b/sd/source/ui/view/sdview.cxx @@ -457,7 +457,7 @@ drawinglayer::primitive2d::Primitive2DContainer ViewRedirector::createRedirected /** * The event will be forwarded to the View */ -void View::CompleteRedraw(OutputDevice* pOutDev, const vcl::Region& rReg, sdr::contact::ViewObjectContactRedirector* pRedirector /*=0L*/) +void View::CompleteRedraw(OutputDevice* pOutDev, const vcl::Region& rReg, sdr::contact::ViewObjectContactRedirector* pRedirector /*=0*/) { // execute ?? if (mnLockRedrawSmph == 0) diff --git a/sd/source/ui/view/viewshel.cxx b/sd/source/ui/view/viewshel.cxx index ff65c31b0140..8fea3f44825f 100644 --- a/sd/source/ui/view/viewshel.cxx +++ b/sd/source/ui/view/viewshel.cxx @@ -813,7 +813,7 @@ bool ViewShell::HandleScrollCommand(const CommandEvent& rCEvt, ::sd::Window* pWi long nNewZoom; Point aOldMousePos = GetActiveWindow()->PixelToLogic(rCEvt.GetMousePosPixel()); - if( pData->GetDelta() < 0L ) + if( pData->GetDelta() < 0 ) nNewZoom = std::max<long>( pWin->GetMinZoom(), basegfx::zoomtools::zoomOut( nOldZoom )); else nNewZoom = std::min<long>( pWin->GetMaxZoom(), basegfx::zoomtools::zoomIn( nOldZoom )); diff --git a/sfx2/source/bastyp/mieclip.cxx b/sfx2/source/bastyp/mieclip.cxx index 71d95da911c5..e6271de164e9 100644 --- a/sfx2/source/bastyp/mieclip.cxx +++ b/sfx2/source/bastyp/mieclip.cxx @@ -76,7 +76,7 @@ SvStream* MSE40HTMLClipFormatObj::IsValid( SvStream& rStream ) ? nEnd - nStt + 32 : 0 )) ); pStrm->WriteStream( rStream ); - pStrm->SetStreamSize( nEnd - nStt + 1L ); + pStrm->SetStreamSize( nEnd - nStt + 1 ); pStrm->Seek( STREAM_SEEK_TO_BEGIN ); return pStrm.get(); } diff --git a/shell/source/win32/shlxthandler/ooofilt/stream_helper.cxx b/shell/source/win32/shlxthandler/ooofilt/stream_helper.cxx index 76fc42927777..b53c56410c3f 100644 --- a/shell/source/win32/shlxthandler/ooofilt/stream_helper.cxx +++ b/shell/source/win32/shlxthandler/ooofilt/stream_helper.cxx @@ -127,14 +127,14 @@ long FileStream::stell () { if (file) return ftell(file); - return -1L; + return -1; } long FileStream::sseek (long offset, int origin) { if (file) return fseek(file, offset, origin); - return -1L; + return -1; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/slideshow/source/engine/shapes/drawinglayeranimation.cxx b/slideshow/source/engine/shapes/drawinglayeranimation.cxx index 242376f27b29..00d6925becc1 100644 --- a/slideshow/source/engine/shapes/drawinglayeranimation.cxx +++ b/slideshow/source/engine/shapes/drawinglayeranimation.cxx @@ -105,7 +105,7 @@ double ScrollTextAnimNode::GetStateAtRelativeTime( const sal_uInt32 nRepeatCount(nRelativeTime / mnDuration); sal_uInt32 nFrameTime(nRelativeTime - (nRepeatCount * mnDuration)); - if(DoAlternate() && (nRepeatCount + 1L) % 2L) + if(DoAlternate() && (nRepeatCount + 1) % 2L) nFrameTime = mnDuration - nFrameTime; return mfStart + ((mfStop - mfStart) * @@ -120,7 +120,7 @@ double ScrollTextAnimNode::GetStateAtRelativeTime( { const sal_uInt32 nRepeatCount(nRelativeTime / mnDuration); - if((nRepeatCount + 1L) % 2L) + if((nRepeatCount + 1) % 2L) nFrameTime = mnDuration - nFrameTime; } @@ -304,7 +304,7 @@ double ActivityImpl::GetMixerState( sal_uInt32 nTime ) else { // end of animation, take last entry's end - fRetval = maVector[maVector.size() - 1L].GetStop(); + fRetval = maVector[maVector.size() - 1].GetStop(); } } @@ -320,25 +320,25 @@ sal_uInt32 ActivityImpl::GetStepWidthLogic() const sal_uInt32 nRetval(0); - if(mnStepWidth < 0L) + if(mnStepWidth < 0) { // is in pixels, convert to logical units nRetval = (-mnStepWidth * PIXEL_TO_LOGIC); } - else if(mnStepWidth > 0L) + else if(mnStepWidth > 0) { // is in logical units nRetval = mnStepWidth; } - if(0L == nRetval) + if(0 == nRetval) { // step 1 pixel, canned value // with very high DPIs like in PDF export, this can // still get zero. for that cases, set a default, too (taken // from ainfoscrolltext.cxx) - nRetval = 100L; + nRetval = 100; } return nRetval; @@ -462,7 +462,7 @@ void ActivityImpl::ImpForceScrollTextAnimNodes() (fRelativeDistance * fDistanceLogic) / GetStepWidthLogic(); nLoopTime = FRound(fNumberSteps * mnFrequency); - if(0L == mnRepeat) + if(0 == mnRepeat) { if(!DoScrollIn()) { @@ -478,8 +478,8 @@ void ActivityImpl::ImpForceScrollTextAnimNodes() { sal_uInt32 nNumRepeat(mnRepeat); - if(DoAlternate() && (nNumRepeat + 1L) % 2L) - nNumRepeat += 1L; + if(DoAlternate() && (nNumRepeat + 1) % 2L) + nNumRepeat += 1; // ending main loop ScrollTextAnimNode aMainNode( @@ -827,7 +827,7 @@ ActivityImpl::ActivityImpl( // eg VisibleWhenStopped is grayed out and needs to be corrected here. mbVisibleWhenStopped = true; mbVisibleWhenStarted = false; - mnRepeat = 0L; + mnRepeat = 0; } // Get animation direction diff --git a/sot/source/sdstor/stg.cxx b/sot/source/sdstor/stg.cxx index a668917cfd13..67ea06b8f815 100644 --- a/sot/source/sdstor/stg.cxx +++ b/sot/source/sdstor/stg.cxx @@ -195,7 +195,7 @@ sal_uLong StorageStream::Read( void* pData, sal_uLong nSize ) nPos += nSize; } else - nSize = 0L; + nSize = 0; return nSize; } @@ -209,7 +209,7 @@ sal_uLong StorageStream::Write( const void* pData, sal_uLong nSize ) nPos += nSize; } else - nSize = 0L; + nSize = 0; return nSize; } diff --git a/sot/source/sdstor/stgole.cxx b/sot/source/sdstor/stgole.cxx index 8b5a8dbca478..3ad9ece73664 100644 --- a/sot/source/sdstor/stgole.cxx +++ b/sot/source/sdstor/stgole.cxx @@ -110,7 +110,7 @@ bool StgCompObjStream::Load() Seek( 8 ); // skip the first part sal_Int32 nMarker = 0; ReadInt32( nMarker ); - if( nMarker == -1L ) + if( nMarker == -1 ) { ReadClsId( *this, m_aClsId ); sal_Int32 nLen1 = 0; @@ -149,7 +149,7 @@ bool StgCompObjStream::Store() WriteInt16( 1 ); // Version? WriteInt16( -2 ); // 0xFFFE = Byte Order Indicator WriteInt32( 0x0A03 ); // Windows 3.10 - WriteInt32( -1L ); + WriteInt32( -1 ); WriteClsId( *this, m_aClsId ); // Class ID WriteInt32( aAsciiUserName.getLength() + 1 ); WriteCharPtr( aAsciiUserName.getStr() ); diff --git a/starmath/source/node.cxx b/starmath/source/node.cxx index e4b0aae6f3b6..8e1875f530c9 100644 --- a/starmath/source/node.cxx +++ b/starmath/source/node.cxx @@ -1541,8 +1541,8 @@ void SmVerticalBraceNode::Arrange(OutputDevice &rDev, const SmFormat &rFormat) eRectPos = RectPos::Bottom; nDistScript *= + rFormat.GetDistance(DIS_LOWERLIMIT); } - nDistBody /= 100L; - nDistScript /= 100L; + nDistBody /= 100; + nDistScript /= 100; Point aPos = pBrace->AlignTo(*pBody, eRectPos, RectHorAlign::Center, RectVerAlign::Baseline); aPos.Y() += nDistBody; diff --git a/stoc/test/testintrosp.cxx b/stoc/test/testintrosp.cxx index 6ac0d399b0ad..f697e0c084c0 100644 --- a/stoc/test/testintrosp.cxx +++ b/stoc/test/testintrosp.cxx @@ -482,7 +482,7 @@ void ImplIntroTest::setPropertyValue( const OUString& aPropertyName, const Any& PropertyChangeEvent aEvt; aEvt.Source = (OWeakObject*)this; aEvt.PropertyName = aPropertyName; - aEvt.PropertyHandle = 0L; + aEvt.PropertyHandle = 0; aPropChangeListener->propertyChange( aEvt ); } if( aVetoPropChangeListener.is() && aPropertyName == aVetoPropChangeListenerStr ) @@ -490,7 +490,7 @@ void ImplIntroTest::setPropertyValue( const OUString& aPropertyName, const Any& PropertyChangeEvent aEvt; aEvt.Source = (OWeakObject*)this; aEvt.PropertyName = aVetoPropChangeListenerStr; - aEvt.PropertyHandle = 0L; + aEvt.PropertyHandle = 0; aVetoPropChangeListener->vetoableChange( aEvt ); } diff --git a/svl/source/numbers/zformat.cxx b/svl/source/numbers/zformat.cxx index 49c1ee0c1e3f..65f06418d1df 100644 --- a/svl/source/numbers/zformat.cxx +++ b/svl/source/numbers/zformat.cxx @@ -2625,7 +2625,7 @@ void SvNumberformat::ImpGetFractionElements ( double& fNumber, sal_uInt16 nIx, { nDiv = 1; sal_uInt64 nBasis = ((sal_uInt64)floor( pow(10.0,rInfo.nCntExp))) - 1; // 9, 99, 999 ,... - sal_uInt64 nFracPrev = 1L, nDivPrev = 0, nFracNext, nDivNext, nPartialDenom; + sal_uInt64 nFracPrev = 1, nDivPrev = 0, nFracNext, nDivNext, nPartialDenom; double fRemainder = fNumber; // Use continued fraction representation of fNumber diff --git a/svtools/source/contnr/treelist.cxx b/svtools/source/contnr/treelist.cxx index 7d47e4b5535a..0aeecd1a47a4 100644 --- a/svtools/source/contnr/treelist.cxx +++ b/svtools/source/contnr/treelist.cxx @@ -342,7 +342,7 @@ void SvTreeList::Move( SvTreeListEntry* pSrcEntry, SvTreeListEntry* pDstEntry ) if ( !pDstEntry ) { pParent = pRootItem; - nPos = 0UL; + nPos = 0; } else { diff --git a/svtools/source/control/toolbarmenu.cxx b/svtools/source/control/toolbarmenu.cxx index b48c79a64811..822a85892564 100644 --- a/svtools/source/control/toolbarmenu.cxx +++ b/svtools/source/control/toolbarmenu.cxx @@ -1376,7 +1376,7 @@ void ToolbarMenu::Command( const CommandEvent& rCEvt ) const CommandWheelData* pData = rCEvt.GetWheelData(); if( !pData->GetModifier() && ( pData->GetMode() == CommandWheelMode::SCROLL ) ) { - implCursorUpDown( pData->GetDelta() > 0L, false ); + implCursorUpDown( pData->GetDelta() > 0, false ); } } } diff --git a/svtools/source/graphic/grfcache.cxx b/svtools/source/graphic/grfcache.cxx index f98534c95adf..14abb1d6e428 100644 --- a/svtools/source/graphic/grfcache.cxx +++ b/svtools/source/graphic/grfcache.cxx @@ -1214,7 +1214,7 @@ bool GraphicCache::DrawDisplayCacheObj( OutputDevice* pOut, const Point& rPt, co bool GraphicCache::ImplFreeDisplayCacheSpace( sal_uLong nSizeToFree ) { - sal_uLong nFreedSize = 0UL; + sal_uLong nFreedSize = 0; if( nSizeToFree ) { diff --git a/svtools/source/graphic/grfmgr.cxx b/svtools/source/graphic/grfmgr.cxx index 83b42ccfa2e4..0664c190c192 100644 --- a/svtools/source/graphic/grfmgr.cxx +++ b/svtools/source/graphic/grfmgr.cxx @@ -461,7 +461,7 @@ bool GraphicObject::Draw( OutputDevice* pOut, const Point& rPt, const Size& rSz, pOut->SetDrawMode( nOldDrawMode & ~DrawModeFlags( DrawModeFlags::SettingsLine | DrawModeFlags::SettingsFill | DrawModeFlags::SettingsText | DrawModeFlags::SettingsGradient ) ); // mirrored horizontically - if( aSz.Width() < 0L ) + if( aSz.Width() < 0 ) { aPt.X() += aSz.Width() + 1; aSz.Width() = -aSz.Width(); @@ -469,7 +469,7 @@ bool GraphicObject::Draw( OutputDevice* pOut, const Point& rPt, const Size& rSz, } // mirrored vertically - if( aSz.Height() < 0L ) + if( aSz.Height() < 0 ) { aPt.Y() += aSz.Height() + 1; aSz.Height() = -aSz.Height(); diff --git a/svtools/source/graphic/grfmgr2.cxx b/svtools/source/graphic/grfmgr2.cxx index 3a6bb6f2fd21..7a9fe8ddd166 100644 --- a/svtools/source/graphic/grfmgr2.cxx +++ b/svtools/source/graphic/grfmgr2.cxx @@ -333,7 +333,7 @@ bool ImplCreateRotatedScaled( const BitmapEx& rBmpEx, const GraphicAttr& rAttrib fRevScaleX = (double) ( aBitmapWidth - 1 ) / (double)( aUnrotatedWidth - 1 ); // create horizontal mapping table long x; - for( x = 0, nTmpX = aBitmapWidth - 1L, nTmp = aBitmapWidth - 2L >= 0 ? aBitmapWidth -2L : 0L; x < aUnrotatedWidth; x++ ) + for( x = 0, nTmpX = aBitmapWidth - 1, nTmp = aBitmapWidth - 2 >= 0 ? aBitmapWidth -2 : 0L; x < aUnrotatedWidth; x++ ) { fTmp = x * fRevScaleX; @@ -372,7 +372,7 @@ bool ImplCreateRotatedScaled( const BitmapEx& rBmpEx, const GraphicAttr& rAttrib fRevScaleY = (double) ( aBitmapHeight - 1 ) / (double)( aUnrotatedHeight - 1 ); // create vertical mapping table long y; - for( y = 0, nTmpY = aBitmapHeight - 1L, nTmp = aBitmapHeight - 2L >= 0 ? aBitmapHeight - 2L : 0L; y < aUnrotatedHeight; y++ ) + for( y = 0, nTmpY = aBitmapHeight - 1, nTmp = aBitmapHeight - 2 >= 0 ? aBitmapHeight - 2 : 0L; y < aUnrotatedHeight; y++ ) { fTmp = y * fRevScaleY; @@ -414,8 +414,8 @@ bool ImplCreateRotatedScaled( const BitmapEx& rBmpEx, const GraphicAttr& rAttrib const double fCosAngle = cos( nRot10 * F_PI1800 ); const double fSinAngle = sin( nRot10 * F_PI1800 ); - const long aTargetWidth = nEndX - nStartX + 1L; - const long aTargetHeight = nEndY - nStartY + 1L; + const long aTargetWidth = nEndX - nStartX + 1; + const long aTargetHeight = nEndY - nStartY + 1; std::unique_ptr<long[]> pCosX(new long[ aTargetWidth ]); std::unique_ptr<long[]> pSinX(new long[ aTargetWidth ]); std::unique_ptr<long[]> pCosY(new long[ aTargetHeight ]); @@ -467,8 +467,8 @@ bool ImplCreateRotatedScaled( const BitmapEx& rBmpEx, const GraphicAttr& rAttrib nUnRotX = ( pCosX[ x ] - nSinY ) >> 8; nUnRotY = ( pSinX[ x ] + nCosY ) >> 8; - if( ( nUnRotX >= 0L ) && ( nUnRotX < aUnrotatedWidth ) && - ( nUnRotY >= 0L ) && ( nUnRotY < aUnrotatedHeight ) ) + if( ( nUnRotX >= 0 ) && ( nUnRotX < aUnrotatedWidth ) && + ( nUnRotY >= 0 ) && ( nUnRotY < aUnrotatedHeight ) ) { nTmpX = pMapIX[ nUnRotX ]; nTmpFX = pMapFX[ nUnRotX ]; @@ -509,8 +509,8 @@ bool ImplCreateRotatedScaled( const BitmapEx& rBmpEx, const GraphicAttr& rAttrib nUnRotX = ( pCosX[ x ] - nSinY ) >> 8; nUnRotY = ( pSinX[ x ] + nCosY ) >> 8; - if( ( nUnRotX >= 0L ) && ( nUnRotX < aUnrotatedWidth ) && - ( nUnRotY >= 0L ) && ( nUnRotY < aUnrotatedHeight ) ) + if( ( nUnRotX >= 0 ) && ( nUnRotX < aUnrotatedWidth ) && + ( nUnRotY >= 0 ) && ( nUnRotY < aUnrotatedHeight ) ) { nTmpX = pMapIX[ nUnRotX ]; nTmpFX = pMapFX[ nUnRotX ]; @@ -648,8 +648,8 @@ bool ImplCreateRotatedScaled( const BitmapEx& rBmpEx, const GraphicAttr& rAttrib nUnRotX = ( pCosX[ nX ] - nSinY ) >> 8; nUnRotY = ( pSinX[ nX ] + nCosY ) >> 8; - if( ( nUnRotX >= 0L ) && ( nUnRotX < aUnrotatedWidth ) && - ( nUnRotY >= 0L ) && ( nUnRotY < aUnrotatedHeight ) ) + if( ( nUnRotX >= 0 ) && ( nUnRotX < aUnrotatedWidth ) && + ( nUnRotY >= 0 ) && ( nUnRotY < aUnrotatedHeight ) ) { nTmpX = pMapIX[ nUnRotX ]; nTmpFX = pMapFX[ nUnRotX ]; @@ -747,8 +747,8 @@ bool ImplCreateRotatedScaled( const BitmapEx& rBmpEx, const GraphicAttr& rAttrib nUnRotX = ( pCosX[ nX ] - nSinY ) >> 8; nUnRotY = ( pSinX[ nX ] + nCosY ) >> 8; - if( ( nUnRotX >= 0L ) && ( nUnRotX < aUnrotatedWidth ) && - ( nUnRotY >= 0L ) && ( nUnRotY < aUnrotatedHeight ) ) + if( ( nUnRotX >= 0 ) && ( nUnRotX < aUnrotatedWidth ) && + ( nUnRotY >= 0 ) && ( nUnRotY < aUnrotatedHeight ) ) { nTmpX = pMapIX[ nUnRotX ]; nTmpFX = pMapFX[ nUnRotX ]; @@ -803,11 +803,11 @@ bool ImplCreateRotatedScaled( const BitmapEx& rBmpEx, const GraphicAttr& rAttrib aTestB = pMAcc->GetBestMatchingColor( Color( COL_BLACK ) ); // create new horizontal mapping table - for( long nX = 0UL; nX < aUnrotatedWidth; nX++ ) + for( long nX = 0; nX < aUnrotatedWidth; nX++ ) pMapLX[ nX ] = FRound( (double) pMapIX[ nX ] + pMapFX[ nX ] / 1048576.0 ); // create new vertical mapping table - for( long nY = 0UL; nY < aUnrotatedHeight; nY++ ) + for( long nY = 0; nY < aUnrotatedHeight; nY++ ) pMapLY[ nY ] = FRound( (double) pMapIY[ nY ] + pMapFY[ nY ] / 1048576.0 ); // do mask rotation @@ -821,8 +821,8 @@ bool ImplCreateRotatedScaled( const BitmapEx& rBmpEx, const GraphicAttr& rAttrib nUnRotX = ( pCosX[ nX ] - nSinY ) >> 8; nUnRotY = ( pSinX[ nX ] + nCosY ) >> 8; - if( ( nUnRotX >= 0L ) && ( nUnRotX < aUnrotatedWidth ) && - ( nUnRotY >= 0L ) && ( nUnRotY < aUnrotatedHeight ) ) + if( ( nUnRotX >= 0 ) && ( nUnRotX < aUnrotatedWidth ) && + ( nUnRotY >= 0 ) && ( nUnRotY < aUnrotatedHeight ) ) { if( pMAcc ) { @@ -931,7 +931,7 @@ bool GraphicManager::ImplCreateOutput( OutputDevice* pOutputDevice, } else { - nStartX = -1L; // invalid + nStartX = -1; // invalid } } else @@ -939,12 +939,12 @@ bool GraphicManager::ImplCreateOutput( OutputDevice* pOutputDevice, aOutPoint = pOutputDevice->PixelToLogic( aOutputPointPix ); aOutSize = pOutputDevice->PixelToLogic( aOutputSizePix ); nStartX = nStartY = 0; - nEndX = aOutputSizePix.Width() - 1L; - nEndY = aOutputSizePix.Height() - 1L; + nEndX = aOutputSizePix.Width() - 1; + nEndY = aOutputSizePix.Height() - 1; } // do transformation - if( nStartX >= 0L ) + if( nStartX >= 0 ) { const bool bSimple = ( 1 == nW || 1 == nH ); diff --git a/svtools/source/svhtml/parhtml.cxx b/svtools/source/svhtml/parhtml.cxx index d576dd8fef05..25fdcd73db7c 100644 --- a/svtools/source/svhtml/parhtml.cxx +++ b/svtools/source/svhtml/parhtml.cxx @@ -434,7 +434,7 @@ HtmlTokenId HTMLParser::ScanText( const sal_Unicode cBreak ) else if( rtl::isAsciiAlpha( nNextCh ) ) { OUStringBuffer sEntityBuffer( MAX_ENTITY_LEN ); - sal_Int32 nPos = 0L; + sal_Int32 nPos = 0; do { sEntityBuffer.appendUtf32( nNextCh ); @@ -692,7 +692,7 @@ HtmlTokenId HTMLParser::ScanText( const sal_Unicode cBreak ) if( sal_Unicode(EOF) == (nNextCh = GetNextChar()) && rInput.IsEof() ) { - if( !aToken.isEmpty() || sTmpBuffer.getLength() > 1L ) + if( !aToken.isEmpty() || sTmpBuffer.getLength() > 1 ) { // Have seen s.th. aside from blanks? aToken += sTmpBuffer.makeStringAndClear(); diff --git a/svx/source/customshapes/EnhancedCustomShape2d.cxx b/svx/source/customshapes/EnhancedCustomShape2d.cxx index 3fc59dcdaf6a..630a2a4cf39d 100644 --- a/svx/source/customshapes/EnhancedCustomShape2d.cxx +++ b/svx/source/customshapes/EnhancedCustomShape2d.cxx @@ -1507,7 +1507,7 @@ void EnhancedCustomShape2d::CreateSubPath( sal_Int32& rSrcPt, sal_Int32& rSegmen break; case MOVETO : { - if(aNewB2DPolygon.count() > 1L) + if(aNewB2DPolygon.count() > 1) { // #i76201# Add conversion to closed polygon when first and last points are equal basegfx::tools::checkClosed(aNewB2DPolygon); @@ -1533,7 +1533,7 @@ void EnhancedCustomShape2d::CreateSubPath( sal_Int32& rSrcPt, sal_Int32& rSegmen { if(aNewB2DPolygon.count()) { - if(aNewB2DPolygon.count() > 1L) + if(aNewB2DPolygon.count() > 1) { aNewB2DPolygon.setClosed(true); aNewB2DPolyPolygon.append(aNewB2DPolygon); @@ -1564,7 +1564,7 @@ void EnhancedCustomShape2d::CreateSubPath( sal_Int32& rSrcPt, sal_Int32& rSegmen { if ( nPntCount ) { - if(aNewB2DPolygon.count() > 1L) + if(aNewB2DPolygon.count() > 1) { // #i76201# Add conversion to closed polygon when first and last points are equal basegfx::tools::checkClosed(aNewB2DPolygon); @@ -1771,7 +1771,7 @@ void EnhancedCustomShape2d::CreateSubPath( sal_Int32& rSrcPt, sal_Int32& rSegmen case ARC : case CLOCKWISEARC : { - if(aNewB2DPolygon.count() > 1L) + if(aNewB2DPolygon.count() > 1) { // #i76201# Add conversion to closed polygon when first and last points are equal basegfx::tools::checkClosed(aNewB2DPolygon); @@ -1952,7 +1952,7 @@ void EnhancedCustomShape2d::CreateSubPath( sal_Int32& rSrcPt, sal_Int32& rSegmen if ( rSegmentInd == nSegInfoSize ) rSegmentInd++; - if(aNewB2DPolygon.count() > 1L) + if(aNewB2DPolygon.count() > 1) { // #i76201# Add conversion to closed polygon when first and last points are equal basegfx::tools::checkClosed(aNewB2DPolygon); @@ -2265,7 +2265,7 @@ SdrObject* EnhancedCustomShape2d::CreatePathObj( bool bLineGeometryNeededOnly ) vObjectList = vTempList; } - if(1L == vObjectList.size()) + if(1 == vObjectList.size()) { // a single object, correct some values AdaptObjColor(*vObjectList[0L],rCustomShapeSet,nColorIndex,nColorCount); diff --git a/svx/source/customshapes/EnhancedCustomShape3d.cxx b/svx/source/customshapes/EnhancedCustomShape3d.cxx index 1fad3815f146..f669338274b2 100644 --- a/svx/source/customshapes/EnhancedCustomShape3d.cxx +++ b/svx/source/customshapes/EnhancedCustomShape3d.cxx @@ -214,7 +214,7 @@ basegfx::B3DPolygon EnhancedCustomShape3d::Transformation2D::ApplySkewSettings( basegfx::B3DPolygon aRetval; sal_uInt32 j; - for ( j = 0L; j < rPoly3D.count(); j++ ) + for ( j = 0; j < rPoly3D.count(); j++ ) { const basegfx::B3DPoint aPoint(rPoly3D.getB3DPoint(j)); double fDepth(-( aPoint.getZ() * fSkew ) / 100.0); @@ -748,12 +748,12 @@ tools::Rectangle EnhancedCustomShape3d::CalculateNewSnapRect( const SdrObject* p basegfx::B3DPolygon aBoundVolume; const tools::Polygon aPolygon( rBoundRect ); - for ( i = 0L; i < 4L; i++ ) + for ( i = 0; i < 4; i++ ) { aBoundVolume.append(basegfx::B3DPoint(aPolygon[ (sal_uInt16)i ].X() - aCenter.X(), aPolygon[ (sal_uInt16)i ].Y() - aCenter.Y(), fExtrusionForward)); } - for ( i = 0L; i < 4L; i++ ) + for ( i = 0; i < 4; i++ ) { aBoundVolume.append(basegfx::B3DPoint(aPolygon[ (sal_uInt16)i ].X() - aCenter.X(), aPolygon[ (sal_uInt16)i ].Y() - aCenter.Y(), fExtrusionBackward)); } @@ -786,7 +786,7 @@ tools::Rectangle EnhancedCustomShape3d::CalculateNewSnapRect( const SdrObject* p aBoundVolume = aTransformation2D.ApplySkewSettings( aBoundVolume ); tools::Polygon aTransformed( 8 ); - for ( i = 0L; i < 8L; i++ ) + for ( i = 0; i < 8; i++ ) aTransformed[ (sal_uInt16)i ] = aTransformation2D.Transform2D( aBoundVolume.getB3DPoint( i ) ); return aTransformed.GetBoundRect(); diff --git a/svx/source/dialog/_contdlg.cxx b/svx/source/dialog/_contdlg.cxx index 133a2d1f026a..cd8ea4850087 100644 --- a/svx/source/dialog/_contdlg.cxx +++ b/svx/source/dialog/_contdlg.cxx @@ -346,7 +346,7 @@ void SvxSuperContourDlg::SetGraphic( const Graphic& rGraphic ) { aUndoGraphic = aRedoGraphic = Graphic(); aGraphic = rGraphic; - nGrfChanged = 0UL; + nGrfChanged = 0; m_pContourWnd->SetGraphic( aGraphic ); } diff --git a/svx/source/dialog/contimp.hxx b/svx/source/dialog/contimp.hxx index 971f31cf21c4..e3358b48ff9d 100644 --- a/svx/source/dialog/contimp.hxx +++ b/svx/source/dialog/contimp.hxx @@ -103,7 +103,7 @@ public: void SetGraphic( const Graphic& rGraphic ); const Graphic& GetGraphic() const { return aGraphic; } - bool IsGraphicChanged() const { return nGrfChanged > 0UL; } + bool IsGraphicChanged() const { return nGrfChanged > 0; } void SetPolyPolygon( const tools::PolyPolygon& rPolyPoly ); tools::PolyPolygon GetPolyPolygon(); diff --git a/svx/source/engine3d/scene3d.cxx b/svx/source/engine3d/scene3d.cxx index 3dd2dbf1f0e0..bb062a30aa4d 100644 --- a/svx/source/engine3d/scene3d.cxx +++ b/svx/source/engine3d/scene3d.cxx @@ -112,7 +112,7 @@ public: Imp3DDepthRemapper::Imp3DDepthRemapper(E3dScene const & rScene) { - // only called when rScene.GetSubList() and nObjCount > 1L + // only called when rScene.GetSubList() and nObjCount > 1 SdrObjList* pList = rScene.GetSubList(); const size_t nObjCount(pList->GetObjCount()); diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx index 3d0e05864205..7fb2883aad2b 100644 --- a/svx/source/fmcomp/gridctrl.cxx +++ b/svx/source/fmcomp/gridctrl.cxx @@ -2490,7 +2490,7 @@ void DbGridControl::MoveToLast() void DbGridControl::MoveToPrev() { - long nNewRow = std::max(GetCurRow() - 1L, 0L); + long nNewRow = std::max(GetCurRow() - 1, 0L); if (GetCurRow() != nNewRow) MoveToPosition(nNewRow); } diff --git a/svx/source/form/fmvwimp.cxx b/svx/source/form/fmvwimp.cxx index 803705f15ef9..6cfe4314aac4 100644 --- a/svx/source/form/fmvwimp.cxx +++ b/svx/source/form/fmvwimp.cxx @@ -1260,7 +1260,7 @@ SdrObject* FmXFormView::implCreateFieldControl( const svx::ODataAccessDescriptor // const SdrPageViewWinList& rWinList = pPageView->GetWinList(); // const SdrPageViewWindows& rPageViewWindows = pPageView->GetPageViewWindows(); - for( sal_uInt32 i = 0L; i < pPageView->PageWindowCount(); i++ ) + for( sal_uInt32 i = 0; i < pPageView->PageWindowCount(); i++ ) { const SdrPageWindow& rPageWindow = *pPageView->GetPageWindow(i); @@ -1411,7 +1411,7 @@ SdrObject* FmXFormView::implCreateXFormsControl( const svx::OXFormsDescriptor &_ // const SdrPageViewWinList& rWinList = pPageView->GetWinList(); // const SdrPageViewWindows& rPageViewWindows = pPageView->GetPageViewWindows(); - for( sal_uInt32 i = 0L; i < pPageView->PageWindowCount(); i++ ) + for( sal_uInt32 i = 0; i < pPageView->PageWindowCount(); i++ ) { const SdrPageWindow& rPageWindow = *pPageView->GetPageWindow(i); diff --git a/svx/source/gallery2/codec.cxx b/svx/source/gallery2/codec.cxx index 2b8b74d8f6e9..0149b4de5e97 100644 --- a/svx/source/gallery2/codec.cxx +++ b/svx/source/gallery2/codec.cxx @@ -76,7 +76,7 @@ void GalleryCodec::Write( SvStream& rStmToWrite ) aCodec.Compress( rStmToWrite, rStm ); aCodec.EndCompression(); - nCompSize = rStm.Tell() - nPos - 4UL; + nCompSize = rStm.Tell() - nPos - 4; rStm.Seek( nPos ); rStm.WriteUInt32( nCompSize ); rStm.Seek( STREAM_SEEK_TO_END ); @@ -102,7 +102,7 @@ void GalleryCodec::Read( SvStream& rStmToRead ) std::unique_ptr<sal_uInt8[]> pOutBuf(new sal_uInt8[ nUnCompressedSize ]); sal_uInt8* pTmpBuf = pOutBuf.get(); sal_uInt8* pLast = pOutBuf.get() + nUnCompressedSize - 1; - sal_uIntPtr nIndex = 0UL, nCountByte, nRunByte; + sal_uIntPtr nIndex = 0, nCountByte, nRunByte; bool bEndDecoding = false; do diff --git a/svx/source/gallery2/galbrws2.cxx b/svx/source/gallery2/galbrws2.cxx index 858b97db244a..05ce91bb1e2f 100644 --- a/svx/source/gallery2/galbrws2.cxx +++ b/svx/source/gallery2/galbrws2.cxx @@ -959,8 +959,8 @@ sal_uIntPtr GalleryBrowser2::ImplGetSelectedItemId( const Point* pSelPos, Point& } } - rSelPos.X() = std::max( std::min( rSelPos.X(), aOutputSizePixel.Width() - 1L ), 0L ); - rSelPos.Y() = std::max( std::min( rSelPos.Y(), aOutputSizePixel.Height() - 1L ), 0L ); + rSelPos.X() = std::max( std::min( rSelPos.X(), aOutputSizePixel.Width() - 1 ), 0L ); + rSelPos.Y() = std::max( std::min( rSelPos.Y(), aOutputSizePixel.Height() - 1 ), 0L ); if( nRet && ( !mpCurTheme || ( nRet > mpCurTheme->GetObjectCount() ) ) ) { 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; } diff --git a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx index d892d8d4d9e5..37d132d6ea01 100644 --- a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx +++ b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx @@ -1053,7 +1053,7 @@ void PosSizePropertyPanel::SetPosSizeMinMax() fRight -= maRect.getWidth(); fBottom -= maRect.getHeight(); - const double fMaxLong((double)(MetricField::ConvertValue( LONG_MAX, 0, MapUnit::Map100thMM, meDlgUnit ) - 1L)); + const double fMaxLong((double)(MetricField::ConvertValue( LONG_MAX, 0, MapUnit::Map100thMM, meDlgUnit ) - 1)); fLeft = basegfx::clamp(fLeft, -fMaxLong, fMaxLong); fRight = basegfx::clamp(fRight, -fMaxLong, fMaxLong); fTop = basegfx::clamp(fTop, - fMaxLong, fMaxLong); diff --git a/svx/source/svdraw/polypolygoneditor.cxx b/svx/source/svdraw/polypolygoneditor.cxx index c7548195cacc..78778eb9062d 100644 --- a/svx/source/svdraw/polypolygoneditor.cxx +++ b/svx/source/svdraw/polypolygoneditor.cxx @@ -46,7 +46,7 @@ bool PolyPolygonEditor::DeletePoints( const std::set< sal_uInt16 >& rAbsPoints ) aCandidate.remove(nPnt); - if( aCandidate.count() < 2L ) + if( aCandidate.count() < 2 ) { maPolyPolygon.remove(nPoly); } diff --git a/svx/source/svdraw/sdrpagewindow.cxx b/svx/source/svdraw/sdrpagewindow.cxx index 282734361225..89158a39e425 100644 --- a/svx/source/svdraw/sdrpagewindow.cxx +++ b/svx/source/svdraw/sdrpagewindow.cxx @@ -232,7 +232,7 @@ namespace if(aCandidate.count()) { - const sal_uInt32 nLoopCount(aCandidate.isClosed() ? aCandidate.count() : aCandidate.count() - 1L); + const sal_uInt32 nLoopCount(aCandidate.isClosed() ? aCandidate.count() : aCandidate.count() - 1); rOutDev.SetFillColor(); rOutDev.SetLineColor(aColor); @@ -249,7 +249,7 @@ namespace void impTryTest(const SdrPageView& rPageView, OutputDevice& rOutDev) { - if(rPageView.GetPage() && rPageView.GetPage()->GetObjCount() >= 2L) + if(rPageView.GetPage() && rPageView.GetPage()->GetObjCount() >= 2) { SdrPage* pPage = rPageView.GetPage(); SdrObject* pObjA = pPage->GetObj(0); diff --git a/svx/source/svdraw/svdattr.cxx b/svx/source/svdraw/svdattr.cxx index b37b9297dd52..cc94cf7efc3e 100644 --- a/svx/source/svdraw/svdattr.cxx +++ b/svx/source/svdraw/svdattr.cxx @@ -1233,7 +1233,7 @@ bool SdrTextAniAmountItem::GetPresentation( sal_Int32 nValue(GetValue()); if(!nValue) - nValue = -1L; + nValue = -1; if(nValue < 0) { diff --git a/svx/source/svdraw/svdedtv.cxx b/svx/source/svdraw/svdedtv.cxx index e7cd29de92f7..e8360d172314 100644 --- a/svx/source/svdraw/svdedtv.cxx +++ b/svx/source/svdraw/svdedtv.cxx @@ -278,7 +278,7 @@ void SdrEditView::EndUndo() // #i13033# // Comparison changed to 1L since EndUndo() is called later now // and EndUndo WILL change count to count-1 - if(1L == mpModel->GetUndoBracketLevel()) + if(1 == mpModel->GetUndoBracketLevel()) { ImpBroadcastEdgesOfMarkedNodes(); } diff --git a/svx/source/svdraw/svdedtv1.cxx b/svx/source/svdraw/svdedtv1.cxx index 9a99fa1d8b04..eea63990eff8 100644 --- a/svx/source/svdraw/svdedtv1.cxx +++ b/svx/source/svdraw/svdedtv1.cxx @@ -518,7 +518,7 @@ void SdrEditView::ImpCrookObj(SdrObject* pO, const Point& rRef, const Point& rRa XPolygon aXP((sal_uInt16)nPointCount); sal_uInt32 nPtNum; - for(nPtNum = 0L; nPtNum < nPointCount; nPtNum++) + for(nPtNum = 0; nPtNum < nPointCount; nPtNum++) { Point aPt(pO->GetPoint(nPtNum)); aXP[(sal_uInt16)nPtNum]=aPt; @@ -531,7 +531,7 @@ void SdrEditView::ImpCrookObj(SdrObject* pO, const Point& rRef, const Point& rRa case SdrCrookMode::Stretch: CrookStretchPoly(aXP,rRef,rRad,bVertical,rMarkRect); break; } - for(nPtNum = 0L; nPtNum < nPointCount; nPtNum++) + for(nPtNum = 0; nPtNum < nPointCount; nPtNum++) { // broadcasting could be optimized here, but for the // current two points of the measurement object, it's fine @@ -632,7 +632,7 @@ void SdrEditView::ImpDistortObj(SdrObject* pO, const tools::Rectangle& rRef, con XPolygon aXP((sal_uInt16)nPointCount); sal_uInt32 nPtNum; - for(nPtNum = 0L; nPtNum < nPointCount; nPtNum++) + for(nPtNum = 0; nPtNum < nPointCount; nPtNum++) { Point aPt(pO->GetPoint(nPtNum)); aXP[(sal_uInt16)nPtNum]=aPt; @@ -640,7 +640,7 @@ void SdrEditView::ImpDistortObj(SdrObject* pO, const tools::Rectangle& rRef, con aXP.Distort(rRef, rDistortedRect); - for(nPtNum = 0L; nPtNum < nPointCount; nPtNum++) + for(nPtNum = 0; nPtNum < nPointCount; nPtNum++) { // broadcasting could be optimized here, but for the // current two points of the measurement object it's fine diff --git a/svx/source/svdraw/svdedtv2.cxx b/svx/source/svdraw/svdedtv2.cxx index e7b8a3f586f9..8c4d82fd8ed1 100644 --- a/svx/source/svdraw/svdedtv2.cxx +++ b/svx/source/svdraw/svdedtv2.cxx @@ -707,9 +707,9 @@ basegfx::B2DPolygon SdrEditView::ImpCombineToSinglePolygon(const basegfx::B2DPol if(aCandidate.count()) { const basegfx::B2DPoint aCA(aCandidate.getB2DPoint(0)); - const basegfx::B2DPoint aCB(aCandidate.getB2DPoint(aCandidate.count() - 1L)); + const basegfx::B2DPoint aCB(aCandidate.getB2DPoint(aCandidate.count() - 1)); const basegfx::B2DPoint aRA(aRetval.getB2DPoint(0)); - const basegfx::B2DPoint aRB(aRetval.getB2DPoint(aRetval.count() - 1L)); + const basegfx::B2DPoint aRB(aRetval.getB2DPoint(aRetval.count() - 1)); const double fRACA(basegfx::B2DVector(aCA - aRA).getLength()); const double fRACB(basegfx::B2DVector(aCB - aRA).getLength()); @@ -789,7 +789,7 @@ void SdrEditView::DistributeMarkedObjects() if(eHor != SvxDistributeHorizontal::NONE) { // build sorted entry list - nFullLength = 0L; + nFullLength = 0; for( size_t a = 0; a < nMark; ++a ) { @@ -884,7 +884,7 @@ void SdrEditView::DistributeMarkedObjects() if(eVer != SvxDistributeVertical::NONE) { // build sorted entry list - nFullLength = 0L; + nFullLength = 0; for( size_t a = 0; a < nMark; ++a ) { @@ -1298,7 +1298,7 @@ void SdrEditView::CombineMarkedObjects(bool bNoPolyPoly) if(!pInsOL) { - nInsPos = pObj->GetOrdNum() + 1L; + nInsPos = pObj->GetOrdNum() + 1; pInsPV = pM->GetPageView(); pInsOL = pObj->GetObjList(); } @@ -1320,7 +1320,7 @@ void SdrEditView::CombineMarkedObjects(bool bNoPolyPoly) { SdrObjKind eKind = OBJ_PATHFILL; - if(nPolyCount > 1L) + if(nPolyCount > 1) { aPolyPolygon.setClosed(true); } @@ -1330,7 +1330,7 @@ void SdrEditView::CombineMarkedObjects(bool bNoPolyPoly) const basegfx::B2DPolygon aPolygon(aPolyPolygon.getB2DPolygon(0)); const sal_uInt32 nPointCount(aPolygon.count()); - if(nPointCount <= 2L) + if(nPointCount <= 2) { eKind = OBJ_PATHLINE; } @@ -1339,7 +1339,7 @@ void SdrEditView::CombineMarkedObjects(bool bNoPolyPoly) if(!aPolygon.isClosed()) { const basegfx::B2DPoint aPointA(aPolygon.getB2DPoint(0)); - const basegfx::B2DPoint aPointB(aPolygon.getB2DPoint(nPointCount - 1L)); + const basegfx::B2DPoint aPointB(aPolygon.getB2DPoint(nPointCount - 1)); const double fDistance(basegfx::B2DVector(aPointB - aPointA).getLength()); const double fJoinTolerance(10.0); @@ -1404,18 +1404,18 @@ bool SdrEditView::ImpCanDismantle(const basegfx::B2DPolyPolygon& rPpolyPolygon, bool bCan(false); const sal_uInt32 nPolygonCount(rPpolyPolygon.count()); - if(nPolygonCount >= 2L) + if(nPolygonCount >= 2) { // #i69172# dismantle makes sense with 2 or more polygons in a polyPolygon bCan = true; } - else if(bMakeLines && 1L == nPolygonCount) + else if(bMakeLines && 1 == nPolygonCount) { // #i69172# ..or with at least 2 edges (curves or lines) const basegfx::B2DPolygon aPolygon(rPpolyPolygon.getB2DPolygon(0)); const sal_uInt32 nPointCount(aPolygon.count()); - if(nPointCount > 2L) + if(nPointCount > 2) { bCan = true; } diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx index eb0083b6a699..5734295acb47 100644 --- a/svx/source/svdraw/svdedxv.cxx +++ b/svx/source/svdraw/svdedxv.cxx @@ -1044,7 +1044,7 @@ bool SdrObjEditView::SdrBeginTextEdit( if(!bBrk && !pWin) { - for(i = 0L; i < nWinCount && !pWin; i++) + for(i = 0; i < nWinCount && !pWin; i++) { SdrPaintWindow* pPaintWindow = GetPaintWindow(i); @@ -1226,7 +1226,7 @@ bool SdrObjEditView::SdrBeginTextEdit( // register all windows as OutlinerViews with the Outliner if(!bOnlyOneView) { - for(i = 0L; i < nWinCount; i++) + for(i = 0; i < nWinCount; i++) { SdrPaintWindow* pPaintWindow = GetPaintWindow(i); OutputDevice& rOutDev = pPaintWindow->GetOutputDevice(); diff --git a/svx/source/svdraw/svdfmtf.cxx b/svx/source/svdraw/svdfmtf.cxx index 5b495583ec1c..e605acdb721d 100644 --- a/svx/source/svdraw/svdfmtf.cxx +++ b/svx/source/svdraw/svdfmtf.cxx @@ -775,7 +775,7 @@ bool ImpSdrGDIMetaFileImport::CheckLastLineMerge(const basegfx::B2DPolygon& rSrc if(pLastPoly) { - if(1L == pLastPoly->GetPathPoly().count()) + if(1 == pLastPoly->GetPathPoly().count()) { bool bOk(false); basegfx::B2DPolygon aDstPoly(pLastPoly->GetPathPoly().getB2DPolygon(0)); @@ -788,32 +788,32 @@ bool ImpSdrGDIMetaFileImport::CheckLastLineMerge(const basegfx::B2DPolygon& rSrc if(aDstPoly.count()) { - const sal_uInt32 nMaxDstPnt(aDstPoly.count() - 1L); - const sal_uInt32 nMaxSrcPnt(rSrcPoly.count() - 1L); + const sal_uInt32 nMaxDstPnt(aDstPoly.count() - 1); + const sal_uInt32 nMaxSrcPnt(rSrcPoly.count() - 1); if(aDstPoly.getB2DPoint(nMaxDstPnt) == rSrcPoly.getB2DPoint(0)) { - aDstPoly.append(rSrcPoly, 1L, rSrcPoly.count() - 1L); + aDstPoly.append(rSrcPoly, 1L, rSrcPoly.count() - 1); bOk = true; } else if(aDstPoly.getB2DPoint(0) == rSrcPoly.getB2DPoint(nMaxSrcPnt)) { basegfx::B2DPolygon aNew(rSrcPoly); - aNew.append(aDstPoly, 1L, aDstPoly.count() - 1L); + aNew.append(aDstPoly, 1L, aDstPoly.count() - 1); aDstPoly = aNew; bOk = true; } else if(aDstPoly.getB2DPoint(0) == rSrcPoly.getB2DPoint(0)) { aDstPoly.flip(); - aDstPoly.append(rSrcPoly, 1L, rSrcPoly.count() - 1L); + aDstPoly.append(rSrcPoly, 1L, rSrcPoly.count() - 1); bOk = true; } else if(aDstPoly.getB2DPoint(nMaxDstPnt) == rSrcPoly.getB2DPoint(nMaxSrcPnt)) { basegfx::B2DPolygon aNew(rSrcPoly); aNew.flip(); - aDstPoly.append(aNew, 1L, aNew.count() - 1L); + aDstPoly.append(aNew, 1L, aNew.count() - 1); bOk = true; } } diff --git a/svx/source/svdraw/svdhdl.cxx b/svx/source/svdraw/svdhdl.cxx index b899f1d905fc..979255576f5f 100644 --- a/svx/source/svdraw/svdhdl.cxx +++ b/svx/source/svdraw/svdhdl.cxx @@ -915,8 +915,8 @@ sdr::overlay::OverlayObject* SdrHdl::CreateOverlayObject( } else { - sal_uInt16 nCenX((sal_uInt16)(aBmpEx.GetSizePixel().Width() - 1L) >> 1); - sal_uInt16 nCenY((sal_uInt16)(aBmpEx.GetSizePixel().Height() - 1L) >> 1); + sal_uInt16 nCenX((sal_uInt16)(aBmpEx.GetSizePixel().Width() - 1) >> 1); + sal_uInt16 nCenY((sal_uInt16)(aBmpEx.GetSizePixel().Height() - 1) >> 1); if(aMoveOutsideOffset.X() > 0) { diff --git a/svx/source/svdraw/svdmark.cxx b/svx/source/svdraw/svdmark.cxx index 661ef14d4694..e82bc794a14c 100644 --- a/svx/source/svdraw/svdmark.cxx +++ b/svx/source/svdraw/svdmark.cxx @@ -435,7 +435,7 @@ const OUString& SdrMarkList::GetMarkDescription() const { const size_t nCount(GetMarkCount()); - if(mbNameOk && 1L == nCount) + if(mbNameOk && 1 == nCount) { // if it's a single selection, cache only text frame const SdrObject* pObj = GetMark(0)->GetMarkedSdrObj(); @@ -456,7 +456,7 @@ const OUString& SdrMarkList::GetMarkDescription() const { const_cast<SdrMarkList*>(this)->maMarkName = ImpGetResStr(STR_ObjNameNoObj); } - else if(1L == nCount) + else if(1 == nCount) { if(pMark->GetMarkedSdrObj()) { @@ -547,7 +547,7 @@ const OUString& SdrMarkList::GetPointMarkDescription(bool bGlue) const const SdrMark* pMark = GetMark(n1stMarkNum); OUString aNam; - if(1L == nMarkPtObjCnt) + if(1 == nMarkPtObjCnt) { if(pMark->GetMarkedSdrObj()) { @@ -585,7 +585,7 @@ const OUString& SdrMarkList::GetPointMarkDescription(bool bGlue) const OUString aStr1; - if(1L == nMarkPtCnt) + if(1 == nMarkPtCnt) { aStr1 = (ImpGetResStr(bGlue ? STR_ViewMarkedGluePoint : STR_ViewMarkedPoint)); } diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx index 72414a356e09..ad2d751abbd9 100644 --- a/svx/source/svdraw/svdmodel.cxx +++ b/svx/source/svdraw/svdmodel.cxx @@ -1173,7 +1173,7 @@ void SdrModel::TakeMetricStr(long nVal, OUString& rStr, bool bNoUnitChars, sal_I { // #i22167# // change to double precision usage to not lose decimal places - const bool bNegative(nVal < 0L); + const bool bNegative(nVal < 0); SvtSysLocale aSysLoc; const LocaleDataWrapper& rLoc(aSysLoc.GetLocaleData()); double fLocalValue(double(nVal) * double(aUIUnitFact)); diff --git a/svx/source/svdraw/svdmrkv.cxx b/svx/source/svdraw/svdmrkv.cxx index 4e287e80de07..73a79d4bb983 100644 --- a/svx/source/svdraw/svdmrkv.cxx +++ b/svx/source/svdraw/svdmrkv.cxx @@ -133,7 +133,7 @@ void SdrMarkView::ImpClearVars() mbPlusHdlAlways=false; mnFrameHandlesLimit=50; mbInsPolyPoint=false; - mnInsPointNum = 0L; + mnInsPointNum = 0; mbMarkedObjRectDirty=false; mbMarkedPointsRectsDirty=false; mbMarkHandlesHidden = false; diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx index 301bda34127a..c41aae438575 100644 --- a/svx/source/svdraw/svdobj.cxx +++ b/svx/source/svdraw/svdobj.cxx @@ -1183,7 +1183,7 @@ SdrHdl* SdrObject::GetPlusHdl(const SdrHdl& /*rHdl*/, sal_uInt32 /*nPlNum*/) con void SdrObject::AddToHdlList(SdrHdlList& rHdlList) const { sal_uInt32 nCount=GetHdlCount(); - for (sal_uInt32 i=0L; i<nCount; i++) { + for (sal_uInt32 i=0; i<nCount; i++) { SdrHdl* pHdl=GetHdl(i); if (pHdl!=nullptr) { rHdlList.AddHdl(pHdl); diff --git a/svx/source/svdraw/svdocapt.cxx b/svx/source/svdraw/svdocapt.cxx index 2f5ae204d3d0..2977b745f5f5 100644 --- a/svx/source/svdraw/svdocapt.cxx +++ b/svx/source/svdraw/svdocapt.cxx @@ -270,7 +270,7 @@ sal_uInt32 SdrCaptionObj::GetHdlCount() const { sal_uInt32 nCount1(SdrRectObj::GetHdlCount()); // Currently only dragging the tail's end is implemented. - return nCount1 + 1L; + return nCount1 + 1; } SdrHdl* SdrCaptionObj::GetHdl(sal_uInt32 nHdlNum) const diff --git a/svx/source/svdraw/svdocirc.cxx b/svx/source/svdraw/svdocirc.cxx index 04fa7b49e0cc..3ea984b4b529 100644 --- a/svx/source/svdraw/svdocirc.cxx +++ b/svx/source/svdraw/svdocirc.cxx @@ -176,13 +176,13 @@ bool SdrCircObj::PaintNeedsXPolyCirc() const if(!bNeed && meCircleKind == OBJ_CARC) { // start of the line is here if StartPolygon, StartWidth!=0 - bNeed=static_cast<const XLineStartItem&>(rSet.Get(XATTR_LINESTART)).GetLineStartValue().count() != 0L && + bNeed=static_cast<const XLineStartItem&>(rSet.Get(XATTR_LINESTART)).GetLineStartValue().count() != 0 && static_cast<const XLineStartWidthItem&>(rSet.Get(XATTR_LINESTARTWIDTH)).GetValue() != 0; if(!bNeed) { // end of the line is here if EndPolygon, EndWidth!=0 - bNeed = static_cast<const XLineEndItem&>(rSet.Get(XATTR_LINEEND)).GetLineEndValue().count() != 0L && + bNeed = static_cast<const XLineEndItem&>(rSet.Get(XATTR_LINEEND)).GetLineEndValue().count() != 0 && static_cast<const XLineEndWidthItem&>(rSet.Get(XATTR_LINEENDWIDTH)).GetValue() != 0; } } @@ -386,7 +386,7 @@ SdrHdl* SdrCircObj::GetHdl(sal_uInt32 nHdlNum) const { if (meCircleKind==OBJ_CIRC) { - nHdlNum += 2L; + nHdlNum += 2; } SdrHdl* pH = nullptr; @@ -404,7 +404,7 @@ SdrHdl* SdrCircObj::GetHdl(sal_uInt32 nHdlNum) const case 1: aPnt = GetAnglePnt(maRect,nEndAngle); eLocalKind = SdrHdlKind::Circle; - nPNum = 2L; + nPNum = 2; break; case 2: aPnt = maRect.TopLeft(); @@ -756,12 +756,12 @@ basegfx::B2DPolyPolygon SdrCircObj::TakeCreatePoly(const SdrDragStat& rDrag) con { const ImpCircUser* pU = static_cast<const ImpCircUser*>(rDrag.GetUser()); - if(rDrag.GetPointCount() < 4L) + if(rDrag.GetPointCount() < 4) { // force to OBJ_CIRC to get full visualisation basegfx::B2DPolyPolygon aRetval(ImpCalcXPolyCirc(OBJ_CIRC, pU->aR, pU->nStart, pU->nEnd)); - if(3L == rDrag.GetPointCount()) + if(3 == rDrag.GetPointCount()) { // add edge to first point on ellipse basegfx::B2DPolygon aNew; diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx index a134c6a408ca..74b1ad82c85d 100644 --- a/svx/source/svdraw/svdograf.cxx +++ b/svx/source/svdraw/svdograf.cxx @@ -952,7 +952,7 @@ sal_uInt32 SdrGrafObj::GetHdlCount() const SdrHdl* SdrGrafObj::GetHdl(sal_uInt32 nHdlNum) const { - return SdrRectObj::GetHdl( nHdlNum + 1L ); + return SdrRectObj::GetHdl( nHdlNum + 1 ); } void SdrGrafObj::NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact) diff --git a/svx/source/svdraw/svdomeas.cxx b/svx/source/svdraw/svdomeas.cxx index 957e03c3f473..f2ea26644eb1 100644 --- a/svx/source/svdraw/svdomeas.cxx +++ b/svx/source/svdraw/svdomeas.cxx @@ -339,7 +339,7 @@ long impGetLineStartEndDistance(const basegfx::B2DPolyPolygon& rPolyPolygon, lon if(bCenter) { - nHeight /= 2L; + nHeight /= 2; } return nHeight; @@ -1090,14 +1090,14 @@ sal_uInt32 SdrMeasureObj::GetPointCount() const Point SdrMeasureObj::GetPoint(sal_uInt32 i) const { - return (0L == i) ? aPt1 : aPt2; + return (0 == i) ? aPt1 : aPt2; } void SdrMeasureObj::NbcSetPoint(const Point& rPnt, sal_uInt32 i) { - if (0L == i) + if (0 == i) aPt1=rPnt; - if (1L == i) + if (1 == i) aPt2=rPnt; SetRectsDirty(); SetTextDirty(); diff --git a/svx/source/svdraw/svdopath.cxx b/svx/source/svdraw/svdopath.cxx index 513adcf0b8ca..49df3cb8cb34 100644 --- a/svx/source/svdraw/svdopath.cxx +++ b/svx/source/svdraw/svdopath.cxx @@ -295,7 +295,7 @@ void ImpPathCreateUser::CalcBezier(const Point& rP1, const Point& rP2, const Poi // #i21479# // Also copy the end point when no end point is set yet - if (!bMouseDown || (0L == aBezEnd.X() && 0L == aBezEnd.Y())) aBezEnd=rP2; + if (!bMouseDown || (0 == aBezEnd.X() && 0 == aBezEnd.Y())) aBezEnd=rP2; bBezier=true; } @@ -870,7 +870,7 @@ bool ImpPathForDragAndCreate::endPathDrag(SdrDragStat const & rDrag) basegfx::B2DPolygon aCandidate(aTempPolyPolygon.getB2DPolygon(nPoly)); aCandidate.remove(nPnt); - if(aCandidate.count() < 2L) + if(aCandidate.count() < 2) { aTempPolyPolygon.remove(nPoly); } @@ -1565,9 +1565,9 @@ basegfx::B2DPolyPolygon ImpPathForDragAndCreate::TakeObjectPolyPolygon(const Sdr return aRetval; ImpPathCreateUser* pU = static_cast<ImpPathCreateUser*>(rDrag.GetUser()); - basegfx::B2DPolygon aNewPolygon(aRetval.count() ? aRetval.getB2DPolygon(aRetval.count() - 1L) : basegfx::B2DPolygon()); + basegfx::B2DPolygon aNewPolygon(aRetval.count() ? aRetval.getB2DPolygon(aRetval.count() - 1) : basegfx::B2DPolygon()); - if(pU->IsFormFlag() && aNewPolygon.count() > 1L) + if(pU->IsFormFlag() && aNewPolygon.count() > 1) { // remove last segment and replace with current // do not forget to rescue the previous control point which will be lost when @@ -1588,7 +1588,7 @@ basegfx::B2DPolyPolygon ImpPathForDragAndCreate::TakeObjectPolyPolygon(const Sdr if(aRetval.count()) { - aRetval.setB2DPolygon(aRetval.count() - 1L, aNewPolygon); + aRetval.setB2DPolygon(aRetval.count() - 1, aNewPolygon); } else { @@ -1681,7 +1681,7 @@ SdrPathObj::~SdrPathObj() static bool lcl_ImpIsLine(const basegfx::B2DPolyPolygon& rPolyPolygon) { - return (1L == rPolyPolygon.count() && 2L == rPolyPolygon.getB2DPolygon(0).count()); + return (1 == rPolyPolygon.count() && 2 == rPolyPolygon.getB2DPolygon(0).count()); } static tools::Rectangle lcl_ImpGetBoundRect(const basegfx::B2DPolyPolygon& rPolyPolygon) @@ -2576,8 +2576,8 @@ sal_uInt32 SdrPathObj::NbcInsPoint(const Point& rPos, bool bNewObj) double fSmallestCut; basegfx::tools::getSmallestDistancePointToPolyPolygon(GetPathPoly(), aTestPoint, nSmallestPolyIndex, nSmallestEdgeIndex, fSmallestCut); basegfx::B2DPolygon aCandidate(GetPathPoly().getB2DPolygon(nSmallestPolyIndex)); - const bool bBefore(!aCandidate.isClosed() && 0L == nSmallestEdgeIndex && 0.0 == fSmallestCut); - const bool bAfter(!aCandidate.isClosed() && aCandidate.count() == nSmallestEdgeIndex + 2L && 1.0 == fSmallestCut); + const bool bBefore(!aCandidate.isClosed() && 0 == nSmallestEdgeIndex && 0.0 == fSmallestCut); + const bool bAfter(!aCandidate.isClosed() && aCandidate.count() == nSmallestEdgeIndex + 2 && 1.0 == fSmallestCut); if(bBefore) { @@ -2593,7 +2593,7 @@ sal_uInt32 SdrPathObj::NbcInsPoint(const Point& rPos, bool bNewObj) } } - nNewHdl = 0L; + nNewHdl = 0; } else if(bAfter) { @@ -2609,7 +2609,7 @@ sal_uInt32 SdrPathObj::NbcInsPoint(const Point& rPos, bool bNewObj) } } - nNewHdl = aCandidate.count() - 1L; + nNewHdl = aCandidate.count() - 1; } else { @@ -2649,10 +2649,10 @@ sal_uInt32 SdrPathObj::NbcInsPoint(const Point& rPos, bool bNewObj) } else { - aCandidate.insert(nSmallestEdgeIndex + 1L, aTestPoint); + aCandidate.insert(nSmallestEdgeIndex + 1, aTestPoint); } - nNewHdl = nSmallestEdgeIndex + 1L; + nNewHdl = nSmallestEdgeIndex + 1; } maPathPolygon.setB2DPolygon(nSmallestPolyIndex, aCandidate); @@ -2676,7 +2676,7 @@ SdrObject* SdrPathObj::RipPoint(sal_uInt32 nHdlNum, sal_uInt32& rNewPt0Index) if(PolyPolygonEditor::GetRelativePolyPoint(aLocalPolyPolygon, nHdlNum, nPoly, nPnt)) { - if(0L == nPoly) + if(0 == nPoly) { const basegfx::B2DPolygon aCandidate(aLocalPolyPolygon.getB2DPolygon(nPoly)); const sal_uInt32 nPointCount(aCandidate.count()); @@ -2696,10 +2696,10 @@ SdrObject* SdrPathObj::RipPoint(sal_uInt32 nHdlNum, sal_uInt32& rNewPt0Index) } else { - if(nPointCount >= 3L && nPnt != 0L && nPnt + 1L < nPointCount) + if(nPointCount >= 3 && nPnt != 0 && nPnt + 1 < nPointCount) { // split in two objects at point nPnt - basegfx::B2DPolygon aSplitPolyA(aCandidate, 0L, nPnt + 1L); + basegfx::B2DPolygon aSplitPolyA(aCandidate, 0L, nPnt + 1); SetPathPoly(basegfx::B2DPolyPolygon(aSplitPolyA)); pNewObj = Clone(); @@ -2857,7 +2857,7 @@ bool SdrPathObj::TRGetBaseGeometry(basegfx::B2DHomMatrix& rMatrix, basegfx::B2DP if(OBJ_LINE == meKind) { // ignore shear and rotate, just use scale and translate - OSL_ENSURE(GetPathPoly().count() > 0L && GetPathPoly().getB2DPolygon(0).count() > 1L, "OBJ_LINE with too few polygons (!)"); + OSL_ENSURE(GetPathPoly().count() > 0 && GetPathPoly().getB2DPolygon(0).count() > 1, "OBJ_LINE with too few polygons (!)"); // #i72287# use polygon without control points for range calculation. Do not change rPolyPolygon // itself, else this method will no longer return the full polygon information (curve will // be lost) diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx index 55e21e79311e..c2805ef47b2b 100644 --- a/svx/source/svdraw/svdotext.cxx +++ b/svx/source/svdraw/svdotext.cxx @@ -1856,7 +1856,7 @@ GDIMetaFile* SdrTextObj::GetTextScrollMetaFileAndRectangle( // get outliner set up. To avoid getting a somehow rotated MetaFile, // temporarily disable object rotation. sal_Int32 nAngle(aGeo.nRotationAngle); - aGeo.nRotationAngle = 0L; + aGeo.nRotationAngle = 0; ImpSetupDrawOutlinerForPaint( bContourFrame, rOutliner, aTextRect, aAnchorRect, aPaintRect, aFitXKorreg ); aGeo.nRotationAngle = nAngle; diff --git a/svx/source/svdraw/svdotextdecomposition.cxx b/svx/source/svdraw/svdotextdecomposition.cxx index c956d9206512..f6f33d2a832b 100644 --- a/svx/source/svdraw/svdotextdecomposition.cxx +++ b/svx/source/svdraw/svdotextdecomposition.cxx @@ -761,8 +761,8 @@ void SdrTextObj::impDecomposeAutoFitTextPrimitive( rOutliner.SetMaxAutoPaperSize(Size(1000000,1000000)); // add one to rage sizes to get back to the old Rectangle and outliner measurements - const sal_uInt32 nAnchorTextWidth(FRound(aAnchorTextRange.getWidth() + 1L)); - const sal_uInt32 nAnchorTextHeight(FRound(aAnchorTextRange.getHeight() + 1L)); + const sal_uInt32 nAnchorTextWidth(FRound(aAnchorTextRange.getWidth() + 1)); + const sal_uInt32 nAnchorTextHeight(FRound(aAnchorTextRange.getHeight() + 1)); const OutlinerParaObject* pOutlinerParaObject = rSdrAutofitTextPrimitive.getSdrText()->GetOutlinerParaObject(); OSL_ENSURE(pOutlinerParaObject, "impDecomposeBlockTextPrimitive used with no OutlinerParaObject (!)"); const bool bVerticalWriting(pOutlinerParaObject->IsVertical()); @@ -928,8 +928,8 @@ void SdrTextObj::impDecomposeBlockTextPrimitive( } // add one to rage sizes to get back to the old Rectangle and outliner measurements - const sal_uInt32 nAnchorTextWidth(FRound(aAnchorTextRange.getWidth() + 1L)); - const sal_uInt32 nAnchorTextHeight(FRound(aAnchorTextRange.getHeight() + 1L)); + const sal_uInt32 nAnchorTextWidth(FRound(aAnchorTextRange.getWidth() + 1)); + const sal_uInt32 nAnchorTextHeight(FRound(aAnchorTextRange.getHeight() + 1)); const bool bVerticalWriting(rSdrBlockTextPrimitive.getOutlinerParaObject().IsVertical()); const bool bTopToBottom(rSdrBlockTextPrimitive.getOutlinerParaObject().IsTopToBottom()); const Size aAnchorTextSize(Size(nAnchorTextWidth, nAnchorTextHeight)); @@ -1310,7 +1310,7 @@ void impCreateAlternateTiming(const SfxItemSet& rSet, drawinglayer::animation::A const double fHalfInnerPath(fTimeForInnerPath * 0.5); const sal_uInt32 nDoubleRepeat(nRepeat / 2L); - if(nDoubleRepeat || 0L == nRepeat) + if(nDoubleRepeat || 0 == nRepeat) { // double forth and back loop drawinglayer::animation::AnimationEntryLoop aLoop(nDoubleRepeat ? nDoubleRepeat : ENDLESS_LOOP); @@ -1361,9 +1361,9 @@ void impCreateSlideTiming(const SfxItemSet& rSet, drawinglayer::animation::Anima rAnimList.append(aOutIn); // loop. In loop, move out and in again - if(nRepeat > 1L || 0L == nRepeat) + if(nRepeat > 1 || 0 == nRepeat) { - drawinglayer::animation::AnimationEntryLoop aLoop(nRepeat ? nRepeat - 1L : ENDLESS_LOOP); + drawinglayer::animation::AnimationEntryLoop aLoop(nRepeat ? nRepeat - 1 : ENDLESS_LOOP); drawinglayer::animation::AnimationEntryLinear aTime0(fTimeFullPath * 0.5, fFrequency, 0.5, fStartPosition); aLoop.append(aTime0); drawinglayer::animation::AnimationEntryLinear aTime1(fTimeFullPath * 0.5, fFrequency, fStartPosition, 0.5); @@ -1524,8 +1524,8 @@ void SdrTextObj::impDecomposeChainedTextPrimitive( rOutliner.SetMaxAutoPaperSize(Size(1000000,1000000)); // add one to rage sizes to get back to the old Rectangle and outliner measurements - const sal_uInt32 nAnchorTextWidth(FRound(aAnchorTextRange.getWidth() + 1L)); - const sal_uInt32 nAnchorTextHeight(FRound(aAnchorTextRange.getHeight() + 1L)); + const sal_uInt32 nAnchorTextWidth(FRound(aAnchorTextRange.getWidth() + 1)); + const sal_uInt32 nAnchorTextHeight(FRound(aAnchorTextRange.getHeight() + 1)); // Text const OutlinerParaObject* pOutlinerParaObject = rSdrChainedTextPrimitive.getSdrText()->GetOutlinerParaObject(); diff --git a/svx/source/svdraw/svdotextpathdecomposition.cxx b/svx/source/svdraw/svdotextpathdecomposition.cxx index b05cc0328b7d..82095c6f6927 100644 --- a/svx/source/svdraw/svdotextpathdecomposition.cxx +++ b/svx/source/svdraw/svdotextpathdecomposition.cxx @@ -712,7 +712,7 @@ void SdrTextObj::impDecomposePathTextPrimitive( aShadowDecomposition); sal_uInt32 a; - for(a = 0L; a < nLoopCount; a++) + for(a = 0; a < nLoopCount; a++) { // filter text portions for this paragraph ::std::vector< const impPathTextPortion* > aParagraphTextPortions; @@ -740,7 +740,7 @@ void SdrTextObj::impDecomposePathTextPrimitive( // add shadow primitives to decomposition aRetvalA.resize(nShadowCount); - for(a = 0L; a < nShadowCount; a++) + for(a = 0; a < nShadowCount; a++) { aRetvalA[a] = drawinglayer::primitive2d::Primitive2DReference(aShadowDecomposition[a]); } @@ -763,7 +763,7 @@ void SdrTextObj::impDecomposePathTextPrimitive( // add normal primitives to decomposition aRetvalB.resize(nRegularCount); - for(a = 0L; a < nRegularCount; a++) + for(a = 0; a < nRegularCount; a++) { aRetvalB[a] = drawinglayer::primitive2d::Primitive2DReference(aRegularDecomposition[a]); } diff --git a/svx/source/svdraw/svdpagv.cxx b/svx/source/svdraw/svdpagv.cxx index cc18ee4888cf..1d7b060b4796 100644 --- a/svx/source/svdraw/svdpagv.cxx +++ b/svx/source/svdraw/svdpagv.cxx @@ -393,7 +393,7 @@ void SdrPageView::DrawLayer(SdrLayerID nID, OutputDevice* pGivenTarget, void SdrPageView::SetDesignMode( bool _bDesignMode ) const { - for ( sal_uInt32 i = 0L; i < PageWindowCount(); ++i ) + for ( sal_uInt32 i = 0; i < PageWindowCount(); ++i ) { const SdrPageWindow& rPageViewWindow = *GetPageWindow(i); rPageViewWindow.SetDesignMode( _bDesignMode ); diff --git a/svx/source/svdraw/svdpntv.cxx b/svx/source/svdraw/svdpntv.cxx index 4d3dc758baaf..4fe03b13a319 100644 --- a/svx/source/svdraw/svdpntv.cxx +++ b/svx/source/svdraw/svdpntv.cxx @@ -553,7 +553,7 @@ void SdrPaintView::CompleteRedraw(OutputDevice* pOut, const vcl::Region& rReg, s count = nRepeatCount; } - for(a = 0L; a < count; a++) + for(a = 0; a < count; a++) { #endif // SVX_REPAINT_TIMER_TEST @@ -624,7 +624,7 @@ void SdrPaintView::CompleteRedraw(OutputDevice* pOut, const vcl::Region& rReg, s if(!bTimesInited) { - for(a = 0L; a < REMEMBERED_TIMES_COUNT; a++) + for(a = 0; a < REMEMBERED_TIMES_COUNT; a++) { fLastTimes[a] = fTimePerPaint; } @@ -633,17 +633,17 @@ void SdrPaintView::CompleteRedraw(OutputDevice* pOut, const vcl::Region& rReg, s } else { - for(a = 1L; a < REMEMBERED_TIMES_COUNT; a++) + for(a = 1; a < REMEMBERED_TIMES_COUNT; a++) { - fLastTimes[a - 1L] = fLastTimes[a]; + fLastTimes[a - 1] = fLastTimes[a]; } - fLastTimes[REMEMBERED_TIMES_COUNT - 1L] = fTimePerPaint; + fLastTimes[REMEMBERED_TIMES_COUNT - 1] = fTimePerPaint; } double fAddedTimes(0.0); - for(a = 0L; a < REMEMBERED_TIMES_COUNT; a++) + for(a = 0; a < REMEMBERED_TIMES_COUNT; a++) { fAddedTimes += fLastTimes[a]; } @@ -654,7 +654,7 @@ void SdrPaintView::CompleteRedraw(OutputDevice* pOut, const vcl::Region& rReg, s fprintf(stderr, "StartTime : %" SAL_PRIuUINT64 ", StopTime: %" SAL_PRIuUINT64 ", NeededTime: %" SAL_PRIuUINT64 ", TimePerPaint: %f\n", nStartTime, nStopTime, nNeededTime, fTimePerPaint); fprintf(stderr, "Remembered times: "); - for(a = 0L; a < REMEMBERED_TIMES_COUNT; a++) + for(a = 0; a < REMEMBERED_TIMES_COUNT; a++) { fprintf(stderr, "%d: %f ", a, fLastTimes[a]); } diff --git a/svx/source/svdraw/svdpoev.cxx b/svx/source/svdraw/svdpoev.cxx index da75f33b83c9..7ae722ba82d7 100644 --- a/svx/source/svdraw/svdpoev.cxx +++ b/svx/source/svdraw/svdpoev.cxx @@ -104,7 +104,7 @@ void SdrPolyEditView::CheckPolyPossibilitiesHelper( SdrMark* pM, bool& b1stSmoot if(PolyPolygonEditor::GetRelativePolyPoint(pPath->GetPathPoly(), nNum, nPolyNum, nPntNum)) { const basegfx::B2DPolygon aLocalPolygon(pPath->GetPathPoly().getB2DPolygon(nPolyNum)); - bool bCanSegment(bClosed || nPntNum < aLocalPolygon.count() - 1L); + bool bCanSegment(bClosed || nPntNum < aLocalPolygon.count() - 1); if(!bSetMarkedSegmentsKindPossible && bCanSegment) { diff --git a/svx/source/svdraw/svdsnpv.cxx b/svx/source/svdraw/svdsnpv.cxx index 302009ade96e..97b96ace2b6d 100644 --- a/svx/source/svdraw/svdsnpv.cxx +++ b/svx/source/svdraw/svdsnpv.cxx @@ -337,7 +337,7 @@ SdrSnap SdrSnapView::SnapPos(Point& rPnt, const SdrPageView* pPV) const if (bOPntSnap && nMaxPointSnapCount>0) { sal_uInt32 nCount(pO->GetSnapPointCount()); - for (sal_uInt32 i(0); i < nCount && nMaxPointSnapCount > 0L; i++) + for (sal_uInt32 i(0); i < nCount && nMaxPointSnapCount > 0; i++) { Point aP(pO->GetSnapPoint(i)); dx1=x-aP.X(); diff --git a/svx/source/svdraw/svdviter.cxx b/svx/source/svdraw/svdviter.cxx index e87d8b69b6fe..b4e70e9432c5 100644 --- a/svx/source/svdraw/svdviter.cxx +++ b/svx/source/svdraw/svdviter.cxx @@ -30,7 +30,7 @@ void SdrViewIter::ImpInitVars() { - mnListenerNum = 0L; + mnListenerNum = 0; mpAktView = nullptr; } diff --git a/svx/source/svdraw/svdxcgv.cxx b/svx/source/svdraw/svdxcgv.cxx index d347a7e1a7da..0debc4ab8e31 100644 --- a/svx/source/svdraw/svdxcgv.cxx +++ b/svx/source/svdraw/svdxcgv.cxx @@ -206,7 +206,7 @@ bool SdrExchangeView::Paste(SvStream& rInput, sal_uInt16 eFormat, const Point& r SdrOutliner& rOutliner = pObj->GetModel()->GetHitTestOutliner(); rOutliner.SetText(*pObj->GetOutlinerParaObject()); - if(1L == rOutliner.GetParagraphCount()) + if(1 == rOutliner.GetParagraphCount()) { SfxStyleSheet* pCandidate = rOutliner.GetStyleSheet(0); diff --git a/svx/source/table/accessibletableshape.cxx b/svx/source/table/accessibletableshape.cxx index dd1e04bf3bb3..2427c36ed3f6 100644 --- a/svx/source/table/accessibletableshape.cxx +++ b/svx/source/table/accessibletableshape.cxx @@ -868,7 +868,7 @@ sal_Int32 AccessibleTableShape::GetIndexOfSelectedChild( sal_Int32 nChildren = const_cast<AccessibleTableShape*>(this)->getAccessibleChildCount(); if( nSelectedChildIndex >= nChildren ) - return -1L; + return -1; sal_Int32 n = 0; while( n < nChildren ) @@ -883,7 +883,7 @@ sal_Int32 AccessibleTableShape::GetIndexOfSelectedChild( ++n; } - return n < nChildren ? n : -1L; + return n < nChildren ? n : -1; } void AccessibleTableShape::getColumnAndRow( sal_Int32 nChildIndex, sal_Int32& rnColumn, sal_Int32& rnRow ) { diff --git a/svx/source/tbxctrls/linectrl.cxx b/svx/source/tbxctrls/linectrl.cxx index 98c3132e3f7f..7a35ddf3a502 100644 --- a/svx/source/tbxctrls/linectrl.cxx +++ b/svx/source/tbxctrls/linectrl.cxx @@ -400,9 +400,9 @@ void SvxLineEndWindow::FillValueSet() OSL_ENSURE( !aBmp.IsEmpty(), "UI bitmap was not created" ); pVD->DrawBitmap( aPt0, aBmp ); - mpLineEndSet->InsertItem((sal_uInt16)((i+1L)*2L+1L), + mpLineEndSet->InsertItem((sal_uInt16)((i+1)*2L+1), Image(pVD->GetBitmap(aPt0, maBmpSize)), pEntry->GetName()); - mpLineEndSet->InsertItem((sal_uInt16)((i+2L)*2L), + mpLineEndSet->InsertItem((sal_uInt16)((i+2)*2L), Image(pVD->GetBitmap(aPt1, maBmpSize)), pEntry->GetName()); } mnLines = std::min( (sal_uInt16)(nCount + 1), (sal_uInt16) MAX_LINES ); diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx index 7ecea951c404..161bf34b1d8a 100644 --- a/svx/source/unodraw/unoshape.cxx +++ b/svx/source/unodraw/unoshape.cxx @@ -2440,7 +2440,7 @@ bool SvxShape::setPropertyValueImpl( const OUString&, const SfxItemPropertySimpl { SdrModel* pModel = pPageObj->GetModel(); SdrPage* pNewPage = nullptr; - const sal_uInt16 nDestinationPageNum((sal_uInt16)((nPageNum << 1) - 1L)); + const sal_uInt16 nDestinationPageNum((sal_uInt16)((nPageNum << 1) - 1)); if(pModel) { diff --git a/svx/source/xoutdev/_xoutbmp.cxx b/svx/source/xoutdev/_xoutbmp.cxx index 8cfd9ed67b80..294da818f420 100644 --- a/svx/source/xoutdev/_xoutbmp.cxx +++ b/svx/source/xoutdev/_xoutbmp.cxx @@ -445,7 +445,7 @@ Bitmap XOutBitmap::DetectEdges( const Bitmap& rBmp, const sal_uInt8 cThreshold ) const Size aSize( rBmp.GetSizePixel() ); Bitmap aRetBmp; - if( ( aSize.Width() > 2L ) && ( aSize.Height() > 2L ) ) + if( ( aSize.Width() > 2 ) && ( aSize.Height() > 2 ) ) { Bitmap aWorkBmp( rBmp ); @@ -460,9 +460,9 @@ Bitmap XOutBitmap::DetectEdges( const Bitmap& rBmp, const sal_uInt8 cThreshold ) if( pReadAcc && pWriteAcc ) { const long nWidth = aSize.Width(); - const long nWidth2 = nWidth - 2L; + const long nWidth2 = nWidth - 2; const long nHeight = aSize.Height(); - const long nHeight2 = nHeight - 2L; + const long nHeight2 = nHeight - 2; const long lThres2 = (long) cThreshold * cThreshold; const sal_uInt8 nWhitePalIdx(static_cast< sal_uInt8 >(pWriteAcc->GetBestPaletteIndex(Color(COL_WHITE)))); const sal_uInt8 nBlackPalIdx(static_cast< sal_uInt8 >(pWriteAcc->GetBestPaletteIndex(Color(COL_BLACK)))); @@ -472,14 +472,14 @@ Bitmap XOutBitmap::DetectEdges( const Bitmap& rBmp, const sal_uInt8 cThreshold ) // initialize border with white pixels pWriteAcc->SetLineColor( Color( COL_WHITE) ); - pWriteAcc->DrawLine( Point(), Point( nWidth - 1L, 0L ) ); - pWriteAcc->DrawLine( Point( nWidth - 1L, 0L ), Point( nWidth - 1L, nHeight - 1L ) ); - pWriteAcc->DrawLine( Point( nWidth - 1L, nHeight - 1L ), Point( 0L, nHeight - 1L ) ); - pWriteAcc->DrawLine( Point( 0, nHeight - 1L ), Point() ); + pWriteAcc->DrawLine( Point(), Point( nWidth - 1, 0L ) ); + pWriteAcc->DrawLine( Point( nWidth - 1, 0L ), Point( nWidth - 1, nHeight - 1 ) ); + pWriteAcc->DrawLine( Point( nWidth - 1, nHeight - 1 ), Point( 0L, nHeight - 1 ) ); + pWriteAcc->DrawLine( Point( 0, nHeight - 1 ), Point() ); - for( long nY = 0L, nY1 = 1L, nY2 = 2; nY < nHeight2; nY++, nY1++, nY2++ ) + for( long nY = 0, nY1 = 1, nY2 = 2; nY < nHeight2; nY++, nY1++, nY2++ ) { - for( long nX = 0L, nXDst = 1L, nXTmp; nX < nWidth2; nX++, nXDst++ ) + for( long nX = 0, nXDst = 1, nXTmp; nX < nWidth2; nX++, nXDst++ ) { nXTmp = nX; @@ -558,12 +558,12 @@ tools::Polygon XOutBitmap::GetContour( const Bitmap& rBmp, const XOutFlags nFlag const Size& rPrefSize = aWorkBmp.GetPrefSize(); const double fFactorX = (double) rPrefSize.Width() / nWidth; const double fFactorY = (double) rPrefSize.Height() / nHeight; - const long nStartX1 = aWorkRect.Left() + 1L; + const long nStartX1 = aWorkRect.Left() + 1; const long nEndX1 = aWorkRect.Right(); - const long nStartX2 = nEndX1 - 1L; - const long nStartY1 = aWorkRect.Top() + 1L; + const long nStartX2 = nEndX1 - 1; + const long nStartY1 = aWorkRect.Top() + 1; const long nEndY1 = aWorkRect.Bottom(); - const long nStartY2 = nEndY1 - 1L; + const long nStartY2 = nEndY1 - 1; std::unique_ptr<Point[]> pPoints1; std::unique_ptr<Point[]> pPoints2; long nX, nY; diff --git a/svx/source/xoutdev/xattr.cxx b/svx/source/xoutdev/xattr.cxx index 055049376300..73d6c6175b49 100644 --- a/svx/source/xoutdev/xattr.cxx +++ b/svx/source/xoutdev/xattr.cxx @@ -1127,7 +1127,7 @@ XLineStartItem* XLineStartItem::checkForUniqueItem( SdrModel* pModel ) const return new XLineStartItem( "", maPolyPolygon ); } - if( maPolyPolygon.count() > 1L ) + if( maPolyPolygon.count() > 1 ) { // check if the polygon is closed if(!maPolyPolygon.isClosed()) @@ -1383,7 +1383,7 @@ XLineEndItem* XLineEndItem::checkForUniqueItem( SdrModel* pModel ) const return new XLineEndItem( "", maPolyPolygon ); } - if( maPolyPolygon.count() > 1L ) + if( maPolyPolygon.count() > 1 ) { // check if the polygon is closed if(!maPolyPolygon.isClosed()) diff --git a/svx/source/xoutdev/xattr2.cxx b/svx/source/xoutdev/xattr2.cxx index 8883ecb7fe74..7e78a67c4ae1 100644 --- a/svx/source/xoutdev/xattr2.cxx +++ b/svx/source/xoutdev/xattr2.cxx @@ -500,7 +500,7 @@ bool XFillBmpSizeXItem::GetPresentation bool XFillBmpSizeXItem::HasMetrics() const { - return GetValue() > 0L; + return GetValue() > 0; } // class XFillBmpTileSizeYItem @@ -530,7 +530,7 @@ bool XFillBmpSizeYItem::GetPresentation bool XFillBmpSizeYItem::HasMetrics() const { - return GetValue() > 0L; + return GetValue() > 0; } // class XFillBmpTileLogItem diff --git a/sw/qa/extras/ww8export/ww8export.cxx b/sw/qa/extras/ww8export/ww8export.cxx index c44f68f78eb9..1d2cd7b9e75c 100644 --- a/sw/qa/extras/ww8export/ww8export.cxx +++ b/sw/qa/extras/ww8export/ww8export.cxx @@ -50,7 +50,7 @@ #include <bordertest.hxx> -#define convertTwipToMm100(TWIP) ((TWIP) >= 0 ? (((TWIP)*127L+36L)/72L) : (((TWIP)*127L-36L)/72L)) +#define convertTwipToMm100(TWIP) ((TWIP) >= 0 ? (((TWIP)*127L+36)/72L) : (((TWIP)*127L-36)/72L)) class Test : public SwModelTestBase { diff --git a/sw/source/core/access/accdoc.cxx b/sw/source/core/access/accdoc.cxx index 5d1e5fccb111..9955017d7ae7 100644 --- a/sw/source/core/access/accdoc.cxx +++ b/sw/source/core/access/accdoc.cxx @@ -185,10 +185,10 @@ sal_Int32 SAL_CALL SwAccessibleDocumentBase::getAccessibleIndexInParent() } catch(const css::lang::IndexOutOfBoundsException &) { - return -1L; + return -1; } } - return -1L; + return -1; } OUString SAL_CALL SwAccessibleDocumentBase::getAccessibleDescription() diff --git a/sw/source/core/access/accframe.cxx b/sw/source/core/access/accframe.cxx index 523572b33369..a9cb2f0a6e04 100644 --- a/sw/source/core/access/accframe.cxx +++ b/sw/source/core/access/accframe.cxx @@ -460,7 +460,7 @@ sal_Int32 SwAccessibleFrame::GetChildIndex( SwAccessibleMap& rAccMap, sal_Int32 nPos = 0; return GetChildIndex( rAccMap, maVisArea, *mpFrame, rChild, nPos, IsInPagePreview() ) ? nPos - : -1L; + : -1; } sw::access::SwAccessibleChild SwAccessibleFrame::GetChildAtPixel( diff --git a/sw/source/core/access/accpara.cxx b/sw/source/core/access/accpara.cxx index 1ec347554526..68f6b067be2a 100644 --- a/sw/source/core/access/accpara.cxx +++ b/sw/source/core/access/accpara.cxx @@ -2427,7 +2427,7 @@ sal_Int32 SwAccessibleParagraph::getIndexAtPoint( const awt::Point& rPoint ) return bSuccess ? GetPortionData().GetAccessiblePosition( aPos.nContent.GetIndex() ) - : -1L; + : -1; } OUString SwAccessibleParagraph::getSelectedText() diff --git a/sw/source/core/access/acctable.cxx b/sw/source/core/access/acctable.cxx index 792ea4a41dcc..23986014cc79 100644 --- a/sw/source/core/access/acctable.cxx +++ b/sw/source/core/access/acctable.cxx @@ -729,7 +729,7 @@ sal_Int32 SwAccessibleTable::GetIndexOfSelectedChild( // iterate over all children to n-th isAccessibleChildSelected() sal_Int32 nChildren = const_cast<SwAccessibleTable*>(this)->getAccessibleChildCount(); // #i77106# if( nSelectedChildIndex >= nChildren ) - return -1L; + return -1; sal_Int32 n = 0; while( n < nChildren ) @@ -744,7 +744,7 @@ sal_Int32 SwAccessibleTable::GetIndexOfSelectedChild( ++n; } - return n < nChildren ? n : -1L; + return n < nChildren ? n : -1; } void SwAccessibleTable::GetStates( diff --git a/sw/source/core/frmedt/feshview.cxx b/sw/source/core/frmedt/feshview.cxx index bee5e916cae0..e3dedeb6398f 100644 --- a/sw/source/core/frmedt/feshview.cxx +++ b/sw/source/core/frmedt/feshview.cxx @@ -120,7 +120,7 @@ namespace { OUString aArrowName( SvxResId(pResId) ); long nCount = pLineEndList->Count(); long nIndex; - for( nIndex = 0L; nIndex < nCount; nIndex++ ) + for( nIndex = 0; nIndex < nCount; nIndex++ ) { const XLineEndEntry* pEntry = pLineEndList->GetLineEnd(nIndex); if( pEntry->GetName() == aArrowName ) diff --git a/sw/source/core/frmedt/fews.cxx b/sw/source/core/frmedt/fews.cxx index 3233ea34800f..38b194f414ff 100644 --- a/sw/source/core/frmedt/fews.cxx +++ b/sw/source/core/frmedt/fews.cxx @@ -990,7 +990,7 @@ void SwFEShell::CalcBoundRect( SwRect& _orRect, ( _eVertRelOrient == text::RelOrientation::CHAR || _eVertRelOrient == text::RelOrientation::TEXT_LINE ) ) { - SwTwips nTop = 0L; + SwTwips nTop = 0; if ( _eVertRelOrient == text::RelOrientation::CHAR ) { SwRect aChRect; @@ -1036,7 +1036,7 @@ void SwFEShell::CalcBoundRect( SwRect& _orRect, (_nAnchorId == RndStdIds::FLY_AT_CHAR) && _eHoriRelOrient == text::RelOrientation::CHAR ) { - SwTwips nLeft = 0L; + SwTwips nLeft = 0; SwRect aChRect; if ( _pToCharContentPos ) { diff --git a/sw/source/core/inc/frame.hxx b/sw/source/core/inc/frame.hxx index e2a3e190c0f7..aaae7fe92f53 100644 --- a/sw/source/core/inc/frame.hxx +++ b/sw/source/core/inc/frame.hxx @@ -452,12 +452,12 @@ public: method replaced 'old' method <bool IsMoveable() const>. Determines, if frame is moveable in given environment. if no environment - is given (parameter _pLayoutFrame == 0L), the movability in the actual + is given (parameter _pLayoutFrame == 0), the movability in the actual environment (<GetUpper()) is checked. @param _pLayoutFrame input parameter - given environment (layout frame), in which the movability - will be checked. If not set ( == 0L ), actual environment is taken. + will be checked. If not set ( == 0 ), actual environment is taken. @return boolean, indicating, if frame is moveable in given environment */ diff --git a/sw/source/core/layout/anchoredobject.cxx b/sw/source/core/layout/anchoredobject.cxx index 97015f858a1f..5d40c5b9600f 100644 --- a/sw/source/core/layout/anchoredobject.cxx +++ b/sw/source/core/layout/anchoredobject.cxx @@ -311,7 +311,7 @@ void SwAnchoredObject::CheckCharRect( const SwFormatAnchor& _rAnch, void SwAnchoredObject::CheckTopOfLine( const SwFormatAnchor& _rAnch, const SwTextFrame& _rAnchorCharFrame ) { - SwTwips nTopOfLine = 0L; + SwTwips nTopOfLine = 0; if ( _rAnchorCharFrame.GetTopOfLine( nTopOfLine, *_rAnch.GetContentAnchor() ) ) { if ( nTopOfLine != mnLastTopOfLine ) diff --git a/sw/source/core/layout/calcmove.cxx b/sw/source/core/layout/calcmove.cxx index 36a4e5e36eca..5b5b7ac644ba 100644 --- a/sw/source/core/layout/calcmove.cxx +++ b/sw/source/core/layout/calcmove.cxx @@ -759,7 +759,7 @@ void SwPageFrame::MakeAll(vcl::RenderContext* pRenderContext) nWidth = nDefWidth; nWidth += + 2 * aBorder.Width(); - nWidth = std::max( nWidth, 2L * aBorder.Width() + 4L*MM50 ); + nWidth = std::max( nWidth, 2L * aBorder.Width() + 4*MM50 ); Frame().Width( nWidth ); SwLayoutFrame *pBody = FindBodyCont(); @@ -1177,7 +1177,7 @@ void SwContentFrame::MakeAll(vcl::RenderContext* /*pRenderContext*/) // because of its object positioning. if ( !static_cast<SwTextFrame*>(this)->IsFollow() ) { - sal_uInt32 nToPageNum = 0L; + sal_uInt32 nToPageNum = 0; const bool bMoveFwdByObjPos = SwLayouter::FrameMovedFwdByObjPos( *(GetAttrSet()->GetDoc()), *(static_cast<SwTextFrame*>(this)), diff --git a/sw/source/core/layout/findfrm.cxx b/sw/source/core/layout/findfrm.cxx index 8aef88ce2d1c..81912ce649db 100644 --- a/sw/source/core/layout/findfrm.cxx +++ b/sw/source/core/layout/findfrm.cxx @@ -1281,7 +1281,7 @@ static bool lcl_IsInSectionDirectly( const SwFrame *pUp ) OD 08.08.2003 #110978# method replaced 'old' method <sal_Bool IsMoveable() const>. Determines, if frame is moveable in given environment. if no environment - is given (parameter _pLayoutFrame == 0L), the movability in the actual + is given (parameter _pLayoutFrame == 0), the movability in the actual environment (<GetUpper()) is checked. */ bool SwFrame::IsMoveable( const SwLayoutFrame* _pLayoutFrame ) const diff --git a/sw/source/core/layout/fly.cxx b/sw/source/core/layout/fly.cxx index dfe7ddb18527..02538a9d9f5a 100644 --- a/sw/source/core/layout/fly.cxx +++ b/sw/source/core/layout/fly.cxx @@ -1701,7 +1701,7 @@ SwTwips SwFlyFrame::Grow_( SwTwips nDist, bool bTst ) if( nSize > 0 && nDist > ( LONG_MAX - nSize ) ) nDist = LONG_MAX - nSize; - if ( nDist <= 0L ) + if ( nDist <= 0 ) return 0L; if ( Lower()->IsColumnFrame() ) @@ -1785,7 +1785,7 @@ SwTwips SwFlyFrame::Shrink_( SwTwips nDist, bool bTst ) nVal = std::min( nDist, nHeight - nFormatHeight ); } - if ( nVal <= 0L ) + if ( nVal <= 0 ) return 0L; if ( Lower()->IsColumnFrame() ) diff --git a/sw/source/core/layout/objectformatter.cxx b/sw/source/core/layout/objectformatter.cxx index 3ec0d996600e..65b37f91ad2e 100644 --- a/sw/source/core/layout/objectformatter.cxx +++ b/sw/source/core/layout/objectformatter.cxx @@ -103,7 +103,7 @@ class SwPageNumAndTypeOfAnchors sal_uInt32 GetPageNum( sal_uInt32 _nIndex ) const { - sal_uInt32 nRetPgNum = 0L; + sal_uInt32 nRetPgNum = 0; if ( _nIndex < Count()) { diff --git a/sw/source/core/layout/objectformattertxtfrm.cxx b/sw/source/core/layout/objectformattertxtfrm.cxx index 3bbffccdc226..58ce8914da1c 100644 --- a/sw/source/core/layout/objectformattertxtfrm.cxx +++ b/sw/source/core/layout/objectformattertxtfrm.cxx @@ -512,7 +512,7 @@ SwAnchoredObject* SwObjectFormatterTextFrame::GetFirstObjWithMovedFwdAnchor( SwAnchoredObject* pRetAnchoredObj = nullptr; - sal_uInt32 i = 0L; + sal_uInt32 i = 0; for ( ; i < CountOfCollected(); ++i ) { SwAnchoredObject* pAnchoredObj = GetCollectedObj(i); diff --git a/sw/source/core/layout/pagechg.cxx b/sw/source/core/layout/pagechg.cxx index 343c157dceae..f4a16cacb3a6 100644 --- a/sw/source/core/layout/pagechg.cxx +++ b/sw/source/core/layout/pagechg.cxx @@ -184,7 +184,7 @@ SwPageFrame::SwPageFrame( SwFrameFormat *pFormat, SwFrame* pSib, SwPageDesc *pPg Frame().Height( 0 ); long nWidth = pSh->VisArea().Width(); if ( !nWidth ) - nWidth = 5000L; //aendert sich sowieso + nWidth = 5000; //aendert sich sowieso Frame().Width ( nWidth ); } else diff --git a/sw/source/core/layout/sectfrm.cxx b/sw/source/core/layout/sectfrm.cxx index eb2af5feec80..69a26eb76506 100644 --- a/sw/source/core/layout/sectfrm.cxx +++ b/sw/source/core/layout/sectfrm.cxx @@ -1923,7 +1923,7 @@ SwTwips SwSectionFrame::Grow_( SwTwips nDist, bool bTst ) if( nFrameHeight > 0 && nDist > (LONG_MAX - nFrameHeight) ) nDist = LONG_MAX - nFrameHeight; - if ( nDist <= 0L ) + if ( nDist <= 0 ) return 0L; bool bInCalcContent = GetUpper() && IsInFly() && FindFlyFrame()->IsLocked(); diff --git a/sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx b/sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx index 1893feb99a5d..2bf253500f5c 100644 --- a/sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx +++ b/sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx @@ -505,7 +505,7 @@ void SwToContentAnchoredObjectPosition::CalcPosition() // #i28701# - correction: use <pAnchorFrameForVertPos> // instead of <pOrientFrame> and do not adjust relative position // to get correct vertical position. - nVertOffsetToFrameAnchorPos = 0L; + nVertOffsetToFrameAnchorPos = 0; // #i11860# - use new method <GetTopForObjPos> // to get top of frame for object positioning. const SwTwips nTopOfOrient = diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx index a8950e56173b..ad71a22898a4 100644 --- a/sw/source/core/view/viewsh.cxx +++ b/sw/source/core/view/viewsh.cxx @@ -347,9 +347,9 @@ void SwViewShell::ImplEndAction( const bool bIdleEnd ) aTmp1 = GetOut()->LogicToPixel( aTmp1 ); tools::Rectangle aTmp2( GetOut()->PixelToLogic( aTmp1 ) ); if ( aTmp2.Left() > aRect.Left() ) - aTmp1.Left() = std::max( 0L, aTmp1.Left() - 1L ); + aTmp1.Left() = std::max( 0L, aTmp1.Left() - 1 ); if ( aTmp2.Top() > aRect.Top() ) - aTmp1.Top() = std::max( 0L, aTmp1.Top() - 1L ); + aTmp1.Top() = std::max( 0L, aTmp1.Top() - 1 ); aTmp1.Right() += 1; aTmp1.Bottom() += 1; aTmp1 = GetOut()->PixelToLogic( aTmp1 ); @@ -1032,7 +1032,7 @@ void SwViewShell::SizeChgNotify() { Size aDocSize = GetDocSize(); std::stringstream ss; - ss << aDocSize.Width() + 2L * DOCUMENTBORDER << ", " << aDocSize.Height() + 2L * DOCUMENTBORDER; + ss << aDocSize.Width() + 2 * DOCUMENTBORDER << ", " << aDocSize.Height() + 2 * DOCUMENTBORDER; OString sSize = ss.str().c_str(); GetSfxViewShell()->libreOfficeKitViewCallback(LOK_CALLBACK_DOCUMENT_SIZE_CHANGED, sSize.getStr()); } diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx b/sw/source/filter/ww8/rtfattributeoutput.cxx index 31cc848bfd72..90ac57e73142 100644 --- a/sw/source/filter/ww8/rtfattributeoutput.cxx +++ b/sw/source/filter/ww8/rtfattributeoutput.cxx @@ -2263,7 +2263,7 @@ void RtfAttributeOutput::CharEscapement(const SvxEscapementItem& rEscapement) * 100% Escapement */ - m_aStyles.append((sal_Int32)((long(nEsc) * nH) + 500L) / 1000L); + m_aStyles.append((sal_Int32)((long(nEsc) * nH) + 500) / 1000L); // 500L to round !! } diff --git a/sw/source/filter/xml/xmlexpit.cxx b/sw/source/filter/xml/xmlexpit.cxx index 66770da5069d..541b31826414 100644 --- a/sw/source/filter/xml/xmlexpit.cxx +++ b/sw/source/filter/xml/xmlexpit.cxx @@ -297,7 +297,7 @@ void SvXMLExportItemMapper::exportXML( SvXMLExport& rExport, exportXML( rExport, rExport.GetAttrList(), rSet, rUnitConverter, rExport.GetNamespaceMap(), nFlags, &aIndexArray ); - if( rExport.GetAttrList().getLength() > 0L || + if( rExport.GetAttrList().getLength() > 0 || (nFlags & SvXmlExportFlags::EMPTY) || !aIndexArray.empty() ) { diff --git a/sw/source/filter/xml/xmlimpit.cxx b/sw/source/filter/xml/xmlimpit.cxx index c4ebf67e2162..c501056a02cd 100644 --- a/sw/source/filter/xml/xmlimpit.cxx +++ b/sw/source/filter/xml/xmlimpit.cxx @@ -897,7 +897,7 @@ bool SvXMLImportItemMapper::PutXMLValue( case MID_FRMSIZE_REL_COL_WIDTH: { sal_Int32 nPos = rValue.indexOf( '*' ); - if( -1L != nPos ) + if( -1 != nPos ) { sal_Int32 nValue = rValue.toInt32(); if( nValue < MINLAY ) diff --git a/sw/source/filter/xml/xmltble.cxx b/sw/source/filter/xml/xmltble.cxx index 391e82d7f9cc..cb944abc9153 100644 --- a/sw/source/filter/xml/xmltble.cxx +++ b/sw/source/filter/xml/xmltble.cxx @@ -137,7 +137,7 @@ SwXMLTableLines_Impl::SwXMLTableLines_Impl( const SwTableLines& rLines ) : { const SwTableBox *pBox = rBoxes[nBox]; - if( nBox < nBoxes-1U || nWidth==0UL ) + if( nBox < nBoxes-1U || nWidth==0 ) { nCPos = nCPos + SwWriteTable::GetBoxWidth( pBox ); SwXMLTableColumn_Impl *pCol = @@ -148,7 +148,7 @@ SwXMLTableLines_Impl::SwXMLTableLines_Impl( const SwTableLines& rLines ) : if( nBox==nBoxes-1U ) { - OSL_ENSURE( nLine==0U && nWidth==0UL, + OSL_ENSURE( nLine==0U && nWidth==0, "parent width will be lost" ); nWidth = nCPos; } @@ -282,7 +282,7 @@ bool SwXMLTableFrameFormatsSort_Impl::AddRow( SwFrameFormat& rFrameFormat, if( bInsert ) { - rFrameFormat.SetName( rNamePrefix + "." + OUString::number(nLine+1UL) ); + rFrameFormat.SetName( rNamePrefix + "." + OUString::number(nLine+1) ); if ( i != aFormatList.end() ) ++i; aFormatList.insert( i, &rFrameFormat ); } @@ -728,7 +728,7 @@ void SwXMLExport::ExportTableAutoStyles( const SwTableNode& rTableNd ) const SwFormatFrameSize& rFrameSize = pTableFormat->GetFrameSize(); sal_uInt32 nAbsWidth = rFrameSize.GetSize().Width(); - sal_uInt32 nBaseWidth = 0UL; + sal_uInt32 nBaseWidth = 0; sal_Int8 nPrcWidth = rFrameSize.GetWidthPercent(); bool bFixAbsWidth = nPrcWidth != 0 || /*text::*/HoriOrientation::NONE == eTabHoriOri diff --git a/sw/source/filter/xml/xmltbli.cxx b/sw/source/filter/xml/xmltbli.cxx index a2fcad1b997d..611a5702fe7a 100644 --- a/sw/source/filter/xml/xmltbli.cxx +++ b/sw/source/filter/xml/xmltbli.cxx @@ -183,7 +183,7 @@ class SwXMLTableCell_Impl public: - SwXMLTableCell_Impl( sal_uInt32 nRSpan=1UL, sal_uInt32 nCSpan=1UL ) : + SwXMLTableCell_Impl( sal_uInt32 nRSpan=1, sal_uInt32 nCSpan=1 ) : dValue( 0.0 ), pStartNode( nullptr ), nRowSpan( nRSpan ), @@ -471,18 +471,18 @@ SwXMLTableCellContext_Impl::SwXMLTableCellContext_Impl( break; case XML_TOK_TABLE_NUM_COLS_SPANNED: nColSpan = (sal_uInt32)rValue.toInt32(); - if( nColSpan < 1UL ) - nColSpan = 1UL; + if( nColSpan < 1 ) + nColSpan = 1; break; case XML_TOK_TABLE_NUM_ROWS_SPANNED: nRowSpan = (sal_uInt32)rValue.toInt32(); - if( nRowSpan < 1UL ) - nRowSpan = 1UL; + if( nRowSpan < 1 ) + nRowSpan = 1; break; case XML_TOK_TABLE_NUM_COLS_REPEATED: nColRepeat = (sal_uInt32)rValue.toInt32(); - if( nColRepeat < 1UL ) - nColRepeat = 1UL; + if( nColRepeat < 1 ) + nColRepeat = 1; break; case XML_TOK_TABLE_FORMULA: { @@ -739,7 +739,7 @@ SwXMLTableColContext_Impl::SwXMLTableColContext_Impl( SvXMLImportContext( rImport, nPrfx, rLName ), xMyTable( pTable ) { - sal_uInt32 nColRep = 1UL; + sal_uInt32 nColRep = 1; OUString aStyleName, aDfltCellStyleName; sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0; @@ -898,8 +898,8 @@ SwXMLTableRowContext_Impl::SwXMLTableRowContext_Impl( SwXMLImport& rImport, else if( IsXMLToken( aLocalName, XML_NUMBER_ROWS_REPEATED ) ) { nRowRepeat = (sal_uInt32)rValue.toInt32(); - if( nRowRepeat < 1UL ) - nRowRepeat = 1UL; + if( nRowRepeat < 1 ) + nRowRepeat = 1; } else if( IsXMLToken( aLocalName, XML_DEFAULT_CELL_STYLE_NAME ) ) { @@ -923,7 +923,7 @@ void SwXMLTableRowContext_Impl::EndElement() { GetTable()->FinishRow(); - if( nRowRepeat > 1UL ) + if( nRowRepeat > 1 ) GetTable()->InsertRepRows( nRowRepeat ); } } @@ -1486,7 +1486,7 @@ sal_Int32 SwXMLTableContext::GetColumnWidth( sal_uInt32 nCol, if( nLast > m_aColumnWidths.size() ) nLast = m_aColumnWidths.size(); - sal_Int32 nWidth2 = 0L; + sal_Int32 nWidth2 = 0; for( sal_uInt32 i=nCol; i < nLast; ++i ) nWidth2 += m_aColumnWidths[i].width; @@ -1519,12 +1519,12 @@ void SwXMLTableContext::InsertCell( const OUString& rStyleName, if( m_nCurCol >= USHRT_MAX || m_nCurRow > USHRT_MAX ) return; - OSL_ENSURE( nRowSpan >=1UL, "SwXMLTableContext::InsertCell: row span is 0" ); - if( 0UL == nRowSpan ) - nRowSpan = 1UL; - OSL_ENSURE( nColSpan >=1UL, "SwXMLTableContext::InsertCell: col span is 0" ); - if( 0UL == nColSpan ) - nColSpan = 1UL; + OSL_ENSURE( nRowSpan >=1, "SwXMLTableContext::InsertCell: row span is 0" ); + if( 0 == nRowSpan ) + nRowSpan = 1; + OSL_ENSURE( nColSpan >=1, "SwXMLTableContext::InsertCell: col span is 0" ); + if( 0 == nColSpan ) + nColSpan = 1; // Until it is possible to add columns here, fix the column span. sal_uInt32 nColsReq = m_nCurCol + nColSpan; @@ -1536,12 +1536,12 @@ void SwXMLTableContext::InsertCell( const OUString& rStyleName, // Check whether there are cells from a previous line already that reach // into the current row. - if( m_nCurRow > 0UL && nColSpan > 1UL ) + if( m_nCurRow > 0 && nColSpan > 1 ) { SwXMLTableRow_Impl *pCurRow = (*m_pRows)[m_nCurRow].get(); sal_uInt32 nLastCol = GetColumnCount() < nColsReq ? GetColumnCount() : nColsReq; - for( sal_uInt32 i=m_nCurCol+1UL; i<nLastCol; ++i ) + for( sal_uInt32 i=m_nCurCol+1; i<nLastCol; ++i ) { if( pCurRow->GetCell(i)->IsUsed() ) { @@ -1594,9 +1594,9 @@ void SwXMLTableContext::InsertCell( const OUString& rStyleName, } // Fill the cells - for( sal_uInt32 i=nColSpan; i>0UL; --i ) + for( sal_uInt32 i=nColSpan; i>0; --i ) { - for( sal_uInt32 j=nRowSpan; j>0UL; --j ) + for( sal_uInt32 j=nRowSpan; j>0; --j ) { const bool bCovered = i != nColSpan || j != nRowSpan; GetCell( nRowsReq-j, nColsReq-i ) @@ -1623,7 +1623,7 @@ void SwXMLTableContext::InsertRow( const OUString& rStyleName, return; // Make sure there is at least one column. - if( 0==m_nCurRow && 0UL == GetColumnCount() ) + if( 0==m_nCurRow && 0 == GetColumnCount() ) InsertColumn( USHRT_MAX, true ); if (m_nCurRow < m_pRows->size()) @@ -1642,7 +1642,7 @@ void SwXMLTableContext::InsertRow( const OUString& rStyleName, } // We start at the first column ... - m_nCurCol=0UL; + m_nCurCol=0; // ... but this cell may be occupied already. while( m_nCurCol<GetColumnCount() && GetCell(m_nCurRow,m_nCurCol)->IsUsed() ) @@ -1700,17 +1700,17 @@ const SwStartNode *SwXMLTableContext::GetPrevStartNode( sal_uInt32 nRow, if( GetColumnCount() == nCol ) { // The last cell is the right one here. - pPrevCell = GetCell( m_pRows->size() - 1U, GetColumnCount() - 1UL ); + pPrevCell = GetCell( m_pRows->size() - 1U, GetColumnCount() - 1 ); } - else if( nCol > 0UL ) + else if( nCol > 0 ) { // The previous cell in this row. - pPrevCell = GetCell( nRow, nCol-1UL ); + pPrevCell = GetCell( nRow, nCol-1 ); } - else if( nRow > 0UL ) + else if( nRow > 0 ) { // The last cell from the previous row. - pPrevCell = GetCell( nRow-1UL, GetColumnCount()-1UL ); + pPrevCell = GetCell( nRow-1, GetColumnCount()-1 ); } const SwStartNode *pSttNd = nullptr; @@ -1737,12 +1737,12 @@ void SwXMLTableContext::FixRowSpan( sal_uInt32 nRow, sal_uInt32 nCol, for( sal_uInt32 i = nCol; i < nLastCol; i++ ) { sal_uInt32 j = nRow; - sal_uInt32 nRowSpan = 1UL; + sal_uInt32 nRowSpan = 1; SwXMLTableCell_Impl *pCell = GetCell( j, i ); - while( pCell && pCell->GetRowSpan() > 1UL ) + while( pCell && pCell->GetRowSpan() > 1 ) { pCell->SetRowSpan( nRowSpan++ ); - pCell = j > 0UL ? GetCell( --j, i ) : nullptr; + pCell = j > 0 ? GetCell( --j, i ) : nullptr; } } } @@ -1880,19 +1880,19 @@ SwTableBox *SwXMLTableContext::MakeTableBox( SwTableLine *pUpper, SwXMLTableRow_Impl *pRow = (*m_pRows)[i].get(); for( sal_uInt32 j=nLeftCol; j<nRightCol; j++ ) { - bSplit = ( 1UL == pRow->GetCell(j)->GetRowSpan() ); + bSplit = ( 1 == pRow->GetCell(j)->GetRowSpan() ); if( !bSplit ) break; } - if( bSplit && (nStartRow>nTopRow || i+1UL<nBottomRow) ) + if( bSplit && (nStartRow>nTopRow || i+1<nBottomRow) ) { SwTableLine *pLine = - MakeTableLine( pBox, nStartRow, nLeftCol, i+1UL, + MakeTableLine( pBox, nStartRow, nLeftCol, i+1, nRightCol ); rLines.push_back( pLine ); - nStartRow = i+1UL; + nStartRow = i+1; bSplitted = true; } } @@ -1904,7 +1904,7 @@ SwTableBox *SwXMLTableContext::MakeTableBox( SwTableLine *pUpper, nStartRow = nTopRow; while( nStartRow < nBottomRow ) { - sal_uInt32 nMaxRowSpan = 0UL; + sal_uInt32 nMaxRowSpan = 0; SwXMLTableRow_Impl *pStartRow = (*m_pRows)[nStartRow].get(); const SwXMLTableCell_Impl *pCell; for( i=nLeftCol; i<nRightCol; i++ ) @@ -1921,12 +1921,12 @@ SwTableBox *SwXMLTableContext::MakeTableBox( SwTableLine *pUpper, i = nLeftCol; while( i < nRightCol ) { - if( pPrevRow->GetCell(i)->GetRowSpan() > 1UL ) + if( pPrevRow->GetCell(i)->GetRowSpan() > 1 ) { const SwXMLTableCell_Impl *pCell2 = GetCell( nStartRow, i ); const sal_uInt32 nColSpan2 = pCell2->GetColSpan(); - FixRowSpan( nStartRow-1UL, i, nColSpan2 ); + FixRowSpan( nStartRow-1, i, nColSpan2 ); ReplaceWithEmptyCell( nStartRow, i, true ); i += nColSpan2; } @@ -2141,7 +2141,7 @@ SwTableLine *SwXMLTableContext::MakeTableLine( SwTableBox *pUpper, const SfxItemSet *pAutoItemSet = nullptr; const OUString& rStyleName = (*m_pRows)[nTopRow]->GetStyleName(); - if( 1UL == (nBottomRow - nTopRow) && + if( 1 == (nBottomRow - nTopRow) && !rStyleName.isEmpty() && GetSwImport().FindAutomaticStyle( XML_STYLE_FAMILY_TABLE_ROW, rStyleName, &pAutoItemSet ) ) @@ -2181,21 +2181,21 @@ SwTableLine *SwXMLTableContext::MakeTableLine( SwTableBox *pUpper, // Could the table fragment be splitted horizontally behind // the current line? bool bHoriSplit = (*m_pRows)[nRow]->IsSplitable() && - nRow+1UL < nBottomRow && - 1UL == pCell->GetRowSpan(); + nRow+1 < nBottomRow && + 1 == pCell->GetRowSpan(); (*m_pRows)[nRow]->SetSplitable( bHoriSplit ); // Could the table fragment be splitted vertically behind the // current column (uptp the current line? - bSplit &= ( 1UL == pCell->GetColSpan() ); + bSplit &= ( 1 == pCell->GetColSpan() ); if( bSplit ) { bHoriSplitPossible |= bHoriSplit; // Could the current table fragment be splitted // horizontally behind the next column, too? - bHoriSplit &= (nCol+1UL < nRightCol && - 1UL == GetCell(nRow,nCol+1UL)->GetRowSpan()); + bHoriSplit &= (nCol+1 < nRightCol && + 1 == GetCell(nRow,nCol+1)->GetRowSpan()); bHoriSplitMayContinue |= bHoriSplit; } } @@ -2214,11 +2214,11 @@ SwTableLine *SwXMLTableContext::MakeTableLine( SwTableBox *pUpper, // Could the table fragment be splitted vertically behind the // current column (uptp the current line? - bSplit = 1UL == pCell->GetColSpan(); + bSplit = 1 == pCell->GetColSpan(); } #if OSL_DEBUG_LEVEL > 0 - if( nCol == nRightCol-1UL ) + if( nCol == nRightCol-1 ) { OSL_ENSURE( bSplit, "Split-Flag wrong" ); if ( m_bHasSubTables ) @@ -2241,7 +2241,7 @@ SwTableLine *SwXMLTableContext::MakeTableLine( SwTableBox *pUpper, SwXMLTableCell_Impl *pCell = GetCell( nTopRow, nStartCol ); // #i95726# - some fault tolerance if( ( !m_bHasSubTables || ( pCell->GetRowSpan() == (nBottomRow-nTopRow) ) ) && - pCell->GetColSpan() == (nCol+1UL-nStartCol) && + pCell->GetColSpan() == (nCol+1-nStartCol) && ( pCell->GetStartNode() || pCell->GetSubTable() ) ) { // insert new empty cell for covered cells: @@ -2258,7 +2258,7 @@ SwTableLine *SwXMLTableContext::MakeTableLine( SwTableBox *pUpper, // The remaining box neither contains lines nor rows (i.e. // is a content box - nSplitCol = nCol + 1UL; + nSplitCol = nCol + 1; pBox = MakeTableBox( pLine, pCell, nStartCol, nSplitCol ); @@ -2275,7 +2275,7 @@ SwTableLine *SwXMLTableContext::MakeTableLine( SwTableBox *pUpper, // the next column, too. That for, we check the next // column but remember the current one as a good place to // split. - nSplitCol = nCol + 1UL; + nSplitCol = nCol + 1; } else if ( m_bHasSubTables ) { @@ -2293,7 +2293,7 @@ SwTableLine *SwXMLTableContext::MakeTableLine( SwTableBox *pUpper, OSL_ENSURE( bHoriSplitPossible || nSplitCol == nRightCol, "bHoriSplitPossible-Flag sollte gesetzt sein" ); - nSplitCol = nCol + 1UL; + nSplitCol = nCol + 1; } pBox = MakeTableBox( pLine, nTopRow, nStartCol, @@ -2332,10 +2332,10 @@ void SwXMLTableContext::MakeTable_( SwTableBox *pBox ) pCell = pPrevRow->GetCell(i); if( pCell->GetRowSpan() > 1 ) { - FixRowSpan( m_nCurRow-1UL, i, 1UL ); + FixRowSpan( m_nCurRow-1, i, 1UL ); } } - for (sal_uLong i = m_pRows->size() - 1UL; i >= m_nCurRow; --i) + for (sal_uLong i = m_pRows->size() - 1; i >= m_nCurRow; --i) m_pRows->pop_back(); } @@ -2346,24 +2346,24 @@ void SwXMLTableContext::MakeTable_( SwTableBox *pBox ) // TODO: Do we have to keep both values, the relative and the absolute // width? - sal_Int32 nAbsWidth = 0L; - sal_Int32 nMinAbsColWidth = 0L; - sal_Int32 nRelWidth = 0L; - sal_Int32 nMinRelColWidth = 0L; - sal_uInt32 nRelCols = 0UL; + sal_Int32 nAbsWidth = 0; + sal_Int32 nMinAbsColWidth = 0; + sal_Int32 nRelWidth = 0; + sal_Int32 nMinRelColWidth = 0; + sal_uInt32 nRelCols = 0; for( colIter = m_aColumnWidths.begin(); colIter < m_aColumnWidths.end(); ++colIter) { if( colIter->isRelative ) { nRelWidth += colIter->width; - if( 0L == nMinRelColWidth || colIter->width < nMinRelColWidth ) + if( 0 == nMinRelColWidth || colIter->width < nMinRelColWidth ) nMinRelColWidth = colIter->width; nRelCols++; } else { nAbsWidth += colIter->width; - if( 0L == nMinAbsColWidth || colIter->width < nMinAbsColWidth ) + if( 0 == nMinAbsColWidth || colIter->width < nMinAbsColWidth ) nMinAbsColWidth = colIter->width; } } @@ -2373,17 +2373,17 @@ void SwXMLTableContext::MakeTable_( SwTableBox *pBox ) { // If there a columns that have an absolute width, we have to // calculate a relative one for them. - if( nAbsCols > 0UL ) + if( nAbsCols > 0 ) { // All column that have absolute widths get relative widths; // these widths relate to each over like the original absolute // widths. The smallest column gets a width that hat the same // value as the smallest column that has an relative width // already. - if( 0L == nMinRelColWidth ) + if( 0 == nMinRelColWidth ) nMinRelColWidth = nMinAbsColWidth; - for( colIter = m_aColumnWidths.begin(); nAbsCols > 0UL && colIter < m_aColumnWidths.end(); ++colIter) + for( colIter = m_aColumnWidths.begin(); nAbsCols > 0 && colIter < m_aColumnWidths.end(); ++colIter) { if( !colIter->isRelative ) { @@ -2409,7 +2409,7 @@ void SwXMLTableContext::MakeTable_( SwTableBox *pBox ) if( nRelWidth != m_nWidth && nRelWidth && nCols ) { double n = (double)m_nWidth / (double)nRelWidth; - nRelWidth = 0L; + nRelWidth = 0; for( colIter = m_aColumnWidths.begin(); colIter < m_aColumnWidths.end() - 1; ++colIter) { sal_Int32 nW = (sal_Int32)( colIter->width * n); @@ -2423,7 +2423,7 @@ void SwXMLTableContext::MakeTable_( SwTableBox *pBox ) { // If there are columns that have relative widths, we have to // calculate a absolute widths for them. - if( nRelCols > 0UL ) + if( nRelCols > 0 ) { // The absolute space that is available for all columns with a // relative width. @@ -2464,12 +2464,12 @@ void SwXMLTableContext::MakeTable_( SwTableBox *pBox ) // Otherwise, if there is enough space for every column, every // column gets this space. - for( colIter = m_aColumnWidths.begin(); nRelCols > 0UL && colIter < m_aColumnWidths.end(); ++colIter ) + for( colIter = m_aColumnWidths.begin(); nRelCols > 0 && colIter < m_aColumnWidths.end(); ++colIter ) { if( colIter->isRelative ) { sal_Int32 nAbsCol; - if( 1UL == nRelCols ) + if( 1 == nRelCols ) { // The last column that has a relative width gets // all absolute space that is left. @@ -2509,7 +2509,7 @@ void SwXMLTableContext::MakeTable_( SwTableBox *pBox ) // column widths, every column get some extra width. sal_Int32 nExtraAbs = m_nWidth - nAbsWidth; sal_Int32 nAbsLastCol = m_aColumnWidths.back().width + nExtraAbs; - for( colIter = m_aColumnWidths.begin(); colIter < m_aColumnWidths.end()-1UL; ++colIter ) + for( colIter = m_aColumnWidths.begin(); colIter < m_aColumnWidths.end()-1; ++colIter ) { sal_Int32 nAbsCol = colIter->width; sal_Int32 nExtraAbsCol = (nAbsCol * nExtraAbs) / @@ -2527,7 +2527,7 @@ void SwXMLTableContext::MakeTable_( SwTableBox *pBox ) // Every column gets the minimum width plus some extra width. sal_Int32 nExtraAbs = m_nWidth - (nCols * MINLAY); sal_Int32 nAbsLastCol = MINLAY + nExtraAbs; - for( colIter = m_aColumnWidths.begin(); colIter < m_aColumnWidths.end()-1UL; ++colIter ) + for( colIter = m_aColumnWidths.begin(); colIter < m_aColumnWidths.end()-1; ++colIter ) { sal_Int32 nAbsCol = colIter->width; sal_Int32 nExtraAbsCol = (nAbsCol * nExtraAbs) / @@ -2545,18 +2545,18 @@ void SwXMLTableContext::MakeTable_( SwTableBox *pBox ) pBox ? pBox->GetTabLines() : m_pTableNode->GetTable().GetTabLines(); - sal_uInt32 nStartRow = 0UL; + sal_uInt32 nStartRow = 0; sal_uInt32 nRows = m_pRows->size(); - for(sal_uInt32 i=0UL; i<nRows; ++i ) + for(sal_uInt32 i=0; i<nRows; ++i ) { // Could we split the table behind the current line? bool bSplit = true; if ( m_bHasSubTables ) { SwXMLTableRow_Impl *pRow = (*m_pRows)[i].get(); - for( sal_uInt32 j=0UL; j<nCols; j++ ) + for( sal_uInt32 j=0; j<nCols; j++ ) { - bSplit = ( 1UL == pRow->GetCell(j)->GetRowSpan() ); + bSplit = ( 1 == pRow->GetCell(j)->GetRowSpan() ); if( !bSplit ) break; } @@ -2565,10 +2565,10 @@ void SwXMLTableContext::MakeTable_( SwTableBox *pBox ) if( bSplit ) { SwTableLine *pLine = - MakeTableLine( pBox, nStartRow, 0UL, i+1UL, nCols ); - if( pBox || nStartRow>0UL ) + MakeTableLine( pBox, nStartRow, 0UL, i+1, nCols ); + if( pBox || nStartRow>0 ) rLines.push_back( pLine ); - nStartRow = i+1UL; + nStartRow = i+1; } } } diff --git a/sw/source/uibase/dochdl/swdtflvr.cxx b/sw/source/uibase/dochdl/swdtflvr.cxx index d7c12cecf35a..3ff36e084ac8 100644 --- a/sw/source/uibase/dochdl/swdtflvr.cxx +++ b/sw/source/uibase/dochdl/swdtflvr.cxx @@ -628,7 +628,7 @@ bool SwTransferable::WriteObject( tools::SvRef<SotStorageStream>& xStream, const SvxFontHeightItem& rDefaultFontHeight = static_cast<const SvxFontHeightItem&>(rItemPool.GetDefaultItem(EE_CHAR_FONTHEIGHT)); // SW should have no MasterPages - OSL_ENSURE(0L == pModel->GetMasterPageCount(), "SW with MasterPages (!)"); + OSL_ENSURE(0 == pModel->GetMasterPageCount(), "SW with MasterPages (!)"); for(sal_uInt16 a(0); a < pModel->GetPageCount(); a++) { diff --git a/sw/source/uibase/misc/redlndlg.cxx b/sw/source/uibase/misc/redlndlg.cxx index 4785e25b8906..4b0879dbde27 100644 --- a/sw/source/uibase/misc/redlndlg.cxx +++ b/sw/source/uibase/misc/redlndlg.cxx @@ -688,7 +688,7 @@ void SwRedlineAcceptDlg::RemoveParents(SwRedlineTable::size_type nStart, SwRedli SvTreeListEntry *const pEntry = m_RedlineParents[i]->pTLBParent; if (pEntry) { - long nIdx = aLBoxArr.size() - 1L; + long nIdx = aLBoxArr.size() - 1; sal_uLong nAbsPos = pModel->GetAbsPos(pEntry); while (nIdx >= 0 && pModel->GetAbsPos(aLBoxArr[ static_cast< sal_uInt16 >(nIdx) ]) > nAbsPos) @@ -698,7 +698,7 @@ void SwRedlineAcceptDlg::RemoveParents(SwRedlineTable::size_type nStart, SwRedli } // clear TLB from behind - long nIdx = (long)aLBoxArr.size() - 1L; + long nIdx = (long)aLBoxArr.size() - 1; while (nIdx >= 0) m_pTable->RemoveEntry(aLBoxArr[ static_cast< sal_uInt16 >(nIdx--) ]); diff --git a/sw/source/uibase/shells/drwbassh.cxx b/sw/source/uibase/shells/drwbassh.cxx index cd1cf3df4cf3..99ada54d2d27 100644 --- a/sw/source/uibase/shells/drwbassh.cxx +++ b/sw/source/uibase/shells/drwbassh.cxx @@ -506,7 +506,7 @@ void SwDrawBaseShell::Execute(SfxRequest const &rReq) { bDone = true; - if(1L == pSdrView->GetMarkedObjectCount()) + if(1 == pSdrView->GetMarkedObjectCount()) { // #i68101# SdrObject* pSelected = pSdrView->GetMarkedObjectByIndex(0); @@ -536,7 +536,7 @@ void SwDrawBaseShell::Execute(SfxRequest const &rReq) { bDone = true; - if(1L == pSdrView->GetMarkedObjectCount()) + if(1 == pSdrView->GetMarkedObjectCount()) { SdrObject* pSelected = pSdrView->GetMarkedObjectByIndex(0); OSL_ENSURE(pSelected, "DrawViewShell::FuTemp03: nMarkCount, but no object (!)"); diff --git a/sw/source/uibase/uno/unotxdoc.cxx b/sw/source/uibase/uno/unotxdoc.cxx index 7c4162a9a2f1..c3afd987974f 100644 --- a/sw/source/uibase/uno/unotxdoc.cxx +++ b/sw/source/uibase/uno/unotxdoc.cxx @@ -3092,8 +3092,8 @@ Size SwXTextDocument::getDocumentSize() SwViewShell* pViewShell = pDocShell->GetWrtShell(); Size aDocSize = pViewShell->GetDocSize(); - return Size(aDocSize.Width() + 2L * DOCUMENTBORDER, - aDocSize.Height() + 2L * DOCUMENTBORDER); + return Size(aDocSize.Width() + 2 * DOCUMENTBORDER, + aDocSize.Height() + 2 * DOCUMENTBORDER); } void SwXTextDocument::setPart(int nPart) diff --git a/sw/source/uibase/wrtsh/delete.cxx b/sw/source/uibase/wrtsh/delete.cxx index 41163c58de00..d839ba57bfe5 100644 --- a/sw/source/uibase/wrtsh/delete.cxx +++ b/sw/source/uibase/wrtsh/delete.cxx @@ -270,7 +270,7 @@ long SwWrtShell::DelRight() } else EnterStdMode(); - nRet = 1L; + nRet = 1; break; } else diff --git a/tools/source/generic/b3dtrans.cxx b/tools/source/generic/b3dtrans.cxx index a28abe320868..1162f24993f6 100644 --- a/tools/source/generic/b3dtrans.cxx +++ b/tools/source/generic/b3dtrans.cxx @@ -270,13 +270,13 @@ void B3dTransformationSet::CalcViewport() // fill parameters for ViewportTransformation // Translation - maTranslate.setX((double)maSetBound.Left() + ((maSetBound.GetWidth() - 1L) / 2.0)); - maTranslate.setY((double)maSetBound.Top() + ((maSetBound.GetHeight() - 1L) / 2.0)); + maTranslate.setX((double)maSetBound.Left() + ((maSetBound.GetWidth() - 1) / 2.0)); + maTranslate.setY((double)maSetBound.Top() + ((maSetBound.GetHeight() - 1) / 2.0)); maTranslate.setZ(ZBUFFER_DEPTH_RANGE / 2.0); // Scaling - maScale.setX((maSetBound.GetWidth() - 1L) / 2.0); - maScale.setY((maSetBound.GetHeight() - 1L) / -2.0); + maScale.setX((maSetBound.GetWidth() - 1) / 2.0); + maScale.setY((maSetBound.GetHeight() - 1) / -2.0); maScale.setZ(ZBUFFER_DEPTH_RANGE / 2.0); } diff --git a/tools/source/generic/poly.cxx b/tools/source/generic/poly.cxx index e42457e0860c..74e265bdb01f 100644 --- a/tools/source/generic/poly.cxx +++ b/tools/source/generic/poly.cxx @@ -291,7 +291,7 @@ void ImplPolygon::ImplCreateFlagArray() inline double ImplGetParameter( const Point& rCenter, const Point& rPt, double fWR, double fHR ) { const long nDX = rPt.X() - rCenter.X(); - double fAngle = atan2( -rPt.Y() + rCenter.Y(), ( ( nDX == 0L ) ? 0.000000001 : nDX ) ); + double fAngle = atan2( -rPt.Y() + rCenter.Y(), ( ( nDX == 0 ) ? 0.000000001 : nDX ) ); return atan2(fWR*sin(fAngle), fHR*cos(fAngle)); } @@ -1396,7 +1396,7 @@ bool Polygon::IsInside( const Point& rPoint ) const DBG_ASSERT( !mpImplPolygon->mpFlagAry, "IsInside could fail with beziers!" ); const tools::Rectangle aBound( GetBoundRect() ); - const Line aLine( rPoint, Point( aBound.Right() + 100L, rPoint.Y() ) ); + const Line aLine( rPoint, Point( aBound.Right() + 100, rPoint.Y() ) ); sal_uInt16 nCount = mpImplPolygon->mnPoints; sal_uInt16 nPCounter = 0; @@ -1813,14 +1813,14 @@ Polygon::Polygon(const basegfx::B2DPolygon& rPolygon) if(bCurve) { // #127979# Reduce source point count hard to the limit of the tools Polygon - if(nB2DLocalCount > ((0x0000ffff / 3L) - 1L)) + if(nB2DLocalCount > ((0x0000ffff / 3L) - 1)) { OSL_FAIL("Polygon::Polygon: Too many points in given B2DPolygon, need to reduce hard to maximum of tools Polygon (!)"); - nB2DLocalCount = ((0x0000ffff / 3L) - 1L); + nB2DLocalCount = ((0x0000ffff / 3L) - 1); } // calculate target point count - const sal_uInt32 nLoopCount(bClosed ? nB2DLocalCount : (nB2DLocalCount ? nB2DLocalCount - 1L : 0L )); + const sal_uInt32 nLoopCount(bClosed ? nB2DLocalCount : (nB2DLocalCount ? nB2DLocalCount - 1 : 0L )); if(nLoopCount) { @@ -1889,7 +1889,7 @@ Polygon::Polygon(const basegfx::B2DPolygon& rPolygon) else { // add last point as closing point - const basegfx::B2DPoint aClosingPoint(rPolygon.getB2DPoint(nB2DLocalCount - 1L)); + const basegfx::B2DPoint aClosingPoint(rPolygon.getB2DPoint(nB2DLocalCount - 1)); const Point aEnd(FRound(aClosingPoint.getX()), FRound(aClosingPoint.getY())); mpImplPolygon->mpPointAry[nArrayInsert] = aEnd; mpImplPolygon->mpFlagAry[nArrayInsert] = PolyFlags::Normal; @@ -1907,10 +1907,10 @@ Polygon::Polygon(const basegfx::B2DPolygon& rPolygon) else { // #127979# Reduce source point count hard to the limit of the tools Polygon - if(nB2DLocalCount > (0x0000ffff - 1L)) + if(nB2DLocalCount > (0x0000ffff - 1)) { OSL_FAIL("Polygon::Polygon: Too many points in given B2DPolygon, need to reduce hard to maximum of tools Polygon (!)"); - nB2DLocalCount = (0x0000ffff - 1L); + nB2DLocalCount = (0x0000ffff - 1); } if(nB2DLocalCount) diff --git a/tools/source/stream/stream.cxx b/tools/source/stream/stream.cxx index 5dac2b27d163..7de1f413b88b 100644 --- a/tools/source/stream/stream.cxx +++ b/tools/source/stream/stream.cxx @@ -1610,9 +1610,9 @@ SvMemoryStream::SvMemoryStream( void* pBuffer, std::size_t bufSize, nEndOfData = bufSize; bOwnsData = false; pBuf = static_cast<sal_uInt8 *>(pBuffer); - nResize = 0L; + nResize = 0; nSize = bufSize; - nPos = 0L; + nPos = 0; SetBufferSize( 0 ); } @@ -1620,7 +1620,7 @@ SvMemoryStream::SvMemoryStream( std::size_t nInitSize, std::size_t nResizeOffset { m_isWritable = true; bOwnsData = true; - nEndOfData = 0L; + nEndOfData = 0; nResize = nResizeOffset; nPos = 0; pBuf = nullptr; @@ -1826,9 +1826,9 @@ bool SvMemoryStream::ReAllocateMemory( long nDiff ) { memcpy( pNewBuf, pBuf, (size_t)nNewSize ); if( nPos > nNewSize ) - nPos = 0L; + nPos = 0; if( nEndOfData >= nNewSize ) - nEndOfData = nNewSize-1L; + nEndOfData = nNewSize-1; } else { @@ -1871,7 +1871,7 @@ void* SvMemoryStream::SwitchBuffer() void* pRetVal = pBuf; pBuf = nullptr; - nEndOfData = 0L; + nEndOfData = 0; nResize = 64; nPos = 0; diff --git a/tools/source/stream/strmwnt.cxx b/tools/source/stream/strmwnt.cxx index 5b7009eda1a5..1635ed42a3a8 100644 --- a/tools/source/stream/strmwnt.cxx +++ b/tools/source/stream/strmwnt.cxx @@ -175,7 +175,7 @@ sal_uInt64 SvFileStream::SeekPos(sal_uInt64 const nPos) if( nNewPos == 0xFFFFFFFF ) { SetError(::GetSvError( GetLastError() ) ); - nNewPos = 0L; + nNewPos = 0; } } else @@ -278,7 +278,7 @@ void SvFileStream::Open( const OUString& rFilename, StreamMode nMode ) DWORD nOpenAction; DWORD nShareMode = FILE_SHARE_READ | FILE_SHARE_WRITE; - DWORD nAccessMode = 0L; + DWORD nAccessMode = 0; UINT nOldErrorMode = SetErrorMode( SEM_FAILCRITICALERRORS|SEM_NOOPENFILEERRORBOX ); if( nMode & StreamMode::SHARE_DENYREAD) diff --git a/tools/source/stream/vcompat.cxx b/tools/source/stream/vcompat.cxx index cd75978a8c73..7e03ef43a0c8 100644 --- a/tools/source/stream/vcompat.cxx +++ b/tools/source/stream/vcompat.cxx @@ -32,7 +32,7 @@ VersionCompat::VersionCompat( SvStream& rStm, StreamMode nStreamMode, sal_uInt16 if( StreamMode::WRITE == mnStmMode ) { mpRWStm->WriteUInt16( mnVersion ); - mnTotalSize = ( mnCompatPos = mpRWStm->Tell() ) + 4UL; + mnTotalSize = ( mnCompatPos = mpRWStm->Tell() ) + 4; mpRWStm->SeekRel( 4 ); } else diff --git a/unotools/source/misc/datetime.cxx b/unotools/source/misc/datetime.cxx index 25c4d5ab079b..b0c1afce82eb 100644 --- a/unotools/source/misc/datetime.cxx +++ b/unotools/source/misc/datetime.cxx @@ -36,7 +36,7 @@ namespace bool bNeg = false; rValue = 0; - sal_Int32 nPos = 0L; + sal_Int32 nPos = 0; sal_Int32 nLen = rString.getLength(); // skip white space diff --git a/vcl/inc/impoctree.hxx b/vcl/inc/impoctree.hxx index fc63ade3c993..fc63122d3e0f 100644 --- a/vcl/inc/impoctree.hxx +++ b/vcl/inc/impoctree.hxx @@ -101,9 +101,9 @@ inline void ImpErrorQuad::ImplAddColorError7( const ImpErrorQuad& rErrQuad ) inline BitmapColor ImpErrorQuad::ImplGetColor() { - return BitmapColor( (sal_uInt8) ( ( nRed < 0L ? 0L : nRed > 8160L ? 8160L : nRed ) >> 5 ), - (sal_uInt8) ( ( nGreen < 0L ? 0L : nGreen > 8160L ? 8160L : nGreen ) >> 5 ), - (sal_uInt8) ( ( nBlue < 0L ? 0L : nBlue > 8160L ? 8160L : nBlue ) >> 5 ) ); + return BitmapColor( (sal_uInt8) ( ( nRed < 0 ? 0L : nRed > 8160 ? 8160L : nRed ) >> 5 ), + (sal_uInt8) ( ( nGreen < 0 ? 0L : nGreen > 8160 ? 8160L : nGreen ) >> 5 ), + (sal_uInt8) ( ( nBlue < 0 ? 0L : nBlue > 8160 ? 8160L : nBlue ) >> 5 ) ); } class ImpNodeCache diff --git a/vcl/inc/octree.hxx b/vcl/inc/octree.hxx index 9f670fa6bf98..114425befdc7 100644 --- a/vcl/inc/octree.hxx +++ b/vcl/inc/octree.hxx @@ -85,7 +85,7 @@ inline sal_uInt16 Octree::GetBestPaletteIndex( const BitmapColor& rColor ) { pColor = &rColor; nPalIndex = 65535; - nLevel = 0L; + nLevel = 0; GetPalIndex( pTree ); return nPalIndex; } diff --git a/vcl/opengl/gdiimpl.cxx b/vcl/opengl/gdiimpl.cxx index 54bb066ddd30..f3d4f6925cef 100644 --- a/vcl/opengl/gdiimpl.cxx +++ b/vcl/opengl/gdiimpl.cxx @@ -887,7 +887,7 @@ void OpenGLSalGraphicsImpl::DrawPolygon( sal_uInt32 nPoints, const SalPoint* pPt if( basegfx::tools::isConvex( aPolygon ) ) { - if( nPoints > 2L ) + if( nPoints > 2 ) DrawConvexPolygon( nPoints, pPtAry ); } else diff --git a/vcl/source/bitmap/bitmapscalesuper.cxx b/vcl/source/bitmap/bitmapscalesuper.cxx index 057a337eee8d..9141805188dd 100644 --- a/vcl/source/bitmap/bitmapscalesuper.cxx +++ b/vcl/source/bitmap/bitmapscalesuper.cxx @@ -30,11 +30,11 @@ namespace { void generateMap(long nW, long nDstW, bool bHMirr, long* pMapIX, long* pMapFX) { - const double fRevScaleX = (nDstW > 1L) ? (double) (nW - 1) / (nDstW - 1) : 0.0; + const double fRevScaleX = (nDstW > 1) ? (double) (nW - 1) / (nDstW - 1) : 0.0; - long nTemp = nW - 2L; - long nTempX = nW - 1L; - for (long nX = 0L; nX < nDstW; nX++) + long nTemp = nW - 2; + long nTempX = nW - 1; + for (long nX = 0; nX < nDstW; nX++) { double fTemp = nX * fRevScaleX; if (bHMirr) @@ -102,7 +102,7 @@ public: void scalePallete8bit(ScaleContext &rCtx, long nStartY, long nEndY) { - const long nStartX = 0, nEndX = rCtx.mnDestW - 1L; + const long nStartX = 0, nEndX = rCtx.mnDestW - 1; for( long nY = nStartY; nY <= nEndY; nY++ ) { @@ -111,7 +111,7 @@ void scalePallete8bit(ScaleContext &rCtx, long nStartY, long nEndY) Scanline pLine0 = rCtx.mpSrc->GetScanline( nTempY ); Scanline pLine1 = rCtx.mpSrc->GetScanline( ++nTempY ); - for(long nX = nStartX, nXDst = 0L; nX <= nEndX; nX++ ) + for(long nX = nStartX, nXDst = 0; nX <= nEndX; nX++ ) { long nTempX = rCtx.mpMapIX[ nX ]; long nTempFX = rCtx.mpMapFX[ nX ]; @@ -139,14 +139,14 @@ void scalePallete8bit(ScaleContext &rCtx, long nStartY, long nEndY) void scalePalleteGeneral(ScaleContext &rCtx, long nStartY, long nEndY) { - const long nStartX = 0, nEndX = rCtx.mnDestW - 1L; + const long nStartX = 0, nEndX = rCtx.mnDestW - 1; for( long nY = nStartY; nY <= nEndY; nY++ ) { long nTempY = rCtx.mpMapIY[ nY ]; long nTempFY = rCtx.mpMapFY[ nY ]; - for( long nX = nStartX, nXDst = 0L; nX <= nEndX; nX++ ) + for( long nX = nStartX, nXDst = 0; nX <= nEndX; nX++ ) { long nTempX = rCtx.mpMapIX[ nX ]; long nTempFX = rCtx.mpMapFX[ nX ]; @@ -173,7 +173,7 @@ void scalePalleteGeneral(ScaleContext &rCtx, long nStartY, long nEndY) void scale24bitBGR(ScaleContext &rCtx, long nStartY, long nEndY) { - const long nStartX = 0, nEndX = rCtx.mnDestW - 1L; + const long nStartX = 0, nEndX = rCtx.mnDestW - 1; for( long nY = nStartY; nY <= nEndY; nY++ ) { @@ -182,20 +182,20 @@ void scale24bitBGR(ScaleContext &rCtx, long nStartY, long nEndY) Scanline pLine0 = rCtx.mpSrc->GetScanline( nTempY ); Scanline pLine1 = rCtx.mpSrc->GetScanline( ++nTempY ); - for( long nX = nStartX, nXDst = 0L; nX <= nEndX; nX++ ) + for( long nX = nStartX, nXDst = 0; nX <= nEndX; nX++ ) { - long nOff = 3L * rCtx.mpMapIX[ nX ]; + long nOff = 3 * rCtx.mpMapIX[ nX ]; long nTempFX = rCtx.mpMapFX[ nX ]; Scanline pTmp0 = pLine0 + nOff ; - Scanline pTmp1 = pTmp0 + 3L; + Scanline pTmp1 = pTmp0 + 3; sal_uInt8 cB0 = MAP( *pTmp0, *pTmp1, nTempFX ); pTmp0++; pTmp1++; sal_uInt8 cG0 = MAP( *pTmp0, *pTmp1, nTempFX ); pTmp0++; pTmp1++; sal_uInt8 cR0 = MAP( *pTmp0, *pTmp1, nTempFX ); - pTmp1 = ( pTmp0 = pLine1 + nOff ) + 3L; + pTmp1 = ( pTmp0 = pLine1 + nOff ) + 3; sal_uInt8 cB1 = MAP( *pTmp0, *pTmp1, nTempFX ); pTmp0++; pTmp1++; sal_uInt8 cG1 = MAP( *pTmp0, *pTmp1, nTempFX ); @@ -212,7 +212,7 @@ void scale24bitBGR(ScaleContext &rCtx, long nStartY, long nEndY) void scale24bitRGB(ScaleContext &rCtx, long nStartY, long nEndY) { - const long nStartX = 0, nEndX = rCtx.mnDestW - 1L; + const long nStartX = 0, nEndX = rCtx.mnDestW - 1; for( long nY = nStartY; nY <= nEndY; nY++ ) { @@ -221,20 +221,20 @@ void scale24bitRGB(ScaleContext &rCtx, long nStartY, long nEndY) Scanline pLine0 = rCtx.mpSrc->GetScanline( nTempY ); Scanline pLine1 = rCtx.mpSrc->GetScanline( ++nTempY ); - for( long nX = nStartX, nXDst = 0L; nX <= nEndX; nX++ ) + for( long nX = nStartX, nXDst = 0; nX <= nEndX; nX++ ) { - long nOff = 3L * rCtx.mpMapIX[ nX ]; + long nOff = 3 * rCtx.mpMapIX[ nX ]; long nTempFX = rCtx.mpMapFX[ nX ]; Scanline pTmp0 = pLine0 + nOff; - Scanline pTmp1 = pTmp0 + 3L; + Scanline pTmp1 = pTmp0 + 3; sal_uInt8 cR0 = MAP( *pTmp0, *pTmp1, nTempFX ); pTmp0++; pTmp1++; sal_uInt8 cG0 = MAP( *pTmp0, *pTmp1, nTempFX ); pTmp0++; pTmp1++; sal_uInt8 cB0 = MAP( *pTmp0, *pTmp1, nTempFX ); - pTmp1 = ( pTmp0 = pLine1 + nOff ) + 3L; + pTmp1 = ( pTmp0 = pLine1 + nOff ) + 3; sal_uInt8 cR1 = MAP( *pTmp0, *pTmp1, nTempFX ); pTmp0++; pTmp1++; sal_uInt8 cG1 = MAP( *pTmp0, *pTmp1, nTempFX ); @@ -251,14 +251,14 @@ void scale24bitRGB(ScaleContext &rCtx, long nStartY, long nEndY) void scaleNonPalleteGeneral(ScaleContext &rCtx, long nStartY, long nEndY) { - const long nStartX = 0, nEndX = rCtx.mnDestW - 1L; + const long nStartX = 0, nEndX = rCtx.mnDestW - 1; for( long nY = nStartY; nY <= nEndY; nY++ ) { long nTempY = rCtx.mpMapIY[ nY ]; long nTempFY = rCtx.mpMapFY[ nY ]; - for( long nX = nStartX, nXDst = 0L; nX <= nEndX; nX++ ) + for( long nX = nStartX, nXDst = 0; nX <= nEndX; nX++ ) { long nTempX = rCtx.mpMapIX[ nX ]; long nTempFX = rCtx.mpMapFX[ nX ]; @@ -285,7 +285,7 @@ void scaleNonPalleteGeneral(ScaleContext &rCtx, long nStartY, long nEndY) void scalePallete8bit2(ScaleContext &rCtx, long nStartY, long nEndY) { - const long nStartX = 0, nEndX = rCtx.mnDestW - 1L; + const long nStartX = 0, nEndX = rCtx.mnDestW - 1; const long nMax = 1 << 7; for( long nY = nStartY; nY <= nEndY; nY++ ) @@ -305,7 +305,7 @@ void scalePallete8bit2(ScaleContext &rCtx, long nStartY, long nEndY) nLineRange = ( rCtx.mpMapIY[ nBottom ] == rCtx.mpMapIY[ nTop ] ) ? 1 :( rCtx.mpMapIY[ nBottom ] - rCtx.mpMapIY[ nTop ] ); } - for( long nX = nStartX , nXDst = 0L; nX <= nEndX; nX++ ) + for( long nX = nStartX , nXDst = 0; nX <= nEndX; nX++ ) { long nLeft = rCtx.mbHMirr ? ( nX + 1 ) : nX; long nRight = rCtx.mbHMirr ? nX : ( nX + 1 ) ; @@ -410,7 +410,7 @@ void scalePallete8bit2(ScaleContext &rCtx, long nStartY, long nEndY) void scalePalleteGeneral2(ScaleContext &rCtx, long nStartY, long nEndY) { - const long nStartX = 0, nEndX = rCtx.mnDestW - 1L; + const long nStartX = 0, nEndX = rCtx.mnDestW - 1; const long nMax = 1 << 7; for( long nY = nStartY; nY <= nEndY; nY++ ) @@ -430,7 +430,7 @@ void scalePalleteGeneral2(ScaleContext &rCtx, long nStartY, long nEndY) nLineRange = ( rCtx.mpMapIY[ nBottom ] == rCtx.mpMapIY[ nTop ] ) ? 1 :( rCtx.mpMapIY[ nBottom ] - rCtx.mpMapIY[ nTop ] ); } - for( long nX = nStartX , nXDst = 0L; nX <= nEndX; nX++ ) + for( long nX = nStartX , nXDst = 0; nX <= nEndX; nX++ ) { long nLeft = rCtx.mbHMirr ? ( nX + 1 ) : nX; long nRight = rCtx.mbHMirr ? nX : ( nX + 1 ) ; @@ -537,7 +537,7 @@ void scalePalleteGeneral2(ScaleContext &rCtx, long nStartY, long nEndY) void scale24bitBGR2(ScaleContext &rCtx, long nStartY, long nEndY) { - const long nStartX = 0, nEndX = rCtx.mnDestW - 1L; + const long nStartX = 0, nEndX = rCtx.mnDestW - 1; const long nMax = 1 << 7; for( long nY = nStartY; nY <= nEndY; nY++ ) @@ -558,7 +558,7 @@ void scale24bitBGR2(ScaleContext &rCtx, long nStartY, long nEndY) nLineRange = ( rCtx.mpMapIY[ nBottom ] == rCtx.mpMapIY[ nTop ] ) ? 1 :( rCtx.mpMapIY[ nBottom ] - rCtx.mpMapIY[ nTop ] ); } - for( long nX = nStartX , nXDst = 0L; nX <= nEndX; nX++ ) + for( long nX = nStartX , nXDst = 0; nX <= nEndX; nX++ ) { long nLeft = rCtx.mbHMirr ? ( nX + 1 ) : nX; long nRight = rCtx.mbHMirr ? nX : ( nX + 1 ) ; @@ -584,7 +584,7 @@ void scale24bitBGR2(ScaleContext &rCtx, long nStartY, long nEndY) for(long i = 0; i<= nLineRange; i++) { Scanline pTmpY = rCtx.mpSrc->GetScanline( nLineStart + i ); - Scanline pTmpX = pTmpY + 3L * nRowStart; + Scanline pTmpX = pTmpY + 3 * nRowStart; long nSumRowR = 0; long nSumRowG = 0; long nSumRowB = 0; @@ -660,7 +660,7 @@ void scale24bitBGR2(ScaleContext &rCtx, long nStartY, long nEndY) void scale24bitRGB2(ScaleContext &rCtx, long nStartY, long nEndY) { - const long nStartX = 0, nEndX = rCtx.mnDestW - 1L; + const long nStartX = 0, nEndX = rCtx.mnDestW - 1; const long nMax = 1 << 7; for( long nY = nStartY; nY <= nEndY; nY++ ) @@ -680,7 +680,7 @@ void scale24bitRGB2(ScaleContext &rCtx, long nStartY, long nEndY) nLineRange = ( rCtx.mpMapIY[ nBottom ] == rCtx.mpMapIY[ nTop ] ) ? 1 :( rCtx.mpMapIY[ nBottom ] - rCtx.mpMapIY[ nTop ] ); } - for( long nX = nStartX , nXDst = 0L; nX <= nEndX; nX++ ) + for( long nX = nStartX , nXDst = 0; nX <= nEndX; nX++ ) { long nLeft = rCtx.mbHMirr ? ( nX + 1 ) : nX; long nRight = rCtx.mbHMirr ? nX : ( nX + 1 ) ; @@ -705,7 +705,7 @@ void scale24bitRGB2(ScaleContext &rCtx, long nStartY, long nEndY) for(long i = 0; i<= nLineRange; i++) { Scanline pTmpY = rCtx.mpSrc->GetScanline( nLineStart + i ); - Scanline pTmpX = pTmpY + 3L * nRowStart; + Scanline pTmpX = pTmpY + 3 * nRowStart; long nSumRowR = 0; long nSumRowG = 0; long nSumRowB = 0; @@ -781,7 +781,7 @@ void scale24bitRGB2(ScaleContext &rCtx, long nStartY, long nEndY) void scaleNonPalleteGeneral2(ScaleContext &rCtx, long nStartY, long nEndY) { - const long nStartX = 0, nEndX = rCtx.mnDestW - 1L; + const long nStartX = 0, nEndX = rCtx.mnDestW - 1; const long nMax = 1 << 7; for( long nY = nStartY; nY <= nEndY; nY++ ) @@ -801,7 +801,7 @@ void scaleNonPalleteGeneral2(ScaleContext &rCtx, long nStartY, long nEndY) nLineRange = ( rCtx.mpMapIY[ nBottom ] == rCtx.mpMapIY[ nTop ] ) ? 1 :( rCtx.mpMapIY[ nBottom ] - rCtx.mpMapIY[ nTop ] ); } - for( long nX = nStartX , nXDst = 0L; nX <= nEndX; nX++ ) + for( long nX = nStartX , nXDst = 0; nX <= nEndX; nX++ ) { long nLeft = rCtx.mbHMirr ? ( nX + 1 ) : nX; long nRight = rCtx.mbHMirr ? nX : ( nX + 1 ) ; @@ -932,7 +932,7 @@ bool BitmapScaleSuper::filter(Bitmap& rBitmap) const double fScaleThresh = 0.6; - if (nDstW <= 1L || nDstH <= 1L) + if (nDstW <= 1 || nDstH <= 1) return false; Bitmap::ScopedReadAccess pReadAccess(rBitmap); @@ -941,7 +941,7 @@ bool BitmapScaleSuper::filter(Bitmap& rBitmap) Bitmap::ScopedWriteAccess pWriteAccess(aOutBmp); const long nStartY = 0; - const long nEndY = nDstH - 1L; + const long nEndY = nDstH - 1; if (pReadAccess && pWriteAccess) { diff --git a/vcl/source/control/longcurr.cxx b/vcl/source/control/longcurr.cxx index 174b84f9d264..8dd0ec192870 100644 --- a/vcl/source/control/longcurr.cxx +++ b/vcl/source/control/longcurr.cxx @@ -61,7 +61,7 @@ OUString ImplGetCurr( const LocaleDataWrapper& rLocaleDataWrapper, const BigInt if ( !aInteger.IsZero() ) { aFraction += aTmp; - aTmp = 1000000000L; + aTmp = 1000000000; } if ( rNumber.IsNeg() ) aFraction *= -1; diff --git a/vcl/source/control/spinfld.cxx b/vcl/source/control/spinfld.cxx index 9ceb2b2f5164..0459160a9b03 100644 --- a/vcl/source/control/spinfld.cxx +++ b/vcl/source/control/spinfld.cxx @@ -553,7 +553,7 @@ bool SpinField::EventNotify(NotifyEvent& rNEvt) const CommandWheelData* pData = rNEvt.GetCommandEvent()->GetWheelData(); if (pData->GetMode() == CommandWheelMode::SCROLL) { - if (pData->GetDelta() < 0L) + if (pData->GetDelta() < 0) Down(); else Up(); diff --git a/vcl/source/filter/graphicfilter2.cxx b/vcl/source/filter/graphicfilter2.cxx index 51ef11b62455..780d11d24eba 100644 --- a/vcl/source/filter/graphicfilter2.cxx +++ b/vcl/source/filter/graphicfilter2.cxx @@ -1035,7 +1035,7 @@ bool GraphicDescriptor::ImpDetectSVM( SvStream& rStm, bool bExtendedInfo ) } else { - rStm.SeekRel( -4L ); + rStm.SeekRel( -4 ); n32 = 0; rStm.ReadUInt32( n32 ); diff --git a/vcl/source/filter/igif/gifread.cxx b/vcl/source/filter/igif/gifread.cxx index 9b98fceca699..ef2cb32ed7fe 100644 --- a/vcl/source/filter/igif/gifread.cxx +++ b/vcl/source/filter/igif/gifread.cxx @@ -264,7 +264,7 @@ bool GIFReader::ReadGlobalHeader() void GIFReader::ReadPaletteEntries( BitmapPalette* pPal, sal_uLong nCount ) { - sal_uLong nLen = 3UL * nCount; + sal_uLong nLen = 3 * nCount; const sal_uInt64 nMaxPossible = rIStm.remainingSize(); if (nLen > nMaxPossible) nLen = nMaxPossible; @@ -275,7 +275,7 @@ void GIFReader::ReadPaletteEntries( BitmapPalette* pPal, sal_uLong nCount ) { sal_uInt8* pTmp = pBuf.get(); - for (sal_uLong i = 0UL; i < nCount; ++i) + for (sal_uLong i = 0; i < nCount; ++i) { BitmapColor& rColor = (*pPal)[i]; @@ -285,11 +285,11 @@ void GIFReader::ReadPaletteEntries( BitmapPalette* pPal, sal_uLong nCount ) } // if possible accommodate some standard colours - if( nCount < 256UL ) + if( nCount < 256 ) { (*pPal)[ 255UL ] = Color( COL_WHITE ); - if( nCount < 255UL ) + if( nCount < 255 ) (*pPal)[ 254UL ] = Color( COL_BLACK ); } } @@ -478,18 +478,18 @@ bool GIFReader::ReadLocalHeader() sal_uLong GIFReader::ReadNextBlock() { - sal_uLong nRet = 0UL; + sal_uLong nRet = 0; sal_uLong nRead; sal_uInt8 cBlockSize; rIStm.ReadUChar( cBlockSize ); if ( rIStm.IsEof() ) - nRet = 4UL; + nRet = 4; else if ( NO_PENDING( rIStm ) ) { if ( cBlockSize == 0 ) - nRet = 2UL; + nRet = 2; else { rIStm.ReadBytes( aSrcBuf.data(), cBlockSize ); @@ -497,7 +497,7 @@ sal_uLong GIFReader::ReadNextBlock() if( NO_PENDING( rIStm ) ) { if( bOverreadBlock ) - nRet = 3UL; + nRet = 3; else { bool bEOI; @@ -519,7 +519,7 @@ sal_uLong GIFReader::ReadNextBlock() void GIFReader::FillImages( const sal_uInt8* pBytes, sal_uLong nCount ) { - for( sal_uLong i = 0UL; i < nCount; i++ ) + for( sal_uLong i = 0; i < nCount; i++ ) { if( nImageX >= nImageWidth ) { @@ -796,7 +796,7 @@ bool GIFReader::ProcessGIF() { bRead = true; - if ( nRet == 1UL ) + if ( nRet == 1 ) { bImGraphicReady = true; eActAction = NEXT_BLOCK_READING; @@ -804,14 +804,14 @@ bool GIFReader::ProcessGIF() } else { - if( nRet == 2UL ) + if( nRet == 2 ) { pDecomp.reset(); CreateNewBitmaps(); eActAction = MARKER_READING; ClearImageExtensions(); } - else if( nRet == 3UL ) + else if( nRet == 3 ) { eActAction = NEXT_BLOCK_READING; bOverreadBlock = true; diff --git a/vcl/source/filter/jpeg/JpegWriter.cxx b/vcl/source/filter/jpeg/JpegWriter.cxx index 1cf302312b22..d5636c53d2ec 100644 --- a/vcl/source/filter/jpeg/JpegWriter.cxx +++ b/vcl/source/filter/jpeg/JpegWriter.cxx @@ -147,7 +147,7 @@ void* JPEGWriter::GetScanline( long nY ) if( mpReadAccess->HasPalette() ) { - for( long nX = 0L; nX < nWidth; nX++ ) + for( long nX = 0; nX < nWidth; nX++ ) { aColor = mpReadAccess->GetPaletteColor( mpReadAccess->GetPixelIndex( nY, nX ) ); *pTmp++ = aColor.GetRed(); @@ -160,7 +160,7 @@ void* JPEGWriter::GetScanline( long nY ) } else { - for( long nX = 0L; nX < nWidth; nX++ ) + for( long nX = 0; nX < nWidth; nX++ ) { aColor = mpReadAccess->GetPixel( nY, nX ); *pTmp++ = aColor.GetRed(); @@ -207,7 +207,7 @@ bool JPEGWriter::Write( const Graphic& rGraphic ) for ( long nY = 0; bIsGrey && ( nY < mpReadAccess->Height() ); nY++ ) { BitmapColor aColor; - for( long nX = 0L; bIsGrey && ( nX < nWidth ); nX++ ) + for( long nX = 0; bIsGrey && ( nX < nWidth ); nX++ ) { aColor = mpReadAccess->HasPalette() ? mpReadAccess->GetPaletteColor( mpReadAccess->GetPixelIndex( nY, nX ) ) : mpReadAccess->GetPixel( nY, nX ); diff --git a/vcl/source/filter/jpeg/transupp.c b/vcl/source/filter/jpeg/transupp.c index 7e72c21719ac..58f2219f790a 100644 --- a/vcl/source/filter/jpeg/transupp.c +++ b/vcl/source/filter/jpeg/transupp.c @@ -30,7 +30,7 @@ jdiv_round_up (long a, long b) /* Compute a/b rounded up to next integer, ie, ceil(a/b) */ /* Assumes a >= 0, b > 0 */ { - return (a + b - 1L) / b; + return (a + b - 1) / b; } #if JPEG_LIB_VERSION >= 70 diff --git a/vcl/source/filter/sgfbram.cxx b/vcl/source/filter/sgfbram.cxx index 10bb23b2f886..8dcda618c817 100644 --- a/vcl/source/filter/sgfbram.cxx +++ b/vcl/source/filter/sgfbram.cxx @@ -238,7 +238,7 @@ bool SgfFilterBMap(SvStream& rInp, SvStream& rOut, SgfHeader& rHead) pBuf[i]=aPcx.GetByte(rInp); } for(sal_uInt16 i=nWdtInp;i<nWdtOut;i++) pBuf[i]=0; // up to 3 bytes - rOut.Seek(nOfs+((sal_uLong)rHead.Ysize-j-1L)*(sal_uLong)nWdtOut); // write backwards + rOut.Seek(nOfs+((sal_uLong)rHead.Ysize-j-1)*(sal_uLong)nWdtOut); // write backwards rOut.WriteBytes(pBuf.get(), nWdtOut); } } else if (nColors==16) { @@ -286,7 +286,7 @@ bool SgfFilterBMap(SvStream& rInp, SvStream& rOut, SgfHeader& rHead) } } for(sal_uInt16 i=nWdtInp*4;i<nWdtOut;i++) pBuf[i]=0; // up to 3 bytes - rOut.Seek(nOfs+((sal_uLong)rHead.Ysize-j-1L)*(sal_uLong)nWdtOut); // write backwards + rOut.Seek(nOfs+((sal_uLong)rHead.Ysize-j-1)*(sal_uLong)nWdtOut); // write backwards rOut.WriteBytes(pBuf.get(), nWdtOut); } } else if (nColors==256) { @@ -315,7 +315,7 @@ bool SgfFilterBMap(SvStream& rInp, SvStream& rOut, SgfHeader& rHead) for(sal_uInt16 i=0;i<rHead.Xsize;i++) pBuf[i]=aPcx.GetByte(rInp); for(sal_uInt16 i=rHead.Xsize;i<nWdtOut;i++) pBuf[i]=0; // up to 3 bytes - rOut.Seek(nOfs+((sal_uLong)rHead.Ysize-j-1L)*(sal_uLong)nWdtOut); // write backwards + rOut.Seek(nOfs+((sal_uLong)rHead.Ysize-j-1)*(sal_uLong)nWdtOut); // write backwards rOut.WriteBytes(pBuf.get(), nWdtOut); } } diff --git a/vcl/source/filter/sgvmain.cxx b/vcl/source/filter/sgvmain.cxx index 9b99f445f71a..b26e120874f8 100644 --- a/vcl/source/filter/sgvmain.cxx +++ b/vcl/source/filter/sgvmain.cxx @@ -829,7 +829,7 @@ void DrawObjkList( SvStream& rInp, OutputDevice& rOut ) ReadGrupType( rInp, aGrup ); if (!rInp.GetError()) { rInp.Seek(rInp.Tell()+aGrup.Last); // object appendix - if(aGrup.GetSubPtr()!=0L) nGrpCnt++; // DrawObjkList(rInp,rOut ); + if(aGrup.GetSubPtr()!=0) nGrpCnt++; // DrawObjkList(rInp,rOut ); } } break; default: { @@ -839,7 +839,7 @@ void DrawObjkList( SvStream& rInp, OutputDevice& rOut ) } } // if rInp if (!rInp.GetError()) { - if (aObjk.Next==0L) { + if (aObjk.Next==0) { if (nGrpCnt==0) bEnd=true; else nGrpCnt--; } @@ -859,11 +859,11 @@ void SkipObjkList(SvStream& rInp) GrupType aGrup; ReadGrupType( rInp, aGrup ); rInp.Seek(rInp.Tell()+aGrup.Last); // object appendix - if(aGrup.GetSubPtr()!=0L) SkipObjkList(rInp); + if(aGrup.GetSubPtr()!=0) SkipObjkList(rInp); } else { ObjkOverSeek(rInp,aObjk); // to next object } - } while (aObjk.Next!=0L && !rInp.GetError()); + } while (aObjk.Next!=0 && !rInp.GetError()); } bool SgfFilterSDrw( SvStream& rInp, GDIMetaFile& rMtf ) @@ -883,7 +883,7 @@ bool SgfFilterSDrw( SvStream& rInp, GDIMetaFile& rMtf ) do { // read standard page ReadPageType( rInp, aPage ); if (aPage.nList!=0) SkipObjkList(rInp); - } while (aPage.Next!=0L && !rInp.GetError()); + } while (aPage.Next!=0 && !rInp.GetError()); nCharPos=rInp.Tell(); ReadPageType( rInp, aPage ); @@ -892,17 +892,17 @@ bool SgfFilterSDrw( SvStream& rInp, GDIMetaFile& rMtf ) Num=aPage.StdPg; if (Num!=0) { rInp.Seek(nStdPos); - while(Num>1 && aPage.Next!=0L && !rInp.GetError()) { // search standard page + while(Num>1 && aPage.Next!=0 && !rInp.GetError()) { // search standard page ReadPageType( rInp, aPage ); if (aPage.nList!=0) SkipObjkList(rInp); Num--; } ReadPageType( rInp, aPage ); - if(Num==1 && aPage.nList!=0L) DrawObjkList( rInp,*pOutDev ); + if(Num==1 && aPage.nList!=0) DrawObjkList( rInp,*pOutDev ); rInp.Seek(nCharPos); ReadPageType( rInp, aPage ); } - if (aPage.nList!=0L) DrawObjkList(rInp,*pOutDev ); + if (aPage.nList!=0) DrawObjkList(rInp,*pOutDev ); rMtf.Stop(); rMtf.WindStart(); diff --git a/vcl/source/filter/wmf/wmfwr.hxx b/vcl/source/filter/wmf/wmfwr.hxx index c0fd6e5fca56..a3f4885d1706 100644 --- a/vcl/source/filter/wmf/wmfwr.hxx +++ b/vcl/source/filter/wmf/wmfwr.hxx @@ -168,7 +168,7 @@ private: void WMFRecord_SetTextColor(const Color & rColor); void WMFRecord_SetWindowExt(const Size & rSize); void WMFRecord_SetWindowOrg(const Point & rPoint); - void WMFRecord_StretchDIB(const Point & rPoint, const Size & rSize, const Bitmap & rBitmap, sal_uInt32 nROP = 0UL ); + void WMFRecord_StretchDIB(const Point & rPoint, const Size & rSize, const Bitmap & rBitmap, sal_uInt32 nROP = 0 ); void WMFRecord_TextOut(const Point & rPoint, const OUString & rString); void WMFRecord_IntersectClipRect( const tools::Rectangle& rRect); diff --git a/vcl/source/gdi/alpha.cxx b/vcl/source/gdi/alpha.cxx index 4f3200bbe41c..285d0bfb0bf9 100644 --- a/vcl/source/gdi/alpha.cxx +++ b/vcl/source/gdi/alpha.cxx @@ -97,8 +97,8 @@ bool AlphaMask::Replace( const Bitmap& rMask, sal_uInt8 cReplaceTransparency ) const long nHeight = std::min( pMaskAcc->Height(), pAcc->Height() ); const BitmapColor aMaskWhite( pMaskAcc->GetBestMatchingColor( Color( COL_WHITE ) ) ); - for( long nY = 0L; nY < nHeight; nY++ ) - for( long nX = 0L; nX < nWidth; nX++ ) + for( long nY = 0; nY < nHeight; nY++ ) + for( long nX = 0; nX < nWidth; nX++ ) if( pMaskAcc->GetPixel( nY, nX ) == aMaskWhite ) pAcc->SetPixel( nY, nX, aReplace ); } @@ -116,11 +116,11 @@ bool AlphaMask::Replace( sal_uInt8 cSearchTransparency, sal_uInt8 cReplaceTransp if( pAcc->GetScanlineFormat() == ScanlineFormat::N8BitPal ) { - for( long nY = 0L; nY < nHeight; nY++ ) + for( long nY = 0; nY < nHeight; nY++ ) { Scanline pScan = pAcc->GetScanline( nY ); - for( long nX = 0L; nX < nWidth; nX++, pScan++ ) + for( long nX = 0; nX < nWidth; nX++, pScan++ ) { if( *pScan == cSearchTransparency ) *pScan = cReplaceTransparency; @@ -131,9 +131,9 @@ bool AlphaMask::Replace( sal_uInt8 cSearchTransparency, sal_uInt8 cReplaceTransp { BitmapColor aReplace( cReplaceTransparency ); - for( long nY = 0L; nY < nHeight; nY++ ) + for( long nY = 0; nY < nHeight; nY++ ) { - for( long nX = 0L; nX < nWidth; nX++ ) + for( long nX = 0; nX < nWidth; nX++ ) { if( pAcc->GetPixel( nY, nX ).GetIndex() == cSearchTransparency ) pAcc->SetPixel( nY, nX, aReplace ); diff --git a/vcl/source/gdi/animate.cxx b/vcl/source/gdi/animate.cxx index 2dab4e98c59a..aa49f7803848 100644 --- a/vcl/source/gdi/animate.cxx +++ b/vcl/source/gdi/animate.cxx @@ -29,7 +29,7 @@ #define MIN_TIMEOUT 2 #define INC_TIMEOUT 0 -sal_uLong Animation::mnAnimCount = 0UL; +sal_uLong Animation::mnAnimCount = 0; BitmapChecksum AnimationBitmap::GetChecksum() const { @@ -261,7 +261,7 @@ bool Animation::Start( OutputDevice* pOut, const Point& rDestPt, const Size& rDe { maTimer.Stop(); mbIsInAnimation = false; - mnPos = 0UL; + mnPos = 0; } if( !pMatch ) @@ -326,7 +326,7 @@ void Animation::Draw( OutputDevice* pOut, const Point& rDestPt, const Size& rDes else { const size_t nOldPos = mnPos; - const_cast<Animation*>(this)->mnPos = mbLoopTerminated ? ( nCount - 1UL ) : mnPos; + const_cast<Animation*>(this)->mnPos = mbLoopTerminated ? ( nCount - 1 ) : mnPos; delete new ImplAnimView( const_cast<Animation*>(this), pOut, rDestPt, rDestSz, 0 ); const_cast<Animation*>(this)->mnPos = nOldPos; } @@ -415,7 +415,7 @@ IMPL_LINK_NOARG(Animation, ImplTimeoutHdl, Timer *, void) { Stop(); mbLoopTerminated = true; - mnPos = nAnimCount - 1UL; + mnPos = nAnimCount - 1; maBitmapEx = maList[ mnPos ]->aBmpEx; return; } @@ -680,7 +680,7 @@ SvStream& WriteAnimation( SvStream& rOStm, const Animation& rAnimation ) if( nCount ) { - const sal_uInt32 nDummy32 = 0UL; + const sal_uInt32 nDummy32 = 0; // If no BitmapEx was set we write the first Bitmap of // the Animation diff --git a/vcl/source/gdi/bitmap.cxx b/vcl/source/gdi/bitmap.cxx index ab49663c87b8..db70c3969904 100644 --- a/vcl/source/gdi/bitmap.cxx +++ b/vcl/source/gdi/bitmap.cxx @@ -478,8 +478,8 @@ bool Bitmap::Invert() const long nWidth = pAcc->Width(); const long nHeight = pAcc->Height(); - for( long nX = 0L; nX < nWidth; nX++ ) - for( long nY = 0L; nY < nHeight; nY++ ) + for( long nX = 0; nX < nWidth; nX++ ) + for( long nY = 0; nY < nHeight; nY++ ) pAcc->SetPixel( nY, nX, pAcc->GetPixel( nY, nX ).Invert() ); } @@ -505,12 +505,12 @@ bool Bitmap::Mirror( BmpMirrorFlags nMirrorFlags ) { const long nWidth = pAcc->Width(); const long nHeight = pAcc->Height(); - const long nWidth1 = nWidth - 1L; + const long nWidth1 = nWidth - 1; const long nWidth_2 = nWidth >> 1; - for( long nY = 0L; nY < nHeight; nY++ ) + for( long nY = 0; nY < nHeight; nY++ ) { - for( long nX = 0L, nOther = nWidth1; nX < nWidth_2; nX++, nOther-- ) + for( long nX = 0, nOther = nWidth1; nX < nWidth_2; nX++, nOther-- ) { const BitmapColor aTemp( pAcc->GetPixel( nY, nX ) ); @@ -532,10 +532,10 @@ bool Bitmap::Mirror( BmpMirrorFlags nMirrorFlags ) const long nScanSize = pAcc->GetScanlineSize(); std::unique_ptr<sal_uInt8[]> pBuffer(new sal_uInt8[ nScanSize ]); const long nHeight = pAcc->Height(); - const long nHeight1 = nHeight - 1L; + const long nHeight1 = nHeight - 1; const long nHeight_2 = nHeight >> 1; - for( long nY = 0L, nOther = nHeight1; nY < nHeight_2; nY++, nOther-- ) + for( long nY = 0, nOther = nHeight1; nY < nHeight_2; nY++, nOther-- ) { memcpy( pBuffer.get(), pAcc->GetScanline( nY ), nScanSize ); memcpy( pAcc->GetScanline( nY ), pAcc->GetScanline( nOther ), nScanSize ); @@ -553,13 +553,13 @@ bool Bitmap::Mirror( BmpMirrorFlags nMirrorFlags ) if( pAcc ) { const long nWidth = pAcc->Width(); - const long nWidth1 = nWidth - 1L; + const long nWidth1 = nWidth - 1; const long nHeight = pAcc->Height(); long nHeight_2 = nHeight >> 1; - for( long nY = 0L, nOtherY = nHeight - 1L; nY < nHeight_2; nY++, nOtherY-- ) + for( long nY = 0, nOtherY = nHeight - 1; nY < nHeight_2; nY++, nOtherY-- ) { - for( long nX = 0L, nOtherX = nWidth1; nX < nWidth; nX++, nOtherX-- ) + for( long nX = 0, nOtherX = nWidth1; nX < nWidth; nX++, nOtherX-- ) { const BitmapColor aTemp( pAcc->GetPixel( nY, nX ) ); @@ -571,7 +571,7 @@ bool Bitmap::Mirror( BmpMirrorFlags nMirrorFlags ) // ggf. noch mittlere Zeile horizontal spiegeln if( nHeight & 1 ) { - for( long nX = 0L, nOtherX = nWidth1, nWidth_2 = nWidth >> 1; nX < nWidth_2; nX++, nOtherX-- ) + for( long nX = 0, nOtherX = nWidth1, nWidth_2 = nWidth >> 1; nX < nWidth_2; nX++, nOtherX-- ) { const BitmapColor aTemp( pAcc->GetPixel( nHeight_2, nX ) ); pAcc->SetPixel( nHeight_2, nX, pAcc->GetPixel( nHeight_2, nOtherX ) ); @@ -593,12 +593,12 @@ bool Bitmap::Rotate( long nAngle10, const Color& rFillColor ) { bool bRet = false; - nAngle10 %= 3600L; - nAngle10 = ( nAngle10 < 0L ) ? ( 3599L + nAngle10 ) : nAngle10; + nAngle10 %= 3600; + nAngle10 = ( nAngle10 < 0 ) ? ( 3599L + nAngle10 ) : nAngle10; if( !nAngle10 ) bRet = true; - else if( 1800L == nAngle10 ) + else if( 1800 == nAngle10 ) bRet = Mirror( BmpMirrorFlags::Horizontal | BmpMirrorFlags::Vertical ); else { @@ -609,7 +609,7 @@ bool Bitmap::Rotate( long nAngle10, const Color& rFillColor ) { const Size aSizePix( GetSizePixel() ); - if( ( 900L == nAngle10 ) || ( 2700L == nAngle10 ) ) + if( ( 900 == nAngle10 ) || ( 2700 == nAngle10 ) ) { const Size aNewSizePix( aSizePix.Height(), aSizePix.Width() ); Bitmap aNewBmp( aNewSizePix, GetBitCount(), &pReadAcc->GetPalette() ); @@ -618,22 +618,22 @@ bool Bitmap::Rotate( long nAngle10, const Color& rFillColor ) if( pWriteAcc ) { const long nWidth = aSizePix.Width(); - const long nWidth1 = nWidth - 1L; + const long nWidth1 = nWidth - 1; const long nHeight = aSizePix.Height(); - const long nHeight1 = nHeight - 1L; + const long nHeight1 = nHeight - 1; const long nNewWidth = aNewSizePix.Width(); const long nNewHeight = aNewSizePix.Height(); - if( 900L == nAngle10 ) + if( 900 == nAngle10 ) { - for( long nY = 0L, nOtherX = nWidth1; nY < nNewHeight; nY++, nOtherX-- ) - for( long nX = 0L, nOtherY = 0L; nX < nNewWidth; nX++ ) + for( long nY = 0, nOtherX = nWidth1; nY < nNewHeight; nY++, nOtherX-- ) + for( long nX = 0, nOtherY = 0; nX < nNewWidth; nX++ ) pWriteAcc->SetPixel( nY, nX, pReadAcc->GetPixel( nOtherY++, nOtherX ) ); } - else if( 2700L == nAngle10 ) + else if( 2700 == nAngle10 ) { - for( long nY = 0L, nOtherX = 0L; nY < nNewHeight; nY++, nOtherX++ ) - for( long nX = 0L, nOtherY = nHeight1; nX < nNewWidth; nX++ ) + for( long nY = 0, nOtherX = 0; nY < nNewHeight; nY++, nOtherX++ ) + for( long nX = 0, nOtherY = nHeight1; nX < nNewWidth; nX++ ) pWriteAcc->SetPixel( nY, nX, pReadAcc->GetPixel( nOtherY--, nOtherX ) ); } @@ -690,17 +690,17 @@ bool Bitmap::Rotate( long nAngle10, const Color& rFillColor ) pSinY[ nY ] = FRound( fSinAngle * fTmp ); } - for( nY = 0L; nY < nNewHeight; nY++ ) + for( nY = 0; nY < nNewHeight; nY++ ) { long nSinY = pSinY[ nY ]; long nCosY = pCosY[ nY ]; - for( nX = 0L; nX < nNewWidth; nX++ ) + for( nX = 0; nX < nNewWidth; nX++ ) { nRotX = ( pCosX[ nX ] - nSinY ) >> 6; nRotY = ( pSinX[ nX ] + nCosY ) >> 6; - if ( ( nRotX > -1L ) && ( nRotX < nWidth ) && ( nRotY > -1L ) && ( nRotY < nHeight ) ) + if ( ( nRotX > -1 ) && ( nRotX < nWidth ) && ( nRotY > -1 ) && ( nRotY < nHeight ) ) pWriteAcc->SetPixel( nY, nX, pReadAcc->GetPixel( nRotY, nRotX ) ); else pWriteAcc->SetPixel( nY, nX, aFillColor ); @@ -880,7 +880,7 @@ bool Bitmap::CopyPixel( const tools::Rectangle& rRectDst, pWriteAcc->SetPixel( nDstY, nDstX, pReadAcc->GetPixel( nSrcY, nSrcX ) ); pWriteAcc.reset(); - bRet = ( nWidth > 0L ) && ( nHeight > 0L ); + bRet = ( nWidth > 0 ) && ( nHeight > 0 ); } pReadAcc.reset(); @@ -903,12 +903,12 @@ bool Bitmap::CopyPixel( const tools::Rectangle& rRectDst, const long nHeight = std::min( aRectSrc.GetHeight(), aRectDst.GetHeight() ); const long nSrcX = aRectSrc.Left(); const long nSrcY = aRectSrc.Top(); - const long nSrcEndX1 = nSrcX + nWidth - 1L; - const long nSrcEndY1 = nSrcY + nHeight - 1L; + const long nSrcEndX1 = nSrcX + nWidth - 1; + const long nSrcEndY1 = nSrcY + nHeight - 1; const long nDstX = aRectDst.Left(); const long nDstY = aRectDst.Top(); - const long nDstEndX1 = nDstX + nWidth - 1L; - const long nDstEndY1 = nDstY + nHeight - 1L; + const long nDstEndX1 = nDstX + nWidth - 1; + const long nDstEndY1 = nDstY + nHeight - 1; if( ( nDstX <= nSrcX ) && ( nDstY <= nSrcY ) ) { @@ -987,7 +987,7 @@ bool Bitmap::CopyPixel_AlphaOptimized( const tools::Rectangle& rRectDst, const t pWriteAcc->SetPixel( nDstY, nDstX, pReadAcc->GetPixel( nSrcY, nSrcX ) ); pWriteAcc.reset(); - bRet = ( nWidth > 0L ) && ( nHeight > 0L ); + bRet = ( nWidth > 0 ) && ( nHeight > 0 ); } pReadAcc.reset(); @@ -1010,12 +1010,12 @@ bool Bitmap::CopyPixel_AlphaOptimized( const tools::Rectangle& rRectDst, const t const long nHeight = std::min( aRectSrc.GetHeight(), aRectDst.GetHeight() ); const long nSrcX = aRectSrc.Left(); const long nSrcY = aRectSrc.Top(); - const long nSrcEndX1 = nSrcX + nWidth - 1L; - const long nSrcEndY1 = nSrcY + nHeight - 1L; + const long nSrcEndX1 = nSrcX + nWidth - 1; + const long nSrcEndY1 = nSrcY + nHeight - 1; const long nDstX = aRectDst.Left(); const long nDstY = aRectDst.Top(); - const long nDstEndX1 = nDstX + nWidth - 1L; - const long nDstEndY1 = nDstY + nHeight - 1L; + const long nDstEndX1 = nDstX + nWidth - 1; + const long nDstEndY1 = nDstY + nHeight - 1; if( ( nDstX <= nSrcX ) && ( nDstY <= nSrcY ) ) { @@ -1084,7 +1084,7 @@ bool Bitmap::Expand( sal_uLong nDX, sal_uLong nDY, const Color* pInitColor ) if( pInitColor ) aColor = pWriteAcc->GetBestMatchingColor( *pInitColor ); - for( nY = 0L; nY < nHeight; nY++ ) + for( nY = 0; nY < nHeight; nY++ ) { pWriteAcc->CopyScanline( nY, *pReadAcc ); @@ -1150,12 +1150,12 @@ Bitmap Bitmap::CreateMask( const Color& rTransColor, sal_uLong nTol ) const aWhite.GetIndex() == 1 ) { // optimized for 1Bit-MSB destination palette - for( nY = 0L; nY < nHeight; nY++ ) + for( nY = 0; nY < nHeight; nY++ ) { Scanline pSrc = pReadAcc->GetScanline( nY ); Scanline pDst = pWriteAcc->GetScanline( nY ); long nShift = 0; - for( nX = 0L, nShift = nShiftInit; nX < nWidth; nX++, nShift ^= 4 ) + for( nX = 0, nShift = nShiftInit; nX < nWidth; nX++, nShift ^= 4 ) { if( cTest == ( ( pSrc[ nX >> 1 ] >> nShift ) & 0x0f ) ) pDst[ nX >> 3 ] |= 1 << ( 7 - ( nX & 7 ) ); @@ -1166,11 +1166,11 @@ Bitmap Bitmap::CreateMask( const Color& rTransColor, sal_uLong nTol ) const } else { - for( nY = 0L; nY < nHeight; nY++ ) + for( nY = 0; nY < nHeight; nY++ ) { Scanline pSrc = pReadAcc->GetScanline( nY ); long nShift = 0; - for( nX = 0L, nShift = nShiftInit; nX < nWidth; nX++, nShift ^= 4 ) + for( nX = 0, nShift = nShiftInit; nX < nWidth; nX++, nShift ^= 4 ) { if( cTest == ( ( pSrc[ nX >> 1 ] >> nShift ) & 0x0f ) ) pWriteAcc->SetPixel( nY, nX, aWhite ); @@ -1189,11 +1189,11 @@ Bitmap Bitmap::CreateMask( const Color& rTransColor, sal_uLong nTol ) const aWhite.GetIndex() == 1 ) { // optimized for 1Bit-MSB destination palette - for( nY = 0L; nY < nHeight; nY++ ) + for( nY = 0; nY < nHeight; nY++ ) { Scanline pSrc = pReadAcc->GetScanline( nY ); Scanline pDst = pWriteAcc->GetScanline( nY ); - for( nX = 0L; nX < nWidth; nX++ ) + for( nX = 0; nX < nWidth; nX++ ) { if( cTest == pSrc[ nX ] ) pDst[ nX >> 3 ] |= 1 << ( 7 - ( nX & 7 ) ); @@ -1204,10 +1204,10 @@ Bitmap Bitmap::CreateMask( const Color& rTransColor, sal_uLong nTol ) const } else { - for( nY = 0L; nY < nHeight; nY++ ) + for( nY = 0; nY < nHeight; nY++ ) { Scanline pSrc = pReadAcc->GetScanline( nY ); - for( nX = 0L; nX < nWidth; nX++ ) + for( nX = 0; nX < nWidth; nX++ ) { if( cTest == pSrc[ nX ] ) pWriteAcc->SetPixel( nY, nX, aWhite ); @@ -1220,9 +1220,9 @@ Bitmap Bitmap::CreateMask( const Color& rTransColor, sal_uLong nTol ) const else { // not optimized - for( nY = 0L; nY < nHeight; nY++ ) + for( nY = 0; nY < nHeight; nY++ ) { - for( nX = 0L; nX < nWidth; nX++ ) + for( nX = 0; nX < nWidth; nX++ ) { if( aTest == pReadAcc->GetPixel( nY, nX ) ) pWriteAcc->SetPixel( nY, nX, aWhite ); @@ -1245,9 +1245,9 @@ Bitmap Bitmap::CreateMask( const Color& rTransColor, sal_uLong nTol ) const if( pReadAcc->HasPalette() ) { - for( long nY = 0L; nY < nHeight; nY++ ) + for( long nY = 0; nY < nHeight; nY++ ) { - for( long nX = 0L; nX < nWidth; nX++ ) + for( long nX = 0; nX < nWidth; nX++ ) { aCol = pReadAcc->GetPaletteColor( pReadAcc->GetPixelIndex( nY, nX ) ); nR = aCol.GetRed(); @@ -1267,9 +1267,9 @@ Bitmap Bitmap::CreateMask( const Color& rTransColor, sal_uLong nTol ) const } else { - for( long nY = 0L; nY < nHeight; nY++ ) + for( long nY = 0; nY < nHeight; nY++ ) { - for( long nX = 0L; nX < nWidth; nX++ ) + for( long nX = 0; nX < nWidth; nX++ ) { aCol = pReadAcc->GetPixel( nY, nX ); nR = aCol.GetRed(); @@ -1349,7 +1349,7 @@ vcl::Region Bitmap::CreateRegion( const Color& rColor, const tools::Rectangle& r while( ( nX <= nRight ) && ( aMatch == pReadAcc->GetPixel( nY, nX ) ) ) nX++; - //aSubRect.Right() = nX - 1L; + //aSubRect.Right() = nX - 1; aNewLine.push_back(nX - 1); //aRegion.ImplAddRect( aSubRect ); @@ -1450,11 +1450,11 @@ bool Bitmap::Replace( const Bitmap& rMask, const Color& rReplaceColor ) // Set all entries to false std::fill( pFlags.get(), pFlags.get()+nMaxColors, false ); - for( long nY = 0L; nY < nHeight; nY++ ) - for( long nX = 0L; nX < nWidth; nX++ ) + for( long nY = 0; nY < nHeight; nY++ ) + for( long nX = 0; nX < nWidth; nX++ ) pFlags[ pAcc->GetPixelIndex( nY, nX ) ] = true; - for( sal_uInt16 i = 0UL; i < nMaxColors; i++ ) + for( sal_uInt16 i = 0; i < nMaxColors; i++ ) { // Hurray, we do have an unused entry if( !pFlags[ i ] ) @@ -1469,8 +1469,8 @@ bool Bitmap::Replace( const Bitmap& rMask, const Color& rReplaceColor ) else aReplace = rReplaceColor; - for( long nY = 0L; nY < nHeight; nY++ ) - for( long nX = 0L; nX < nWidth; nX++ ) + for( long nY = 0; nY < nHeight; nY++ ) + for( long nX = 0; nX < nWidth; nX++ ) if( pMaskAcc->GetPixel( nY, nX ) == aMaskWhite ) pAcc->SetPixel( nY, nX, aReplace ); @@ -1494,9 +1494,9 @@ bool Bitmap::Replace( const AlphaMask& rAlpha, const Color& rMergeColor ) const long nWidth = std::min( pAlphaAcc->Width(), pAcc->Width() ); const long nHeight = std::min( pAlphaAcc->Height(), pAcc->Height() ); - for( long nY = 0L; nY < nHeight; nY++ ) + for( long nY = 0; nY < nHeight; nY++ ) { - for( long nX = 0L; nX < nWidth; nX++ ) + for( long nX = 0; nX < nWidth; nX++ ) { aCol = pAcc->GetColor( nY, nX ); pNewAcc->SetPixel( nY, nX, aCol.Merge( rMergeColor, 255 - pAlphaAcc->GetPixelIndex( nY, nX ) ) ); @@ -1575,9 +1575,9 @@ bool Bitmap::Replace( const Color& rSearchColor, const Color& rReplaceColor, sal BitmapColor aCol; const BitmapColor aReplace( pAcc->GetBestMatchingColor( rReplaceColor ) ); - for( long nY = 0L, nHeight = pAcc->Height(); nY < nHeight; nY++ ) + for( long nY = 0, nHeight = pAcc->Height(); nY < nHeight; nY++ ) { - for( long nX = 0L, nWidth = pAcc->Width(); nX < nWidth; nX++ ) + for( long nX = 0, nWidth = pAcc->Width(); nX < nWidth; nX++ ) { aCol = pAcc->GetPixel( nY, nX ); @@ -1628,7 +1628,7 @@ bool Bitmap::Replace( const Color* pSearchColors, const Color* pReplaceColors, else pTols = reinterpret_cast<long*>(_pTols); - for( i = 0UL; i < nColorCount; i++ ) + for( i = 0; i < nColorCount; i++ ) { const Color& rCol = pSearchColors[ i ]; const long nTol = pTols[ i ]; @@ -1647,7 +1647,7 @@ bool Bitmap::Replace( const Color* pSearchColors, const Color* pReplaceColors, { const BitmapColor& rCol = pAcc->GetPaletteColor( nEntry ); - for( i = 0UL; i < nColorCount; i++ ) + for( i = 0; i < nColorCount; i++ ) { if( pMinR[ i ] <= rCol.GetRed() && pMaxR[ i ] >= rCol.GetRed() && pMinG[ i ] <= rCol.GetGreen() && pMaxG[ i ] >= rCol.GetGreen() && @@ -1664,16 +1664,16 @@ bool Bitmap::Replace( const Color* pSearchColors, const Color* pReplaceColors, BitmapColor aCol; std::unique_ptr<BitmapColor[]> pReplaces(new BitmapColor[ nColorCount ]); - for( i = 0UL; i < nColorCount; i++ ) + for( i = 0; i < nColorCount; i++ ) pReplaces[ i ] = pAcc->GetBestMatchingColor( pReplaceColors[ i ] ); - for( long nY = 0L, nHeight = pAcc->Height(); nY < nHeight; nY++ ) + for( long nY = 0, nHeight = pAcc->Height(); nY < nHeight; nY++ ) { - for( long nX = 0L, nWidth = pAcc->Width(); nX < nWidth; nX++ ) + for( long nX = 0, nWidth = pAcc->Width(); nX < nWidth; nX++ ) { aCol = pAcc->GetPixel( nY, nX ); - for( i = 0UL; i < nColorCount; i++ ) + for( i = 0; i < nColorCount; i++ ) { if( pMinR[ i ] <= aCol.GetRed() && pMaxR[ i ] >= aCol.GetRed() && pMinG[ i ] <= aCol.GetGreen() && pMaxG[ i ] >= aCol.GetGreen() && @@ -1734,7 +1734,7 @@ bool Bitmap::CombineSimple( const Bitmap& rMask, BmpCombine eCombine ) { case BmpCombine::And: { - for( long nY = 0L; nY < nHeight; nY++ ) for( long nX = 0L; nX < nWidth; nX++ ) + for( long nY = 0; nY < nHeight; nY++ ) for( long nX = 0; nX < nWidth; nX++ ) { if( pMaskAcc->GetPixel( nY, nX ) != aMaskBlack && pAcc->GetPixel( nY, nX ) != aBlack ) pAcc->SetPixel( nY, nX, aWhite ); @@ -1746,7 +1746,7 @@ bool Bitmap::CombineSimple( const Bitmap& rMask, BmpCombine eCombine ) case BmpCombine::Or: { - for( long nY = 0L; nY < nHeight; nY++ ) for( long nX = 0L; nX < nWidth; nX++ ) + for( long nY = 0; nY < nHeight; nY++ ) for( long nX = 0; nX < nWidth; nX++ ) { if( pMaskAcc->GetPixel( nY, nX ) != aMaskBlack || pAcc->GetPixel( nY, nX ) != aBlack ) pAcc->SetPixel( nY, nX, aWhite ); @@ -1783,8 +1783,8 @@ bool Bitmap::Blend( const AlphaMask& rAlpha, const Color& rBackgroundColor ) const long nWidth = std::min( pAlphaAcc->Width(), pAcc->Width() ); const long nHeight = std::min( pAlphaAcc->Height(), pAcc->Height() ); - for( long nY = 0L; nY < nHeight; ++nY ) - for( long nX = 0L; nX < nWidth; ++nX ) + for( long nY = 0; nY < nHeight; ++nY ) + for( long nX = 0; nX < nWidth; ++nX ) pAcc->SetPixel( nY, nX, pAcc->GetPixel( nY, nX ).Merge( rBackgroundColor, 255 - pAlphaAcc->GetPixelIndex( nY, nX ) ) ); diff --git a/vcl/source/gdi/bitmap3.cxx b/vcl/source/gdi/bitmap3.cxx index bae9d2ac0e3b..48b11eec4f93 100644 --- a/vcl/source/gdi/bitmap3.cxx +++ b/vcl/source/gdi/bitmap3.cxx @@ -37,7 +37,7 @@ #include "octree.hxx" #include "BitmapScaleConvolution.hxx" -#define RGB15( _def_cR, _def_cG, _def_cB ) (((sal_uLong)(_def_cR)<<10UL)|((sal_uLong)(_def_cG)<<5UL)|(sal_uLong)(_def_cB)) +#define RGB15( _def_cR, _def_cG, _def_cB ) (((sal_uLong)(_def_cR)<<10)|((sal_uLong)(_def_cG)<<5)|(sal_uLong)(_def_cB)) #define GAMMA( _def_cVal, _def_InvGamma ) ((sal_uInt8)MinMax(FRound(pow( _def_cVal/255.0,_def_InvGamma)*255.0),0,255)) #define CALC_ERRORS \ @@ -1227,9 +1227,9 @@ bool Bitmap::ImplDitherMatrix() if( pReadAcc->HasPalette() ) { - for( sal_uLong nY = 0UL; nY < nHeight; nY++ ) + for( sal_uLong nY = 0; nY < nHeight; nY++ ) { - for( sal_uLong nX = 0UL, nModY = ( nY & 0x0FUL ) << 4; nX < nWidth; nX++ ) + for( sal_uLong nX = 0, nModY = ( nY & 0x0FUL ) << 4; nX < nWidth; nX++ ) { const BitmapColor aCol( pReadAcc->GetPaletteColor( pReadAcc->GetPixelIndex( nY, nX ) ) ); const sal_uLong nD = nVCLDitherLut[ nModY + ( nX & 0x0FUL ) ]; @@ -1244,9 +1244,9 @@ bool Bitmap::ImplDitherMatrix() } else { - for( sal_uLong nY = 0UL; nY < nHeight; nY++ ) + for( sal_uLong nY = 0; nY < nHeight; nY++ ) { - for( sal_uLong nX = 0UL, nModY = ( nY & 0x0FUL ) << 4; nX < nWidth; nX++ ) + for( sal_uLong nX = 0, nModY = ( nY & 0x0FUL ) << 4; nX < nWidth; nX++ ) { const BitmapColor aCol( pReadAcc->GetPixel( nY, nX ) ); const sal_uLong nD = nVCLDitherLut[ nModY + ( nX & 0x0FUL ) ]; @@ -1777,7 +1777,7 @@ bool Bitmap::ImplReduceMedian( sal_uInt16 nColCount ) if( pWAcc ) { - const sal_uLong nSize = 32768UL * sizeof( sal_uLong ); + const sal_uLong nSize = 32768 * sizeof( sal_uLong ); sal_uLong* pColBuf = static_cast<sal_uLong*>(rtl_allocateMemory( nSize )); const long nWidth = pWAcc->Width(); const long nHeight = pWAcc->Height(); diff --git a/vcl/source/gdi/dibtools.cxx b/vcl/source/gdi/dibtools.cxx index 002f617cdb1b..f2dc2c25f474 100644 --- a/vcl/source/gdi/dibtools.cxx +++ b/vcl/source/gdi/dibtools.cxx @@ -355,7 +355,7 @@ bool ImplDecodeRLE(sal_uInt8* pBuffer, DIBV5Header const & rHeader, BitmapWriteA const sal_uLong nWidth = rAcc.Width(); sal_uLong nCountByte; sal_uLong nRunByte; - sal_uLong nX = 0UL; + sal_uLong nX = 0; sal_uInt8 cTmp; bool bEndDecoding = false; @@ -375,7 +375,7 @@ bool ImplDecodeRLE(sal_uInt8* pBuffer, DIBV5Header const & rHeader, BitmapWriteA { nCountByte = nRunByte >> 1; - for( sal_uLong i = 0UL; i < nCountByte; i++ ) + for( sal_uLong i = 0; i < nCountByte; i++ ) { if (pRLE == pEndRLE) return false; @@ -410,7 +410,7 @@ bool ImplDecodeRLE(sal_uInt8* pBuffer, DIBV5Header const & rHeader, BitmapWriteA } else { - for( sal_uLong i = 0UL; i < nRunByte; i++ ) + for( sal_uLong i = 0; i < nRunByte; i++ ) { if (pRLE == pEndRLE) return false; @@ -433,7 +433,7 @@ bool ImplDecodeRLE(sal_uInt8* pBuffer, DIBV5Header const & rHeader, BitmapWriteA else if( !nRunByte ) { nY--; - nX = 0UL; + nX = 0; } else if( nRunByte == 1 ) bEndDecoding = true; @@ -460,7 +460,7 @@ bool ImplDecodeRLE(sal_uInt8* pBuffer, DIBV5Header const & rHeader, BitmapWriteA { nRunByte = nCountByte >> 1; - for( sal_uLong i = 0UL; i < nRunByte; i++ ) + for( sal_uLong i = 0; i < nRunByte; i++ ) { if( nX < nWidth ) rAcc.SetPixelIndex(nY, nX++, SanitizePaletteIndex(cTmp >> 4, rPalette, bForceToMonoWhileReading)); @@ -474,7 +474,7 @@ bool ImplDecodeRLE(sal_uInt8* pBuffer, DIBV5Header const & rHeader, BitmapWriteA } else { - for( sal_uLong i = 0UL; ( i < nCountByte ) && ( nX < nWidth ); i++ ) + for( sal_uLong i = 0; ( i < nCountByte ) && ( nX < nWidth ); i++ ) rAcc.SetPixelIndex(nY, nX++, SanitizePaletteIndex(cTmp, rPalette, bForceToMonoWhileReading)); } } @@ -611,7 +611,7 @@ bool ImplReadDIBBits(SvStream& rIStm, DIBV5Header& rHeader, BitmapWriteAccess& r { if( !nShift ) { - nShift = 2UL; + nShift = 2; cTmp = *pTmp++; } @@ -1030,14 +1030,14 @@ bool ImplReadDIBFileHeader( SvStream& rIStm, sal_uLong& rOffset ) rIStm.ReadUInt16( nTmp16 ); rIStm.SeekRel( 8 ); rIStm.ReadUInt32( nTmp32 ); - rOffset = nTmp32 - 28UL; + rOffset = nTmp32 - 28; bRet = ( 0x4D42 == nTmp16 ); } else // 0x4D42 == nTmp16, 'MB' from BITMAPFILEHEADER { rIStm.SeekRel( 8 ); // we are on bfSize member of BITMAPFILEHEADER, forward to bfOffBits rIStm.ReadUInt32( nTmp32 ); // read bfOffBits - rOffset = nTmp32 - 14UL; // adapt offset by sizeof(BITMAPFILEHEADER) + rOffset = nTmp32 - 14; // adapt offset by sizeof(BITMAPFILEHEADER) bRet = rIStm.GetError() == ERRCODE_NONE; } @@ -1094,7 +1094,7 @@ bool ImplWriteRLE( SvStream& rOStm, BitmapReadAccess const & rAcc, bool bRLE4 ) for ( long nY = nHeight - 1; nY >= 0; nY-- ) { sal_uInt8* pTmp = pBuf.get(); - nX = nBufCount = 0UL; + nX = nBufCount = 0; while( nX < nWidth ) { @@ -1117,7 +1117,7 @@ bool ImplWriteRLE( SvStream& rOStm, BitmapReadAccess const & rAcc, bool bRLE4 ) else { cLast = cPix; - nSaveIndex = nX - 1UL; + nSaveIndex = nX - 1; bFound = false; while( ( nX < nWidth ) && ( nCount < 256 ) @@ -1150,7 +1150,7 @@ bool ImplWriteRLE( SvStream& rOStm, BitmapReadAccess const & rAcc, bool bRLE4 ) } else { - for( sal_uLong i = 0UL; i < nCount; i++ ) + for( sal_uLong i = 0; i < nCount; i++ ) *pTmp++ = rAcc.GetPixelIndex( nY, nSaveIndex++ ); } diff --git a/vcl/source/gdi/gdimtf.cxx b/vcl/source/gdi/gdimtf.cxx index d339f7f5ff46..5fe087fa478e 100644 --- a/vcl/source/gdi/gdimtf.cxx +++ b/vcl/source/gdi/gdimtf.cxx @@ -2701,7 +2701,7 @@ SvStream& ReadGDIMetaFile( SvStream& rIStm, GDIMetaFile& rGDIMetaFile ) ImplMetaReadData aReadData; aReadData.meActualCharSet = rIStm.GetStreamCharSet(); - for( sal_uInt32 nAction = 0UL; ( nAction < nCount ) && !rIStm.IsEof(); nAction++ ) + for( sal_uInt32 nAction = 0; ( nAction < nCount ) && !rIStm.IsEof(); nAction++ ) { MetaAction* pAction = MetaAction::ReadMetaAction( rIStm, &aReadData ); if( pAction ) diff --git a/vcl/source/gdi/impanmvw.cxx b/vcl/source/gdi/impanmvw.cxx index 3da968663d6e..59519b291f2e 100644 --- a/vcl/source/gdi/impanmvw.cxx +++ b/vcl/source/gdi/impanmvw.cxx @@ -171,9 +171,9 @@ void ImplAnimView::drawToPos( sal_uLong nPos ) std::unique_ptr<vcl::Region> xOldClip(!maClip.IsNull() ? new vcl::Region( pRenderContext->GetClipRegion() ) : nullptr); aVDev->SetOutputSizePixel( maSzPix, false ); - nPos = std::min( nPos, (sal_uLong) mpParent->Count() - 1UL ); + nPos = std::min( nPos, (sal_uLong) mpParent->Count() - 1 ); - for( sal_uLong i = 0UL; i <= nPos; i++ ) + for( sal_uLong i = 0; i <= nPos; i++ ) draw( i, aVDev.get() ); if (xOldClip) diff --git a/vcl/source/gdi/impvect.cxx b/vcl/source/gdi/impvect.cxx index b8cf13fe727f..a40ad29224ae 100644 --- a/vcl/source/gdi/impvect.cxx +++ b/vcl/source/gdi/impvect.cxx @@ -161,7 +161,7 @@ void ImplPointArray::ImplSetSize( sal_uLong nSize ) const sal_uLong nTotal = nSize * sizeof( Point ); mnSize = nSize; - mnRealSize = 0UL; + mnRealSize = 0; if( mpArray ) rtl_freeMemory( mpArray ); @@ -311,7 +311,7 @@ void ImplChain::ImplBeginAdd( const Point& rStartPt ) { maPoly = tools::Polygon(); maStartPt = rStartPt; - mnCount = 0UL; + mnCount = 0; } inline void ImplChain::ImplAdd( sal_uInt8 nCode ) @@ -914,12 +914,12 @@ bool ImplGetChain( ImplVectMap* pMap, const Point& rStartPt, ImplChain& rChain long nActX = rStartPt.X(); long nActY = rStartPt.Y(); sal_uLong nFound; - sal_uLong nLastDir = 0UL; + sal_uLong nLastDir = 0; sal_uLong nDir; do { - nFound = 0UL; + nFound = 0; // first try last direction long nTryX = nActX + aImplMove[ nLastDir ].nDX; @@ -929,12 +929,12 @@ bool ImplGetChain( ImplVectMap* pMap, const Point& rStartPt, ImplChain& rChain { rChain.ImplAdd( (sal_uInt8) nLastDir ); pMap->Set( nActY = nTryY, nActX = nTryX, VECT_DONE_INDEX ); - nFound = 1UL; + nFound = 1; } else { // try other directions - for( nDir = 0UL; nDir < 8UL; nDir++ ) + for( nDir = 0; nDir < 8; nDir++ ) { // we already tried nLastDir if( nDir != nLastDir ) @@ -946,7 +946,7 @@ bool ImplGetChain( ImplVectMap* pMap, const Point& rStartPt, ImplChain& rChain { rChain.ImplAdd( (sal_uInt8) nDir ); pMap->Set( nActY = nTryY, nActX = nTryX, VECT_DONE_INDEX ); - nFound = 1UL; + nFound = 1; nLastDir = nDir; break; } diff --git a/vcl/source/gdi/pngwrite.cxx b/vcl/source/gdi/pngwrite.cxx index bb0ee05d0f37..ab15754724f4 100644 --- a/vcl/source/gdi/pngwrite.cxx +++ b/vcl/source/gdi/pngwrite.cxx @@ -347,7 +347,7 @@ void PNGWriterImpl::ImplWriteTransparent() ImplOpenChunk(PNGCHUNK_tRNS); - for (sal_uLong n = 0UL; n <= nTransIndex; n++) + for (sal_uLong n = 0; n <= nTransIndex; n++) { ImplWriteChunk((nTransIndex == n) ? static_cast<sal_uInt8>(0x0) : static_cast<sal_uInt8>(0xff)); } diff --git a/vcl/source/gdi/svmconverter.cxx b/vcl/source/gdi/svmconverter.cxx index 55087af5fb90..5a07927216f4 100644 --- a/vcl/source/gdi/svmconverter.cxx +++ b/vcl/source/gdi/svmconverter.cxx @@ -335,7 +335,7 @@ void ImplSkipActions(SvStream& rIStm, sal_uLong nSkipCount) { sal_Int32 nActionSize; sal_Int16 nType; - for (sal_uLong i = 0UL; i < nSkipCount; ++i) + for (sal_uLong i = 0; i < nSkipCount; ++i) { rIStm.ReadInt16(nType).ReadInt32(nActionSize); if (!rIStm.good() || nActionSize < 4) diff --git a/vcl/source/outdev/bitmap.cxx b/vcl/source/outdev/bitmap.cxx index e361ed6a9b52..cdebce02a139 100644 --- a/vcl/source/outdev/bitmap.cxx +++ b/vcl/source/outdev/bitmap.cxx @@ -642,13 +642,13 @@ void OutputDevice::DrawDeviceAlphaBitmap( const Bitmap& rBmp, const AlphaMask& r if (bHMirr) { aOutSz.Width() = -aOutSz.Width(); - aOutPt.X() -= aOutSz.Width() - 1L; + aOutPt.X() -= aOutSz.Width() - 1; } if (bVMirr) { aOutSz.Height() = -aOutSz.Height(); - aOutPt.Y() -= aOutSz.Height() - 1L; + aOutPt.Y() -= aOutSz.Height() - 1; } if (!aDstRect.Intersection(tools::Rectangle(aOutPt, aOutSz)).IsEmpty()) @@ -744,11 +744,11 @@ private: long nOutDimention, long nOffset, long* pMap, long* pMapOffset) { - const double fReverseScale = (std::abs(nOutDimention) > 1L) ? (nSrcDimension - 1L) / double(std::abs(nOutDimention) - 1L) : 0.0; + const double fReverseScale = (std::abs(nOutDimention) > 1) ? (nSrcDimension - 1) / double(std::abs(nOutDimention) - 1) : 0.0; - long nSampleRange = std::max(0L, nSrcDimension - 2L); + long nSampleRange = std::max(0L, nSrcDimension - 2); - for (long i = 0L; i < nDstDimension; i++) + for (long i = 0; i < nDstDimension; i++) { double fTemp = std::abs((nOffset + i) * fReverseScale); @@ -807,7 +807,7 @@ public: sal_uInt8 nColor1, nColor2, nColor3, nAlpha; - for (long nY = 0L; nY < nDstHeight; nY++) + for (long nY = 0; nY < nDstHeight; nY++) { const long nMapY = mpMapY[nY]; const long nMapFY = mpMapYOffset[nY]; @@ -822,13 +822,13 @@ public: pDestScanline = pDestination->GetScanline(nY); - for (long nX = 0L; nX < nDstWidth; nX++) + for (long nX = 0; nX < nDstWidth; nX++) { const long nMapX = mpMapX[nX]; const long nMapFX = mpMapXOffset[nX]; - pColorSample1 = pLine0 + 3L * nMapX; - pColorSample2 = (nMapX + 1 < pSource->Width()) ? pColorSample1 + 3L : pColorSample1; + pColorSample1 = pLine0 + 3 * nMapX; + pColorSample2 = (nMapX + 1 < pSource->Width()) ? pColorSample1 + 3 : pColorSample1; nColor1Line1 = (static_cast<long>(*pColorSample1) << 7) + nMapFX * (static_cast<long>(*pColorSample2) - *pColorSample1); pColorSample1++; @@ -839,8 +839,8 @@ public: pColorSample2++; nColor3Line1 = (static_cast<long>(*pColorSample1) << 7) + nMapFX * (static_cast<long>(*pColorSample2) - *pColorSample1); - pColorSample1 = pLine1 + 3L * nMapX; - pColorSample2 = (nMapX + 1 < pSource->Width()) ? pColorSample1 + 3L : pColorSample1; + pColorSample1 = pLine1 + 3 * nMapX; + pColorSample2 = (nMapX + 1 < pSource->Width()) ? pColorSample1 + 3 : pColorSample1; nColor1Line2 = (static_cast<long>(*pColorSample1) << 7) + nMapFX * (static_cast<long>(*pColorSample2) - *pColorSample1); pColorSample1++; @@ -852,11 +852,11 @@ public: nColor3Line2 = (static_cast<long>(*pColorSample1) << 7) + nMapFX * (static_cast<long>(*pColorSample2) - *pColorSample1); pColorSample1 = pLineAlpha0 + nMapX; - pColorSample2 = (nMapX + 1 < pSourceAlpha->Width()) ? pColorSample1 + 1L : pColorSample1; + pColorSample2 = (nMapX + 1 < pSourceAlpha->Width()) ? pColorSample1 + 1 : pColorSample1; nAlphaLine1 = (static_cast<long>(*pColorSample1) << 7) + nMapFX * (static_cast<long>(*pColorSample2) - *pColorSample1); pColorSample1 = pLineAlpha1 + nMapX; - pColorSample2 = (nMapX + 1 < pSourceAlpha->Width()) ? pColorSample1 + 1L : pColorSample1; + pColorSample2 = (nMapX + 1 < pSourceAlpha->Width()) ? pColorSample1 + 1 : pColorSample1; nAlphaLine2 = (static_cast<long>(*pColorSample1) << 7) + nMapFX * (static_cast<long>(*pColorSample2) - *pColorSample1); nColor1 = (nColor1Line1 + nMapFY * ((nColor1Line2 >> 7) - (nColor1Line1 >> 7))) >> 7; @@ -911,9 +911,9 @@ private: long nMirrorOffset = 0; if (bMirror) - nMirrorOffset = (nDstLocation << 1) + nSrcDimension - 1L; + nMirrorOffset = (nDstLocation << 1) + nSrcDimension - 1; - for (long i = 0L; i < nDstDimension; ++i, ++nOffset) + for (long i = 0; i < nDstDimension; ++i, ++nOffset) { pMap[i] = nDstLocation + nOffset * nSrcDimension / nOutDimention; if (bMirror) diff --git a/vcl/source/outdev/outdev.cxx b/vcl/source/outdev/outdev.cxx index df1c7ee8c380..903157fd01b5 100644 --- a/vcl/source/outdev/outdev.cxx +++ b/vcl/source/outdev/outdev.cxx @@ -333,7 +333,7 @@ void OutputDevice::SetRefPoint() mpMetaFile->AddAction( new MetaRefPointAction( Point(), false ) ); mbRefPoint = false; - maRefPoint.X() = maRefPoint.Y() = 0L; + maRefPoint.X() = maRefPoint.Y() = 0; if( mpAlphaVDev ) mpAlphaVDev->SetRefPoint(); diff --git a/vcl/source/outdev/rect.cxx b/vcl/source/outdev/rect.cxx index 30ca92c1f7db..11633591d084 100644 --- a/vcl/source/outdev/rect.cxx +++ b/vcl/source/outdev/rect.cxx @@ -254,15 +254,15 @@ void OutputDevice::DrawGrid( const tools::Rectangle& rRect, const Size& rDist, D const long nEndX = ImplLogicXToDevicePixel( nRight ); const long nStartY = ImplLogicYToDevicePixel( nY ); const long nEndY = ImplLogicYToDevicePixel( nBottom ); - long nHorzCount = 0L; - long nVertCount = 0L; + long nHorzCount = 0; + long nVertCount = 0; std::vector< sal_Int32 > aVertBuf; std::vector< sal_Int32 > aHorzBuf; if( ( nFlags & DrawGridFlags::Dots ) || ( nFlags & DrawGridFlags::HorzLines ) ) { - aVertBuf.resize( aDstRect.GetHeight() / nDistY + 2L ); + aVertBuf.resize( aDstRect.GetHeight() / nDistY + 2 ); aVertBuf[ nVertCount++ ] = nStartY; while( ( nY += nDistY ) <= nBottom ) { @@ -272,7 +272,7 @@ void OutputDevice::DrawGrid( const tools::Rectangle& rRect, const Size& rDist, D if( ( nFlags & DrawGridFlags::Dots ) || ( nFlags & DrawGridFlags::VertLines ) ) { - aHorzBuf.resize( aDstRect.GetWidth() / nDistX + 2L ); + aHorzBuf.resize( aDstRect.GetWidth() / nDistX + 2 ); aHorzBuf[ nHorzCount++ ] = nStartX; while( ( nX += nDistX ) <= nRight ) { @@ -291,9 +291,9 @@ void OutputDevice::DrawGrid( const tools::Rectangle& rRect, const Size& rDist, D if( nFlags & DrawGridFlags::Dots ) { - for( long i = 0L; i < nVertCount; i++ ) + for( long i = 0; i < nVertCount; i++ ) { - for( long j = 0L, Y = aVertBuf[ i ]; j < nHorzCount; j++ ) + for( long j = 0, Y = aVertBuf[ i ]; j < nHorzCount; j++ ) { mpGraphics->DrawPixel( aHorzBuf[ j ], Y, this ); } @@ -303,7 +303,7 @@ void OutputDevice::DrawGrid( const tools::Rectangle& rRect, const Size& rDist, D { if( nFlags & DrawGridFlags::HorzLines ) { - for( long i = 0L; i < nVertCount; i++ ) + for( long i = 0; i < nVertCount; i++ ) { nY = aVertBuf[ i ]; mpGraphics->DrawLine( nStartX, nY, nEndX, nY, this ); @@ -312,7 +312,7 @@ void OutputDevice::DrawGrid( const tools::Rectangle& rRect, const Size& rDist, D if( nFlags & DrawGridFlags::VertLines ) { - for( long i = 0L; i < nHorzCount; i++ ) + for( long i = 0; i < nHorzCount; i++ ) { nX = aHorzBuf[ i ]; mpGraphics->DrawLine( nX, nStartY, nX, nEndY, this ); diff --git a/vcl/source/outdev/text.cxx b/vcl/source/outdev/text.cxx index 94e46d00224a..658a7a157b53 100644 --- a/vcl/source/outdev/text.cxx +++ b/vcl/source/outdev/text.cxx @@ -244,8 +244,8 @@ bool OutputDevice::ImplDrawRotateText( SalLayout& rSalLayout ) long nOldOffY = mnOutOffY; bool bOldMap = mbMap; - mnOutOffX = 0L; - mnOutOffY = 0L; + mnOutOffX = 0; + mnOutOffY = 0; mpMetaFile = nullptr; EnableMapMode( false ); diff --git a/vcl/source/outdev/textline.cxx b/vcl/source/outdev/textline.cxx index da95bf17e107..a1f3ad04ec89 100644 --- a/vcl/source/outdev/textline.cxx +++ b/vcl/source/outdev/textline.cxx @@ -1005,7 +1005,7 @@ void OutputDevice::DrawWaveLine( const Point& rStartPos, const Point& rEndPos ) if ( (nStartY != nEndY) || (nStartX > nEndX) ) { long nDX = nEndX - nStartX; - double nO = atan2( -nEndY + nStartY, ((nDX == 0L) ? 0.000000001 : nDX) ); + double nO = atan2( -nEndY + nStartY, ((nDX == 0) ? 0.000000001 : nDX) ); nO /= F_PI1800; nOrientation = (short)nO; aStartPt.RotateAround( nEndX, nEndY, -nOrientation ); diff --git a/vcl/source/outdev/transparent.cxx b/vcl/source/outdev/transparent.cxx index e4e21d49b0a1..8d79075e0dca 100644 --- a/vcl/source/outdev/transparent.cxx +++ b/vcl/source/outdev/transparent.cxx @@ -132,18 +132,18 @@ void OutputDevice::ImplPrintTransparent( const Bitmap& rBmp, const Bitmap& rMask aMask.Convert( BmpConversion::N1BitThreshold ); // mirrored horizontically - if( aDestSz.Width() < 0L ) + if( aDestSz.Width() < 0 ) { aDestSz.Width() = -aDestSz.Width(); - aDestPt.X() -= ( aDestSz.Width() - 1L ); + aDestPt.X() -= ( aDestSz.Width() - 1 ); nMirrFlags |= BmpMirrorFlags::Horizontal; } // mirrored vertically - if( aDestSz.Height() < 0L ) + if( aDestSz.Height() < 0 ) { aDestSz.Height() = -aDestSz.Height(); - aDestPt.Y() -= ( aDestSz.Height() - 1L ); + aDestPt.Y() -= ( aDestSz.Height() - 1 ); nMirrFlags |= BmpMirrorFlags::Vertical; } @@ -178,10 +178,10 @@ void OutputDevice::ImplPrintTransparent( const Bitmap& rBmp, const Bitmap& rMask mbMap = false; // create forward mapping tables - for( nX = 0L; nX <= nSrcWidth; nX++ ) + for( nX = 0; nX <= nSrcWidth; nX++ ) pMapX[ nX ] = aDestPt.X() + FRound( (double) aDestSz.Width() * nX / nSrcWidth ); - for( nY = 0L; nY <= nSrcHeight; nY++ ) + for( nY = 0; nY <= nSrcHeight; nY++ ) pMapY[ nY ] = aDestPt.Y() + FRound( (double) aDestSz.Height() * nY / nSrcHeight ); // walk through all rectangles of mask diff --git a/vcl/source/outdev/wallpaper.cxx b/vcl/source/outdev/wallpaper.cxx index 452cb12f4df6..bb22f2be95ea 100644 --- a/vcl/source/outdev/wallpaper.cxx +++ b/vcl/source/outdev/wallpaper.cxx @@ -240,8 +240,8 @@ void OutputDevice::DrawBitmapWallpaper( long nX, long nY, default: { - const long nRight = nX + nWidth - 1L; - const long nBottom = nY + nHeight - 1L; + const long nRight = nX + nWidth - 1; + const long nBottom = nY + nHeight - 1; long nFirstX; long nFirstY; @@ -261,10 +261,10 @@ void OutputDevice::DrawBitmapWallpaper( long nX, long nY, long nStartX = nX + nOffX; long nStartY = nY + nOffY; - if( nOffX > 0L ) + if( nOffX > 0 ) nStartX -= nBmpWidth; - if( nOffY > 0L ) + if( nOffY > 0 ) nStartY -= nBmpHeight; for( long nBmpY = nStartY; nBmpY <= nBottom; nBmpY += nBmpHeight ) @@ -290,7 +290,7 @@ void OutputDevice::DrawBitmapWallpaper( long nX, long nY, const tools::Rectangle aColRect( Point( nX, nY ), Size( nWidth, nHeight ) ); tools::Rectangle aWorkRect; - aWorkRect = tools::Rectangle( 0, 0, aOutRect.Right(), aPos.Y() - 1L ); + aWorkRect = tools::Rectangle( 0, 0, aOutRect.Right(), aPos.Y() - 1 ); aWorkRect.Justify(); aWorkRect.Intersection( aColRect ); if( !aWorkRect.IsEmpty() ) @@ -300,7 +300,7 @@ void OutputDevice::DrawBitmapWallpaper( long nX, long nY, rWallpaper ); } - aWorkRect = tools::Rectangle( 0, aPos.Y(), aPos.X() - 1L, aPos.Y() + aBmpSize.Height() - 1L ); + aWorkRect = tools::Rectangle( 0, aPos.Y(), aPos.X() - 1, aPos.Y() + aBmpSize.Height() - 1 ); aWorkRect.Justify(); aWorkRect.Intersection( aColRect ); if( !aWorkRect.IsEmpty() ) @@ -311,7 +311,7 @@ void OutputDevice::DrawBitmapWallpaper( long nX, long nY, } aWorkRect = tools::Rectangle( aPos.X() + aBmpSize.Width(), aPos.Y(), - aOutRect.Right(), aPos.Y() + aBmpSize.Height() - 1L ); + aOutRect.Right(), aPos.Y() + aBmpSize.Height() - 1 ); aWorkRect.Justify(); aWorkRect.Intersection( aColRect ); if( !aWorkRect.IsEmpty() ) diff --git a/vcl/source/window/menufloatingwindow.cxx b/vcl/source/window/menufloatingwindow.cxx index e9d691ec5aa2..0204828574e5 100644 --- a/vcl/source/window/menufloatingwindow.cxx +++ b/vcl/source/window/menufloatingwindow.cxx @@ -1278,7 +1278,7 @@ void MenuFloatingWindow::Command( const CommandEvent& rCEvt ) const CommandWheelData* pData = rCEvt.GetWheelData(); if( !pData->GetModifier() && ( pData->GetMode() == CommandWheelMode::SCROLL ) ) { - ImplScroll( pData->GetDelta() > 0L ); + ImplScroll( pData->GetDelta() > 0 ); MouseMove( MouseEvent( GetPointerPosPixel(), 0 ) ); } } diff --git a/vcl/source/window/scrwnd.cxx b/vcl/source/window/scrwnd.cxx index 10008241c571..672c37394ca9 100644 --- a/vcl/source/window/scrwnd.cxx +++ b/vcl/source/window/scrwnd.cxx @@ -184,7 +184,7 @@ void ImplWheelWindow::ImplRecalcScrollValues() { if( mnActDist < WHEEL_RADIUS ) { - mnActDeltaX = mnActDeltaY = 0L; + mnActDeltaX = mnActDeltaY = 0; mnTimeout = DEF_TIMEOUT; } else @@ -201,7 +201,7 @@ void ImplWheelWindow::ImplRecalcScrollValues() nCurTime = MAX_TIME; if( !nCurTime ) - nCurTime = 1UL; + nCurTime = 1; if( mnRepaintTime <= nCurTime ) mnTimeout = nCurTime - mnRepaintTime; @@ -210,7 +210,7 @@ void ImplWheelWindow::ImplRecalcScrollValues() sal_uInt64 nMult = mnRepaintTime / nCurTime; if( !( mnRepaintTime % nCurTime ) ) - mnTimeout = 0UL; + mnTimeout = 0; else mnTimeout = ++nMult * nCurTime - mnRepaintTime; @@ -325,14 +325,14 @@ void ImplWheelWindow::MouseMove( const MouseEvent& rMEvt ) { switch( eActStyle ) { - case( PointerStyle::AutoScrollN ): mnActDeltaX = +0L; mnActDeltaY = +1L; break; - case( PointerStyle::AutoScrollS ): mnActDeltaX = +0L; mnActDeltaY = -1L; break; - case( PointerStyle::AutoScrollW ): mnActDeltaX = +1L; mnActDeltaY = +0L; break; - case( PointerStyle::AutoScrollE ): mnActDeltaX = -1L; mnActDeltaY = +0L; break; - case( PointerStyle::AutoScrollNW ): mnActDeltaX = +1L; mnActDeltaY = +1L; break; - case( PointerStyle::AutoScrollNE ): mnActDeltaX = -1L; mnActDeltaY = +1L; break; - case( PointerStyle::AutoScrollSW ): mnActDeltaX = +1L; mnActDeltaY = -1L; break; - case( PointerStyle::AutoScrollSE ): mnActDeltaX = -1L; mnActDeltaY = -1L; break; + case( PointerStyle::AutoScrollN ): mnActDeltaX = +0; mnActDeltaY = +1; break; + case( PointerStyle::AutoScrollS ): mnActDeltaX = +0; mnActDeltaY = -1; break; + case( PointerStyle::AutoScrollW ): mnActDeltaX = +1; mnActDeltaY = +0; break; + case( PointerStyle::AutoScrollE ): mnActDeltaX = -1; mnActDeltaY = +0; break; + case( PointerStyle::AutoScrollNW ): mnActDeltaX = +1; mnActDeltaY = +1; break; + case( PointerStyle::AutoScrollNE ): mnActDeltaX = -1; mnActDeltaY = +1; break; + case( PointerStyle::AutoScrollSW ): mnActDeltaX = +1; mnActDeltaY = -1; break; + case( PointerStyle::AutoScrollSE ): mnActDeltaX = -1; mnActDeltaY = -1; break; default: break; diff --git a/vcl/win/gdi/salbmp.cxx b/vcl/win/gdi/salbmp.cxx index 7ef19c97d6c3..c9216bfd0109 100644 --- a/vcl/win/gdi/salbmp.cxx +++ b/vcl/win/gdi/salbmp.cxx @@ -884,7 +884,7 @@ BitmapBuffer* WinSalBitmap::AcquireBuffer( BitmapAccessMode /*nMode*/ ) } else if( ( pBIH->biBitCount == 16 ) || ( pBIH->biBitCount == 32 ) ) { - sal_uLong nOffset = 0UL; + sal_uLong nOffset = 0; if( pBIH->biCompression == BI_BITFIELDS ) { @@ -982,7 +982,7 @@ void WinSalBitmap::ImplDecodeRLEBuffer( const BYTE* pSrcBuf, BYTE* pDstBuf, { nRunByte = *pRLE++; - if( nRunByte > 2UL ) + if( nRunByte > 2 ) { if( bRLE4 ) { @@ -1014,7 +1014,7 @@ void WinSalBitmap::ImplDecodeRLEBuffer( const BYTE* pSrcBuf, BYTE* pDstBuf, else if( !nRunByte ) { pDIB = ( pRow += nWidthAl ); - nX = 0UL; + nX = 0; } else if( nRunByte == 1 ) bEndDecoding = TRUE; diff --git a/vcl/win/gdi/salgdi.cxx b/vcl/win/gdi/salgdi.cxx index 0a85a3059ea5..ef9732c7f9fc 100644 --- a/vcl/win/gdi/salgdi.cxx +++ b/vcl/win/gdi/salgdi.cxx @@ -170,14 +170,14 @@ void ImplInitSalGDI() pBIH->biPlanes = 1; pBIH->biBitCount = 24; - for( n = 0; n < 256L; n++ ) + for( n = 0; n < 256; n++ ) pSalData->mpDitherDiff[ n ] = n - ( n & 248L ); - for( n = 0; n < 256L; n++ ) + for( n = 0; n < 256; n++ ) pSalData->mpDitherLow[ n ] = (BYTE) ( n & 248 ); - for( n = 0; n < 256L; n++ ) - pSalData->mpDitherHigh[ n ] = (BYTE) std::min( pSalData->mpDitherLow[ n ] + 8L, 255L ); + for( n = 0; n < 256; n++ ) + pSalData->mpDitherHigh[ n ] = (BYTE) std::min( pSalData->mpDitherLow[ n ] + 8, 255 ); } } else if ( (nRasterCaps & RC_PALETTE) && (nBitCount == 8) ) @@ -248,13 +248,13 @@ void ImplInitSalGDI() for( n = 0; n < nDitherPalCount; n++ ) pColors[ n ] = (short)( n + DITHER_MAX_SYSCOLOR ); - for( n = 0; n < 256L; n++ ) + for( n = 0; n < 256; n++ ) pSalData->mpDitherDiff[ n ] = n % 51L; - for( n = 0; n < 256L; n++ ) + for( n = 0; n < 256; n++ ) pSalData->mpDitherLow[ n ] = (BYTE) ( n / 51L ); - for( n = 0; n < 256L; n++ ) + for( n = 0; n < 256; n++ ) pSalData->mpDitherHigh[ n ] = (BYTE)std::min( pSalData->mpDitherLow[ n ] + 1, 5 ); } diff --git a/winaccessibility/source/UAccCOM/MAccessible.cxx b/winaccessibility/source/UAccCOM/MAccessible.cxx index 1cf370976cdb..f6251afadf2c 100644 --- a/winaccessibility/source/UAccCOM/MAccessible.cxx +++ b/winaccessibility/source/UAccCOM/MAccessible.cxx @@ -1823,7 +1823,7 @@ STDMETHODIMP CMAccessible:: get_nActions(long __RPC_FAR *nActions) { return E_INVALIDARG; } - *nActions = 0L; + *nActions = 0; IAccessibleAction* pAcc = nullptr; HRESULT hr = QueryInterface(IID_IAccessibleAction, reinterpret_cast<void**>(&pAcc)); if( hr == S_OK ) @@ -1836,7 +1836,7 @@ STDMETHODIMP CMAccessible:: get_nActions(long __RPC_FAR *nActions) } catch(...) { - *nActions = 0L; + *nActions = 0; return S_OK; } } diff --git a/writerperfect/source/common/WPXSvInputStream.cxx b/writerperfect/source/common/WPXSvInputStream.cxx index 0fd2ae33ef0a..f70b4548267a 100644 --- a/writerperfect/source/common/WPXSvInputStream.cxx +++ b/writerperfect/source/common/WPXSvInputStream.cxx @@ -507,12 +507,12 @@ const unsigned char *WPXSvInputStreamImpl::read(unsigned long numBytes, unsigned long WPXSvInputStreamImpl::tell() { if ((mnLength == 0) || !mxStream.is() || !mxSeekable.is()) - return -1L; + return -1; else { const sal_Int64 tmpPosition = mxSeekable->getPosition(); if ((tmpPosition < 0) || (tmpPosition > LONG_MAX)) - return -1L; + return -1; return (long)tmpPosition; } } diff --git a/xmloff/source/core/nmspmap.cxx b/xmloff/source/core/nmspmap.cxx index 47d6e07ebec4..441b4c53bde0 100644 --- a/xmloff/source/core/nmspmap.cxx +++ b/xmloff/source/core/nmspmap.cxx @@ -308,7 +308,7 @@ sal_uInt16 SvXMLNamespaceMap::GetKeyByAttrName_( const OUString& rAttrName, rtl::Reference<NameSpaceEntry> xEntry(new NameSpaceEntry); sal_Int32 nColonPos = rAttrName.indexOf( ':' ); - if( -1L == nColonPos ) + if( -1 == nColonPos ) { // case: no ':' found -> default namespace (xEntry->sPrefix).clear(); @@ -318,7 +318,7 @@ sal_uInt16 SvXMLNamespaceMap::GetKeyByAttrName_( const OUString& rAttrName, { // normal case: ':' found -> get prefix/suffix xEntry->sPrefix = rAttrName.copy( 0L, nColonPos ); - xEntry->sName = rAttrName.copy( nColonPos + 1L ); + xEntry->sName = rAttrName.copy( nColonPos + 1 ); } if( pPrefix ) @@ -337,7 +337,7 @@ sal_uInt16 SvXMLNamespaceMap::GetKeyByAttrName_( const OUString& rAttrName, else if ( xEntry->sPrefix == sXMLNS ) // not found, but xmlns prefix: return xmlns 'namespace' nKey = xEntry->nKey = XML_NAMESPACE_XMLNS; - else if( nColonPos == -1L ) + else if( nColonPos == -1 ) // not found, and no namespace: 'namespace' none nKey = xEntry->nKey = XML_NAMESPACE_NONE; else diff --git a/xmloff/source/core/unoatrcn.cxx b/xmloff/source/core/unoatrcn.cxx index df18d1f91543..8ab927f9ce3d 100644 --- a/xmloff/source/core/unoatrcn.cxx +++ b/xmloff/source/core/unoatrcn.cxx @@ -63,7 +63,7 @@ sal_uInt16 SvUnoAttributeContainer::getIndexByName(const OUString& aName ) const const sal_uInt16 nAttrCount = mpContainer->GetAttrCount(); sal_Int32 nPos = aName.indexOf( ':' ); - if( nPos == -1L ) + if( nPos == -1 ) { for( sal_uInt16 nAttr = 0; nAttr < nAttrCount; nAttr++ ) { @@ -75,7 +75,7 @@ sal_uInt16 SvUnoAttributeContainer::getIndexByName(const OUString& aName ) const else { const OUString aPrefix( aName.copy( 0L, nPos ) ); - const OUString aLName( aName.copy( nPos+1L ) ); + const OUString aLName( aName.copy( nPos+1 ) ); for( sal_uInt16 nAttr = 0; nAttr < nAttrCount; nAttr++ ) { @@ -158,10 +158,10 @@ void SAL_CALL SvUnoAttributeContainer::replaceByName(const OUString& aName, cons throw container::NoSuchElementException(); sal_Int32 nPos = aName.indexOf( ':' ); - if( nPos != -1L ) + if( nPos != -1 ) { const OUString aPrefix( aName.copy( 0L, nPos )); - const OUString aLName( aName.copy( nPos+1L )); + const OUString aLName( aName.copy( nPos+1 )); if( pData->Namespace.isEmpty() ) { @@ -199,10 +199,10 @@ void SAL_CALL SvUnoAttributeContainer::insertByName(const OUString& aName, const throw container::ElementExistException(); sal_Int32 nPos = aName.indexOf( ':' ); - if( nPos != -1L ) + if( nPos != -1 ) { const OUString aPrefix( aName.copy( 0L, nPos )); - const OUString aLName( aName.copy( nPos+1L )); + const OUString aLName( aName.copy( nPos+1 )); if( pData->Namespace.isEmpty() ) { diff --git a/xmloff/source/draw/xexptran.cxx b/xmloff/source/draw/xexptran.cxx index afa03e0857cb..efbb82111ac8 100644 --- a/xmloff/source/draw/xexptran.cxx +++ b/xmloff/source/draw/xexptran.cxx @@ -330,7 +330,7 @@ const OUString& SdXMLImExTransform2D::GetExportString(const SvXMLUnitConverter& } // if not the last entry, add one space to next tag - if(a + 1UL != maList.size()) + if(a + 1 != maList.size()) { aNewString += aEmptySpace; } @@ -736,7 +736,7 @@ const OUString& SdXMLImExTransform3D::GetExportString(const SvXMLUnitConverter& } // if not the last entry, add one space to next tag - if(a + 1UL != maList.size()) + if(a + 1 != maList.size()) { aNewString += aEmptySpace; } diff --git a/xmloff/source/style/fonthdl.cxx b/xmloff/source/style/fonthdl.cxx index a04f4c1b8d26..0f0caa3446f8 100644 --- a/xmloff/source/style/fonthdl.cxx +++ b/xmloff/source/style/fonthdl.cxx @@ -127,13 +127,13 @@ bool XMLFontFamilyNamePropHdl::exportXML( OUString& rStrExpValue, const uno::Any // Set position to the character behind the ';', so we won't // forget this. - if( -1L != nPos ) + if( -1 != nPos ) nPos++; // If the property value was empty, we stop now. // If there is a ';' at the first position, the empty name // at the start will be removed. - if( 0L == nLast ) + if( 0 == nLast ) continue; // nFirst and nLast now denote the first and last character of @@ -174,7 +174,7 @@ bool XMLFontFamilyNamePropHdl::exportXML( OUString& rStrExpValue, const uno::Any sValue.append( '\'' ); } } - while( -1L != nPos ); + while( -1 != nPos ); rStrExpValue = sValue.makeStringAndClear(); diff --git a/xmloff/source/style/xmlnumi.cxx b/xmloff/source/style/xmlnumi.cxx index 5e9429e1232d..eef7317cd281 100644 --- a/xmloff/source/style/xmlnumi.cxx +++ b/xmloff/source/style/xmlnumi.cxx @@ -301,7 +301,7 @@ SvxXMLListLevelStyleContext_Impl::SvxXMLListLevelStyleContext_Impl( { case XML_TOK_TEXT_LEVEL_ATTR_LEVEL: nLevel = rValue.toInt32(); - if( nLevel >= 1L ) + if( nLevel >= 1 ) nLevel--; else nLevel = 0; diff --git a/xmloff/source/text/txtparae.cxx b/xmloff/source/text/txtparae.cxx index b8f4f09d7e0b..1abc10f0095b 100644 --- a/xmloff/source/text/txtparae.cxx +++ b/xmloff/source/text/txtparae.cxx @@ -770,7 +770,7 @@ OUString XMLTextParagraphExport::FindTextStyleAndHyperlink( ppAddStates++; } } - if( (aPropStates.size() - nIgnoreProps) > 0L ) + if( (aPropStates.size() - nIgnoreProps) > 0 ) { // erase the character style, otherwise the autostyle cannot be found! // erase the hyperlink, otherwise the autostyle cannot be found! diff --git a/xmloff/source/text/txtparai.cxx b/xmloff/source/text/txtparai.cxx index f960ef371379..b52f9f45061d 100644 --- a/xmloff/source/text/txtparai.cxx +++ b/xmloff/source/text/txtparai.cxx @@ -117,7 +117,7 @@ XMLCharContext::XMLCharContext( IsXMLToken( aLocalName, XML_C ) ) { sal_Int32 nTmp = xAttrList->getValueByIndex(i).toInt32(); - if( nTmp > 0L ) + if( nTmp > 0 ) { if( nTmp > USHRT_MAX ) m_nCount = USHRT_MAX; @@ -1829,7 +1829,7 @@ XMLParaContext::XMLParaContext( case XML_TOK_TEXT_P_LEVEL: { sal_Int32 nTmp = rValue.toInt32(); - if( nTmp > 0L ) + if( nTmp > 0 ) { if( nTmp > 127 ) nTmp = 127; |