summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2018-10-22 16:41:35 +0100
committerCaolán McNamara <caolanm@redhat.com>2018-10-22 21:55:36 +0200
commitff65c84450d29207f45354e363ce900dce0b6625 (patch)
tree6fefadf43b74fc478856607afba5936ca0cd8f01
parent8cf0b56f1fbca36c86d499e5473c242041ba5183 (diff)
pvs-studio: V581 identical conditional expressions situated alongside
Change-Id: I063bd0dbfe1d7b00e56cd4e01affa5465ae04d9a Reviewed-on: https://gerrit.libreoffice.org/62192 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
-rw-r--r--editeng/source/editeng/impedit3.cxx3
-rw-r--r--filter/source/graphicfilter/itiff/itiff.cxx4
-rw-r--r--reportdesign/source/ui/report/FormattedFieldBeautifier.cxx3
3 files changed, 1 insertions, 9 deletions
diff --git a/editeng/source/editeng/impedit3.cxx b/editeng/source/editeng/impedit3.cxx
index fadb8db0c56f..c4938eb3f075 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -2695,10 +2695,7 @@ void ImpEditEngine::SeekCursor( ContentNode* pNode, sal_Int32 nPos, SvxFont& rFo
pOut->SetTextLineColor( rTextLineColor.GetColor() );
else
pOut->SetTextLineColor();
- }
- if ( pOut )
- {
const SvxOverlineItem& rOverlineColor = pNode->GetContentAttribs().GetItem( EE_CHAR_OVERLINE );
if ( rOverlineColor.GetColor() != COL_TRANSPARENT )
pOut->SetOverlineColor( rOverlineColor.GetColor() );
diff --git a/filter/source/graphicfilter/itiff/itiff.cxx b/filter/source/graphicfilter/itiff/itiff.cxx
index 4dbc1589ca5a..a2b8ddb06ae8 100644
--- a/filter/source/graphicfilter/itiff/itiff.cxx
+++ b/filter/source/graphicfilter/itiff/itiff.cxx
@@ -1464,10 +1464,6 @@ bool TIFFReader::ReadTIFF(SvStream & rTIFF, Graphic & rGraphic )
if ( ( nFillOrder == 2 ) && ( nCompression != 5 ) ) // in the LZW mode bits are already being inverted
bByteSwap = true;
nStripsPerPlane = ( nImageLength - 1 ) / nDiv + 1;
- }
-
- if (bStatus)
- {
bStatus = nSamplesPerPixel != 0;
}
diff --git a/reportdesign/source/ui/report/FormattedFieldBeautifier.cxx b/reportdesign/source/ui/report/FormattedFieldBeautifier.cxx
index 1fb7740f1b38..7cf51a8e53b5 100644
--- a/reportdesign/source/ui/report/FormattedFieldBeautifier.cxx
+++ b/reportdesign/source/ui/report/FormattedFieldBeautifier.cxx
@@ -100,10 +100,9 @@ namespace rptui
if ( bSet )
sDataField = aFormula.getEqualUndecoratedContent();
}
- }
- if ( xControlModel.is() )
setPlaceholderText( getVclWindowPeer( xControlModel.get() ), sDataField );
+ }
}
catch (const uno::Exception &)
{