diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-08-16 16:27:55 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-08-17 11:25:21 +0200 |
commit | 2e8acde112e1c6754df26902e79a78346ba45a2d (patch) | |
tree | 2d836747a7aafdd0b64ab9aabf01be59e94745d4 /svtools | |
parent | 006a7b50546c57e260245d4630de565705f2fc38 (diff) |
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>
Diffstat (limited to 'svtools')
-rw-r--r-- | svtools/source/contnr/treelist.cxx | 2 | ||||
-rw-r--r-- | svtools/source/control/toolbarmenu.cxx | 2 | ||||
-rw-r--r-- | svtools/source/graphic/grfcache.cxx | 2 | ||||
-rw-r--r-- | svtools/source/graphic/grfmgr.cxx | 4 | ||||
-rw-r--r-- | svtools/source/graphic/grfmgr2.cxx | 40 | ||||
-rw-r--r-- | svtools/source/svhtml/parhtml.cxx | 4 |
6 files changed, 27 insertions, 27 deletions
diff --git a/svtools/source/contnr/treelist.cxx b/svtools/source/contnr/treelist.cxx index 7d47e4b5535a..0aeecd1a47a4 100644 --- a/svtools/source/contnr/treelist.cxx +++ b/svtools/source/contnr/treelist.cxx @@ -342,7 +342,7 @@ void SvTreeList::Move( SvTreeListEntry* pSrcEntry, SvTreeListEntry* pDstEntry ) if ( !pDstEntry ) { pParent = pRootItem; - nPos = 0UL; + nPos = 0; } else { diff --git a/svtools/source/control/toolbarmenu.cxx b/svtools/source/control/toolbarmenu.cxx index b48c79a64811..822a85892564 100644 --- a/svtools/source/control/toolbarmenu.cxx +++ b/svtools/source/control/toolbarmenu.cxx @@ -1376,7 +1376,7 @@ void ToolbarMenu::Command( const CommandEvent& rCEvt ) const CommandWheelData* pData = rCEvt.GetWheelData(); if( !pData->GetModifier() && ( pData->GetMode() == CommandWheelMode::SCROLL ) ) { - implCursorUpDown( pData->GetDelta() > 0L, false ); + implCursorUpDown( pData->GetDelta() > 0, false ); } } } diff --git a/svtools/source/graphic/grfcache.cxx b/svtools/source/graphic/grfcache.cxx index f98534c95adf..14abb1d6e428 100644 --- a/svtools/source/graphic/grfcache.cxx +++ b/svtools/source/graphic/grfcache.cxx @@ -1214,7 +1214,7 @@ bool GraphicCache::DrawDisplayCacheObj( OutputDevice* pOut, const Point& rPt, co bool GraphicCache::ImplFreeDisplayCacheSpace( sal_uLong nSizeToFree ) { - sal_uLong nFreedSize = 0UL; + sal_uLong nFreedSize = 0; if( nSizeToFree ) { diff --git a/svtools/source/graphic/grfmgr.cxx b/svtools/source/graphic/grfmgr.cxx index 83b42ccfa2e4..0664c190c192 100644 --- a/svtools/source/graphic/grfmgr.cxx +++ b/svtools/source/graphic/grfmgr.cxx @@ -461,7 +461,7 @@ bool GraphicObject::Draw( OutputDevice* pOut, const Point& rPt, const Size& rSz, pOut->SetDrawMode( nOldDrawMode & ~DrawModeFlags( DrawModeFlags::SettingsLine | DrawModeFlags::SettingsFill | DrawModeFlags::SettingsText | DrawModeFlags::SettingsGradient ) ); // mirrored horizontically - if( aSz.Width() < 0L ) + if( aSz.Width() < 0 ) { aPt.X() += aSz.Width() + 1; aSz.Width() = -aSz.Width(); @@ -469,7 +469,7 @@ bool GraphicObject::Draw( OutputDevice* pOut, const Point& rPt, const Size& rSz, } // mirrored vertically - if( aSz.Height() < 0L ) + if( aSz.Height() < 0 ) { aPt.Y() += aSz.Height() + 1; aSz.Height() = -aSz.Height(); diff --git a/svtools/source/graphic/grfmgr2.cxx b/svtools/source/graphic/grfmgr2.cxx index 3a6bb6f2fd21..7a9fe8ddd166 100644 --- a/svtools/source/graphic/grfmgr2.cxx +++ b/svtools/source/graphic/grfmgr2.cxx @@ -333,7 +333,7 @@ bool ImplCreateRotatedScaled( const BitmapEx& rBmpEx, const GraphicAttr& rAttrib fRevScaleX = (double) ( aBitmapWidth - 1 ) / (double)( aUnrotatedWidth - 1 ); // create horizontal mapping table long x; - for( x = 0, nTmpX = aBitmapWidth - 1L, nTmp = aBitmapWidth - 2L >= 0 ? aBitmapWidth -2L : 0L; x < aUnrotatedWidth; x++ ) + for( x = 0, nTmpX = aBitmapWidth - 1, nTmp = aBitmapWidth - 2 >= 0 ? aBitmapWidth -2 : 0L; x < aUnrotatedWidth; x++ ) { fTmp = x * fRevScaleX; @@ -372,7 +372,7 @@ bool ImplCreateRotatedScaled( const BitmapEx& rBmpEx, const GraphicAttr& rAttrib fRevScaleY = (double) ( aBitmapHeight - 1 ) / (double)( aUnrotatedHeight - 1 ); // create vertical mapping table long y; - for( y = 0, nTmpY = aBitmapHeight - 1L, nTmp = aBitmapHeight - 2L >= 0 ? aBitmapHeight - 2L : 0L; y < aUnrotatedHeight; y++ ) + for( y = 0, nTmpY = aBitmapHeight - 1, nTmp = aBitmapHeight - 2 >= 0 ? aBitmapHeight - 2 : 0L; y < aUnrotatedHeight; y++ ) { fTmp = y * fRevScaleY; @@ -414,8 +414,8 @@ bool ImplCreateRotatedScaled( const BitmapEx& rBmpEx, const GraphicAttr& rAttrib const double fCosAngle = cos( nRot10 * F_PI1800 ); const double fSinAngle = sin( nRot10 * F_PI1800 ); - const long aTargetWidth = nEndX - nStartX + 1L; - const long aTargetHeight = nEndY - nStartY + 1L; + const long aTargetWidth = nEndX - nStartX + 1; + const long aTargetHeight = nEndY - nStartY + 1; std::unique_ptr<long[]> pCosX(new long[ aTargetWidth ]); std::unique_ptr<long[]> pSinX(new long[ aTargetWidth ]); std::unique_ptr<long[]> pCosY(new long[ aTargetHeight ]); @@ -467,8 +467,8 @@ bool ImplCreateRotatedScaled( const BitmapEx& rBmpEx, const GraphicAttr& rAttrib nUnRotX = ( pCosX[ x ] - nSinY ) >> 8; nUnRotY = ( pSinX[ x ] + nCosY ) >> 8; - if( ( nUnRotX >= 0L ) && ( nUnRotX < aUnrotatedWidth ) && - ( nUnRotY >= 0L ) && ( nUnRotY < aUnrotatedHeight ) ) + if( ( nUnRotX >= 0 ) && ( nUnRotX < aUnrotatedWidth ) && + ( nUnRotY >= 0 ) && ( nUnRotY < aUnrotatedHeight ) ) { nTmpX = pMapIX[ nUnRotX ]; nTmpFX = pMapFX[ nUnRotX ]; @@ -509,8 +509,8 @@ bool ImplCreateRotatedScaled( const BitmapEx& rBmpEx, const GraphicAttr& rAttrib nUnRotX = ( pCosX[ x ] - nSinY ) >> 8; nUnRotY = ( pSinX[ x ] + nCosY ) >> 8; - if( ( nUnRotX >= 0L ) && ( nUnRotX < aUnrotatedWidth ) && - ( nUnRotY >= 0L ) && ( nUnRotY < aUnrotatedHeight ) ) + if( ( nUnRotX >= 0 ) && ( nUnRotX < aUnrotatedWidth ) && + ( nUnRotY >= 0 ) && ( nUnRotY < aUnrotatedHeight ) ) { nTmpX = pMapIX[ nUnRotX ]; nTmpFX = pMapFX[ nUnRotX ]; @@ -648,8 +648,8 @@ bool ImplCreateRotatedScaled( const BitmapEx& rBmpEx, const GraphicAttr& rAttrib nUnRotX = ( pCosX[ nX ] - nSinY ) >> 8; nUnRotY = ( pSinX[ nX ] + nCosY ) >> 8; - if( ( nUnRotX >= 0L ) && ( nUnRotX < aUnrotatedWidth ) && - ( nUnRotY >= 0L ) && ( nUnRotY < aUnrotatedHeight ) ) + if( ( nUnRotX >= 0 ) && ( nUnRotX < aUnrotatedWidth ) && + ( nUnRotY >= 0 ) && ( nUnRotY < aUnrotatedHeight ) ) { nTmpX = pMapIX[ nUnRotX ]; nTmpFX = pMapFX[ nUnRotX ]; @@ -747,8 +747,8 @@ bool ImplCreateRotatedScaled( const BitmapEx& rBmpEx, const GraphicAttr& rAttrib nUnRotX = ( pCosX[ nX ] - nSinY ) >> 8; nUnRotY = ( pSinX[ nX ] + nCosY ) >> 8; - if( ( nUnRotX >= 0L ) && ( nUnRotX < aUnrotatedWidth ) && - ( nUnRotY >= 0L ) && ( nUnRotY < aUnrotatedHeight ) ) + if( ( nUnRotX >= 0 ) && ( nUnRotX < aUnrotatedWidth ) && + ( nUnRotY >= 0 ) && ( nUnRotY < aUnrotatedHeight ) ) { nTmpX = pMapIX[ nUnRotX ]; nTmpFX = pMapFX[ nUnRotX ]; @@ -803,11 +803,11 @@ bool ImplCreateRotatedScaled( const BitmapEx& rBmpEx, const GraphicAttr& rAttrib aTestB = pMAcc->GetBestMatchingColor( Color( COL_BLACK ) ); // create new horizontal mapping table - for( long nX = 0UL; nX < aUnrotatedWidth; nX++ ) + for( long nX = 0; nX < aUnrotatedWidth; nX++ ) pMapLX[ nX ] = FRound( (double) pMapIX[ nX ] + pMapFX[ nX ] / 1048576.0 ); // create new vertical mapping table - for( long nY = 0UL; nY < aUnrotatedHeight; nY++ ) + for( long nY = 0; nY < aUnrotatedHeight; nY++ ) pMapLY[ nY ] = FRound( (double) pMapIY[ nY ] + pMapFY[ nY ] / 1048576.0 ); // do mask rotation @@ -821,8 +821,8 @@ bool ImplCreateRotatedScaled( const BitmapEx& rBmpEx, const GraphicAttr& rAttrib nUnRotX = ( pCosX[ nX ] - nSinY ) >> 8; nUnRotY = ( pSinX[ nX ] + nCosY ) >> 8; - if( ( nUnRotX >= 0L ) && ( nUnRotX < aUnrotatedWidth ) && - ( nUnRotY >= 0L ) && ( nUnRotY < aUnrotatedHeight ) ) + if( ( nUnRotX >= 0 ) && ( nUnRotX < aUnrotatedWidth ) && + ( nUnRotY >= 0 ) && ( nUnRotY < aUnrotatedHeight ) ) { if( pMAcc ) { @@ -931,7 +931,7 @@ bool GraphicManager::ImplCreateOutput( OutputDevice* pOutputDevice, } else { - nStartX = -1L; // invalid + nStartX = -1; // invalid } } else @@ -939,12 +939,12 @@ bool GraphicManager::ImplCreateOutput( OutputDevice* pOutputDevice, aOutPoint = pOutputDevice->PixelToLogic( aOutputPointPix ); aOutSize = pOutputDevice->PixelToLogic( aOutputSizePix ); nStartX = nStartY = 0; - nEndX = aOutputSizePix.Width() - 1L; - nEndY = aOutputSizePix.Height() - 1L; + nEndX = aOutputSizePix.Width() - 1; + nEndY = aOutputSizePix.Height() - 1; } // do transformation - if( nStartX >= 0L ) + if( nStartX >= 0 ) { const bool bSimple = ( 1 == nW || 1 == nH ); diff --git a/svtools/source/svhtml/parhtml.cxx b/svtools/source/svhtml/parhtml.cxx index d576dd8fef05..25fdcd73db7c 100644 --- a/svtools/source/svhtml/parhtml.cxx +++ b/svtools/source/svhtml/parhtml.cxx @@ -434,7 +434,7 @@ HtmlTokenId HTMLParser::ScanText( const sal_Unicode cBreak ) else if( rtl::isAsciiAlpha( nNextCh ) ) { OUStringBuffer sEntityBuffer( MAX_ENTITY_LEN ); - sal_Int32 nPos = 0L; + sal_Int32 nPos = 0; do { sEntityBuffer.appendUtf32( nNextCh ); @@ -692,7 +692,7 @@ HtmlTokenId HTMLParser::ScanText( const sal_Unicode cBreak ) if( sal_Unicode(EOF) == (nNextCh = GetNextChar()) && rInput.IsEof() ) { - if( !aToken.isEmpty() || sTmpBuffer.getLength() > 1L ) + if( !aToken.isEmpty() || sTmpBuffer.getLength() > 1 ) { // Have seen s.th. aside from blanks? aToken += sTmpBuffer.makeStringAndClear(); |