diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-08-16 16:27:55 +0200 |
---|---|---|
committer | Ashod Nakashian <ashod.nakashian@collabora.co.uk> | 2017-12-05 08:19:24 -0500 |
commit | 116fca4a4cb01cfb646f2271daccaac76b90d423 (patch) | |
tree | 389df9824b7b4751395e3ad853df64aa5d98df1b /include | |
parent | New loplugin:dynexcspec: Add @throws documentation, dbaccess (diff) | |
download | core-116fca4a4cb01cfb646f2271daccaac76b90d423.tar.gz core-116fca4a4cb01cfb646f2271daccaac76b90d423.zip |
remove UL/L suffixes from integer constants on the RHS of expressions
Reviewed-on: https://gerrit.libreoffice.org/41237
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
(cherry picked from commit 2e8acde112e1c6754df26902e79a78346ba45a2d)
Change-Id: I899a8126c9d971601fea6c77eca165718aea0ac5
Reviewed-on: https://gerrit.libreoffice.org/45452
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
(cherry picked from commit 2887aefa4d4f60ba8b0cd7efd5d3a73ffb209781)
Diffstat (limited to 'include')
-rw-r--r-- | include/basegfx/pixel/bpixel.hxx | 2 | ||||
-rw-r--r-- | include/basegfx/polygon/b3dpolypolygontools.hxx | 8 | ||||
-rw-r--r-- | include/svtools/grfmgr.hxx | 4 | ||||
-rw-r--r-- | include/svtools/parhtml.hxx | 6 | ||||
-rw-r--r-- | include/svx/contdlg.hxx | 2 | ||||
-rw-r--r-- | include/svx/galmisc.hxx | 4 | ||||
-rw-r--r-- | include/svx/svdmark.hxx | 2 | ||||
-rw-r--r-- | include/tools/stream.hxx | 2 | ||||
-rw-r--r-- | include/vcl/animate.hxx | 2 | ||||
-rw-r--r-- | include/vcl/bitmap.hxx | 2 | ||||
-rw-r--r-- | include/vcl/graph.hxx | 2 | ||||
-rw-r--r-- | include/vcl/lineinfo.hxx | 2 | ||||
-rw-r--r-- | include/vcl/metaact.hxx | 2 | ||||
-rw-r--r-- | include/vcl/salbtype.hxx | 6 | ||||
-rw-r--r-- | include/xmloff/styleexp.hxx | 4 |
15 files changed, 25 insertions, 25 deletions
diff --git a/include/basegfx/pixel/bpixel.hxx b/include/basegfx/pixel/bpixel.hxx index bce856c27a97..fcf7fcc31c4b 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/svtools/grfmgr.hxx b/include/svtools/grfmgr.hxx index c1e165c1ed1a..0cd3d6f64e45 100644 --- a/include/svtools/grfmgr.hxx +++ b/include/svtools/grfmgr.hxx @@ -461,11 +461,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 f48106695a4a..85a961417460 100644 --- a/include/svtools/parhtml.hxx +++ b/include/svtools/parhtml.hxx @@ -246,21 +246,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 bbb7d5d7dba8..876aa70ded2f 100644 --- a/include/svx/contdlg.hxx +++ b/include/svx/contdlg.hxx @@ -73,7 +73,7 @@ public: static tools::PolyPolygon CreateAutoContour( const Graphic& rGraphic, const 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 4031af58369e..c9711c95ca1d 100644 --- a/include/svx/galmisc.hxx +++ b/include/svx/galmisc.hxx @@ -205,10 +205,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 39a5eb3f6c7a..731179c7c040 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* pPageView, Rectangle& rRect) const; bool TakeSnapRect(SdrPageView* pPageView, Rectangle& rRect) const; diff --git a/include/tools/stream.hxx b/include/tools/stream.hxx index 73955bf9c96f..3f457057e08a 100644 --- a/include/tools/stream.hxx +++ b/include/tools/stream.hxx @@ -623,7 +623,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 119499629d36..5f705444775d 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 474441719031..bc17cbc70c13 100644 --- a/include/vcl/bitmap.hxx +++ b/include/vcl/bitmap.hxx @@ -500,7 +500,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 1339a88c7319..9a398c76c9e0 100644 --- a/include/vcl/graph.hxx +++ b/include/vcl/graph.hxx @@ -176,7 +176,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 5041f3a954ee..3a52aaff98cb 100644 --- a/include/vcl/metaact.hxx +++ b/include/vcl/metaact.hxx @@ -1442,7 +1442,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 5129ee76f54f..0cf73e2745f5 100644 --- a/include/vcl/salbtype.hxx +++ b/include/vcl/salbtype.hxx @@ -76,11 +76,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 5f215069d06a..c4b1fc7df080 100644 --- a/include/xmloff/styleexp.hxx +++ b/include/xmloff/styleexp.hxx @@ -87,13 +87,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, |