mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

coverity#704394 Logically dead code

Browse Source 
Change-Id: I380730d3f915fb5cd9e2e2be272d4c9c56dd0831
This commit is contained in:
Caolán McNamara
2014-03-29 16:58:06 +00:00
parent e67a148d52
commit e9c7da896f
1 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
vcl/generic/print/common_gfx.cxx
View File

@@ -219,7 +219,7 @@ PrinterGfx::JoinVerticalClipRectangles( std::list< Rectangle >::iterator& it,
rightside.push_back( Point( aLastRect.Right()+1, aLastRect.Bottom()+1 ) ); rightside.push_back( Point( aLastRect.Right()+1, aLastRect.Bottom()+1 ) );
// cool, we can concatenate rectangles // cool, we can concatenate rectangles
int nDX = -65536, nDY = 65536; const int nDX = -65536, nDY = 65536;
int nNewDX = 0, nNewDY = 0; int nNewDX = 0, nNewDY = 0;
Point aLastPoint = leftside.front(); Point aLastPoint = leftside.front();
@@ -234,9 +234,7 @@ PrinterGfx::JoinVerticalClipRectangles( std::list< Rectangle >::iterator& it,
{ {
nNewDX = aPoint.X() - aLastPoint.X(); nNewDX = aPoint.X() - aLastPoint.X();
nNewDY = aPoint.Y() - aLastPoint.Y(); nNewDY = aPoint.Y() - aLastPoint.Y();
if( nNewDX == 0 && nDX == 0 ) if( nNewDX != 0 &&
continue;
if( nDX != 0 && nNewDX != 0 &&
(double)nNewDY/(double)nNewDX == (double)nDY/(double)nDX ) (double)nNewDY/(double)nNewDX == (double)nDY/(double)nDX )
continue; continue;
} }
@@ -245,8 +243,6 @@ PrinterGfx::JoinVerticalClipRectangles( std::list< Rectangle >::iterator& it,
} }
aLastPoint = rightside.back(); aLastPoint = rightside.back();
nDX = -65536;
nDY = 65536;
PSBinLineTo (aLastPoint, rOldPoint, rColumn); PSBinLineTo (aLastPoint, rOldPoint, rColumn);
rightside.pop_back(); rightside.pop_back();
while( rightside.begin() != rightside.end() ) while( rightside.begin() != rightside.end() )
@@ -257,9 +253,7 @@ PrinterGfx::JoinVerticalClipRectangles( std::list< Rectangle >::iterator& it,
{ {
nNewDX = aPoint.X() - aLastPoint.X(); nNewDX = aPoint.X() - aLastPoint.X();
nNewDY = aPoint.Y() - aLastPoint.Y(); nNewDY = aPoint.Y() - aLastPoint.Y();
if( nNewDX == 0 && nDX == 0 ) if( nNewDX != 0 &&
continue;
if( nDX != 0 && nNewDX != 0 &&
(double)nNewDY/(double)nNewDX == (double)nDY/(double)nDX ) (double)nNewDY/(double)nNewDX == (double)nDY/(double)nDX )
continue; continue;
} }