diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2004-05-03 12:43:29 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2004-05-03 12:43:29 +0000 |
| commit | 91f66beb516ba3e007998e846bfebc37402c374a (patch) | |
| tree | 80c3a400276246a892d78e6b98b9b666c625fb4f /sw/source/core | |
| parent | 99a51de915f8eecff4b46b3a05d35bffa5896f0b (diff) | |
INTEGRATION: CWS gt03 (1.9.80); FILE MERGED
2004/03/11 14:54:59 fme 1.9.80.1: #26165# Feature - Multiple headline rows in tables
Diffstat (limited to 'sw/source/core')
| -rw-r--r-- | sw/source/core/doc/docsort.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sw/source/core/doc/docsort.cxx b/sw/source/core/doc/docsort.cxx index b8bcfff40973..a8b072b79cef 100644 --- a/sw/source/core/doc/docsort.cxx +++ b/sw/source/core/doc/docsort.cxx @@ -2,9 +2,9 @@ * * $RCSfile: docsort.cxx,v $ * - * $Revision: 1.9 $ + * $Revision: 1.10 $ * - * last change: $Author: hr $ $Date: 2004-02-04 14:07:12 $ + * last change: $Author: rt $ $Date: 2004-05-03 13:43:29 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -598,15 +598,15 @@ BOOL SwDoc::SortTbl(const SwSelBoxes& rBoxes, const SwSortOptions& rOpt) DeleteRedline( *pTblNd ); USHORT nStart = 0; - if(pTblNd->GetTable().IsHeadlineRepeat() && rOpt.eDirection == SRT_ROWS) + if( pTblNd->GetTable().GetRowsToRepeat() > 0 && rOpt.eDirection == SRT_ROWS ) { // Das ist die Kopfzeile - SwTableLine * pHeadLine = pTblNd->GetTable().GetTabLines()[0]; + SwTableLine* pHeadLine = pTblNd->GetTable().GetTabLines()[0]; // Oberste seleketierte Zeile _FndLines& rLines = aFndBox.GetLines(); - while(nStart < rLines.Count() ) + while( nStart < rLines.Count() ) { // Verschachtelung durch Split Merge beachten, // die oberste rausholen @@ -614,13 +614,13 @@ BOOL SwDoc::SortTbl(const SwSelBoxes& rBoxes, const SwSortOptions& rOpt) while ( pLine->GetUpper() ) pLine = pLine->GetUpper()->GetUpper(); - if( pLine == pHeadLine) + if( pTblNd->GetTable().IsHeadline( *pLine ) ) nStart++; else break; } // Alle selektierten in der HeaderLine ? -> kein Offset - if(nStart == rLines.Count()) + if( nStart == rLines.Count() ) nStart = 0; } |