diff options
| author | Michael Stahl <mstahl@redhat.com> | 2012-02-12 22:11:37 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-02-13 00:25:05 +0100 |
| commit | 657c500e2e9e9ad2e38e9da278b20fb82c109001 (patch) | |
| tree | 3750b7503b18904787eb82d2d8dbaaa3a3ca78d5 /sw/source/core/text | |
| parent | c0970c2be45ea62d86e24271065311aaa92c0186 (diff) | |
fdo#41712: sw: fix crash in layout frame linked lists:
The pPrecede member is not maintained properly when setting the
corresponding pFollow member.
The change in SwTxtFrm::JoinFrm() fixes the crash, the other changes
are perhaps fixes for other crashes...
(regression from cc3d0d182cafef9649e45f4657233ac2221fdd0a)
Diffstat (limited to 'sw/source/core/text')
| -rw-r--r-- | sw/source/core/text/frmform.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sw/source/core/text/frmform.cxx b/sw/source/core/text/frmform.cxx index 1b3418725d37..0731b1021abf 100644 --- a/sw/source/core/text/frmform.cxx +++ b/sw/source/core/text/frmform.cxx @@ -680,8 +680,8 @@ SwCntntFrm *SwTxtFrm::JoinFrm() } } pFoll->Cut(); + SetFollow(pNxt); delete pFoll; - m_pFollow = pNxt; return pNxt; } |