diff options
| author | Michael Stahl <mstahl@redhat.com> | 2017-02-16 18:17:53 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2017-02-16 22:42:49 +0100 |
| commit | d4620d535bd5a8e73bdb9d556933b9ae22800a7d (patch) | |
| tree | 3ffddd8013fec9fbd80aa2f4c57d86afb8b68c94 /sw/source | |
| parent | 4178f55bce696affd5074ebdcc32e84d00f7df09 (diff) | |
i#92948 sw: WW8 import: fix table in Apo in header
The document contains a table inside of a frame anchored in the header.
In WW8TabDesc::WW8TabDesc() the update to nOrigPos makes a mess of
things because the new nOrigPos value contains the value of nCpOfs (93)
already, so later on when SwWW8ImplReader::TestApo() calls
WW8PLCFxDesc::Save() / WW8PLCFxDesc::Restore(), the call to SeekPos()
positions it on CP 325 instead of 232 and the subsequent call to
GetSprms() finds nothing on the wrong position; thus TestApo() concludes
that the paragraph has different Apo properties than the previous one
and a new fly frame is created.
(regression from 4bd341e2c8a1f3a4f4677eb879a60a4ffc3369db)
Change-Id: I697c4526c7c3a12119947ff5659c11ea9ee7fff8
Diffstat (limited to 'sw/source')
| -rw-r--r-- | sw/source/filter/ww8/ww8par2.cxx | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx index c1e1cb6c912a..fabd439d5c21 100644 --- a/sw/source/filter/ww8/ww8par2.cxx +++ b/sw/source/filter/ww8/ww8par2.cxx @@ -2020,6 +2020,7 @@ WW8TabDesc::WW8TabDesc(SwWW8ImplReader* pIoClass, WW8_CP nStartCp) : // PlcxMan currently points too far ahead so we need to bring // it back to where we are trying to make a table m_pIo->m_pPlcxMan->GetPap()->nOrigStartPos = aRes.nStartPos; + m_pIo->m_pPlcxMan->GetPap()->nCpOfs = aRes.nCpOfs; if (!(pPap->SeekPos(aRes.nStartPos))) { aRes.nEndPos = WW8_CP_MAX; |