remove UL/L suffixes from integer constants on the RHS of expressions

Change-Id: I899a8126c9d971601fea6c77eca165718aea0ac5
Reviewed-on: https://gerrit.libreoffice.org/41237
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

16 files changed, 134 insertions, 134 deletions

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,