diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2015-04-07 15:08:58 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-04-07 15:14:10 +0100 |
| commit | 4498bc4483c4a37b5ffaa649fa148ef3d381d399 (patch) | |
| tree | 2287adfbd87a923d148f406217895345381f470d /sw | |
| parent | 75a3ade6f31c7a1b9b6e1d260eec7130845ed11f (diff) | |
fix assert on export of fdo77716-1.docx to odt
SwWriteTableCols becomes unsorted because rCol.nPos is < COLFUZZY
and it is unsigned so integer overflow on comparison. Just just move rhs
subtract to lhs add.
Change-Id: Ie037e8ba914a4c00e51d9dd1e0a0af9e1f4d353b
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/filter/inc/wrtswtbl.hxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sw/source/filter/inc/wrtswtbl.hxx b/sw/source/filter/inc/wrtswtbl.hxx index 9aa2a666eac0..e14261dbc6bb 100644 --- a/sw/source/filter/inc/wrtswtbl.hxx +++ b/sw/source/filter/inc/wrtswtbl.hxx @@ -204,7 +204,7 @@ inline bool SwWriteTableCol::operator<( const SwWriteTableCol& rCol ) const { // Da wir hier nur die Wahrheits-Grade 0 und 1 kennen, lassen wir lieber // auch nicht zu, dass x==y und x<y gleichzeitig gilt ;-) - return nPos < rCol.nPos - COLFUZZY; + return nPos + COLFUZZY < rCol.nPos; } struct SwWriteTableColLess { |