diff options
Diffstat (limited to 'vcl')
-rw-r--r-- | vcl/qa/cppunit/fontmetric.cxx | 6 | ||||
-rw-r--r-- | vcl/source/filter/graphicfilter.cxx | 2 | ||||
-rw-r--r-- | vcl/source/filter/igif/gifread.cxx | 4 | ||||
-rw-r--r-- | vcl/source/gdi/animate.cxx | 2 | ||||
-rw-r--r-- | vcl/source/gdi/dibtools.cxx | 40 | ||||
-rw-r--r-- | vcl/source/gdi/impgraph.cxx | 12 | ||||
-rw-r--r-- | vcl/source/gdi/impvect.cxx | 8 | ||||
-rw-r--r-- | vcl/source/gdi/pngwrite.cxx | 2 | ||||
-rw-r--r-- | vcl/source/window/scrwnd.cxx | 8 |
9 files changed, 42 insertions, 42 deletions
diff --git a/vcl/qa/cppunit/fontmetric.cxx b/vcl/qa/cppunit/fontmetric.cxx index 93378c6e581c..3166752f3273 100644 --- a/vcl/qa/cppunit/fontmetric.cxx +++ b/vcl/qa/cppunit/fontmetric.cxx @@ -68,13 +68,13 @@ void VclFontMetricTest::testSpacings() aFontMetric.SetDescent( 100 ); CPPUNIT_ASSERT_EQUAL( aFontMetric.GetDescent(), 100L ); - aFontMetric.SetExternalLeading( 100L ); + aFontMetric.SetExternalLeading( 100 ); CPPUNIT_ASSERT_EQUAL( aFontMetric.GetExternalLeading(), 100L ); - aFontMetric.SetInternalLeading( 100L ); + aFontMetric.SetInternalLeading( 100 ); CPPUNIT_ASSERT_EQUAL( aFontMetric.GetInternalLeading(), 100L ); - aFontMetric.SetLineHeight( 100L ); + aFontMetric.SetLineHeight( 100 ); CPPUNIT_ASSERT_EQUAL( aFontMetric.GetLineHeight(), 100L ); } diff --git a/vcl/source/filter/graphicfilter.cxx b/vcl/source/filter/graphicfilter.cxx index 5fea84fed4e2..4747301d4510 100644 --- a/vcl/source/filter/graphicfilter.cxx +++ b/vcl/source/filter/graphicfilter.cxx @@ -1832,7 +1832,7 @@ ErrCode GraphicFilter::ImportGraphic( Graphic& rGraphic, const OUString& rPath, nStatus = ERRCODE_GRFILTER_FILTERERROR; else { - aTempStream.Seek( 0L ); + aTempStream.Seek( 0 ); ReadGraphic( aTempStream, rGraphic ); if( aTempStream.GetError() ) diff --git a/vcl/source/filter/igif/gifread.cxx b/vcl/source/filter/igif/gifread.cxx index 3b2a74302d32..9b98fceca699 100644 --- a/vcl/source/filter/igif/gifread.cxx +++ b/vcl/source/filter/igif/gifread.cxx @@ -115,8 +115,8 @@ GIFReader::GIFReader( SvStream& rStm ) , nYAcc ( 0 ) , nLastPos ( rStm.Tell() ) , nMaxStreamData( rStm.remainingSize() ) - , nLogWidth100 ( 0UL ) - , nLogHeight100 ( 0UL ) + , nLogWidth100 ( 0 ) + , nLogHeight100 ( 0 ) , nGlobalWidth ( 0 ) , nGlobalHeight ( 0 ) , nImageWidth ( 0 ) diff --git a/vcl/source/gdi/animate.cxx b/vcl/source/gdi/animate.cxx index 6b96cb971eca..2dab4e98c59a 100644 --- a/vcl/source/gdi/animate.cxx +++ b/vcl/source/gdi/animate.cxx @@ -788,7 +788,7 @@ SvStream& ReadAnimation( SvStream& rIStm, Animation& rAnimation ) AInfo::AInfo() : pOutDev( nullptr ), pViewData( nullptr ), - nExtraData( 0L ), + nExtraData( 0 ), bPause( false ) {} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/source/gdi/dibtools.cxx b/vcl/source/gdi/dibtools.cxx index a7242f39b26e..002f617cdb1b 100644 --- a/vcl/source/gdi/dibtools.cxx +++ b/vcl/source/gdi/dibtools.cxx @@ -84,17 +84,17 @@ struct DIBInfoHeader sal_uInt32 nColsImportant; DIBInfoHeader() - : nSize(0UL), - nWidth(0UL), - nHeight(0UL), + : nSize(0), + nWidth(0), + nHeight(0), nPlanes(0), nBitCount(0), nCompression(0), nSizeImage(0), - nXPelsPerMeter(0UL), - nYPelsPerMeter(0UL), - nColsUsed(0UL), - nColsImportant(0UL) + nXPelsPerMeter(0), + nYPelsPerMeter(0), + nColsUsed(0), + nColsImportant(0) {} }; @@ -116,19 +116,19 @@ struct DIBV5Header : public DIBInfoHeader DIBV5Header() : DIBInfoHeader(), - nV5RedMask(0UL), - nV5GreenMask(0UL), - nV5BlueMask(0UL), - nV5AlphaMask(0UL), - nV5CSType(0UL), + nV5RedMask(0), + nV5GreenMask(0), + nV5BlueMask(0), + nV5AlphaMask(0), + nV5CSType(0), aV5Endpoints(), - nV5GammaRed(0UL), - nV5GammaGreen(0UL), - nV5GammaBlue(0UL), - nV5Intent(0UL), - nV5ProfileData(0UL), - nV5ProfileSize(0UL), - nV5Reserved(0UL) + nV5GammaRed(0), + nV5GammaGreen(0), + nV5GammaBlue(0), + nV5Intent(0), + nV5ProfileData(0), + nV5ProfileSize(0), + nV5Reserved(0) {} }; @@ -1594,7 +1594,7 @@ bool ImplReadDIB( { const SvStreamEndian nOldFormat(rIStm.GetEndian()); const sal_uLong nOldPos(rIStm.Tell()); - sal_uLong nOffset(0UL); + sal_uLong nOffset(0); bool bRet(false); rIStm.SetEndian(SvStreamEndian::LITTLE); diff --git a/vcl/source/gdi/impgraph.cxx b/vcl/source/gdi/impgraph.cxx index 812e504880ab..e67191c8a5c0 100644 --- a/vcl/source/gdi/impgraph.cxx +++ b/vcl/source/gdi/impgraph.cxx @@ -99,7 +99,7 @@ Size GraphicReader::GetPreviewSize() const ImpGraphic::ImpGraphic() : meType ( GraphicType::NONE ), - mnSizeBytes ( 0UL ), + mnSizeBytes ( 0 ), mbSwapOut ( false ), mbDummyContext ( false ) { @@ -150,7 +150,7 @@ ImpGraphic::ImpGraphic(ImpGraphic&& rImpGraphic) ImpGraphic::ImpGraphic( const Bitmap& rBitmap ) : maEx ( rBitmap ), meType ( !rBitmap.IsEmpty() ? GraphicType::Bitmap : GraphicType::NONE ), - mnSizeBytes ( 0UL ), + mnSizeBytes ( 0 ), mbSwapOut ( false ), mbDummyContext ( false ) { @@ -159,7 +159,7 @@ ImpGraphic::ImpGraphic( const Bitmap& rBitmap ) : ImpGraphic::ImpGraphic( const BitmapEx& rBitmapEx ) : maEx ( rBitmapEx ), meType ( !rBitmapEx.IsEmpty() ? GraphicType::Bitmap : GraphicType::NONE ), - mnSizeBytes ( 0UL ), + mnSizeBytes ( 0 ), mbSwapOut ( false ), mbDummyContext ( false ) { @@ -167,7 +167,7 @@ ImpGraphic::ImpGraphic( const BitmapEx& rBitmapEx ) : ImpGraphic::ImpGraphic(const VectorGraphicDataPtr& rVectorGraphicDataPtr) : meType( rVectorGraphicDataPtr.get() ? GraphicType::Bitmap : GraphicType::NONE ), - mnSizeBytes( 0UL ), + mnSizeBytes( 0 ), mbSwapOut( false ), mbDummyContext ( false ), maVectorGraphicData(rVectorGraphicDataPtr) @@ -178,7 +178,7 @@ ImpGraphic::ImpGraphic( const Animation& rAnimation ) : maEx ( rAnimation.GetBitmapEx() ), mpAnimation ( o3tl::make_unique<Animation>( rAnimation ) ), meType ( GraphicType::Bitmap ), - mnSizeBytes ( 0UL ), + mnSizeBytes ( 0 ), mbSwapOut ( false ), mbDummyContext ( false ) { @@ -187,7 +187,7 @@ ImpGraphic::ImpGraphic( const Animation& rAnimation ) : ImpGraphic::ImpGraphic( const GDIMetaFile& rMtf ) : maMetaFile ( rMtf ), meType ( GraphicType::GdiMetafile ), - mnSizeBytes ( 0UL ), + mnSizeBytes ( 0 ), mbSwapOut ( false ), mbDummyContext ( false ) { diff --git a/vcl/source/gdi/impvect.cxx b/vcl/source/gdi/impvect.cxx index 96cf9728d657..b8cf13fe727f 100644 --- a/vcl/source/gdi/impvect.cxx +++ b/vcl/source/gdi/impvect.cxx @@ -144,8 +144,8 @@ public: ImplPointArray::ImplPointArray() : mpArray ( nullptr ), - mnSize ( 0UL ), - mnRealSize ( 0UL ) + mnSize ( 0 ), + mnRealSize ( 0 ) { } @@ -290,8 +290,8 @@ public: }; ImplChain::ImplChain() : - mnArraySize ( 1024UL ), - mnCount ( 0UL ) + mnArraySize ( 1024 ), + mnCount ( 0 ) { mpCodes.reset( new sal_uInt8[ mnArraySize ] ); } diff --git a/vcl/source/gdi/pngwrite.cxx b/vcl/source/gdi/pngwrite.cxx index e18b8dd878c2..bb0ee05d0f37 100644 --- a/vcl/source/gdi/pngwrite.cxx +++ b/vcl/source/gdi/pngwrite.cxx @@ -113,7 +113,7 @@ PNGWriterImpl::PNGWriterImpl( const BitmapEx& rBmpEx, , mnFilterType(0) , mnBBP(0) , mbTrueAlpha(false) - , mnCRC(0UL) + , mnCRC(0) { if (!rBmpEx.IsEmpty()) { diff --git a/vcl/source/window/scrwnd.cxx b/vcl/source/window/scrwnd.cxx index f90e22b79d9e..10008241c571 100644 --- a/vcl/source/window/scrwnd.cxx +++ b/vcl/source/window/scrwnd.cxx @@ -38,12 +38,12 @@ ImplWheelWindow::ImplWheelWindow( vcl::Window* pParent ) : FloatingWindow ( pParent, 0 ), - mnRepaintTime ( 1UL ), + mnRepaintTime ( 1 ), mnTimeout ( DEF_TIMEOUT ), mnWheelMode ( WheelMode::NONE ), - mnActDist ( 0UL ), - mnActDeltaX ( 0L ), - mnActDeltaY ( 0L ) + mnActDist ( 0 ), + mnActDeltaX ( 0 ), + mnActDeltaY ( 0 ) { // we need a parent SAL_WARN_IF( !pParent, "vcl", "ImplWheelWindow::ImplWheelWindow(): Parent not set!" ); |