summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2015-04-23 10:25:13 +0100
committerCaolán McNamara <caolanm@redhat.com>2015-04-23 10:25:13 +0100
commit598f0db1ddccb7cb4d703940a1d94830fa3e94bf (patch)
treed5bf3c165e24e893777c2d9fe36fb9c390a2f48b
parent025bfa7e510bdab3ef93ad45a731fc25085ba3cc (diff)
avoid crash in layout on exporting ooo101776-1.odt to .doc
Change-Id: Ie103baa15eee6bec382239423e008ac5808a4b7b
-rw-r--r--sw/source/core/layout/flowfrm.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/sw/source/core/layout/flowfrm.cxx b/sw/source/core/layout/flowfrm.cxx
index b9b55372305c..6c88769ab297 100644
--- a/sw/source/core/layout/flowfrm.cxx
+++ b/sw/source/core/layout/flowfrm.cxx
@@ -2087,7 +2087,7 @@ bool SwFlowFrm::MoveBwd( bool &rbReformat )
// section and on page 1 is normal content. Method <FindPrev(..)>
// will find the last content of page 1, but <GetLeaf(..)>
// returns new upper on page 2.
- if ( pNewUpper->Lower() )
+ if (pNewUpper && pNewUpper->Lower())
{
SwLayoutFrm* pNewNextUpper = pNewUpper->GetLeaf( MAKEPAGE_NONE, true );
if ( pNewNextUpper &&