diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2015-06-03 14:15:03 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-06-03 16:16:07 +0100 |
| commit | 9eb16c85d6af4b73de9a75716c3ff34f929f26b2 (patch) | |
| tree | 866962a7592313614e496a16a1c288a562bd57ab | |
| parent | 768a2d61c3b0a71fef0d9d732ae83938fe24633e (diff) | |
don't crash on layout of ooo55381-1.sxw
The pLay here is getting joined and thus deleted in a stack of
FormatLayoutTabs so set it as unjoinable for the duration that
we expect pLay to remain valid
Change-Id: Iedfaf710022ad19c0f415cee84f70c74dd7dbd96
| -rw-r--r-- | sw/source/core/layout/layact.cxx | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sw/source/core/layout/layact.cxx b/sw/source/core/layout/layact.cxx index fa4c2899b62f..c06706e0dc06 100644 --- a/sw/source/core/layout/layact.cxx +++ b/sw/source/core/layout/layact.cxx @@ -1393,6 +1393,7 @@ bool SwLayAction::FormatLayout( SwLayoutFrm *pLay, bool bAddRect ) if ( pLay->IsFootnoteFrm() ) // no LayFrms as Lower return bChanged; + FlowFrmJoinLockGuard aJoinGuard(pLay); SwFrm *pLow = pLay->Lower(); bool bTabChanged = false; while ( pLow && pLow->GetUpper() == pLay ) |