[Libreoffice-commits] core.git: basegfx/source basic/source chart2/source connectivity/source cui/source drawinglayer/source editeng/source extensions/source filter/source forms/source include/basegfx include/basic include/svtools include/svx include/tools include/vcl include/xmloff lotuswordpro/source reportdesign/source salhelper/source sal/osl sal/rtl sc/source sd/source sfx2/source shell/source slideshow/source sot/source starmath/source stoc/test svl/source svtools/source svx/source sw/qa sw/source tools/source unotools/source vcl/inc vcl/opengl vcl/source vcl/win winaccessibility/source writerperfect/source xmloff/source
Noel Grandin
noel.grandin at collabora.co.uk
Thu Aug 17 09:27:15 UTC 2017
basegfx/source/curve/b2dcubicbezier.cxx | 2
basic/source/runtime/methods.cxx | 2
basic/source/runtime/props.cxx | 2
chart2/source/controller/main/SelectionHelper.cxx | 4
connectivity/source/drivers/firebird/ResultSet.cxx | 2
cui/source/options/optchart.cxx | 2
drawinglayer/source/primitive2d/animatedprimitive2d.cxx | 4
drawinglayer/source/primitive2d/graphicprimitive2d.cxx | 2
drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx | 6
drawinglayer/source/primitive2d/textlayoutdevice.cxx | 2
drawinglayer/source/primitive3d/polygontubeprimitive3d.cxx | 4
drawinglayer/source/primitive3d/sdrcubeprimitive3d.cxx | 8
drawinglayer/source/primitive3d/sdrextrudelathetools3d.cxx | 42 -
drawinglayer/source/primitive3d/sdrlatheprimitive3d.cxx | 2
drawinglayer/source/primitive3d/sdrsphereprimitive3d.cxx | 2
drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx | 2
drawinglayer/source/processor3d/defaultprocessor3d.cxx | 6
drawinglayer/source/texture/texture3d.cxx | 4
editeng/source/editeng/editeng.cxx | 2
extensions/source/scanner/grid.cxx | 2
filter/source/graphicfilter/egif/egif.cxx | 4
filter/source/graphicfilter/ipcd/ipcd.cxx | 2
filter/source/msfilter/svdfppt.cxx | 8
forms/source/component/imgprod.cxx | 10
include/basegfx/pixel/bpixel.hxx | 2
include/basegfx/polygon/b3dpolypolygontools.hxx | 8
include/basic/sberrors.hxx | 218 +++++-----
include/svtools/grfmgr.hxx | 4
include/svtools/parhtml.hxx | 6
include/svx/contdlg.hxx | 2
include/svx/galmisc.hxx | 4
include/svx/svdmark.hxx | 2
include/tools/stream.hxx | 2
include/vcl/animate.hxx | 2
include/vcl/bitmap.hxx | 2
include/vcl/graph.hxx | 2
include/vcl/lineinfo.hxx | 2
include/vcl/metaact.hxx | 2
include/vcl/salbtype.hxx | 6
include/xmloff/styleexp.hxx | 4
lotuswordpro/source/filter/lwpbasetype.cxx | 4
reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx | 12
sal/osl/unx/profile.cxx | 2
sal/rtl/cipher.cxx | 12
sal/rtl/digest.cxx | 12
sal/rtl/random.cxx | 6
salhelper/source/timer.cxx | 2
sc/source/core/data/document.cxx | 4
sc/source/filter/excel/xltools.cxx | 2
sc/source/filter/lotus/lotread.cxx | 4
sc/source/ui/Accessibility/AccessibleCsvControl.cxx | 2
sc/source/ui/cctrl/dpcontrol.cxx | 2
sc/source/ui/dbgui/csvcontrol.cxx | 4
sc/source/ui/dbgui/csvgrid.cxx | 2
sc/source/ui/dbgui/csvruler.cxx | 2
sc/source/ui/drawfunc/fuconrec.cxx | 2
sc/source/ui/view/gridwin4.cxx | 2
sd/source/core/PageListWatcher.cxx | 6
sd/source/filter/html/htmlex.cxx | 4
sd/source/ui/app/sdmod2.cxx | 4
sd/source/ui/dlg/copydlg.cxx | 12
sd/source/ui/dlg/custsdlg.cxx | 4
sd/source/ui/dlg/vectdlg.cxx | 14
sd/source/ui/func/fuconrec.cxx | 2
sd/source/ui/func/fucopy.cxx | 6
sd/source/ui/func/fumorph.cxx | 8
sd/source/ui/func/fuoaprms.cxx | 4
sd/source/ui/func/fupoor.cxx | 4
sd/source/ui/func/fusel.cxx | 4
sd/source/ui/func/fusldlg.cxx | 2
sd/source/ui/inc/DrawViewShell.hxx | 2
sd/source/ui/slideshow/slideshowimpl.cxx | 4
sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx | 2
sd/source/ui/view/drawview.cxx | 2
sd/source/ui/view/drtxtob.cxx | 4
sd/source/ui/view/drviews4.cxx | 4
sd/source/ui/view/drviewsa.cxx | 2
sd/source/ui/view/outlnvsh.cxx | 4
sd/source/ui/view/outlview.cxx | 12
sd/source/ui/view/sdview.cxx | 2
sd/source/ui/view/viewshel.cxx | 2
sfx2/source/bastyp/mieclip.cxx | 2
shell/source/win32/shlxthandler/ooofilt/stream_helper.cxx | 4
slideshow/source/engine/shapes/drawinglayeranimation.cxx | 22 -
sot/source/sdstor/stg.cxx | 4
sot/source/sdstor/stgole.cxx | 4
starmath/source/node.cxx | 4
stoc/test/testintrosp.cxx | 4
svl/source/numbers/zformat.cxx | 2
svtools/source/contnr/treelist.cxx | 2
svtools/source/control/toolbarmenu.cxx | 2
svtools/source/graphic/grfcache.cxx | 2
svtools/source/graphic/grfmgr.cxx | 4
svtools/source/graphic/grfmgr2.cxx | 40 -
svtools/source/svhtml/parhtml.cxx | 4
svx/source/customshapes/EnhancedCustomShape2d.cxx | 12
svx/source/customshapes/EnhancedCustomShape3d.cxx | 8
svx/source/dialog/_contdlg.cxx | 2
svx/source/dialog/contimp.hxx | 2
svx/source/engine3d/scene3d.cxx | 2
svx/source/fmcomp/gridctrl.cxx | 2
svx/source/form/fmvwimp.cxx | 4
svx/source/gallery2/codec.cxx | 4
svx/source/gallery2/galbrws2.cxx | 4
svx/source/sdr/animation/animationstate.cxx | 2
svx/source/sdr/animation/scheduler.cxx | 2
svx/source/sdr/event/eventhandler.cxx | 2
svx/source/sdr/overlay/overlaymanagerbuffered.cxx | 8
svx/source/sdr/primitive2d/sdrattributecreator.cxx | 12
svx/source/sdr/primitive3d/sdrattributecreator3d.cxx | 12
svx/source/sidebar/possize/PosSizePropertyPanel.cxx | 2
svx/source/svdraw/polypolygoneditor.cxx | 2
svx/source/svdraw/sdrpagewindow.cxx | 4
svx/source/svdraw/svdattr.cxx | 2
svx/source/svdraw/svdedtv.cxx | 2
svx/source/svdraw/svdedtv1.cxx | 8
svx/source/svdraw/svdedtv2.cxx | 22 -
svx/source/svdraw/svdedxv.cxx | 4
svx/source/svdraw/svdfmtf.cxx | 14
svx/source/svdraw/svdhdl.cxx | 4
svx/source/svdraw/svdmark.cxx | 8
svx/source/svdraw/svdmodel.cxx | 2
svx/source/svdraw/svdmrkv.cxx | 2
svx/source/svdraw/svdobj.cxx | 2
svx/source/svdraw/svdocapt.cxx | 2
svx/source/svdraw/svdocirc.cxx | 12
svx/source/svdraw/svdograf.cxx | 2
svx/source/svdraw/svdomeas.cxx | 8
svx/source/svdraw/svdopath.cxx | 32 -
svx/source/svdraw/svdotext.cxx | 2
svx/source/svdraw/svdotextdecomposition.cxx | 18
svx/source/svdraw/svdotextpathdecomposition.cxx | 6
svx/source/svdraw/svdpagv.cxx | 2
svx/source/svdraw/svdpntv.cxx | 14
svx/source/svdraw/svdpoev.cxx | 2
svx/source/svdraw/svdsnpv.cxx | 2
svx/source/svdraw/svdviter.cxx | 2
svx/source/svdraw/svdxcgv.cxx | 2
svx/source/table/accessibletableshape.cxx | 4
svx/source/tbxctrls/linectrl.cxx | 4
svx/source/unodraw/unoshape.cxx | 2
svx/source/xoutdev/_xoutbmp.cxx | 26 -
svx/source/xoutdev/xattr.cxx | 4
svx/source/xoutdev/xattr2.cxx | 4
sw/qa/extras/ww8export/ww8export.cxx | 2
sw/source/core/access/accdoc.cxx | 4
sw/source/core/access/accframe.cxx | 2
sw/source/core/access/accpara.cxx | 2
sw/source/core/access/acctable.cxx | 4
sw/source/core/frmedt/feshview.cxx | 2
sw/source/core/frmedt/fews.cxx | 4
sw/source/core/inc/frame.hxx | 4
sw/source/core/layout/anchoredobject.cxx | 2
sw/source/core/layout/calcmove.cxx | 4
sw/source/core/layout/findfrm.cxx | 2
sw/source/core/layout/fly.cxx | 4
sw/source/core/layout/objectformatter.cxx | 2
sw/source/core/layout/objectformattertxtfrm.cxx | 2
sw/source/core/layout/pagechg.cxx | 2
sw/source/core/layout/sectfrm.cxx | 2
sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx | 2
sw/source/core/view/viewsh.cxx | 6
sw/source/filter/ww8/rtfattributeoutput.cxx | 2
sw/source/filter/xml/xmlexpit.cxx | 2
sw/source/filter/xml/xmlimpit.cxx | 2
sw/source/filter/xml/xmltble.cxx | 8
sw/source/filter/xml/xmltbli.cxx | 152 +++---
sw/source/uibase/dochdl/swdtflvr.cxx | 2
sw/source/uibase/misc/redlndlg.cxx | 4
sw/source/uibase/shells/drwbassh.cxx | 4
sw/source/uibase/uno/unotxdoc.cxx | 4
sw/source/uibase/wrtsh/delete.cxx | 2
tools/source/generic/b3dtrans.cxx | 8
tools/source/generic/poly.cxx | 16
tools/source/stream/stream.cxx | 12
tools/source/stream/strmwnt.cxx | 4
tools/source/stream/vcompat.cxx | 2
unotools/source/misc/datetime.cxx | 2
vcl/inc/impoctree.hxx | 6
vcl/inc/octree.hxx | 2
vcl/opengl/gdiimpl.cxx | 2
vcl/source/bitmap/bitmapscalesuper.cxx | 68 +--
vcl/source/control/longcurr.cxx | 2
vcl/source/control/spinfld.cxx | 2
vcl/source/filter/graphicfilter2.cxx | 2
vcl/source/filter/igif/gifread.cxx | 24 -
vcl/source/filter/jpeg/JpegWriter.cxx | 6
vcl/source/filter/jpeg/transupp.c | 2
vcl/source/filter/sgfbram.cxx | 6
vcl/source/filter/sgvmain.cxx | 16
vcl/source/filter/wmf/wmfwr.hxx | 2
vcl/source/gdi/alpha.cxx | 12
vcl/source/gdi/animate.cxx | 10
vcl/source/gdi/bitmap.cxx | 142 +++---
vcl/source/gdi/bitmap3.cxx | 12
vcl/source/gdi/dibtools.cxx | 24 -
vcl/source/gdi/gdimtf.cxx | 2
vcl/source/gdi/impanmvw.cxx | 4
vcl/source/gdi/impvect.cxx | 14
vcl/source/gdi/pngwrite.cxx | 2
vcl/source/gdi/svmconverter.cxx | 2
vcl/source/outdev/bitmap.cxx | 30 -
vcl/source/outdev/outdev.cxx | 2
vcl/source/outdev/rect.cxx | 16
vcl/source/outdev/text.cxx | 4
vcl/source/outdev/textline.cxx | 2
vcl/source/outdev/transparent.cxx | 12
vcl/source/outdev/wallpaper.cxx | 14
vcl/source/window/menufloatingwindow.cxx | 2
vcl/source/window/scrwnd.cxx | 22 -
vcl/win/gdi/salbmp.cxx | 6
vcl/win/gdi/salgdi.cxx | 14
winaccessibility/source/UAccCOM/MAccessible.cxx | 4
writerperfect/source/common/WPXSvInputStream.cxx | 4
xmloff/source/core/nmspmap.cxx | 6
xmloff/source/core/unoatrcn.cxx | 12
xmloff/source/draw/xexptran.cxx | 4
xmloff/source/style/fonthdl.cxx | 6
xmloff/source/style/xmlnumi.cxx | 2
xmloff/source/text/txtparae.cxx | 2
xmloff/source/text/txtparai.cxx | 4
221 files changed, 900 insertions(+), 900 deletions(-)
New commits:
commit 2e8acde112e1c6754df26902e79a78346ba45a2d
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Wed Aug 16 16:27:55 2017 +0200
remove UL/L suffixes from integer constants on the RHS of expressions
Change-Id: I899a8126c9d971601fea6c77eca165718aea0ac5
Reviewed-on: https://gerrit.libreoffice.org/41237
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
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& )
{
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list