diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2014-06-26 11:04:20 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-06-26 16:29:15 +0100 |
| commit | 4079089d0a3cf6b55c937447407f68b7339bca68 (patch) | |
| tree | 18aee7f2c10108d632ff0d3295f4943ded491e44 | |
| parent | 5b621a30ccf2ba3967e1189986bf1a3ea8079e8e (diff) | |
clang: Dead increment
Change-Id: I231218ab7a7984943470b62339e34801fb5fb9e3
| -rw-r--r-- | filter/source/msfilter/svdfppt.cxx | 8 | ||||
| -rw-r--r-- | svx/source/items/grfitem.cxx | 2 | ||||
| -rw-r--r-- | vcl/generic/glyphs/gcach_ftyp.cxx | 1 | ||||
| -rw-r--r-- | vcl/generic/print/glyphset.cxx | 2 |
4 files changed, 5 insertions, 8 deletions
diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx index bfa7eb42e01a..17d4e71a8658 100644 --- a/filter/source/msfilter/svdfppt.cxx +++ b/filter/source/msfilter/svdfppt.cxx @@ -6052,10 +6052,10 @@ void PPTParagraphObj::ApplyTo( SfxItemSet& rSet, boost::optional< sal_Int16 >& } } - sal_uInt32 nIsBullet2, _nTextOfs, _nBulletOfs, nHardAttribute = 0; - GetAttrib( PPT_ParaAttr_BulletOn, nIsBullet2, nDestinationInstance ); - nHardAttribute += GetAttrib( PPT_ParaAttr_TextOfs, _nTextOfs, nDestinationInstance ) ? 1 : 0; - nHardAttribute += GetAttrib( PPT_ParaAttr_BulletOfs, _nBulletOfs, nDestinationInstance ) ? 1 : 0; + sal_uInt32 nIsBullet2, _nTextOfs, _nBulletOfs; + GetAttrib(PPT_ParaAttr_BulletOn, nIsBullet2, nDestinationInstance); + GetAttrib(PPT_ParaAttr_TextOfs, _nTextOfs, nDestinationInstance); + GetAttrib(PPT_ParaAttr_BulletOfs, _nBulletOfs, nDestinationInstance); if ( !nIsBullet2 ) { SvxLRSpaceItem aLRSpaceItem( EE_PARA_LRSPACE ); diff --git a/svx/source/items/grfitem.cxx b/svx/source/items/grfitem.cxx index 05232eb82b0f..748221048dca 100644 --- a/svx/source/items/grfitem.cxx +++ b/svx/source/items/grfitem.cxx @@ -87,7 +87,6 @@ SvStream& SvxGrfCrop::Store( SvStream& rStrm, sal_uInt16 nVersion ) const bool SvxGrfCrop::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const { bool bConvert = 0!=(nMemberId&CONVERT_TWIPS); - nMemberId &= ~CONVERT_TWIPS; text::GraphicCrop aRet; aRet.Left = nLeft; aRet.Right = nRight; @@ -110,7 +109,6 @@ bool SvxGrfCrop::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const bool SvxGrfCrop::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) { bool bConvert = 0!=(nMemberId&CONVERT_TWIPS); - nMemberId &= ~CONVERT_TWIPS; text::GraphicCrop aVal; if(!(rVal >>= aVal)) diff --git a/vcl/generic/glyphs/gcach_ftyp.cxx b/vcl/generic/glyphs/gcach_ftyp.cxx index f8880b937456..a95ab5e5f774 100644 --- a/vcl/generic/glyphs/gcach_ftyp.cxx +++ b/vcl/generic/glyphs/gcach_ftyp.cxx @@ -1804,7 +1804,6 @@ bool ServerFont::ApplyGSUB( const FontSelectPattern& rFSD ) case 1: // Single Substitution Format 1 { const sal_uInt16 nDeltaGlyphId = GetUShort( pSubLookup ); - pSubLookup += 2; for(; it != aSubstVector.end(); ++it ) (*it).second = (*it).first + nDeltaGlyphId; } diff --git a/vcl/generic/print/glyphset.cxx b/vcl/generic/print/glyphset.cxx index 016c8f70fa28..5c81214cfc0f 100644 --- a/vcl/generic/print/glyphset.cxx +++ b/vcl/generic/print/glyphset.cxx @@ -666,7 +666,7 @@ GlyphSet::PSUploadEncoding(osl::File* pOutFile, PrinterGfx &rGfx) // flush line if (nSize >= 70) { - nSize += psp::appendStr ("\n", pEncodingVector + nSize); + psp::appendStr ("\n", pEncodingVector + nSize); psp::WritePS (pOutFile, pEncodingVector); nSize = 0; } |