[Libreoffice-commits] core.git: vcl/source
Caolán McNamara
caolanm at redhat.com
Thu Sep 10 13:16:52 PDT 2015
vcl/source/edit/texteng.cxx | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
New commits:
commit f9a4123637366d925e79b52123cb11dce1bccf0f
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Sep 10 21:15:55 2015 +0100
coverity#1323752 Logically dead code
Change-Id: Ic7b0e9c6a1e4e1ce37d49358828a660fdfc63a1d
diff --git a/vcl/source/edit/texteng.cxx b/vcl/source/edit/texteng.cxx
index bc9bc3f..e3ad74f 100644
--- a/vcl/source/edit/texteng.cxx
+++ b/vcl/source/edit/texteng.cxx
@@ -2203,7 +2203,6 @@ bool TextEngine::CreateLines( sal_uInt32 nPara )
// format all lines starting here
size_t nDelFromLine = std::numeric_limits<size_t>::max();
- bool bLineBreak = false;
sal_Int32 nIndex = pLine->GetStart();
TextLine aSaveLine( *pLine );
@@ -2227,7 +2226,6 @@ bool TextEngine::CreateLines( sal_uInt32 nPara )
// search for Portion that does not fit anymore into line
TETextPortion* pPortion = 0;
bool bBrokenLine = false;
- bLineBreak = false;
while ( ( nTmpWidth <= nXWidth ) && !bEOL && ( nTmpPortion < pTEParaPortion->GetTextPortions().size() ) )
{
@@ -2296,7 +2294,7 @@ bool TextEngine::CreateLines( sal_uInt32 nPara )
pLine->SetEnd( nPortionStart );
pLine->SetEndPortion( nTmpPortion-1 );
}
- else if ( bLineBreak || bBrokenLine )
+ else if ( bBrokenLine )
{
pLine->SetEnd( nPortionStart+1 );
pLine->SetEndPortion( nTmpPortion-1 );
@@ -2421,9 +2419,6 @@ bool TextEngine::CreateLines( sal_uInt32 nPara )
DBG_ASSERT( pTEParaPortion->GetLines().size(), "CreateLines: No Line!" );
- if ( bLineBreak )
- CreateAndInsertEmptyLine( nPara );
-
pTEParaPortion->SetValid();
return nOldLineCount != pTEParaPortion->GetLines().size();
More information about the Libreoffice-commits
mailing list