summaryrefslogtreecommitdiff
path: root/vcl/source/edit/texteng.cxx
diff options
context:
space:
mode:
authorMike Kaganski <mike.kaganski@collabora.com>2018-11-06 10:12:29 +0300
committerMike Kaganski <mike.kaganski@collabora.com>2018-11-10 12:23:42 +0100
commit065edb4c8e91170017df482843d0c3eb8d4db114 (patch)
tree1d030ec9868a56b375a563c9d6e6d81c6115d717 /vcl/source/edit/texteng.cxx
parent0b34a5dd39e177ba99cd21b639d67ac8123b8458 (diff)
tdf#120703 PVS: V547 Expression is always true/false
Change-Id: I0b3c407331bfa1fa0c5003250d327d4f26de3643 Reviewed-on: https://gerrit.libreoffice.org/63235 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'vcl/source/edit/texteng.cxx')
-rw-r--r--vcl/source/edit/texteng.cxx26
1 files changed, 11 insertions, 15 deletions
diff --git a/vcl/source/edit/texteng.cxx b/vcl/source/edit/texteng.cxx
index fd38f2413c57..a8fe3486be61 100644
--- a/vcl/source/edit/texteng.cxx
+++ b/vcl/source/edit/texteng.cxx
@@ -2000,25 +2000,21 @@ void TextEngine::ImpPaint( OutputDevice* pOutDev, const Point& rStartPos, tools:
break;
case PORTIONKIND_TAB:
// for HideSelection() only Range, pSelection = 0.
- if ( pSelStart )
+ if ( pSelStart ) // also implies pSelEnd
{
const tools::Rectangle aTabArea( aTmpPos, Point( aTmpPos.X()+nTxtWidth, aTmpPos.Y()+mnCharHeight-1 ) );
- bool bDone = false;
- if ( pSelStart )
+ // is the Tab in the Selection???
+ const TextPaM aTextStart(nPara, nIndex);
+ const TextPaM aTextEnd(nPara, nIndex + 1);
+ if ((aTextStart < *pSelEnd) && (aTextEnd > *pSelStart))
{
- // is the Tab in the Selection???
- const TextPaM aTextStart( nPara, nIndex );
- const TextPaM aTextEnd( nPara, nIndex+1 );
- if ( ( aTextStart < *pSelEnd ) && ( aTextEnd > *pSelStart ) )
- {
- const Color aOldColor = pOutDev->GetFillColor();
- pOutDev->SetFillColor( rStyleSettings.GetHighlightColor() );
- pOutDev->DrawRect( aTabArea );
- pOutDev->SetFillColor( aOldColor );
- bDone = true;
- }
+ const Color aOldColor = pOutDev->GetFillColor();
+ pOutDev->SetFillColor(
+ rStyleSettings.GetHighlightColor());
+ pOutDev->DrawRect(aTabArea);
+ pOutDev->SetFillColor(aOldColor);
}
- if ( !bDone )
+ else
{
pOutDev->Erase( aTabArea );
}