diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-01-27 15:28:37 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-01-27 15:50:17 +0000 |
| commit | b7ffd2564e9e410c4ab995dd15a8aa0bddb7d06b (patch) | |
| tree | 436e87e86e3d952f180da6ba26c2e843830309d3 | |
| parent | 1e4433bf52f0b242b769d8d34e02ff5610d75839 (diff) | |
Related: rhbz#1293210 crash in SwFlowFrm::BwdMoveNecessary
Change-Id: I3b902b7fbd02b32f5d13dc47854445558e93b341
| -rw-r--r-- | sw/source/core/layout/flowfrm.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sw/source/core/layout/flowfrm.cxx b/sw/source/core/layout/flowfrm.cxx index 44c1254dad57..becbffff35e8 100644 --- a/sw/source/core/layout/flowfrm.cxx +++ b/sw/source/core/layout/flowfrm.cxx @@ -287,10 +287,11 @@ sal_uInt8 SwFlowFrame::BwdMoveNecessary( const SwPageFrame *pPage, const SwRect nRet = 1; pTmp = pTmp->GetFollow(); } while ( !nRet && pTmp ); - if ( pPage->GetSortedObjs() ) + const SwSortedObjs *pObjs = pPage ? pPage->GetSortedObjs() : nullptr; + if (pObjs) { // #i28701# - new type <SwSortedObjs> - const SwSortedObjs &rObjs = *pPage->GetSortedObjs(); + const SwSortedObjs &rObjs = *pObjs; sal_uLong nIndex = ULONG_MAX; for ( size_t i = 0; nRet < 3 && i < rObjs.size(); ++i ) { |