diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-04-27 15:27:29 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2015-04-27 15:30:55 +0200 |
commit | e8d9bf50780b9be871a49035e62c94b9976d84bc (patch) | |
tree | 2d38157a2a482b02ec82bd7adcd8a248a8251d51 /filter/source | |
parent | 4591a1373ad2ba726f321b6c11576464a40df621 (diff) |
More loplugin:simplifybool
Change-Id: I49ef963c3c10614d3dd3012a756a1ca81aa62391
Diffstat (limited to 'filter/source')
-rw-r--r-- | filter/source/graphicfilter/eos2met/eos2met.cxx | 16 | ||||
-rw-r--r-- | filter/source/graphicfilter/epict/epict.cxx | 26 | ||||
-rw-r--r-- | filter/source/graphicfilter/icgm/actimpr.cxx | 2 | ||||
-rw-r--r-- | filter/source/graphicfilter/icgm/bitmap.cxx | 2 | ||||
-rw-r--r-- | filter/source/graphicfilter/icgm/cgm.cxx | 2 | ||||
-rw-r--r-- | filter/source/graphicfilter/idxf/dxf2mtf.cxx | 4 | ||||
-rw-r--r-- | filter/source/graphicfilter/idxf/dxfentrd.cxx | 2 | ||||
-rw-r--r-- | filter/source/graphicfilter/idxf/idxf.cxx | 4 | ||||
-rw-r--r-- | filter/source/graphicfilter/ipbm/ipbm.cxx | 10 | ||||
-rw-r--r-- | filter/source/graphicfilter/ipcd/ipcd.cxx | 6 | ||||
-rw-r--r-- | filter/source/graphicfilter/ipcx/ipcx.cxx | 2 | ||||
-rw-r--r-- | filter/source/graphicfilter/ipict/ipict.cxx | 2 | ||||
-rw-r--r-- | filter/source/graphicfilter/ipsd/ipsd.cxx | 2 | ||||
-rw-r--r-- | filter/source/graphicfilter/iras/iras.cxx | 2 | ||||
-rw-r--r-- | filter/source/graphicfilter/itiff/ccidecom.cxx | 10 | ||||
-rw-r--r-- | filter/source/graphicfilter/itiff/itiff.cxx | 6 | ||||
-rw-r--r-- | filter/source/msfilter/dffpropset.cxx | 2 | ||||
-rw-r--r-- | filter/source/msfilter/svdfppt.cxx | 6 |
18 files changed, 53 insertions, 53 deletions
diff --git a/filter/source/graphicfilter/eos2met/eos2met.cxx b/filter/source/graphicfilter/eos2met/eos2met.cxx index 780ac5dcfc4d..501a9a8ac31d 100644 --- a/filter/source/graphicfilter/eos2met/eos2met.cxx +++ b/filter/source/graphicfilter/eos2met/eos2met.cxx @@ -509,7 +509,7 @@ void METWriter::WriteColorAttributeTable(sal_uInt32 nFieldId, BitmapPalette* pPa { sal_uInt16 nIndex,nNumI,i; - if (bStatus==false) return; + if (!bStatus) return; //--- The Field 'Begin Color Attribute Table': WriteFieldIntroducer(16,BegColAtrMagic,0,0); @@ -567,7 +567,7 @@ void METWriter::WriteImageObject(const Bitmap & rBitmap) sal_uInt16 nBitsPerPixel; sal_uInt8 nbyte; - if (bStatus==false) + if (!bStatus) return; nActColMapId=((nActBitmapId>>24)&0x000000ff) | ((nActBitmapId>> 8)&0x0000ff00) | @@ -701,7 +701,7 @@ void METWriter::WriteImageObject(const Bitmap & rBitmap) if (aTemp.GetError() || pMET->GetError()) bStatus=false; nActBitmapPercent=(ny+1)*100/nHeight; MayCallback(); - if (bStatus==false) return; + if (!bStatus) return; } pBuf.reset(); @@ -1482,7 +1482,7 @@ void METWriter::METSetChrSet(sal_uInt8 nSet) void METWriter::WriteOrders( const GDIMetaFile* pMTF ) { - if(bStatus==false) + if(!bStatus) return; for( size_t nA = 0, nACount = pMTF->GetActionSize(); nA < nACount; nA++ ) @@ -2323,7 +2323,7 @@ void METWriter::WriteOrders( const GDIMetaFile* pMTF ) if( pMET->GetError() ) bStatus=false; - if( bStatus == false ) + if( !bStatus ) break; } } @@ -2379,7 +2379,7 @@ void METWriter::WriteGraphicsObject(const GDIMetaFile * pMTF) { sal_uInt32 nSegmentSize,nPos,nDataFieldsStartPos; - if( bStatus==false ) + if( !bStatus ) return; //--- Das Feld 'Begin Graphics Object': @@ -2439,7 +2439,7 @@ void METWriter::WriteGraphicsObject(const GDIMetaFile * pMTF) void METWriter::WriteResourceGroup(const GDIMetaFile * pMTF) { - if( bStatus==false ) + if( !bStatus ) return; //--- The Field 'Begin Resource Group': @@ -2464,7 +2464,7 @@ void METWriter::WriteResourceGroup(const GDIMetaFile * pMTF) void METWriter::WriteDocument(const GDIMetaFile * pMTF) { - if( bStatus==false ) + if( !bStatus ) return; //--- The Field 'Begin Document': diff --git a/filter/source/graphicfilter/epict/epict.cxx b/filter/source/graphicfilter/epict/epict.cxx index 93d7e290af6c..6631bdfc3671 100644 --- a/filter/source/graphicfilter/epict/epict.cxx +++ b/filter/source/graphicfilter/epict/epict.cxx @@ -460,7 +460,7 @@ void PictWriter::WriteOpcode_TxFace(const vcl::Font & rFont) if (rFont.IsOutline()) nFace|=0x08; if (rFont.IsShadow()) nFace|=0x10; - if (bDstTxFaceValid==false || nDstTxFace!=nFace) { + if (!bDstTxFaceValid || nDstTxFace!=nFace) { pPict->WriteUInt16( 0x0004 ).WriteUChar( nFace ).WriteUChar( 0 ); nDstTxFace=nFace; bDstTxFaceValid=true; @@ -472,7 +472,7 @@ void PictWriter::WriteOpcode_TxMode(RasterOp eMode) { sal_uInt16 nVal; - if (bDstTxModeValid==false || eDstTxMode!=eMode) { + if (!bDstTxModeValid || eDstTxMode!=eMode) { switch (eMode) { case ROP_INVERT: nVal=0x000c; break; case ROP_XOR: nVal=0x000a; break; @@ -488,7 +488,7 @@ void PictWriter::WriteOpcode_TxMode(RasterOp eMode) void PictWriter::WriteOpcode_PnSize(sal_uInt16 nSize) { if (nSize==0) nSize=1; - if (bDstPnSizeValid==false || nDstPnSize!=nSize) { + if (!bDstPnSizeValid || nDstPnSize!=nSize) { pPict->WriteUInt16( 0x0007 ).WriteUInt16( nSize ).WriteUInt16( nSize ); nDstPnSize=nSize; bDstPnSizeValid=true; @@ -500,7 +500,7 @@ void PictWriter::WriteOpcode_PnMode(RasterOp eMode) { sal_uInt16 nVal; - if (bDstPnModeValid==false || eDstPnMode!=eMode) { + if (!bDstPnModeValid || eDstPnMode!=eMode) { switch (eMode) { case ROP_INVERT: nVal=0x000c; break; @@ -519,7 +519,7 @@ void PictWriter::WriteOpcode_PnLinePat(bool bVisible) PictPattern aPat; ConvertLinePattern(aPat,bVisible); - if (bDstPnPatValid==false || aDstPnPat.nHi!=aPat.nHi || aDstPnPat.nLo!=aPat.nLo) { + if (!bDstPnPatValid || aDstPnPat.nHi!=aPat.nHi || aDstPnPat.nLo!=aPat.nLo) { pPict->WriteUInt16( 0x0009 ).WriteUInt32( aPat.nHi ).WriteUInt32( aPat.nLo ); aDstPnPat=aPat; bDstPnPatValid=true; @@ -532,7 +532,7 @@ void PictWriter::WriteOpcode_PnFillPat(bool bVisible) PictPattern aPat; ConvertFillPattern(aPat,bVisible); - if (bDstPnPatValid==false || aDstPnPat.nHi!=aPat.nHi || aDstPnPat.nLo!=aPat.nLo) { + if (!bDstPnPatValid || aDstPnPat.nHi!=aPat.nHi || aDstPnPat.nLo!=aPat.nLo) { pPict->WriteUInt16( 0x0009 ).WriteUInt32( aPat.nHi ).WriteUInt32( aPat.nLo ); aDstPnPat=aPat; bDstPnPatValid=true; @@ -549,7 +549,7 @@ void PictWriter::WriteOpcode_OvSize(const Size & rSize) void PictWriter::WriteOpcode_TxSize(sal_uInt16 nSize) { - if (bDstTxSizeValid==false || nDstTxSize!=nSize) { + if (!bDstTxSizeValid || nDstTxSize!=nSize) { nDstTxSize = (sal_uInt16) OutputDevice::LogicToLogic( Size( 0, nSize ), aSrcMapMode, aTargetMapMode ).Height(); @@ -562,7 +562,7 @@ void PictWriter::WriteOpcode_TxSize(sal_uInt16 nSize) void PictWriter::WriteOpcode_RGBFgCol(const Color & rColor) { - if (bDstFgColValid==false || aDstFgCol!=rColor) { + if (!bDstFgColValid || aDstFgCol!=rColor) { pPict->WriteUInt16( 0x001a ); WriteRGBColor(rColor); aDstFgCol=rColor; @@ -573,7 +573,7 @@ void PictWriter::WriteOpcode_RGBFgCol(const Color & rColor) void PictWriter::WriteOpcode_RGBBkCol(const Color & rColor) { - if (bDstBkColValid==false || aDstBkCol!=rColor) { + if (!bDstBkColValid || aDstBkCol!=rColor) { pPict->WriteUInt16( 0x001b ); WriteRGBColor(rColor); aDstBkCol=rColor; @@ -648,7 +648,7 @@ void PictWriter::WriteOpcode_Text(const Point & rPoint, const OUString& rString, dh = aPoint.X()-aDstTextPosition.X(); dv = aPoint.Y()-aDstTextPosition.Y(); - if (bDstTextPositionValid==false || dh<0 || dh>255 || dv<0 || dv>255 || bDelta==false) + if (!bDstTextPositionValid || dh<0 || dh>255 || dv<0 || dv>255 || !bDelta) { pPict->WriteUInt16( 0x0028 ); WritePoint(rPoint); @@ -686,7 +686,7 @@ void PictWriter::WriteOpcode_FontName(const vcl::Font & rFont) default: nFontId=1; } - if (bDstFontNameValid==false || nDstFontNameId!=nFontId || aDstFontName!=rFont.GetName()) + if (!bDstFontNameValid || nDstFontNameId!=nFontId || aDstFontName!=rFont.GetName()) { OString aString(OUStringToOString(rFont.GetName(), osl_getThreadTextEncoding())); sal_uInt16 nFontNameLen = aString.getLength(); @@ -881,7 +881,7 @@ void PictWriter::WriteOpcode_BitsRect(const Point & rPoint, const Size & rSize, nActBitmapPercent=30; MayCallback(); - if ( bStatus == false ) + if ( !bStatus ) return; if ( ( pAcc = aBitmap.AcquireReadAccess() ) == NULL ) return; @@ -2127,7 +2127,7 @@ void PictWriter::WriteOpcodes( const GDIMetaFile & rMTF ) if (pPict->GetError()) bStatus=false; - if (bStatus==false) + if (!bStatus) break; } } diff --git a/filter/source/graphicfilter/icgm/actimpr.cxx b/filter/source/graphicfilter/icgm/actimpr.cxx index 43689881a929..7d1dd7c0705b 100644 --- a/filter/source/graphicfilter/icgm/actimpr.cxx +++ b/filter/source/graphicfilter/icgm/actimpr.cxx @@ -389,7 +389,7 @@ void CGMImpressOutAct::InsertPage() { uno::Reference< drawing::XDrawPage > xPage( maXDrawPages->insertNewByIndex( 0xffff ), uno::UNO_QUERY ); maXDrawPage = xPage; - if ( ImplInitPage() == false ) + if ( !ImplInitPage() ) mpCGM->mbStatus = false; } mnCurrentPage++; diff --git a/filter/source/graphicfilter/icgm/bitmap.cxx b/filter/source/graphicfilter/icgm/bitmap.cxx index 8a6953a449d8..b8acf4f2215d 100644 --- a/filter/source/graphicfilter/icgm/bitmap.cxx +++ b/filter/source/graphicfilter/icgm/bitmap.cxx @@ -206,7 +206,7 @@ void CGMBitmap::ImplGetBitmap( CGMBitmapDescriptor& rDesc ) Bitmap::ReleaseAccess( rDesc.mpAcc ); rDesc.mpAcc = NULL; } - if ( rDesc.mbStatus == false ) + if ( !rDesc.mbStatus ) { if ( rDesc.mpBitmap ) { diff --git a/filter/source/graphicfilter/icgm/cgm.cxx b/filter/source/graphicfilter/icgm/cgm.cxx index acd073eb88c3..55a6158e8b46 100644 --- a/filter/source/graphicfilter/icgm/cgm.cxx +++ b/filter/source/graphicfilter/icgm/cgm.cxx @@ -749,7 +749,7 @@ ImportCGM( OUString const & rFileName, uno::Reference< frame::XModel > const & r } } - if ( pCGM->Write( *pIn ) == false ) + if ( !pCGM->Write( *pIn ) ) break; } if ( pCGM->IsValid() ) diff --git a/filter/source/graphicfilter/idxf/dxf2mtf.cxx b/filter/source/graphicfilter/idxf/dxf2mtf.cxx index 8429940c9cef..bacd08189425 100644 --- a/filter/source/graphicfilter/idxf/dxf2mtf.cxx +++ b/filter/source/graphicfilter/idxf/dxf2mtf.cxx @@ -261,7 +261,7 @@ void DXF2GDIMetaFile::DrawCircleEntity(const DXFCircleEntity & rE, const DXFTran sal_uInt16 nPoints,i; DXFVector aC; - if (SetLineAttribute(rE)==false) return; + if (!SetLineAttribute(rE)) return; rTransform.Transform(rE.aP0,aC); if (rE.fThickness==0 && rTransform.TransCircleToEllipse(rE.fRadius,frx,fry)) { pVirDev->DrawEllipse( @@ -304,7 +304,7 @@ void DXF2GDIMetaFile::DrawArcEntity(const DXFArcEntity & rE, const DXFTransform DXFVector aC; Point aPS,aPE; - if (SetLineAttribute(rE)==false) return; + if (!SetLineAttribute(rE)) return; fA1=rE.fStart; fdA=rE.fEnd-fA1; while (fdA>=360.0) fdA-=360.0; diff --git a/filter/source/graphicfilter/idxf/dxfentrd.cxx b/filter/source/graphicfilter/idxf/dxfentrd.cxx index 8bb1dce40ffa..3966e1cca7ea 100644 --- a/filter/source/graphicfilter/idxf/dxfentrd.cxx +++ b/filter/source/graphicfilter/idxf/dxfentrd.cxx @@ -709,7 +709,7 @@ void DXFHatchEntity::EvaluateGroup( DXFGroupReader & rDGR ) ( nCurrentBoundaryPathIndex < nBoundaryPathCount ) ) bExecutingGroupCode = pBoundaryPathData[ nCurrentBoundaryPathIndex ].EvaluateGroup( rDGR ); } - if ( bExecutingGroupCode == false ) + if ( !bExecutingGroupCode ) DXFBasicEntity::EvaluateGroup(rDGR); } break; diff --git a/filter/source/graphicfilter/idxf/idxf.cxx b/filter/source/graphicfilter/idxf/idxf.cxx index 5927a5613d63..1ecd9fc37bb6 100644 --- a/filter/source/graphicfilter/idxf/idxf.cxx +++ b/filter/source/graphicfilter/idxf/idxf.cxx @@ -43,9 +43,9 @@ GraphicImport( SvStream & rStream, Graphic & rGraphic, FilterConfigItem* ) DXF2GDIMetaFile aConverter; GDIMetaFile aMTF; - if ( aDXF.Read( rStream, 0, 60 ) == false ) + if ( !aDXF.Read( rStream, 0, 60 ) ) return false; - if ( aConverter.Convert( aDXF, aMTF, 60, 100 ) == false ) + if ( !aConverter.Convert( aDXF, aMTF, 60, 100 ) ) return false; rGraphic = Graphic(aMTF); diff --git a/filter/source/graphicfilter/ipbm/ipbm.cxx b/filter/source/graphicfilter/ipbm/ipbm.cxx index 6415066af397..248d4dfa9a72 100644 --- a/filter/source/graphicfilter/ipbm/ipbm.cxx +++ b/filter/source/graphicfilter/ipbm/ipbm.cxx @@ -80,7 +80,7 @@ bool PBMReader::ReadPBM(Graphic & rGraphic ) // read header: - if ( ( mbStatus = ImplReadHeader() ) == false ) + if ( !( mbStatus = ImplReadHeader() ) ) return false; if ( ( mnMaxVal == 0 ) || ( mnWidth == 0 ) || ( mnHeight == 0 ) ) @@ -177,7 +177,7 @@ bool PBMReader::ImplReadHeader() default: return false; } - while ( bFinished == false ) + while ( !bFinished ) { if ( mrPBM.GetError() ) return false; @@ -318,7 +318,7 @@ bool PBMReader::ImplReadBody() { // PBM case 0 : - while ( bFinished == false ) + while ( !bFinished ) { if ( mrPBM.IsEof() || mrPBM.GetError() ) return false; @@ -361,7 +361,7 @@ bool PBMReader::ImplReadBody() nCount = 0; nGrey = 0; - while ( bFinished == false ) + while ( !bFinished ) { if ( nCount ) { @@ -435,7 +435,7 @@ bool PBMReader::ImplReadBody() nCount = 0; nRGB[ 0 ] = nRGB[ 1 ] = nRGB[ 2 ] = 0; - while ( bFinished == false ) + while ( !bFinished ) { if ( nCount == 3 ) { diff --git a/filter/source/graphicfilter/ipcd/ipcd.cxx b/filter/source/graphicfilter/ipcd/ipcd.cxx index d1b521749524..9a8d9bfb5775 100644 --- a/filter/source/graphicfilter/ipcd/ipcd.cxx +++ b/filter/source/graphicfilter/ipcd/ipcd.cxx @@ -184,7 +184,7 @@ void PCDReader::CheckPCDImagePacFile() void PCDReader::ReadOrientation() { - if ( bStatus == false ) + if ( !bStatus ) return; m_rPCD.Seek( 194635 ); m_rPCD.ReadUChar( nOrientation ); @@ -204,7 +204,7 @@ void PCDReader::ReadImage() sal_uInt8 * pCr; // red chrominance fuer je 2x2 pixel of the current pair of rows sal_uInt8 * pL0N, * pL1N, * pCbN, * pCrN; // like above, but for the next pair of rows - if ( bStatus == false ) + if ( !bStatus ) return; nW2=nWidth>>1; @@ -350,7 +350,7 @@ void PCDReader::ReadImage() if ( m_rPCD.GetError() ) bStatus = false; - if ( bStatus == false ) + if ( !bStatus ) break; } rtl_freeMemory((void*)pL0 ); diff --git a/filter/source/graphicfilter/ipcx/ipcx.cxx b/filter/source/graphicfilter/ipcx/ipcx.cxx index d5cc51b4dd7d..61b7fa6f9631 100644 --- a/filter/source/graphicfilter/ipcx/ipcx.cxx +++ b/filter/source/graphicfilter/ipcx/ipcx.cxx @@ -413,7 +413,7 @@ GraphicImport( SvStream & rStream, Graphic & rGraphic, FilterConfigItem* ) { PCXReader aPCXReader(rStream); bool nRetValue = aPCXReader.ReadPCX(rGraphic); - if ( nRetValue == false ) + if ( !nRetValue ) rStream.SetError( SVSTREAM_FILEFORMAT_ERROR ); return nRetValue; } diff --git a/filter/source/graphicfilter/ipict/ipict.cxx b/filter/source/graphicfilter/ipict/ipict.cxx index 9ab206f67534..badebaf82c3a 100644 --- a/filter/source/graphicfilter/ipict/ipict.cxx +++ b/filter/source/graphicfilter/ipict/ipict.cxx @@ -63,7 +63,7 @@ namespace PictReaderInternal { } //! returns true if this is the default pattern - bool isDefault() const { return isRead == false; } + bool isDefault() const { return !isRead; } enum PenStyle { PEN_NULL, PEN_SOLID, PEN_DOT, PEN_DASH, PEN_DASHDOT }; enum BrushStyle { BRUSH_NULL, BRUSH_SOLID, BRUSH_HORZ, BRUSH_VERT, diff --git a/filter/source/graphicfilter/ipsd/ipsd.cxx b/filter/source/graphicfilter/ipsd/ipsd.cxx index 222f90d4a282..c25468ca90e7 100644 --- a/filter/source/graphicfilter/ipsd/ipsd.cxx +++ b/filter/source/graphicfilter/ipsd/ipsd.cxx @@ -115,7 +115,7 @@ bool PSDReader::ReadPSD(Graphic & rGraphic ) // read header: - if ( ImplReadHeader() == false ) + if ( !ImplReadHeader() ) return false; Size aBitmapSize( mpFileHeader->nColumns, mpFileHeader->nRows ); diff --git a/filter/source/graphicfilter/iras/iras.cxx b/filter/source/graphicfilter/iras/iras.cxx index facca761af63..cca5bc899af1 100644 --- a/filter/source/graphicfilter/iras/iras.cxx +++ b/filter/source/graphicfilter/iras/iras.cxx @@ -102,7 +102,7 @@ bool RASReader::ReadRAS(Graphic & rGraphic) // Kopf einlesen: - if ( ( mbStatus = ImplReadHeader() ) == false ) + if ( !( mbStatus = ImplReadHeader() ) ) return false; maBmp = Bitmap( Size( mnWidth, mnHeight ), mnDstBitsPerPix ); diff --git a/filter/source/graphicfilter/itiff/ccidecom.cxx b/filter/source/graphicfilter/itiff/ccidecom.cxx index 6cd2c4141533..f7eed8141085 100644 --- a/filter/source/graphicfilter/itiff/ccidecom.cxx +++ b/filter/source/graphicfilter/itiff/ccidecom.cxx @@ -635,7 +635,7 @@ bool CCIDecompressor::DecompressScanline( sal_uInt8 * pTarget, sal_uLong nTarget if ( nEOLCount >= 5 ) // RTC (Return To Controller) return true; - if ( bStatus == false ) + if ( !bStatus ) return false; // If EOL-Codes exist, the EOL-Code also appeared in front of the first line. @@ -648,7 +648,7 @@ bool CCIDecompressor::DecompressScanline( sal_uInt8 * pTarget, sal_uLong nTarget sal_uInt32 nCurPos = pIStream->Tell(); sal_uInt16 nOldInputBitsBufSize = nInputBitsBufSize; sal_uInt32 nOldInputBitsBuf = nInputBitsBuf; - if ( ReadEOL( 32 ) == false ) + if ( !ReadEOL( 32 ) ) { nInputBitsBufSize = nOldInputBitsBufSize; nInputBitsBuf = nOldInputBitsBuf; @@ -659,7 +659,7 @@ bool CCIDecompressor::DecompressScanline( sal_uInt8 * pTarget, sal_uLong nTarget } else { - if ( ReadEOL( nTargetBits ) == false ) + if ( !ReadEOL( nTargetBits ) ) { return bStatus; } @@ -1010,7 +1010,7 @@ void CCIDecompressor::Read1DScanlineData(sal_uInt8 * pTarget, sal_uInt16 nTarget // should the situation arise, switch Black <-> White: if (bTerminatingCode) nBlackOrWhite = ~nBlackOrWhite; - } while (nTargetBits>0 || bTerminatingCode==false); + } while (nTargetBits>0 || !bTerminatingCode); } @@ -1026,7 +1026,7 @@ void CCIDecompressor::Read2DScanlineData(sal_uInt8 * pTarget, sal_uInt16 nTarget while (nBitPos<nTargetBits && bStatus) { n2DMode=ReadCodeAndDecode(p2DModeLookUp,10); - if (bStatus==false) return; + if (!bStatus) return; if (n2DMode==CCI2DMODE_UNCOMP) { for (;;) { diff --git a/filter/source/graphicfilter/itiff/itiff.cxx b/filter/source/graphicfilter/itiff/itiff.cxx index 718fad56d67c..84bff7336f52 100644 --- a/filter/source/graphicfilter/itiff/itiff.cxx +++ b/filter/source/graphicfilter/itiff/itiff.cxx @@ -306,7 +306,7 @@ double TIFFReader::ReadDoubleData() void TIFFReader::ReadTagData( sal_uInt16 nTagType, sal_uInt32 nDataLen) { - if ( bStatus == false ) + if ( !bStatus ) return; switch ( nTagType ) @@ -605,7 +605,7 @@ bool TIFFReader::ReadMap() pTIFF->Seek( pStripOffsets[ nStrip ] ); aCCIDecom.StartDecompression( *pTIFF ); } - if ( aCCIDecom.DecompressScanline( pMap[ np ], nImageWidth * nBitsPerSample * nSamplesPerPixel / nPlanes, np + 1 == nPlanes ) == false ) + if ( !aCCIDecom.DecompressScanline( pMap[ np ], nImageWidth * nBitsPerSample * nSamplesPerPixel / nPlanes, np + 1 == nPlanes ) ) return false; if ( pTIFF->GetError() ) return false; @@ -1277,7 +1277,7 @@ bool TIFFReader::ReadTIFF(SvStream & rTIFF, Graphic & rGraphic ) if ( pTIFF->GetError() ) bStatus = false; - if ( bStatus == false ) + if ( !bStatus ) break; } pTIFF->ReadUInt32( nNextIfd ); diff --git a/filter/source/msfilter/dffpropset.cxx b/filter/source/msfilter/dffpropset.cxx index ffa33700bed5..5c5af5d07b5d 100644 --- a/filter/source/msfilter/dffpropset.cxx +++ b/filter/source/msfilter/dffpropset.cxx @@ -1273,7 +1273,7 @@ bool DffPropSet::IsHardAttribute( sal_uInt32 nId ) const bRetValue = (mpPropSetEntries[nId | 0x3f].nComplexIndexOrFlagsHAttr & (1 << (0xf - (nId & 0xf)))) != 0; else - bRetValue = ( mpPropSetEntries[ nId ].aFlags.bSoftAttr == false ); + bRetValue = !mpPropSetEntries[ nId ].aFlags.bSoftAttr; return bRetValue; }; diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx index 1f08100d97d1..1456fc9308c2 100644 --- a/filter/source/msfilter/svdfppt.cxx +++ b/filter/source/msfilter/svdfppt.cxx @@ -775,7 +775,7 @@ SdrObject* SdrEscherImport::ProcessObj( SvStream& rSt, DffObjData& rObjData, voi aClientDataHd.SeekToEndOfRecord( rSt ); } } - if ( ( aPlaceholderAtom.nPlaceholderId == PptPlaceholder::NOTESSLIDEIMAGE ) && ( rPersistEntry.bNotesMaster == false ) ) + if ( ( aPlaceholderAtom.nPlaceholderId == PptPlaceholder::NOTESSLIDEIMAGE ) && !rPersistEntry.bNotesMaster ) { sal_uInt16 nPageNum = pSdrModel->GetPageCount(); if ( nPageNum > 0 ) @@ -1584,7 +1584,7 @@ SdrPowerPointImport::SdrPowerPointImport( PowerPointImportParam& rParam, const O } } // office xp is supporting more than one stylesheet - if ( ( rE2.ePageKind == PPT_MASTERPAGE ) && ( rE2.aSlideAtom.nMasterId == 0 ) && ( rE2.bNotesMaster == false ) ) + if ( ( rE2.ePageKind == PPT_MASTERPAGE ) && ( rE2.aSlideAtom.nMasterId == 0 ) && !rE2.bNotesMaster ) { PPTTextSpecInfo aTxSI( 0 ); if ( aTxSIStyle.bValid && !aTxSIStyle.aList.empty() ) @@ -4084,7 +4084,7 @@ PPTStyleSheet::PPTStyleSheet( const DffRecordHeader& rSlideHd, SvStream& rIn, Sd { sal_uInt32 nInstance = aTxMasterStyleHd.nRecInstance; if ( ( nInstance < PPT_STYLESHEETENTRYS ) && - ( ( nInstance != TSS_TYPE_TEXT_IN_SHAPE ) || ( bFoundTxMasterStyleAtom04 == false ) ) ) + ( ( nInstance != TSS_TYPE_TEXT_IN_SHAPE ) || !bFoundTxMasterStyleAtom04 ) ) { if ( nInstance > 4 ) { |