Kaydet (Commit) b9e4f8e1 authored tarafından Xisco Fauli's avatar Xisco Fauli Kaydeden (comit) Caolán McNamara

tdf#120703 (PVS): Recurring check.

V571 The 'pColumn->GetWidthOption()' condition was already verified in line 1033.

Change-Id: I5bc11bceddc8090f41bf86b45f880ceea3dfb204
Reviewed-on: https://gerrit.libreoffice.org/62158
Tested-by: Jenkins
Reviewed-by: 's avatarCaolán McNamara <caolanm@redhat.com>
Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
üst fbfb65f1
...@@ -1032,14 +1032,11 @@ void SwHTMLTableLayout::AutoLayoutPass1() ...@@ -1032,14 +1032,11 @@ void SwHTMLTableLayout::AutoLayoutPass1()
SwHTMLTableLayoutColumn *pColumn = GetColumn( i ); SwHTMLTableLayoutColumn *pColumn = GetColumn( i );
if (pColumn->IsRelWidthOption() && pColumn->GetWidthOption() && nQuotMax) if (pColumn->IsRelWidthOption() && pColumn->GetWidthOption() && nQuotMax)
{ {
if( pColumn->GetWidthOption() ) pColumn->SetMax( pColumn->GetMax() / nQuotMax );
{ OSL_ENSURE( pColumn->GetMax() >= pColumn->GetMin(),
pColumn->SetMax( pColumn->GetMax() / nQuotMax ); "Minimum width is one column bigger than maximum" );
OSL_ENSURE( pColumn->GetMax() >= pColumn->GetMin(), if( pColumn->GetMax() < pColumn->GetMin() )
"Minimum width is one column bigger than maximum" ); pColumn->SetMax( pColumn->GetMin() );
if( pColumn->GetMax() < pColumn->GetMin() )
pColumn->SetMax( pColumn->GetMin() );
}
} }
m_nMax += pColumn->GetMax(); m_nMax += pColumn->GetMax();
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment