diff options
| author | Oliver Bolte <obo@openoffice.org> | 2006-07-10 14:16:22 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2006-07-10 14:16:22 +0000 |
| commit | e8102b036e1f40669b612aa64a5f991937369ada (patch) | |
| tree | 765d09899727ca19dcc00185cca083241e5f4272 /sw/source/core/layout/findfrm.cxx | |
| parent | 550c92231eb01e6e5fff510fee1d5a1e5ff5c748 (diff) | |
INTEGRATION: CWS swqbf72 (1.37.166); FILE MERGED
2006/06/29 08:31:56 od 1.37.166.1: #b6443897# method <SwFrm::IsInSplitTableRow()>
- frames inside a headline row aren't in a splitted table row.
Diffstat (limited to 'sw/source/core/layout/findfrm.cxx')
| -rw-r--r-- | sw/source/core/layout/findfrm.cxx | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/sw/source/core/layout/findfrm.cxx b/sw/source/core/layout/findfrm.cxx index ebfbf53b23cc..b8b3404bb13e 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.37 $ + * $Revision: 1.38 $ * - * last change: $Author: rt $ $Date: 2006-03-09 14:06:56 $ + * last change: $Author: obo $ $Date: 2006-07-10 15:16:22 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -1607,10 +1607,16 @@ const SwRowFrm* SwFrm::IsInSplitTableRow() const ASSERT( pRow->GetUpper()->IsTabFrm(), "Confusion in table layout" ) const SwTabFrm* pTab = (SwTabFrm*)pRow->GetUpper(); + // --> OD 2006-06-28 #b6443897# + // If most upper row frame is a headline row, the current frame + // can't be in a splitted table row. Thus, add corresponding condition. if ( pRow->GetNext() || - !pTab->HasFollowFlowLine() || - !pTab->GetFollow() ) + pTab->GetTable()->IsHeadline( + *(static_cast<const SwRowFrm*>(pRow)->GetTabLine()) ) || + !pTab->HasFollowFlowLine() || + !pTab->GetFollow() ) return NULL; + // <-- // skip headline const SwRowFrm* pFollowRow = pTab->GetFollow()->GetFirstNonHeadlineRow(); |