diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2007-07-26 07:19:27 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2007-07-26 07:19:27 +0000 |
| commit | 02fd844bb3ad778040b958a471ec3dc8a4262bcd (patch) | |
| tree | 5b0cf5b3540a9ea74993aa59bc15f7603ebce13a /sw/source/core/layout/findfrm.cxx | |
| parent | a9207a83634feeff0b46e2f66b1ba874c7b87ab9 (diff) | |
INTEGRATION: CWS swqbf101 (1.41.150); FILE MERGED
2007/07/05 07:31:58 od 1.41.150.1: #146872# method <SwFrm::_FindPrevCnt(..)>
- correct wrong loop condition, which causes null pointer access
Diffstat (limited to 'sw/source/core/layout/findfrm.cxx')
| -rw-r--r-- | sw/source/core/layout/findfrm.cxx | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/sw/source/core/layout/findfrm.cxx b/sw/source/core/layout/findfrm.cxx index 53473d9b691a..e4365b8fc0b1 100644 --- a/sw/source/core/layout/findfrm.cxx +++ b/sw/source/core/layout/findfrm.cxx @@ -4,9 +4,9 @@ * * $RCSfile: findfrm.cxx,v $ * - * $Revision: 1.41 $ + * $Revision: 1.42 $ * - * last change: $Author: vg $ $Date: 2007-02-28 15:47:20 $ + * last change: $Author: rt $ $Date: 2007-07-26 08:19:27 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -1054,11 +1054,14 @@ SwCntntFrm* SwFrm::_FindPrevCnt( const bool _bInSameFtn ) SwFtnFrm* pMasterFtnFrmOfCurr( const_cast<SwFtnFrm*>(pFtnFrmOfCurr) ); pPrevCntntFrm = 0L; + // --> OD 2007-07-05 #146872# + // correct wrong loop-condition do { pMasterFtnFrmOfCurr = pMasterFtnFrmOfCurr->GetMaster(); pPrevCntntFrm = pMasterFtnFrmOfCurr->FindLastCntnt(); } while ( !pPrevCntntFrm && - pMasterFtnFrmOfCurr->GetFollow() ); + pMasterFtnFrmOfCurr->GetMaster() ); + // <-- } else { |