sw/source/filter/ww8/ww8par2.cxx | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit eea59fff8545eea112507cbf2d8423729f038868
Author: Caolán McNamara <caol...@redhat.com>
Date: Fri Nov 24 15:36:35 2017 +0000
ofz#4414 set new nWwCols after verifying legal size
otherwise we're returning early with the now wrong
nWwCols
Change-Id: I2031c23ca24241fb4946b5a5a62eabc27c2bdcc2
Reviewed-on: https://gerrit.libreoffice.org/45240
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx
index c2eb4fed9f20..a517dffe03ea 100644
--- a/sw/source/filter/ww8/ww8par2.cxx
+++ b/sw/source/filter/ww8/ww8par2.cxx
@@ -1241,13 +1241,13 @@ void WW8TabBandDesc::ReadDef(bool bVer67, const
sal_uInt8* pS, short nLen)
if (nCols > MAX_COL)
return;
- short nOldCols = nWwCols;
- nWwCols = nCols;
-
nLen -= 2 * (nCols + 1); //reduce len by claimed amount of next x-borders
arguments
if (nLen < 0)
return;
+ short nOldCols = nWwCols;
+ nWwCols = nCols;
+
const sal_uInt8* pT = &pS[1];
for (int i = 0; i <= nCols; i++, pT+=2)
nCenter[i] = (sal_Int16)SVBT16ToShort( pT ); // X-borders
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
