INTEGRATION: CWS swqbf105 (1.47.6); FILE MERGED

2007/10/04 17:01:39 od 1.47.6.2: RESYNC: (1.47-1.48); FILE MERGED
2007/08/30 09:41:11 ama 1.47.6.1: Fix #i75008#: Put table frame into the right section frame
This commit is contained in:
Rüdiger Timm
2007-11-07 11:17:47 +00:00
parent c8dac7c7d0
commit 0d39d39c3d

View File

@@ -4,9 +4,9 @@
*
* $RCSfile: ndtbl.cxx,v $
*
* $Revision: 1.50 $
* $Revision: 1.51 $
*
* last change: $Author: hr $ $Date: 2007-11-02 14:41:12 $
* last change: $Author: rt $ $Date: 2007-11-07 12:17:47 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -2547,15 +2547,13 @@ void SwTableNode::MakeFrms( SwNodeIndex* pIdxBehind )
if( !pNd )
return ;
// liegt der gefundene ContentNode vor oder hinter der Tabelle ?
BOOL bBehind = EndOfSectionIndex() < pIdxBehind->GetIndex();
SwFrm *pFrm( 0L );
SwLayoutFrm *pUpper( 0L );
SwNode2Layout aNode2Layout( *pNd, GetIndex() );
while( 0 != (pFrm = aNode2Layout.NextFrm()) )
while( 0 != (pUpper = aNode2Layout.UpperFrm( pFrm, *this )) )
{
SwTabFrm* pNew = MakeFrm();
pNew->Paste( pFrm->GetUpper(), bBehind ? pFrm : pFrm->GetNext() );
pNew->Paste( pUpper, pFrm );
// --> OD 2005-12-01 #i27138#
// notify accessibility paragraphs objects about changed
// CONTENT_FLOWS_FROM/_TO relation.