diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2008-06-06 09:06:41 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2008-06-06 09:06:41 +0000 |
| commit | 5b666148c998fbac5ce756206249f5a92be97bde (patch) | |
| tree | 2c9247ce8f6d61562f4805b7a89fceb00fa56d74 /sw/source/core/layout/paintfrm.cxx | |
| parent | 5957f803aeceddd7f18ed90d4d1d25c4505f0c25 (diff) | |
INTEGRATION: CWS fmebugs04 (1.115.46); FILE MERGED
2008/05/13 13:56:19 fme 1.115.46.2: #i9860# Top border for tables - correction
2008/05/13 13:49:23 fme 1.115.46.1: #i9860# Top border for tables
Diffstat (limited to 'sw/source/core/layout/paintfrm.cxx')
| -rw-r--r-- | sw/source/core/layout/paintfrm.cxx | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx index fd5eb97d11..130cd0d827 100644 --- a/sw/source/core/layout/paintfrm.cxx +++ b/sw/source/core/layout/paintfrm.cxx @@ -1,13 +1,13 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: paintfrm.cxx,v $ - * $Revision: 1.118 $ + * $Revision: 1.119 $ * * This file is part of OpenOffice.org. * @@ -2585,6 +2585,22 @@ void SwTabFrmPainter::Insert( const SwFrm& rFrm, const SvxBoxItem& rBoxItem ) Insert( aRight, false ); Insert( aTop, true ); Insert( aBottom, true ); + + const SwRowFrm* pThisRowFrm = dynamic_cast<const SwRowFrm*>(rFrm.GetUpper()); + + // special case: #i9860# + // first line in follow table without repeated headlines + if ( pThisRowFrm && + pThisRowFrm->GetUpper() == &mrTabFrm && + mrTabFrm.IsFollow() && + !mrTabFrm.GetTable()->GetRowsToRepeat() && + (!pThisRowFrm->GetPrev() || static_cast<const SwRowFrm*>(pThisRowFrm->GetPrev())->IsRowSpanLine()) && + !rBoxItem.GetTop() && + rBoxItem.GetBottom() ) + { + SwLineEntry aFollowTop( !bVert ? nTop : nRight, !bVert ? nLeft : nTop, !bVert ? nRight : nBottom, aB ); + Insert( aFollowTop, !bVert ); + } } void SwTabFrmPainter::Insert( SwLineEntry& rNew, bool bHori ) |