diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-08-28 10:17:56 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2017-08-28 15:38:57 +0200 |
| commit | 5377233d145df2e158c44090032ea19b02566827 (patch) | |
| tree | 3fc0c6984acdb649e6809b7e000b4322ba857813 | |
| parent | 2c410a04c15c21eb025ae5df0f70f63df9757cca (diff) | |
ofz#3110 GeneratePLCF only generated word6 sized missing entries
BTE was 2 bytes in word 7- but 4 bytes in word 8+
Change-Id: I24007d26fccc5edc104320bd2eb8f9c62399c988
Reviewed-on: https://gerrit.libreoffice.org/41625
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
(cherry picked from commit 35c07f69a28c24a8561f86ff82387f11a85d368a)
| -rw-r--r-- | sw/source/filter/ww8/ww8scan.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx index 0026ade52132..1d51c27a5623 100644 --- a/sw/source/filter/ww8/ww8scan.cxx +++ b/sw/source/filter/ww8/ww8scan.cxx @@ -2162,7 +2162,7 @@ void WW8PLCF::GeneratePLCF(SvStream& rSt, sal_Int32 nPN, sal_Int32 ncpN) if (!failure) { - size_t nSiz = 6 * nIMax + 4; + size_t nSiz = (4 + nStru) * nIMax + 4; size_t nElems = ( nSiz + 3 ) / 4; pPLCF_PosArray = new sal_Int32[ nElems ]; // Pointer to Pos-array @@ -2217,7 +2217,7 @@ void WW8PLCF::GeneratePLCF(SvStream& rSt, sal_Int32 nPN, sal_Int32 ncpN) for (sal_Int32 i = 0; i < ncpN; ++i) // construct PNs { ShortToSVBT16(static_cast<sal_uInt16>(nPN + i), p); - p+=2; + p += nStru; } } |