2000-09-18 23:08:29 +00:00
|
|
|
/*************************************************************************
|
|
|
|
*
|
2008-04-10 13:43:20 +00:00
|
|
|
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
2000-09-18 23:08:29 +00:00
|
|
|
*
|
2008-04-10 13:43:20 +00:00
|
|
|
* Copyright 2008 by Sun Microsystems, Inc.
|
2000-09-18 23:08:29 +00:00
|
|
|
*
|
2008-04-10 13:43:20 +00:00
|
|
|
* OpenOffice.org - a multi-platform office productivity suite
|
2000-09-18 23:08:29 +00:00
|
|
|
*
|
2008-04-10 13:43:20 +00:00
|
|
|
* $RCSfile: flowfrm.cxx,v $
|
|
|
|
* $Revision: 1.71 $
|
2000-09-18 23:08:29 +00:00
|
|
|
*
|
2008-04-10 13:43:20 +00:00
|
|
|
* This file is part of OpenOffice.org.
|
2000-09-18 23:08:29 +00:00
|
|
|
*
|
2008-04-10 13:43:20 +00:00
|
|
|
* OpenOffice.org is free software: you can redistribute it and/or modify
|
|
|
|
* it under the terms of the GNU Lesser General Public License version 3
|
|
|
|
* only, as published by the Free Software Foundation.
|
2000-09-18 23:08:29 +00:00
|
|
|
*
|
2008-04-10 13:43:20 +00:00
|
|
|
* OpenOffice.org is distributed in the hope that it will be useful,
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
* GNU Lesser General Public License version 3 for more details
|
|
|
|
* (a copy is included in the LICENSE file that accompanied this code).
|
2000-09-18 23:08:29 +00:00
|
|
|
*
|
2008-04-10 13:43:20 +00:00
|
|
|
* You should have received a copy of the GNU Lesser General Public License
|
|
|
|
* version 3 along with OpenOffice.org. If not, see
|
|
|
|
* <http://www.openoffice.org/license.html>
|
|
|
|
* for a copy of the LGPLv3 License.
|
2000-09-18 23:08:29 +00:00
|
|
|
*
|
|
|
|
************************************************************************/
|
2006-09-16 20:17:47 +00:00
|
|
|
|
|
|
|
// MARKER(update_precomp.py): autogen include statement, do not remove
|
|
|
|
#include "precompiled_sw.hxx"
|
2000-09-18 23:08:29 +00:00
|
|
|
#include "pam.hxx"
|
|
|
|
#include "swtable.hxx"
|
|
|
|
#include "frame.hxx"
|
|
|
|
#include "pagefrm.hxx"
|
|
|
|
#include "flyfrm.hxx"
|
|
|
|
#include "viewsh.hxx"
|
|
|
|
#include "doc.hxx"
|
|
|
|
#include "viewimp.hxx"
|
|
|
|
#include "dflyobj.hxx"
|
|
|
|
#include "frmtool.hxx"
|
|
|
|
#include "dcontact.hxx"
|
|
|
|
#include <svx/brkitem.hxx>
|
|
|
|
#include <svx/keepitem.hxx>
|
|
|
|
#include <fmtsrnd.hxx>
|
|
|
|
#include <fmtanchr.hxx>
|
|
|
|
#include <fmtpdsc.hxx>
|
|
|
|
#include <svx/ulspitem.hxx>
|
2002-02-05 14:00:23 +00:00
|
|
|
#include <tgrditem.hxx>
|
2000-09-18 23:08:29 +00:00
|
|
|
#include <txtftn.hxx>
|
|
|
|
#include <fmtftn.hxx>
|
2002-02-08 13:49:20 +00:00
|
|
|
#include <svx/pgrditem.hxx>
|
|
|
|
#include <paratr.hxx>
|
2000-09-18 23:08:29 +00:00
|
|
|
|
|
|
|
#include "ftnfrm.hxx"
|
|
|
|
#include "txtfrm.hxx"
|
|
|
|
#include "tabfrm.hxx"
|
|
|
|
#include "pagedesc.hxx"
|
|
|
|
#include "layact.hxx"
|
|
|
|
#include "fmtornt.hxx"
|
|
|
|
#include "flyfrms.hxx"
|
|
|
|
#include "sectfrm.hxx"
|
|
|
|
#include "section.hxx"
|
|
|
|
#include "dbg_lay.hxx"
|
|
|
|
#include "lineinfo.hxx"
|
2004-03-23 10:25:05 +00:00
|
|
|
// OD 2004-03-02 #106629#
|
|
|
|
#include <fmtclbl.hxx>
|
2004-08-02 13:08:38 +00:00
|
|
|
// --> OD 2004-06-23 #i28701#
|
|
|
|
#include <sortedobjs.hxx>
|
|
|
|
#include <layouter.hxx>
|
|
|
|
// <--
|
2004-11-16 14:44:46 +00:00
|
|
|
// --> OD 2004-10-15 #i26945#
|
|
|
|
#include <fmtfollowtextflow.hxx>
|
|
|
|
// <--
|
2000-09-18 23:08:29 +00:00
|
|
|
|
|
|
|
BOOL SwFlowFrm::bMoveBwdJump = FALSE;
|
|
|
|
|
|
|
|
|
|
|
|
/*************************************************************************
|
|
|
|
|*
|
|
|
|
|* SwFlowFrm::SwFlowFrm()
|
|
|
|
|*
|
|
|
|
|* Ersterstellung MA 26. Apr. 95
|
|
|
|
|* Letzte Aenderung MA 26. Apr. 95
|
|
|
|
|*
|
|
|
|
|*************************************************************************/
|
|
|
|
|
|
|
|
|
|
|
|
SwFlowFrm::SwFlowFrm( SwFrm &rFrm ) :
|
|
|
|
rThis( rFrm ),
|
|
|
|
pFollow( 0 )
|
|
|
|
{
|
2002-09-13 11:13:06 +00:00
|
|
|
bLockJoin = bIsFollow = bCntntLock = bOwnFtnNum =
|
|
|
|
bFtnLock = bFlyLock = FALSE;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*************************************************************************
|
|
|
|
|*
|
|
|
|
|* SwFlowFrm::IsFollowLocked()
|
|
|
|
|* return TRUE if any follow has the JoinLocked flag
|
|
|
|
|*
|
|
|
|
|*************************************************************************/
|
|
|
|
|
|
|
|
sal_Bool SwFlowFrm::HasLockedFollow() const
|
|
|
|
{
|
|
|
|
const SwFlowFrm* pFrm = GetFollow();
|
|
|
|
while( pFrm )
|
|
|
|
{
|
|
|
|
if( pFrm->IsJoinLocked() )
|
|
|
|
return sal_True;
|
|
|
|
pFrm = pFrm->GetFollow();
|
|
|
|
}
|
|
|
|
return sal_False;
|
2000-09-18 23:08:29 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/*************************************************************************
|
|
|
|
|*
|
|
|
|
|* SwFlowFrm::IsKeepFwdMoveAllowed()
|
|
|
|
|*
|
|
|
|
|* Ersterstellung MA 20. Jul. 94
|
|
|
|
|* Letzte Aenderung MA 16. May. 95
|
|
|
|
|*
|
|
|
|
|*************************************************************************/
|
|
|
|
|
|
|
|
|
|
|
|
BOOL SwFlowFrm::IsKeepFwdMoveAllowed()
|
|
|
|
{
|
|
|
|
//Wenn der Vorgaenger das KeepAttribut traegt und auch dessen
|
|
|
|
//Vorgaenger usw. bis zum ersten der Kette und fuer diesen das
|
|
|
|
//IsFwdMoveAllowed ein FALSE liefert, so ist das Moven eben nicht erlaubt.
|
|
|
|
SwFrm *pFrm = &rThis;
|
|
|
|
if ( !pFrm->IsInFtn() )
|
|
|
|
do
|
|
|
|
{ if ( pFrm->GetAttrSet()->GetKeep().GetValue() )
|
|
|
|
pFrm = pFrm->GetIndPrev();
|
|
|
|
else
|
|
|
|
return TRUE;
|
|
|
|
} while ( pFrm );
|
|
|
|
|
|
|
|
//Siehe IsFwdMoveAllowed()
|
2007-09-27 08:01:58 +00:00
|
|
|
BOOL bRet = FALSE;
|
|
|
|
if ( pFrm && pFrm->GetIndPrev() )
|
|
|
|
bRet = TRUE;
|
|
|
|
return bRet;
|
2000-09-18 23:08:29 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/*************************************************************************
|
|
|
|
|*
|
|
|
|
|* SwFlowFrm::CheckKeep()
|
|
|
|
|*
|
|
|
|
|* Beschreibung
|
|
|
|
|* Ersterstellung MA 20. Jun. 95
|
|
|
|
|* Letzte Aenderung MA 09. Apr. 97
|
|
|
|
|*
|
|
|
|
|*************************************************************************/
|
|
|
|
|
|
|
|
|
|
|
|
void SwFlowFrm::CheckKeep()
|
|
|
|
{
|
|
|
|
//Den 'letzten' Vorgaenger mit KeepAttribut anstossen, denn
|
|
|
|
//die ganze Truppe koennte zuruckrutschen.
|
|
|
|
SwFrm *pPre = rThis.GetIndPrev();
|
|
|
|
if( pPre->IsSctFrm() )
|
|
|
|
{
|
|
|
|
SwFrm *pLast = ((SwSectionFrm*)pPre)->FindLastCntnt();
|
|
|
|
if( pLast && pLast->FindSctFrm() == pPre )
|
|
|
|
pPre = pLast;
|
|
|
|
else
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
SwFrm* pTmp;
|
|
|
|
BOOL bKeep;
|
|
|
|
while ( TRUE == (bKeep = pPre->GetAttrSet()->GetKeep().GetValue()) &&
|
|
|
|
0 != ( pTmp = pPre->GetIndPrev() ) )
|
|
|
|
{
|
|
|
|
if( pTmp->IsSctFrm() )
|
|
|
|
{
|
|
|
|
SwFrm *pLast = ((SwSectionFrm*)pTmp)->FindLastCntnt();
|
|
|
|
if( pLast && pLast->FindSctFrm() == pTmp )
|
|
|
|
pTmp = pLast;
|
|
|
|
else
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
pPre = pTmp;
|
|
|
|
}
|
|
|
|
if ( bKeep )
|
|
|
|
pPre->InvalidatePos();
|
|
|
|
}
|
|
|
|
|
|
|
|
/*************************************************************************
|
|
|
|
|*
|
|
|
|
|* SwFlowFrm::IsKeep()
|
|
|
|
|*
|
|
|
|
|* Ersterstellung MA 09. Apr. 97
|
|
|
|
|* Letzte Aenderung MA 09. Apr. 97
|
|
|
|
|*
|
|
|
|
|*************************************************************************/
|
|
|
|
|
2006-05-16 15:08:29 +00:00
|
|
|
BOOL SwFlowFrm::IsKeep( const SwAttrSet& rAttrs, bool bCheckIfLastRowShouldKeep ) const
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
2004-01-13 12:13:45 +00:00
|
|
|
// 1. The keep attribute is ignored inside footnotes
|
|
|
|
// 2. For compatibility reasons, the keep attribute is
|
|
|
|
// ignored for frames inside table cells
|
2006-03-09 13:07:10 +00:00
|
|
|
// 3. If bBreakCheck is set to true, this function only checks
|
|
|
|
// if there are any break after attributes set at rAttrs
|
|
|
|
// or break before attributes set for the next content (or next table)
|
2006-05-16 15:08:29 +00:00
|
|
|
BOOL bKeep = bCheckIfLastRowShouldKeep ||
|
2006-03-09 13:07:10 +00:00
|
|
|
( !rThis.IsInFtn() &&
|
|
|
|
( !rThis.IsInTab() || rThis.IsTabFrm() ) &&
|
|
|
|
rAttrs.GetKeep().GetValue() );
|
2004-01-13 12:13:45 +00:00
|
|
|
|
2006-05-16 15:08:29 +00:00
|
|
|
ASSERT( !bCheckIfLastRowShouldKeep || rThis.IsTabFrm(),
|
|
|
|
"IsKeep with bCheckIfLastRowShouldKeep should only be used for tabfrms" )
|
|
|
|
|
2004-01-13 12:13:45 +00:00
|
|
|
// Ignore keep attribute if there are break situations:
|
2000-09-18 23:08:29 +00:00
|
|
|
if ( bKeep )
|
|
|
|
{
|
2006-03-09 13:07:10 +00:00
|
|
|
switch ( rAttrs.GetBreak().GetBreak() )
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
|
|
|
case SVX_BREAK_COLUMN_AFTER:
|
|
|
|
case SVX_BREAK_COLUMN_BOTH:
|
|
|
|
case SVX_BREAK_PAGE_AFTER:
|
|
|
|
case SVX_BREAK_PAGE_BOTH:
|
2006-03-09 13:07:10 +00:00
|
|
|
{
|
2000-09-18 23:08:29 +00:00
|
|
|
bKeep = FALSE;
|
2006-03-09 13:07:10 +00:00
|
|
|
}
|
2007-09-27 08:01:58 +00:00
|
|
|
default: break;
|
2000-09-18 23:08:29 +00:00
|
|
|
}
|
|
|
|
if ( bKeep )
|
|
|
|
{
|
|
|
|
SwFrm *pNxt;
|
|
|
|
if( 0 != (pNxt = rThis.FindNextCnt()) &&
|
|
|
|
(!pFollow || pNxt != pFollow->GetFrm()))
|
|
|
|
{
|
2006-05-16 15:08:29 +00:00
|
|
|
// --> FME 2006-05-15 #135914#
|
|
|
|
// The last row of a table only keeps with the next content
|
|
|
|
// it they are in the same section:
|
|
|
|
if ( bCheckIfLastRowShouldKeep )
|
2002-11-13 08:40:43 +00:00
|
|
|
{
|
2006-05-16 15:08:29 +00:00
|
|
|
const SwSection* pThisSection = 0;
|
|
|
|
const SwSection* pNextSection = 0;
|
|
|
|
const SwSectionFrm* pThisSectionFrm = rThis.FindSctFrm();
|
|
|
|
const SwSectionFrm* pNextSectionFrm = pNxt->FindSctFrm();
|
2002-11-13 08:40:43 +00:00
|
|
|
|
2006-05-16 15:08:29 +00:00
|
|
|
if ( pThisSectionFrm )
|
|
|
|
pThisSection = pThisSectionFrm->GetSection();
|
2002-11-13 08:40:43 +00:00
|
|
|
|
2006-05-16 15:08:29 +00:00
|
|
|
if ( pNextSectionFrm )
|
|
|
|
pNextSection = pNextSectionFrm->GetSection();
|
|
|
|
|
|
|
|
if ( pThisSection != pNextSection )
|
|
|
|
bKeep = FALSE;
|
|
|
|
}
|
|
|
|
// <--
|
2002-11-13 08:40:43 +00:00
|
|
|
|
2006-05-16 15:08:29 +00:00
|
|
|
if ( bKeep )
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
2006-05-16 15:08:29 +00:00
|
|
|
const SwAttrSet* pSet = NULL;
|
|
|
|
|
|
|
|
if ( pNxt->IsInTab() )
|
|
|
|
{
|
|
|
|
SwTabFrm* pTab = pNxt->FindTabFrm();
|
|
|
|
if ( ! rThis.IsInTab() || rThis.FindTabFrm() != pTab )
|
|
|
|
pSet = &pTab->GetFmt()->GetAttrSet();
|
|
|
|
}
|
|
|
|
|
|
|
|
if ( ! pSet )
|
|
|
|
pSet = pNxt->GetAttrSet();
|
|
|
|
|
|
|
|
ASSERT( pSet, "No AttrSet to check keep attribute" )
|
|
|
|
|
|
|
|
if ( pSet->GetPageDesc().GetPageDesc() )
|
2000-09-18 23:08:29 +00:00
|
|
|
bKeep = FALSE;
|
2006-05-16 15:08:29 +00:00
|
|
|
else switch ( pSet->GetBreak().GetBreak() )
|
|
|
|
{
|
|
|
|
case SVX_BREAK_COLUMN_BEFORE:
|
|
|
|
case SVX_BREAK_COLUMN_BOTH:
|
|
|
|
case SVX_BREAK_PAGE_BEFORE:
|
|
|
|
case SVX_BREAK_PAGE_BOTH:
|
|
|
|
bKeep = FALSE;
|
2007-09-27 08:01:58 +00:00
|
|
|
default: break;
|
2006-05-16 15:08:29 +00:00
|
|
|
}
|
2000-09-18 23:08:29 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return bKeep;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*************************************************************************
|
|
|
|
|*
|
|
|
|
|* SwFlowFrm::BwdMoveNecessary()
|
|
|
|
|*
|
|
|
|
|* Ersterstellung MA 20. Jul. 94
|
|
|
|
|* Letzte Aenderung MA 02. May. 96
|
|
|
|
|*
|
|
|
|
|*************************************************************************/
|
|
|
|
|
|
|
|
|
|
|
|
BYTE SwFlowFrm::BwdMoveNecessary( const SwPageFrm *pPage, const SwRect &rRect )
|
|
|
|
{
|
|
|
|
// Der return-Wert entscheidet mit,
|
|
|
|
// ob auf Zurueckgeflossen werden muss, (3)
|
|
|
|
// ob das gute alte WouldFit gerufen werden kann (0, 1)
|
|
|
|
// oder ob ein Umhaengen und eine Probeformatierung sinnvoll ist (2)
|
|
|
|
// dabei bedeutet Bit 1, dass Objekte an mir selbst verankert sind
|
|
|
|
// und Bit 2, dass ich anderen Objekten ausweichen muss.
|
|
|
|
|
|
|
|
//Wenn ein SurroundObj, dass einen Umfluss wuenscht mit dem Rect ueberlappt
|
|
|
|
//ist der Fluss notwendig (weil die Verhaeltnisse nicht geschaetzt werden
|
|
|
|
//koennen), es kann allerdings ggf. eine TestFormatierung stattfinden.
|
|
|
|
//Wenn das SurroundObj ein Fly ist und ich selbst ein Lower bin oder der Fly
|
|
|
|
//Lower von mir ist, so spielt er keine Rolle.
|
|
|
|
//Wenn das SurroundObj in einem zeichengebunden Fly verankert ist, und ich
|
|
|
|
//selbst nicht Lower dieses Zeichengebundenen Flys bin, so spielt der Fly
|
|
|
|
//keine Rolle.
|
|
|
|
//#32639# Wenn das Objekt bei mir verankert ist kann ich es
|
|
|
|
//vernachlaessigen, weil es hoechstwahrscheinlich (!?) mitfliesst,
|
|
|
|
//eine TestFormatierung ist dann allerdings nicht erlaubt!
|
|
|
|
BYTE nRet = 0;
|
|
|
|
SwFlowFrm *pTmp = this;
|
|
|
|
do
|
|
|
|
{ // Wenn an uns oder einem Follow Objekte haengen, so
|
|
|
|
// kann keine ProbeFormatierung stattfinden, da absatzgebundene
|
|
|
|
// nicht richtig beruecksichtigt wuerden und zeichengebundene sollten
|
|
|
|
// gar nicht zur Probe formatiert werden.
|
|
|
|
if( pTmp->GetFrm()->GetDrawObjs() )
|
|
|
|
nRet = 1;
|
|
|
|
pTmp = pTmp->GetFollow();
|
|
|
|
} while ( !nRet && pTmp );
|
|
|
|
if ( pPage->GetSortedObjs() )
|
|
|
|
{
|
2004-08-02 13:08:38 +00:00
|
|
|
// --> OD 2004-07-01 #i28701# - new type <SwSortedObjs>
|
|
|
|
const SwSortedObjs &rObjs = *pPage->GetSortedObjs();
|
2000-09-18 23:08:29 +00:00
|
|
|
ULONG nIndex = ULONG_MAX;
|
|
|
|
for ( USHORT i = 0; nRet < 3 && i < rObjs.Count(); ++i )
|
|
|
|
{
|
2004-08-02 13:08:38 +00:00
|
|
|
// --> OD 2004-07-01 #i28701# - consider changed type of
|
|
|
|
// <SwSortedObjs> entries.
|
|
|
|
SwAnchoredObject* pObj = rObjs[i];
|
|
|
|
const SwFrmFmt& rFmt = pObj->GetFrmFmt();
|
|
|
|
const SwRect aRect( pObj->GetObjRect() );
|
2000-09-18 23:08:29 +00:00
|
|
|
if ( aRect.IsOver( rRect ) &&
|
2004-08-02 13:08:38 +00:00
|
|
|
rFmt.GetSurround().GetSurround() != SURROUND_THROUGHT )
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
|
|
|
if( rThis.IsLayoutFrm() && //Fly Lower von This?
|
2004-08-02 13:08:38 +00:00
|
|
|
Is_Lower_Of( &rThis, pObj->GetDrawObj() ) )
|
2000-09-18 23:08:29 +00:00
|
|
|
continue;
|
2004-08-02 13:08:38 +00:00
|
|
|
if( pObj->ISA(SwFlyFrm) )
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
2004-08-02 13:08:38 +00:00
|
|
|
const SwFlyFrm *pFly = static_cast<const SwFlyFrm*>(pObj);
|
2000-09-18 23:08:29 +00:00
|
|
|
if ( pFly->IsAnLower( &rThis ) )//This Lower vom Fly?
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
2004-08-02 13:08:38 +00:00
|
|
|
const SwFrm* pAnchor = pObj->GetAnchorFrm();
|
2000-09-18 23:08:29 +00:00
|
|
|
if ( pAnchor == &rThis )
|
|
|
|
{
|
|
|
|
nRet |= 1;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
//Nicht wenn das Objekt im Textfluss hinter mir verankert ist,
|
|
|
|
//denn dann weiche ich ihm nicht aus.
|
|
|
|
if ( ::IsFrmInSameKontext( pAnchor, &rThis ) )
|
|
|
|
{
|
2004-08-02 13:08:38 +00:00
|
|
|
if ( rFmt.GetAnchor().GetAnchorId() == FLY_AT_CNTNT )
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
|
|
|
// Den Index des anderen erhalten wir immer ueber das Ankerattr.
|
2004-08-02 13:08:38 +00:00
|
|
|
ULONG nTmpIndex = rFmt.GetAnchor().GetCntntAnchor()->nNode.GetIndex();
|
2000-09-18 23:08:29 +00:00
|
|
|
// Jetzt wird noch ueberprueft, ob der aktuelle Absatz vor dem
|
|
|
|
// Anker des verdraengenden Objekts im Text steht, dann wird
|
|
|
|
// nicht ausgewichen.
|
|
|
|
// Der Index wird moeglichst ueber einen SwFmtAnchor ermittelt,
|
|
|
|
// da sonst recht teuer.
|
|
|
|
if( ULONG_MAX == nIndex )
|
|
|
|
{
|
|
|
|
const SwNode *pNode;
|
|
|
|
if ( rThis.IsCntntFrm() )
|
|
|
|
pNode = ((SwCntntFrm&)rThis).GetNode();
|
|
|
|
else if( rThis.IsSctFrm() )
|
|
|
|
pNode = ((SwSectionFmt*)((SwSectionFrm&)rThis).
|
|
|
|
GetFmt())->GetSectionNode();
|
|
|
|
else
|
|
|
|
{
|
|
|
|
ASSERT( rThis.IsTabFrm(), "new FowFrm?" );
|
|
|
|
pNode = ((SwTabFrm&)rThis).GetTable()->
|
|
|
|
GetTabSortBoxes()[0]->GetSttNd()->FindTableNode();
|
|
|
|
}
|
|
|
|
nIndex = pNode->GetIndex();
|
|
|
|
}
|
|
|
|
if( nIndex < nTmpIndex )
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
continue;
|
|
|
|
|
|
|
|
nRet |= 2;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return nRet;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*************************************************************************
|
|
|
|
|*
|
|
|
|
|* SwFlowFrm::CutTree(), PasteTree(), MoveSubTree()
|
|
|
|
|*
|
|
|
|
|* Beschreibung Eine Spezialisierte Form des Cut() und Paste(), die
|
|
|
|
|* eine ganze Kette umhaengt (naehmlich this und folgende). Dabei werden
|
|
|
|
|* nur minimale Operationen und Benachrichtigungen ausgefuehrt.
|
|
|
|
|* Ersterstellung MA 18. Mar. 93
|
|
|
|
|* Letzte Aenderung MA 18. May. 95
|
|
|
|
|*
|
|
|
|
|*************************************************************************/
|
|
|
|
|
|
|
|
|
|
|
|
SwLayoutFrm *SwFlowFrm::CutTree( SwFrm *pStart )
|
|
|
|
{
|
|
|
|
//Der Start und alle Nachbarn werden ausgeschnitten, sie werden aneinander-
|
|
|
|
//gereiht und ein Henkel auf den ersten wird zurueckgeliefert.
|
|
|
|
//Zurueckbleibende werden geeignet invalidiert.
|
|
|
|
|
|
|
|
SwLayoutFrm *pLay = pStart->GetUpper();
|
|
|
|
if ( pLay->IsInFtn() )
|
|
|
|
pLay = pLay->FindFtnFrm();
|
2006-05-24 12:54:43 +00:00
|
|
|
|
|
|
|
// --> OD 2006-05-08 #i58846#
|
|
|
|
// <pPrepare( PREP_QUOVADIS )> only for frames in footnotes
|
|
|
|
if( pStart->IsInFtn() )
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
|
|
|
SwFrm* pTmp = pStart->GetIndPrev();
|
|
|
|
if( pTmp )
|
|
|
|
pTmp->Prepare( PREP_QUOVADIS );
|
|
|
|
}
|
2006-05-24 12:54:43 +00:00
|
|
|
// <--
|
2000-09-18 23:08:29 +00:00
|
|
|
|
|
|
|
//Nur fix auschneiden und zwar so, dass klare Verhaeltnisse bei den
|
|
|
|
//Verlassenen herrschen. Die Pointer der ausgeschnittenen Kette zeigen
|
|
|
|
//noch wer weiss wo hin.
|
|
|
|
if ( pStart == pStart->GetUpper()->Lower() )
|
|
|
|
pStart->GetUpper()->pLower = 0;
|
|
|
|
if ( pStart->GetPrev() )
|
|
|
|
{
|
|
|
|
pStart->GetPrev()->pNext = 0;
|
|
|
|
pStart->pPrev = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
if ( pLay->IsFtnFrm() )
|
2009-04-27 15:45:01 +00:00
|
|
|
{
|
|
|
|
if ( !pLay->Lower() && !pLay->IsColLocked() &&
|
2001-08-17 11:22:48 +00:00
|
|
|
!((SwFtnFrm*)pLay)->IsBackMoveLocked() )
|
2009-04-27 15:45:01 +00:00
|
|
|
{
|
|
|
|
pLay->Cut();
|
2000-09-18 23:08:29 +00:00
|
|
|
delete pLay;
|
|
|
|
}
|
|
|
|
else
|
2009-04-27 15:45:01 +00:00
|
|
|
{
|
|
|
|
BOOL bUnlock = !((SwFtnFrm*)pLay)->IsBackMoveLocked();
|
2001-08-17 11:22:48 +00:00
|
|
|
((SwFtnFrm*)pLay)->LockBackMove();
|
2000-09-18 23:08:29 +00:00
|
|
|
pLay->InvalidateSize();
|
|
|
|
pLay->Calc();
|
|
|
|
SwCntntFrm *pCnt = pLay->ContainsCntnt();
|
|
|
|
while ( pCnt && pLay->IsAnLower( pCnt ) )
|
|
|
|
{
|
|
|
|
//Kann sein, dass der CntFrm gelockt ist, wir wollen hier nicht
|
|
|
|
//in eine endlose Seitenwanderung hineinlaufen und rufen das
|
|
|
|
//Calc garnicht erst!
|
|
|
|
ASSERT( pCnt->IsTxtFrm(), "Die Graphic ist gelandet." );
|
|
|
|
if ( ((SwTxtFrm*)pCnt)->IsLocked() ||
|
|
|
|
((SwTxtFrm*)pCnt)->GetFollow() == pStart )
|
|
|
|
break;
|
|
|
|
pCnt->Calc();
|
|
|
|
pCnt = pCnt->GetNextCntntFrm();
|
|
|
|
}
|
2001-08-17 11:22:48 +00:00
|
|
|
if( bUnlock )
|
|
|
|
((SwFtnFrm*)pLay)->UnlockBackMove();
|
2000-09-18 23:08:29 +00:00
|
|
|
}
|
|
|
|
pLay = 0;
|
|
|
|
}
|
|
|
|
return pLay;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
BOOL SwFlowFrm::PasteTree( SwFrm *pStart, SwLayoutFrm *pParent, SwFrm *pSibling,
|
|
|
|
SwFrm *pOldParent )
|
|
|
|
{
|
|
|
|
//returnt TRUE wenn in der Kette ein LayoutFrm steht.
|
|
|
|
BOOL bRet = FALSE;
|
|
|
|
|
|
|
|
//Die mit pStart beginnende Kette wird vor den Sibling unter den Parent
|
|
|
|
//gehaengt. Fuer geeignete Invalidierung wird ebenfalls gesorgt.
|
|
|
|
|
|
|
|
//Ich bekomme eine fertige Kette. Der Anfang der Kette muss verpointert
|
|
|
|
//werden, dann alle Upper fuer die Kette und schliesslich dass Ende.
|
|
|
|
//Unterwegs werden alle geeignet invalidiert.
|
|
|
|
if ( pSibling )
|
|
|
|
{
|
|
|
|
if ( 0 != (pStart->pPrev = pSibling->GetPrev()) )
|
|
|
|
pStart->GetPrev()->pNext = pStart;
|
|
|
|
else
|
|
|
|
pParent->pLower = pStart;
|
|
|
|
pSibling->_InvalidatePos();
|
|
|
|
pSibling->_InvalidatePrt();
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
if ( 0 == (pStart->pPrev = pParent->Lower()) )
|
|
|
|
pParent->pLower = pStart;
|
|
|
|
else
|
2009-04-27 15:45:01 +00:00
|
|
|
//Modified for #i100782#,04/03/2009
|
|
|
|
//If the pParent has more than 1 child nodes, former design will
|
|
|
|
//ignore them directly without any collection work. It will make some
|
|
|
|
//dangling pointers. This lead the crash...
|
|
|
|
//The new design will find the last child of pParent in loop way, and
|
|
|
|
//add the pStart after the last child.
|
|
|
|
// pParent->Lower()->pNext = pStart;
|
|
|
|
{
|
|
|
|
SwFrm* pTemp = pParent->pLower;
|
|
|
|
while (pTemp)
|
|
|
|
{
|
|
|
|
if (pTemp->pNext)
|
|
|
|
pTemp = pTemp->pNext;
|
|
|
|
else
|
|
|
|
{
|
|
|
|
pStart->pPrev = pTemp;
|
|
|
|
pTemp->pNext = pStart;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
//End modification for #i100782#,04/03/2009
|
2004-06-04 07:44:36 +00:00
|
|
|
|
|
|
|
// #i27145#
|
|
|
|
if ( pParent->IsSctFrm() )
|
|
|
|
{
|
|
|
|
// We have no sibling because pParent is a section frame and
|
|
|
|
// has just been created to contain some content. The printing
|
|
|
|
// area of the frame behind pParent has to be invalidated, so
|
|
|
|
// that the correct distance between pParent and the next frame
|
|
|
|
// can be calculated.
|
|
|
|
pParent->InvalidateNextPrtArea();
|
|
|
|
}
|
2000-09-18 23:08:29 +00:00
|
|
|
}
|
|
|
|
SwFrm *pFloat = pStart;
|
2007-09-27 08:01:58 +00:00
|
|
|
SwFrm *pLst = 0;
|
2001-10-05 11:36:10 +00:00
|
|
|
SWRECTFN( pParent )
|
2000-09-18 23:08:29 +00:00
|
|
|
SwTwips nGrowVal = 0;
|
|
|
|
do
|
|
|
|
{ pFloat->pUpper = pParent;
|
|
|
|
pFloat->_InvalidateAll();
|
2001-11-14 15:08:34 +00:00
|
|
|
pFloat->CheckDirChange();
|
2000-09-18 23:08:29 +00:00
|
|
|
|
|
|
|
//Ich bin Freund des TxtFrm und darf deshalb so einiges. Das mit
|
|
|
|
//dem CacheIdx scheint etwas riskant!
|
|
|
|
if ( pFloat->IsTxtFrm() )
|
|
|
|
{
|
|
|
|
if ( ((SwTxtFrm*)pFloat)->GetCacheIdx() != USHRT_MAX )
|
|
|
|
((SwTxtFrm*)pFloat)->Init(); //Ich bin sein Freund.
|
|
|
|
}
|
|
|
|
else
|
|
|
|
bRet = TRUE;
|
|
|
|
|
2001-10-05 11:36:10 +00:00
|
|
|
nGrowVal += (pFloat->Frm().*fnRect->fnGetHeight)();
|
2000-09-18 23:08:29 +00:00
|
|
|
if ( pFloat->GetNext() )
|
|
|
|
pFloat = pFloat->GetNext();
|
|
|
|
else
|
2004-06-04 07:44:36 +00:00
|
|
|
{
|
|
|
|
pLst = pFloat;
|
2000-09-18 23:08:29 +00:00
|
|
|
pFloat = 0;
|
|
|
|
}
|
|
|
|
} while ( pFloat );
|
|
|
|
|
|
|
|
if ( pSibling )
|
|
|
|
{
|
|
|
|
pLst->pNext = pSibling;
|
|
|
|
pSibling->pPrev = pLst;
|
|
|
|
if( pSibling->IsInFtn() )
|
|
|
|
{
|
|
|
|
if( pSibling->IsSctFrm() )
|
|
|
|
pSibling = ((SwSectionFrm*)pSibling)->ContainsAny();
|
|
|
|
if( pSibling )
|
|
|
|
pSibling->Prepare( PREP_ERGOSUM );
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if ( nGrowVal )
|
|
|
|
{
|
|
|
|
if ( pOldParent && pOldParent->IsBodyFrm() ) //Fuer variable Seitenhoehe beim Browsen
|
2007-02-28 14:47:32 +00:00
|
|
|
pOldParent->Shrink( nGrowVal );
|
|
|
|
pParent->Grow( nGrowVal );
|
2000-09-18 23:08:29 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
if ( pParent->IsFtnFrm() )
|
|
|
|
((SwFtnFrm*)pParent)->InvalidateNxtFtnCnts( pParent->FindPageFrm() );
|
|
|
|
return bRet;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
void SwFlowFrm::MoveSubTree( SwLayoutFrm* pParent, SwFrm* pSibling )
|
|
|
|
{
|
|
|
|
ASSERT( pParent, "Kein Parent uebergeben." );
|
|
|
|
ASSERT( rThis.GetUpper(), "Wo kommen wir denn her?" );
|
|
|
|
|
|
|
|
//Sparsamer benachrichtigen wenn eine Action laeuft.
|
|
|
|
ViewShell *pSh = rThis.GetShell();
|
|
|
|
const SwViewImp *pImp = pSh ? pSh->Imp() : 0;
|
|
|
|
const BOOL bComplete = pImp && pImp->IsAction() && pImp->GetLayAction().IsComplete();
|
|
|
|
|
|
|
|
if ( !bComplete )
|
|
|
|
{
|
|
|
|
SwFrm *pPre = rThis.GetIndPrev();
|
|
|
|
if ( pPre )
|
|
|
|
{
|
|
|
|
pPre->SetRetouche();
|
2004-12-23 09:07:01 +00:00
|
|
|
// --> OD 2004-11-23 #115759# - follow-up of #i26250#
|
|
|
|
// invalidate printing area of previous frame, if it's in a table
|
2006-03-09 13:07:10 +00:00
|
|
|
if ( pPre->GetUpper()->IsInTab() )
|
2004-12-23 09:07:01 +00:00
|
|
|
{
|
|
|
|
pPre->_InvalidatePrt();
|
|
|
|
}
|
|
|
|
// <--
|
2000-09-18 23:08:29 +00:00
|
|
|
pPre->InvalidatePage();
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{ rThis.GetUpper()->SetCompletePaint();
|
|
|
|
rThis.GetUpper()->InvalidatePage();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
SwPageFrm *pOldPage = rThis.FindPageFrm();
|
|
|
|
|
|
|
|
SwLayoutFrm *pOldParent = CutTree( &rThis );
|
|
|
|
const BOOL bInvaLay = PasteTree( &rThis, pParent, pSibling, pOldParent );
|
|
|
|
|
|
|
|
// Wenn durch das Cut&Paste ein leerer SectionFrm entstanden ist, sollte
|
|
|
|
// dieser automatisch verschwinden.
|
|
|
|
SwSectionFrm *pSct;
|
2006-01-27 13:35:52 +00:00
|
|
|
// --> OD 2006-01-04 #126020# - adjust check for empty section
|
2006-02-06 15:30:31 +00:00
|
|
|
// --> OD 2006-02-01 #130797# - correct fix #126020#
|
2000-09-18 23:08:29 +00:00
|
|
|
if ( pOldParent && !pOldParent->Lower() &&
|
2006-02-06 15:30:31 +00:00
|
|
|
( pOldParent->IsInSct() &&
|
|
|
|
!(pSct = pOldParent->FindSctFrm())->ContainsCntnt() &&
|
|
|
|
!pSct->ContainsAny( true ) ) )
|
2006-01-27 13:35:52 +00:00
|
|
|
// <--
|
|
|
|
{
|
2000-09-18 23:08:29 +00:00
|
|
|
pSct->DelEmpty( FALSE );
|
2006-01-27 13:35:52 +00:00
|
|
|
}
|
2004-06-01 06:44:04 +00:00
|
|
|
|
2000-09-18 23:08:29 +00:00
|
|
|
// In einem spaltigen Bereich rufen wir lieber kein Calc "von unten"
|
2004-06-01 06:44:04 +00:00
|
|
|
if( !rThis.IsInSct() &&
|
|
|
|
( !rThis.IsInTab() || ( rThis.IsTabFrm() && !rThis.GetUpper()->IsInTab() ) ) )
|
2000-09-18 23:08:29 +00:00
|
|
|
rThis.GetUpper()->Calc();
|
|
|
|
else if( rThis.GetUpper()->IsSctFrm() )
|
|
|
|
{
|
2007-09-27 08:01:58 +00:00
|
|
|
SwSectionFrm* pTmpSct = (SwSectionFrm*)rThis.GetUpper();
|
|
|
|
BOOL bOld = pTmpSct->IsCntntLocked();
|
|
|
|
pTmpSct->SetCntntLock( TRUE );
|
|
|
|
pTmpSct->Calc();
|
2000-09-18 23:08:29 +00:00
|
|
|
if( !bOld )
|
2007-09-27 08:01:58 +00:00
|
|
|
pTmpSct->SetCntntLock( FALSE );
|
2000-09-18 23:08:29 +00:00
|
|
|
}
|
|
|
|
SwPageFrm *pPage = rThis.FindPageFrm();
|
|
|
|
|
|
|
|
if ( pOldPage != pPage )
|
|
|
|
{
|
|
|
|
rThis.InvalidatePage( pPage );
|
|
|
|
if ( rThis.IsLayoutFrm() )
|
|
|
|
{
|
|
|
|
SwCntntFrm *pCnt = ((SwLayoutFrm*)&rThis)->ContainsCntnt();
|
|
|
|
if ( pCnt )
|
|
|
|
pCnt->InvalidatePage( pPage );
|
|
|
|
}
|
2000-10-30 15:22:11 +00:00
|
|
|
else if ( pSh && pSh->GetDoc()->GetLineNumberInfo().IsRestartEachPage()
|
|
|
|
&& pPage->FindFirstBodyCntnt() == &rThis )
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
|
|
|
rThis._InvalidateLineNum();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if ( bInvaLay || (pSibling && pSibling->IsLayoutFrm()) )
|
|
|
|
rThis.GetUpper()->InvalidatePage( pPage );
|
|
|
|
}
|
|
|
|
|
|
|
|
/*************************************************************************
|
|
|
|
|*
|
|
|
|
|* SwFlowFrm::IsAnFollow()
|
|
|
|
|*
|
|
|
|
|* Ersterstellung MA 26. Apr. 95
|
|
|
|
|* Letzte Aenderung MA 26. Apr. 95
|
|
|
|
|*
|
|
|
|
|*************************************************************************/
|
|
|
|
|
|
|
|
|
|
|
|
BOOL SwFlowFrm::IsAnFollow( const SwFlowFrm *pAssumed ) const
|
|
|
|
{
|
|
|
|
const SwFlowFrm *pFoll = this;
|
|
|
|
do
|
|
|
|
{ if ( pAssumed == pFoll )
|
|
|
|
return TRUE;
|
|
|
|
pFoll = pFoll->GetFollow();
|
|
|
|
} while ( pFoll );
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
2004-01-13 12:13:45 +00:00
|
|
|
|
2000-09-18 23:08:29 +00:00
|
|
|
/*************************************************************************
|
|
|
|
|*
|
|
|
|
|* SwFlowFrm::FindMaster()
|
|
|
|
|*
|
|
|
|
|* Ersterstellung MA 26. Apr. 95
|
|
|
|
|* Letzte Aenderung MA 26. Apr. 95
|
|
|
|
|*
|
|
|
|
|*************************************************************************/
|
|
|
|
|
2004-01-13 12:13:45 +00:00
|
|
|
SwTxtFrm* SwCntntFrm::FindMaster() const
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
2004-01-13 12:13:45 +00:00
|
|
|
ASSERT( IsFollow(), "SwCntntFrm::FindMaster(): !IsFollow" );
|
2000-09-18 23:08:29 +00:00
|
|
|
|
2004-01-13 12:13:45 +00:00
|
|
|
const SwCntntFrm* pCnt = GetPrevCntntFrm();
|
|
|
|
|
|
|
|
while ( pCnt )
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
2004-01-13 12:13:45 +00:00
|
|
|
if ( pCnt->HasFollow() && pCnt->GetFollow() == this )
|
|
|
|
{
|
|
|
|
ASSERT( pCnt->IsTxtFrm(), "NoTxtFrm with follow found" )
|
|
|
|
return (SwTxtFrm*)pCnt;
|
|
|
|
}
|
2002-08-07 14:52:50 +00:00
|
|
|
pCnt = pCnt->GetPrevCntntFrm();
|
2000-09-18 23:08:29 +00:00
|
|
|
}
|
2002-08-07 14:52:50 +00:00
|
|
|
|
2004-01-13 12:13:45 +00:00
|
|
|
ASSERT( FALSE, "Follow ist lost in Space." );
|
|
|
|
return 0;
|
|
|
|
}
|
2002-08-07 14:52:50 +00:00
|
|
|
|
2004-01-13 12:13:45 +00:00
|
|
|
SwSectionFrm* SwSectionFrm::FindMaster() const
|
|
|
|
{
|
|
|
|
ASSERT( IsFollow(), "SwSectionFrm::FindMaster(): !IsFollow" );
|
|
|
|
|
|
|
|
SwClientIter aIter( *pSection->GetFmt() );
|
|
|
|
SwClient *pLast = aIter.GoStart();
|
|
|
|
|
|
|
|
while ( pLast )
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
2004-01-13 12:13:45 +00:00
|
|
|
if ( pLast->ISA( SwFrm ) )
|
|
|
|
{
|
|
|
|
ASSERT( ((SwFrm*)pLast)->IsSctFrm(),
|
|
|
|
"Non-section frame registered in section format" )
|
|
|
|
SwSectionFrm* pSect = (SwSectionFrm*)pLast;
|
|
|
|
if( pSect->GetFollow() == this )
|
|
|
|
return pSect;
|
|
|
|
}
|
|
|
|
pLast = aIter++;
|
2000-09-18 23:08:29 +00:00
|
|
|
}
|
|
|
|
|
2004-01-13 12:13:45 +00:00
|
|
|
ASSERT( FALSE, "Follow ist lost in Space." );
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
SwTabFrm* SwTabFrm::FindMaster( bool bFirstMaster ) const
|
|
|
|
{
|
|
|
|
ASSERT( IsFollow(), "SwTabFrm::FindMaster(): !IsFollow" );
|
|
|
|
|
|
|
|
SwClientIter aIter( *GetTable()->GetFrmFmt() );
|
|
|
|
SwClient* pLast = aIter.GoStart();
|
|
|
|
|
|
|
|
while ( pLast )
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
2004-01-13 12:13:45 +00:00
|
|
|
if ( pLast->ISA( SwFrm ) )
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
2004-01-13 12:13:45 +00:00
|
|
|
ASSERT( ((SwFrm*)pLast)->IsTabFrm(),
|
|
|
|
"Non-table frame registered in table format" )
|
|
|
|
SwTabFrm* pTab = (SwTabFrm*)pLast;
|
|
|
|
|
|
|
|
if ( bFirstMaster )
|
|
|
|
{
|
|
|
|
//
|
|
|
|
// Optimization. This makes code like this obsolete:
|
|
|
|
// while ( pTab->IsFollow() )
|
|
|
|
// pTab = pTab->FindMaster();
|
|
|
|
//
|
|
|
|
if ( !pTab->IsFollow() )
|
|
|
|
{
|
|
|
|
SwTabFrm* pNxt = pTab;
|
|
|
|
while ( pNxt )
|
|
|
|
{
|
|
|
|
if ( pNxt->GetFollow() == this )
|
|
|
|
return pTab;
|
|
|
|
pNxt = pNxt->GetFollow();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
if ( pTab->GetFollow() == this )
|
|
|
|
return pTab;
|
|
|
|
}
|
2000-09-18 23:08:29 +00:00
|
|
|
}
|
2004-01-13 12:13:45 +00:00
|
|
|
pLast = aIter++;
|
2000-09-18 23:08:29 +00:00
|
|
|
}
|
2004-01-13 12:13:45 +00:00
|
|
|
|
2000-09-18 23:08:29 +00:00
|
|
|
ASSERT( FALSE, "Follow ist lost in Space." );
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*************************************************************************
|
|
|
|
|*
|
|
|
|
|* SwFrm::GetLeaf()
|
|
|
|
|*
|
|
|
|
|* Beschreibung Liefert das naechste/vorhergehende LayoutBlatt,
|
|
|
|
|* das _nicht_ unterhalb von this liegt (oder gar this selbst ist).
|
|
|
|
|* Ausserdem muss dieses LayoutBlatt im gleichen Textfluss wie
|
|
|
|
|* pAnch Ausgangsfrm liegen (Body, Ftn)
|
|
|
|
|* Ersterstellung MA 25. Nov. 92
|
|
|
|
|* Letzte Aenderung MA 25. Apr. 95
|
|
|
|
|*
|
|
|
|
|*************************************************************************/
|
|
|
|
|
|
|
|
|
|
|
|
const SwLayoutFrm *SwFrm::GetLeaf( MakePageType eMakePage, BOOL bFwd,
|
|
|
|
const SwFrm *pAnch ) const
|
|
|
|
{
|
|
|
|
//Ohne Fluss kein genuss...
|
2004-01-13 12:13:45 +00:00
|
|
|
if ( !(IsInDocBody() || IsInFtn() || IsInFly()) )
|
2000-09-18 23:08:29 +00:00
|
|
|
return 0;
|
|
|
|
|
|
|
|
const SwFrm *pLeaf = this;
|
|
|
|
BOOL bFound = FALSE;
|
|
|
|
|
|
|
|
do
|
|
|
|
{ pLeaf = ((SwFrm*)pLeaf)->GetLeaf( eMakePage, bFwd );
|
|
|
|
|
|
|
|
if ( pLeaf &&
|
|
|
|
(!IsLayoutFrm() || !((SwLayoutFrm*)this)->IsAnLower( pLeaf )))
|
|
|
|
{
|
|
|
|
if ( pAnch->IsInDocBody() == pLeaf->IsInDocBody() &&
|
|
|
|
pAnch->IsInFtn() == pLeaf->IsInFtn() )
|
|
|
|
{
|
|
|
|
bFound = TRUE;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
} while ( !bFound && pLeaf );
|
|
|
|
|
|
|
|
return (const SwLayoutFrm*)pLeaf;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*************************************************************************
|
|
|
|
|*
|
|
|
|
|* SwFrm::GetLeaf()
|
|
|
|
|*
|
|
|
|
|* Beschreibung Ruft Get[Next|Prev]Leaf
|
|
|
|
|*
|
|
|
|
|* Ersterstellung MA 20. Mar. 93
|
|
|
|
|* Letzte Aenderung MA 25. Apr. 95
|
|
|
|
|*
|
|
|
|
|*************************************************************************/
|
|
|
|
|
|
|
|
|
|
|
|
SwLayoutFrm *SwFrm::GetLeaf( MakePageType eMakePage, BOOL bFwd )
|
|
|
|
{
|
|
|
|
if ( IsInFtn() )
|
|
|
|
return bFwd ? GetNextFtnLeaf( eMakePage ) : GetPrevFtnLeaf( eMakePage );
|
2004-01-13 12:13:45 +00:00
|
|
|
|
2005-09-28 10:11:17 +00:00
|
|
|
// --> OD 2005-08-16 #i53323#
|
|
|
|
// A frame could be inside a table AND inside a section.
|
|
|
|
// Thus, it has to be determined, which is the first parent.
|
|
|
|
bool bInTab( IsInTab() );
|
|
|
|
bool bInSct( IsInSct() );
|
|
|
|
if ( bInTab && bInSct )
|
|
|
|
{
|
|
|
|
const SwFrm* pUpperFrm( GetUpper() );
|
|
|
|
while ( pUpperFrm )
|
|
|
|
{
|
|
|
|
if ( pUpperFrm->IsTabFrm() )
|
|
|
|
{
|
|
|
|
// the table is the first.
|
|
|
|
bInSct = false;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
else if ( pUpperFrm->IsSctFrm() )
|
|
|
|
{
|
|
|
|
// the section is the first.
|
|
|
|
bInTab = false;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
pUpperFrm = pUpperFrm->GetUpper();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if ( bInTab && ( !IsTabFrm() || GetUpper()->IsCellFrm() ) ) // TABLE IN TABLE
|
2004-01-13 12:13:45 +00:00
|
|
|
return bFwd ? GetNextCellLeaf( eMakePage ) : GetPrevCellLeaf( eMakePage );
|
|
|
|
|
2005-09-28 10:11:17 +00:00
|
|
|
if ( bInSct )
|
2000-09-18 23:08:29 +00:00
|
|
|
return bFwd ? GetNextSctLeaf( eMakePage ) : GetPrevSctLeaf( eMakePage );
|
2005-09-28 10:11:17 +00:00
|
|
|
// <--
|
2004-01-13 12:13:45 +00:00
|
|
|
|
2000-09-18 23:08:29 +00:00
|
|
|
return bFwd ? GetNextLeaf( eMakePage ) : GetPrevLeaf( eMakePage );
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
BOOL SwFrm::WrongPageDesc( SwPageFrm* pNew )
|
|
|
|
{
|
|
|
|
//Jetzt wirds leider etwas kompliziert:
|
|
|
|
//Ich bringe ich evtl. selbst
|
|
|
|
//einen Pagedesc mit; der der Folgeseite muss dann damit
|
|
|
|
//uebereinstimmen.
|
|
|
|
//Anderfalls muss ich mir etwas genauer ansehen wo der
|
|
|
|
//Folgepagedesc herkam.
|
|
|
|
//Wenn die Folgeseite selbst schon sagt, dass ihr
|
|
|
|
//Pagedesc nicht stimmt so kann ich das Teil bedenkenlos
|
|
|
|
//auswechseln.
|
|
|
|
//Wenn die Seite meint, dass ihr Pagedesc stimmt, so heisst
|
|
|
|
//das leider noch immer nicht, dass ich damit etwas anfangen
|
|
|
|
//kann: Wenn der erste BodyCntnt einen PageDesc oder einen
|
|
|
|
//PageBreak wuenscht, so muss ich ebenfalls eine neue
|
|
|
|
//Seite einfuegen; es sein denn die gewuenschte Seite ist
|
|
|
|
//die richtige.
|
|
|
|
//Wenn ich einen neue Seite eingefuegt habe, so fangen die
|
|
|
|
//Probleme leider erst an, denn wahrscheinlich wird die dann
|
|
|
|
//folgende Seite verkehrt gewesen und ausgewechselt worden
|
|
|
|
//sein. Das hat zur Folge, dass ich zwar eine neue (und
|
|
|
|
//jetzt richtige) Seite habe, die Bedingungen zum auswechseln
|
|
|
|
//aber leider noch immer stimmen.
|
|
|
|
//Ausweg: Vorlaeufiger Versuch, nur einmal eine neue Seite
|
|
|
|
//einsetzen (Leerseiten werden noetigenfalls bereits von
|
|
|
|
//InsertPage() eingefuegt.
|
|
|
|
const SwFmtPageDesc &rFmtDesc = GetAttrSet()->GetPageDesc();
|
|
|
|
|
|
|
|
//Mein Pagedesc zaehlt nicht, wenn ich ein Follow bin!
|
|
|
|
SwPageDesc *pDesc = 0;
|
2001-03-02 09:47:13 +00:00
|
|
|
USHORT nTmp = 0;
|
2000-09-18 23:08:29 +00:00
|
|
|
SwFlowFrm *pFlow = SwFlowFrm::CastFlowFrm( this );
|
|
|
|
if ( !pFlow || !pFlow->IsFollow() )
|
2001-03-02 09:47:13 +00:00
|
|
|
{
|
2000-09-18 23:08:29 +00:00
|
|
|
pDesc = (SwPageDesc*)rFmtDesc.GetPageDesc();
|
2001-03-02 09:47:13 +00:00
|
|
|
if( pDesc )
|
|
|
|
{
|
|
|
|
if( !pDesc->GetRightFmt() )
|
|
|
|
nTmp = 2;
|
|
|
|
else if( !pDesc->GetLeftFmt() )
|
|
|
|
nTmp = 1;
|
|
|
|
else if( rFmtDesc.GetNumOffset() )
|
|
|
|
nTmp = rFmtDesc.GetNumOffset();
|
|
|
|
}
|
|
|
|
}
|
2000-09-18 23:08:29 +00:00
|
|
|
|
|
|
|
//Bringt der Cntnt einen Pagedesc mit oder muss zaehlt die
|
|
|
|
//virtuelle Seitennummer des neuen Layoutleafs?
|
|
|
|
// Bei Follows zaehlt der PageDesc nicht
|
2001-03-02 09:47:13 +00:00
|
|
|
const BOOL bOdd = nTmp ? ( nTmp % 2 ? TRUE : FALSE )
|
|
|
|
: pNew->OnRightPage();
|
2000-09-18 23:08:29 +00:00
|
|
|
if ( !pDesc )
|
|
|
|
pDesc = pNew->FindPageDesc();
|
|
|
|
const SwFlowFrm *pNewFlow = pNew->FindFirstBodyCntnt();
|
|
|
|
// Haben wir uns selbst gefunden?
|
|
|
|
if( pNewFlow == pFlow )
|
|
|
|
pNewFlow = NULL;
|
|
|
|
if ( pNewFlow && pNewFlow->GetFrm()->IsInTab() )
|
|
|
|
pNewFlow = pNewFlow->GetFrm()->FindTabFrm();
|
|
|
|
const SwPageDesc *pNewDesc= ( pNewFlow && !pNewFlow->IsFollow() )
|
|
|
|
? pNewFlow->GetFrm()->GetAttrSet()->GetPageDesc().GetPageDesc():0;
|
|
|
|
|
|
|
|
return ( pNew->GetPageDesc() != pDesc || // own desc ?
|
|
|
|
pNew->GetFmt() != (bOdd ? pDesc->GetRightFmt() : pDesc->GetLeftFmt()) ||
|
|
|
|
( pNewDesc && pNewDesc == pDesc ) );
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*************************************************************************
|
|
|
|
|*
|
|
|
|
|* SwFrm::GetNextLeaf()
|
|
|
|
|*
|
|
|
|
|* Beschreibung Liefert das naechste LayoutBlatt in den das
|
|
|
|
|* Frame gemoved werden kann.
|
|
|
|
|*
|
|
|
|
|* Ersterstellung MA 16. Nov. 92
|
|
|
|
|* Letzte Aenderung MA 05. Dec. 96
|
|
|
|
|*
|
|
|
|
|*************************************************************************/
|
|
|
|
|
|
|
|
SwLayoutFrm *SwFrm::GetNextLeaf( MakePageType eMakePage )
|
|
|
|
{
|
|
|
|
ASSERT( !IsInFtn(), "GetNextLeaf(), don't call me for Ftn." );
|
|
|
|
ASSERT( !IsInSct(), "GetNextLeaf(), don't call me for Sections." );
|
|
|
|
|
|
|
|
const BOOL bBody = IsInDocBody(); //Wenn ich aus dem DocBody komme
|
|
|
|
//Will ich auch im Body landen.
|
|
|
|
|
|
|
|
// Bei Flys macht es keinen Sinn, Seiten einzufuegen, wir wollen lediglich
|
|
|
|
// die Verkettung absuchen.
|
|
|
|
if( IsInFly() )
|
|
|
|
eMakePage = MAKEPAGE_NONE;
|
2004-01-07 15:33:16 +00:00
|
|
|
|
2000-09-18 23:08:29 +00:00
|
|
|
//Bei Tabellen gleich den grossen Sprung wagen, ein einfaches GetNext...
|
|
|
|
//wuerde die erste Zellen und in der Folge alle weiteren Zellen nacheinander
|
|
|
|
//abklappern....
|
2004-01-07 15:33:16 +00:00
|
|
|
SwLayoutFrm *pLayLeaf = 0;
|
2000-09-18 23:08:29 +00:00
|
|
|
if ( IsTabFrm() )
|
2004-01-07 15:33:16 +00:00
|
|
|
{
|
|
|
|
SwCntntFrm* pTmp = ((SwTabFrm*)this)->FindLastCntnt();
|
|
|
|
if ( pTmp )
|
|
|
|
pLayLeaf = pTmp->GetUpper();
|
|
|
|
}
|
2004-01-13 12:13:45 +00:00
|
|
|
if ( !pLayLeaf )
|
2000-09-18 23:08:29 +00:00
|
|
|
pLayLeaf = GetNextLayoutLeaf();
|
|
|
|
|
|
|
|
SwLayoutFrm *pOldLayLeaf = 0; //Damit bei neu erzeugten Seiten
|
|
|
|
//nicht wieder vom Anfang gesucht
|
|
|
|
//wird.
|
|
|
|
BOOL bNewPg = FALSE; //nur einmal eine neue Seite einfuegen.
|
|
|
|
|
|
|
|
while ( TRUE )
|
|
|
|
{
|
|
|
|
if ( pLayLeaf )
|
|
|
|
{
|
|
|
|
//Es gibt noch einen weiteren LayoutFrm, mal sehen,
|
|
|
|
//ob er bereit ist mich aufzunehmen.
|
|
|
|
//Dazu braucht er nur von der gleichen Art wie mein Ausgangspunkt
|
|
|
|
//sein (DocBody bzw. Footnote.)
|
|
|
|
if ( pLayLeaf->FindPageFrm()->IsFtnPage() )
|
|
|
|
{ //Wenn ich bei den Endnotenseiten angelangt bin hat sichs.
|
|
|
|
pLayLeaf = 0;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
if ( (bBody && !pLayLeaf->IsInDocBody()) || pLayLeaf->IsInTab()
|
|
|
|
|| pLayLeaf->IsInSct() )
|
|
|
|
{
|
|
|
|
//Er will mich nicht; neuer Versuch, neues Glueck
|
|
|
|
pOldLayLeaf = pLayLeaf;
|
|
|
|
pLayLeaf = pLayLeaf->GetNextLayoutLeaf();
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
//Er will mich, also ist er der gesuchte und ich bin fertig.
|
|
|
|
//Bei einem Seitenwechsel kann es allerdings noch sein, dass
|
|
|
|
//Der Seitentyp nicht der gewuenschte ist, in diesem Fall muessen
|
|
|
|
//wir eine Seite des richtigen Typs einfuegen.
|
|
|
|
|
2001-03-14 13:16:02 +00:00
|
|
|
if( !IsFlowFrm() && ( eMakePage == MAKEPAGE_NONE ||
|
|
|
|
eMakePage==MAKEPAGE_APPEND || eMakePage==MAKEPAGE_NOSECTION ) )
|
2000-09-18 23:08:29 +00:00
|
|
|
return pLayLeaf;
|
|
|
|
|
|
|
|
SwPageFrm *pNew = pLayLeaf->FindPageFrm();
|
2003-10-30 09:18:32 +00:00
|
|
|
// #111704# The pagedesc check does not make sense for frames in fly frames
|
2005-09-28 10:11:17 +00:00
|
|
|
if ( pNew != FindPageFrm() && !bNewPg && !IsInFly() &&
|
|
|
|
// --> FME 2005-05-10 #i46683#
|
|
|
|
// Do not consider page descriptions in browse mode (since
|
|
|
|
// MoveBwd ignored them)
|
2006-08-14 15:25:22 +00:00
|
|
|
!pNew->GetFmt()->getIDocumentSettingAccess()->get(IDocumentSettingAccess::BROWSE_MODE) )
|
2005-09-28 10:11:17 +00:00
|
|
|
// <--
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
|
|
|
if( WrongPageDesc( pNew ) )
|
|
|
|
{
|
|
|
|
SwFtnContFrm *pCont = pNew->FindFtnCont();
|
|
|
|
if( pCont )
|
|
|
|
{
|
|
|
|
// Falls die Referenz der ersten Fussnote dieser Seite
|
|
|
|
// vor der Seite liegt, fuegen wir lieber keine neue Seite
|
|
|
|
// ein (Bug #55620#)
|
|
|
|
SwFtnFrm *pFtn = (SwFtnFrm*)pCont->Lower();
|
|
|
|
if( pFtn && pFtn->GetRef() )
|
|
|
|
{
|
|
|
|
const USHORT nRefNum = pNew->GetPhyPageNum();
|
|
|
|
if( pFtn->GetRef()->GetPhyPageNum() < nRefNum )
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
//Erwischt, die folgende Seite ist verkehrt, also
|
|
|
|
//muss eine neue eingefuegt werden.
|
|
|
|
if ( eMakePage == MAKEPAGE_INSERT )
|
|
|
|
{
|
|
|
|
bNewPg = TRUE;
|
|
|
|
|
|
|
|
SwPageFrm *pPg = pOldLayLeaf ?
|
|
|
|
pOldLayLeaf->FindPageFrm() : 0;
|
|
|
|
if ( pPg && pPg->IsEmptyPage() )
|
|
|
|
//Nicht hinter, sondern vor der EmptyPage einfuegen.
|
|
|
|
pPg = (SwPageFrm*)pPg->GetPrev();
|
|
|
|
|
|
|
|
if ( !pPg || pPg == pNew )
|
|
|
|
pPg = FindPageFrm();
|
|
|
|
|
|
|
|
InsertPage( pPg, FALSE );
|
|
|
|
pLayLeaf = GetNextLayoutLeaf();
|
|
|
|
pOldLayLeaf = 0;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
pLayLeaf = 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
//Es gibt keinen passenden weiteren LayoutFrm, also muss eine
|
|
|
|
//neue Seite her.
|
|
|
|
if ( eMakePage == MAKEPAGE_APPEND || eMakePage == MAKEPAGE_INSERT )
|
|
|
|
{
|
|
|
|
InsertPage(
|
|
|
|
pOldLayLeaf ? pOldLayLeaf->FindPageFrm() : FindPageFrm(),
|
|
|
|
FALSE );
|
|
|
|
|
|
|
|
//und nochmal das ganze
|
|
|
|
pLayLeaf = pOldLayLeaf ? pOldLayLeaf : GetNextLayoutLeaf();
|
|
|
|
}
|
|
|
|
else
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return pLayLeaf;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*************************************************************************
|
|
|
|
|*
|
|
|
|
|* SwFrm::GetPrevLeaf()
|
|
|
|
|*
|
|
|
|
|* Beschreibung Liefert das vorhergehende LayoutBlatt in das der
|
|
|
|
|* Frame gemoved werden kann.
|
|
|
|
|* Ersterstellung MA 16. Nov. 92
|
|
|
|
|* Letzte Aenderung MA 25. Apr. 95
|
|
|
|
|*
|
|
|
|
|*************************************************************************/
|
|
|
|
|
|
|
|
|
2007-09-27 08:01:58 +00:00
|
|
|
SwLayoutFrm *SwFrm::GetPrevLeaf( MakePageType )
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
|
|
|
ASSERT( !IsInFtn(), "GetPrevLeaf(), don't call me for Ftn." );
|
|
|
|
|
|
|
|
const BOOL bBody = IsInDocBody(); //Wenn ich aus dem DocBody komme
|
|
|
|
//will ich auch im Body landen.
|
|
|
|
const BOOL bFly = IsInFly();
|
|
|
|
|
|
|
|
SwLayoutFrm *pLayLeaf = GetPrevLayoutLeaf();
|
|
|
|
SwLayoutFrm *pPrevLeaf = 0;
|
|
|
|
|
|
|
|
while ( pLayLeaf )
|
|
|
|
{
|
|
|
|
if ( pLayLeaf->IsInTab() || //In Tabellen geht's niemals hinein.
|
|
|
|
pLayLeaf->IsInSct() ) //In Bereiche natuerlich auch nicht!
|
|
|
|
pLayLeaf = pLayLeaf->GetPrevLayoutLeaf();
|
|
|
|
else if ( bBody && pLayLeaf->IsInDocBody() )
|
|
|
|
{
|
|
|
|
if ( pLayLeaf->Lower() )
|
|
|
|
break;
|
|
|
|
pPrevLeaf = pLayLeaf;
|
|
|
|
pLayLeaf = pLayLeaf->GetPrevLayoutLeaf();
|
|
|
|
if ( pLayLeaf )
|
|
|
|
SwFlowFrm::SetMoveBwdJump( TRUE );
|
|
|
|
}
|
|
|
|
else if ( bFly )
|
|
|
|
break; //Cntnts in Flys sollte jedes Layout-Blatt recht sein.
|
|
|
|
else
|
|
|
|
pLayLeaf = pLayLeaf->GetPrevLayoutLeaf();
|
|
|
|
}
|
|
|
|
return pLayLeaf ? pLayLeaf : pPrevLeaf;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*************************************************************************
|
|
|
|
|*
|
|
|
|
|* SwFlowFrm::IsPrevObjMove()
|
|
|
|
|*
|
|
|
|
|* Ersterstellung MA 20. Feb. 96
|
|
|
|
|* Letzte Aenderung MA 22. Feb. 96
|
|
|
|
|*
|
|
|
|
|*************************************************************************/
|
|
|
|
|
|
|
|
|
|
|
|
BOOL SwFlowFrm::IsPrevObjMove() const
|
|
|
|
{
|
|
|
|
//TRUE der FlowFrm soll auf einen Rahmen des Vorgaengers Ruecksicht nehmen
|
|
|
|
// und fuer diesen ggf. Umbrechen.
|
|
|
|
|
|
|
|
//!!!!!!!!!!!Hack!!!!!!!!!!!
|
2006-08-14 15:25:22 +00:00
|
|
|
if ( rThis.GetUpper()->GetFmt()->getIDocumentSettingAccess()->get(IDocumentSettingAccess::BROWSE_MODE) )
|
2000-09-18 23:08:29 +00:00
|
|
|
return FALSE;
|
|
|
|
|
|
|
|
SwFrm *pPre = rThis.FindPrev();
|
|
|
|
|
|
|
|
if ( pPre && pPre->GetDrawObjs() )
|
|
|
|
{
|
|
|
|
ASSERT( SwFlowFrm::CastFlowFrm( pPre ), "new flowfrm?" );
|
|
|
|
if( SwFlowFrm::CastFlowFrm( pPre )->IsAnFollow( this ) )
|
|
|
|
return FALSE;
|
2004-11-16 14:44:46 +00:00
|
|
|
SwLayoutFrm* pPreUp = pPre->GetUpper();
|
2000-09-18 23:08:29 +00:00
|
|
|
// Wenn der Upper ein SectionFrm oder die Spalte eines SectionFrms ist,
|
|
|
|
// duerfen wir aus diesem durchaus heraushaengen,
|
|
|
|
// es muss stattdessen der Upper des SectionFrms beruecksichtigt werden.
|
|
|
|
if( pPreUp->IsInSct() )
|
|
|
|
{
|
|
|
|
if( pPreUp->IsSctFrm() )
|
|
|
|
pPreUp = pPreUp->GetUpper();
|
|
|
|
else if( pPreUp->IsColBodyFrm() &&
|
|
|
|
pPreUp->GetUpper()->GetUpper()->IsSctFrm() )
|
2003-03-27 14:45:43 +00:00
|
|
|
pPreUp = pPreUp->GetUpper()->GetUpper()->GetUpper();
|
2000-09-18 23:08:29 +00:00
|
|
|
}
|
2004-11-16 14:44:46 +00:00
|
|
|
// --> OD 2004-10-15 #i26945# - re-factoring:
|
|
|
|
// use <GetVertPosOrientFrm()> to determine, if object has followed the
|
|
|
|
// text flow to the next layout frame
|
2000-09-18 23:08:29 +00:00
|
|
|
for ( USHORT i = 0; i < pPre->GetDrawObjs()->Count(); ++i )
|
|
|
|
{
|
2004-08-02 13:08:38 +00:00
|
|
|
// --> OD 2004-07-01 #i28701# - consider changed type of
|
|
|
|
// <SwSortedObjs> entries.
|
|
|
|
const SwAnchoredObject* pObj = (*pPre->GetDrawObjs())[i];
|
2004-11-16 14:44:46 +00:00
|
|
|
// OD 2004-01-20 #110582# - do not consider hidden objects
|
|
|
|
// --> OD 2004-10-15 #i26945# - do not consider object, which
|
|
|
|
// doesn't follow the text flow.
|
|
|
|
if ( pObj->GetFrmFmt().GetDoc()->IsVisibleLayerId(
|
|
|
|
pObj->GetDrawObj()->GetLayer() ) &&
|
|
|
|
pObj->GetFrmFmt().GetFollowTextFlow().GetValue() )
|
|
|
|
// <--
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
2004-11-16 14:44:46 +00:00
|
|
|
const SwLayoutFrm* pVertPosOrientFrm = pObj->GetVertPosOrientFrm();
|
|
|
|
if ( pVertPosOrientFrm &&
|
|
|
|
pPreUp != pVertPosOrientFrm &&
|
|
|
|
!pPreUp->IsAnLower( pVertPosOrientFrm ) )
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
2004-11-16 14:44:46 +00:00
|
|
|
return TRUE;
|
2000-09-18 23:08:29 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2004-11-16 14:44:46 +00:00
|
|
|
// <--
|
2000-09-18 23:08:29 +00:00
|
|
|
}
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*************************************************************************
|
|
|
|
|*
|
|
|
|
|* BOOL SwFlowFrm::IsPageBreak()
|
|
|
|
|*
|
|
|
|
|* Beschreibung Wenn vor dem Frm ein harter Seitenumbruch steht UND
|
|
|
|
|* es einen Vorgaenger auf der gleichen Seite gibt, wird TRUE
|
|
|
|
|* zurueckgeliefert (es muss ein PageBreak erzeugt werden) FALSE sonst.
|
|
|
|
|* Wenn in bAct TRUE uebergeben wird, gibt die Funktion dann TRUE
|
|
|
|
|* zurueck, wenn ein PageBreak besteht.
|
|
|
|
|* Fuer Follows wird der harte Seitenumbruch natuerlich nicht
|
|
|
|
|* ausgewertet.
|
|
|
|
|* Der Seitenumbruch steht im eigenen FrmFmt (BEFORE) oder im FrmFmt
|
|
|
|
|* des Vorgaengers (AFTER). Wenn es keinen Vorgaenger auf der Seite
|
|
|
|
|* gibt ist jede weitere Ueberlegung ueberfluessig.
|
|
|
|
|* Ein Seitenumbruch (oder der Bedarf) liegt auch dann vor, wenn
|
|
|
|
|* im FrmFmt ein PageDesc angegeben wird.
|
|
|
|
|* Die Implementierung arbeitet zuaechst nur auf CntntFrms!
|
|
|
|
|* -->Fuer LayoutFrms ist die Definition des Vorgaengers unklar.
|
|
|
|
|* Ersterstellung MA ??
|
|
|
|
|* Letzte Aenderung MA 21. Mar. 95
|
|
|
|
|*
|
|
|
|
|*************************************************************************/
|
|
|
|
|
|
|
|
|
|
|
|
BOOL SwFlowFrm::IsPageBreak( BOOL bAct ) const
|
|
|
|
{
|
|
|
|
if ( !IsFollow() && rThis.IsInDocBody() &&
|
2007-09-20 10:48:44 +00:00
|
|
|
( !rThis.IsInTab() || ( rThis.IsTabFrm() && !rThis.GetUpper()->IsInTab() ) ) && // i66968
|
2006-08-14 15:25:22 +00:00
|
|
|
!rThis.GetUpper()->GetFmt()->getIDocumentSettingAccess()->get(IDocumentSettingAccess::BROWSE_MODE) )
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
2006-08-14 15:25:22 +00:00
|
|
|
const SwAttrSet *pSet = rThis.GetAttrSet();
|
|
|
|
|
2000-09-18 23:08:29 +00:00
|
|
|
//Vorgaenger ermitteln
|
|
|
|
const SwFrm *pPrev = rThis.FindPrev();
|
|
|
|
while ( pPrev && ( !pPrev->IsInDocBody() ||
|
|
|
|
( pPrev->IsTxtFrm() && ((SwTxtFrm*)pPrev)->IsHiddenNow() ) ) )
|
|
|
|
pPrev = pPrev->FindPrev();
|
|
|
|
|
|
|
|
if ( pPrev )
|
|
|
|
{
|
|
|
|
ASSERT( pPrev->IsInDocBody(), "IsPageBreak: Not in DocBody?" );
|
|
|
|
if ( bAct )
|
|
|
|
{ if ( rThis.FindPageFrm() == pPrev->FindPageFrm() )
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{ if ( rThis.FindPageFrm() != pPrev->FindPageFrm() )
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
2006-03-09 13:07:10 +00:00
|
|
|
const SvxBreak eBreak = pSet->GetBreak().GetBreak();
|
|
|
|
if ( eBreak == SVX_BREAK_PAGE_BEFORE || eBreak == SVX_BREAK_PAGE_BOTH )
|
2006-02-03 16:17:24 +00:00
|
|
|
return TRUE;
|
2006-03-09 13:07:10 +00:00
|
|
|
else
|
2006-02-03 16:17:24 +00:00
|
|
|
{
|
2006-03-09 13:07:10 +00:00
|
|
|
const SvxBreak &ePrB = pPrev->GetAttrSet()->GetBreak().GetBreak();
|
|
|
|
if ( ePrB == SVX_BREAK_PAGE_AFTER ||
|
|
|
|
ePrB == SVX_BREAK_PAGE_BOTH ||
|
|
|
|
pSet->GetPageDesc().GetPageDesc() )
|
|
|
|
return TRUE;
|
2006-02-03 16:17:24 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2006-03-09 13:07:10 +00:00
|
|
|
return FALSE;
|
2006-02-03 16:17:24 +00:00
|
|
|
}
|
|
|
|
|
2000-09-18 23:08:29 +00:00
|
|
|
/*************************************************************************
|
|
|
|
|*
|
|
|
|
|* BOOL SwFlowFrm::IsColBreak()
|
|
|
|
|*
|
|
|
|
|* Beschreibung Wenn vor dem Frm ein harter Spaltenumbruch steht UND
|
|
|
|
|* es einen Vorgaenger in der gleichen Spalte gibt, wird TRUE
|
|
|
|
|* zurueckgeliefert (es muss ein PageBreak erzeugt werden) FALSE sonst.
|
|
|
|
|* Wenn in bAct TRUE uebergeben wird, gibt die Funktion dann TRUE
|
|
|
|
|* zurueck, wenn ein ColBreak besteht.
|
|
|
|
|* Fuer Follows wird der harte Spaltenumbruch natuerlich nicht
|
|
|
|
|* ausgewertet.
|
|
|
|
|* Der Spaltenumbruch steht im eigenen FrmFmt (BEFORE) oder im FrmFmt
|
|
|
|
|* des Vorgaengers (AFTER). Wenn es keinen Vorgaenger in der Spalte
|
|
|
|
|* gibt ist jede weitere Ueberlegung ueberfluessig.
|
|
|
|
|* Die Implementierung arbeitet zuaechst nur auf CntntFrms!
|
|
|
|
|* -->Fuer LayoutFrms ist die Definition des Vorgaengers unklar.
|
|
|
|
|* Ersterstellung MA 11. Jun. 93
|
|
|
|
|* Letzte Aenderung MA 21. Mar. 95
|
|
|
|
|*
|
|
|
|
|*************************************************************************/
|
|
|
|
|
|
|
|
BOOL SwFlowFrm::IsColBreak( BOOL bAct ) const
|
|
|
|
{
|
|
|
|
if ( !IsFollow() && (rThis.IsMoveable() || bAct) )
|
|
|
|
{
|
|
|
|
const SwFrm *pCol = rThis.FindColFrm();
|
|
|
|
if ( pCol )
|
|
|
|
{
|
|
|
|
//Vorgaenger ermitteln
|
|
|
|
const SwFrm *pPrev = rThis.FindPrev();
|
|
|
|
while( pPrev && ( ( !pPrev->IsInDocBody() && !rThis.IsInFly() ) ||
|
|
|
|
( pPrev->IsTxtFrm() && ((SwTxtFrm*)pPrev)->IsHiddenNow() ) ) )
|
|
|
|
pPrev = pPrev->FindPrev();
|
|
|
|
|
|
|
|
if ( pPrev )
|
|
|
|
{
|
|
|
|
if ( bAct )
|
|
|
|
{ if ( pCol == pPrev->FindColFrm() )
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{ if ( pCol != pPrev->FindColFrm() )
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
2006-03-09 13:07:10 +00:00
|
|
|
const SvxBreak eBreak = rThis.GetAttrSet()->GetBreak().GetBreak();
|
|
|
|
if ( eBreak == SVX_BREAK_COLUMN_BEFORE ||
|
|
|
|
eBreak == SVX_BREAK_COLUMN_BOTH )
|
2006-02-03 16:17:24 +00:00
|
|
|
return TRUE;
|
2006-03-09 13:07:10 +00:00
|
|
|
else
|
|
|
|
{
|
|
|
|
const SvxBreak &ePrB = pPrev->GetAttrSet()->GetBreak().GetBreak();
|
|
|
|
if ( ePrB == SVX_BREAK_COLUMN_AFTER ||
|
|
|
|
ePrB == SVX_BREAK_COLUMN_BOTH )
|
|
|
|
return TRUE;
|
2000-09-18 23:08:29 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
|
|
|
BOOL SwFlowFrm::HasParaSpaceAtPages( BOOL bSct ) const
|
|
|
|
{
|
|
|
|
if( rThis.IsInSct() )
|
|
|
|
{
|
|
|
|
const SwFrm* pTmp = rThis.GetUpper();
|
|
|
|
while( pTmp )
|
|
|
|
{
|
|
|
|
if( pTmp->IsCellFrm() || pTmp->IsFlyFrm() ||
|
|
|
|
pTmp->IsFooterFrm() || pTmp->IsHeaderFrm() ||
|
|
|
|
( pTmp->IsFtnFrm() && !((SwFtnFrm*)pTmp)->GetMaster() ) )
|
|
|
|
return TRUE;
|
|
|
|
if( pTmp->IsPageFrm() )
|
|
|
|
return ( pTmp->GetPrev() && !IsPageBreak(TRUE) ) ? FALSE : TRUE;
|
|
|
|
if( pTmp->IsColumnFrm() && pTmp->GetPrev() )
|
|
|
|
return IsColBreak( TRUE );
|
|
|
|
if( pTmp->IsSctFrm() && ( !bSct || pTmp->GetPrev() ) )
|
|
|
|
return FALSE;
|
|
|
|
pTmp = pTmp->GetUpper();
|
|
|
|
}
|
|
|
|
ASSERT( FALSE, "HasParaSpaceAtPages: Where's my page?" );
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
if( !rThis.IsInDocBody() || ( rThis.IsInTab() && !rThis.IsTabFrm()) ||
|
|
|
|
IsPageBreak( TRUE ) || ( rThis.FindColFrm() && IsColBreak( TRUE ) ) )
|
|
|
|
return TRUE;
|
|
|
|
const SwFrm* pTmp = rThis.FindColFrm();
|
|
|
|
if( pTmp )
|
|
|
|
{
|
|
|
|
if( pTmp->GetPrev() )
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
pTmp = &rThis;
|
|
|
|
pTmp = pTmp->FindPageFrm();
|
|
|
|
return pTmp && !pTmp->GetPrev();
|
|
|
|
}
|
|
|
|
|
2004-03-31 14:08:26 +00:00
|
|
|
/** helper method to determine previous frame for calculation of the
|
|
|
|
upper space
|
|
|
|
|
|
|
|
OD 2004-03-10 #i11860#
|
|
|
|
|
|
|
|
@author OD
|
|
|
|
*/
|
|
|
|
const SwFrm* SwFlowFrm::_GetPrevFrmForUpperSpaceCalc( const SwFrm* _pProposedPrevFrm ) const
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
2004-03-31 14:08:26 +00:00
|
|
|
const SwFrm* pPrevFrm = _pProposedPrevFrm
|
|
|
|
? _pProposedPrevFrm
|
|
|
|
: rThis.GetPrev();
|
|
|
|
|
|
|
|
// Skip hidden paragraphs and empty sections
|
|
|
|
while ( pPrevFrm &&
|
|
|
|
( ( pPrevFrm->IsTxtFrm() &&
|
|
|
|
static_cast<const SwTxtFrm*>(pPrevFrm)->IsHiddenNow() ) ||
|
|
|
|
( pPrevFrm->IsSctFrm() &&
|
|
|
|
!static_cast<const SwSectionFrm*>(pPrevFrm)->GetSection() ) ) )
|
|
|
|
{
|
|
|
|
pPrevFrm = pPrevFrm->GetPrev();
|
|
|
|
}
|
|
|
|
|
|
|
|
// Special case: no direct previous frame is found but frame is in footnote
|
|
|
|
// Search for a previous frame in previous footnote,
|
|
|
|
// if frame isn't in a section, which is also in the footnote
|
|
|
|
if ( !pPrevFrm && rThis.IsInFtn() &&
|
|
|
|
( rThis.IsSctFrm() ||
|
|
|
|
!rThis.IsInSct() || !rThis.FindSctFrm()->IsInFtn() ) )
|
|
|
|
{
|
|
|
|
const SwFtnFrm* pPrevFtnFrm =
|
|
|
|
static_cast<const SwFtnFrm*>(rThis.FindFtnFrm()->GetPrev());
|
|
|
|
if ( pPrevFtnFrm )
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
2006-03-09 13:07:10 +00:00
|
|
|
pPrevFrm = pPrevFtnFrm->GetLastLower();
|
|
|
|
|
2004-03-31 14:08:26 +00:00
|
|
|
// Skip hidden paragraphs and empty sections
|
|
|
|
while ( pPrevFrm &&
|
|
|
|
( ( pPrevFrm->IsTxtFrm() &&
|
|
|
|
static_cast<const SwTxtFrm*>(pPrevFrm)->IsHiddenNow() ) ||
|
|
|
|
( pPrevFrm->IsSctFrm() &&
|
|
|
|
!static_cast<const SwSectionFrm*>(pPrevFrm)->GetSection() ) ) )
|
2004-03-23 10:25:05 +00:00
|
|
|
{
|
2004-03-31 14:08:26 +00:00
|
|
|
pPrevFrm = pPrevFrm->GetPrev();
|
2004-03-23 10:25:05 +00:00
|
|
|
}
|
2004-03-31 14:08:26 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
// Special case: found previous frame is a section
|
|
|
|
// Search for the last content in the section
|
|
|
|
if( pPrevFrm && pPrevFrm->IsSctFrm() )
|
|
|
|
{
|
|
|
|
const SwSectionFrm* pPrevSectFrm =
|
|
|
|
static_cast<const SwSectionFrm*>(pPrevFrm);
|
|
|
|
pPrevFrm = pPrevSectFrm->FindLastCntnt();
|
|
|
|
// If the last content is in a table _inside_ the section,
|
|
|
|
// take the table herself.
|
|
|
|
// OD 2004-02-18 #106629# - correction:
|
|
|
|
// Check directly, if table is inside table, instead of indirectly
|
|
|
|
// by checking, if section isn't inside a table
|
|
|
|
if ( pPrevFrm && pPrevFrm->IsInTab() )
|
|
|
|
{
|
|
|
|
const SwTabFrm* pTableFrm = pPrevFrm->FindTabFrm();
|
|
|
|
if ( pPrevSectFrm->IsAnLower( pTableFrm ) )
|
2004-03-23 10:25:05 +00:00
|
|
|
{
|
2004-03-31 14:08:26 +00:00
|
|
|
pPrevFrm = pTableFrm;
|
2004-03-23 10:25:05 +00:00
|
|
|
}
|
2000-09-18 23:08:29 +00:00
|
|
|
}
|
2004-03-31 14:08:26 +00:00
|
|
|
// OD 2004-02-18 #106629# correction: skip hidden text frames
|
|
|
|
while ( pPrevFrm &&
|
|
|
|
pPrevFrm->IsTxtFrm() &&
|
|
|
|
static_cast<const SwTxtFrm*>(pPrevFrm)->IsHiddenNow() )
|
|
|
|
{
|
|
|
|
pPrevFrm = pPrevFrm->GetPrev();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return pPrevFrm;
|
|
|
|
}
|
|
|
|
|
|
|
|
// OD 2004-03-12 #i11860# - add 3rd parameter <_bConsiderGrid>
|
|
|
|
SwTwips SwFlowFrm::CalcUpperSpace( const SwBorderAttrs *pAttrs,
|
|
|
|
const SwFrm* pPr,
|
|
|
|
const bool _bConsiderGrid ) const
|
|
|
|
{
|
|
|
|
// OD 2004-03-10 #i11860# - use new method <GetPrevFrmForUpperSpaceCalc(..)>
|
|
|
|
const SwFrm* pPrevFrm = _GetPrevFrmForUpperSpaceCalc( pPr );
|
|
|
|
|
2000-09-18 23:08:29 +00:00
|
|
|
SwBorderAttrAccess *pAccess;
|
|
|
|
SwFrm* pOwn;
|
|
|
|
if( !pAttrs )
|
|
|
|
{
|
|
|
|
if( rThis.IsSctFrm() )
|
|
|
|
{
|
|
|
|
SwSectionFrm* pFoll = &((SwSectionFrm&)rThis);
|
|
|
|
do
|
|
|
|
pOwn = pFoll->ContainsAny();
|
|
|
|
while( !pOwn && 0 != ( pFoll = pFoll->GetFollow() ) );
|
|
|
|
if( !pOwn )
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
pOwn = &rThis;
|
|
|
|
pAccess= new SwBorderAttrAccess( SwFrm::GetCache(), pOwn );
|
|
|
|
pAttrs = pAccess->Get();
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
pAccess = NULL;
|
|
|
|
pOwn = &rThis;
|
|
|
|
}
|
|
|
|
SwTwips nUpper = 0;
|
2004-02-26 16:00:05 +00:00
|
|
|
// OD 06.01.2004 #i11859#
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
2006-08-14 15:25:22 +00:00
|
|
|
const IDocumentSettingAccess* pIDSA = rThis.GetUpper()->GetFmt()->getIDocumentSettingAccess();
|
|
|
|
const bool bUseFormerLineSpacing = pIDSA->get(IDocumentSettingAccess::OLD_LINE_SPACING);
|
2004-03-31 14:08:26 +00:00
|
|
|
if( pPrevFrm )
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
2004-03-31 14:08:26 +00:00
|
|
|
// OD 2004-03-10 #i11860# - use new method to determine needed spacing
|
|
|
|
// values of found previous frame and use these values.
|
|
|
|
SwTwips nPrevLowerSpace = 0;
|
|
|
|
SwTwips nPrevLineSpacing = 0;
|
2004-08-02 13:08:38 +00:00
|
|
|
GetSpacingValuesOfFrm( (*pPrevFrm), nPrevLowerSpace, nPrevLineSpacing );
|
2006-08-14 15:25:22 +00:00
|
|
|
if( pIDSA->get(IDocumentSettingAccess::PARA_SPACE_MAX) )
|
2004-02-26 16:00:05 +00:00
|
|
|
{
|
2004-03-31 14:08:26 +00:00
|
|
|
nUpper = nPrevLowerSpace + pAttrs->GetULSpace().GetUpper();
|
|
|
|
SwTwips nAdd = nPrevLineSpacing;
|
2004-02-26 16:00:05 +00:00
|
|
|
// OD 07.01.2004 #i11859# - consideration of the line spacing
|
|
|
|
// for the upper spacing of a text frame
|
|
|
|
if ( bUseFormerLineSpacing )
|
|
|
|
{
|
|
|
|
// former consideration
|
|
|
|
if ( pOwn->IsTxtFrm() )
|
2004-03-31 14:08:26 +00:00
|
|
|
{
|
2004-02-26 16:00:05 +00:00
|
|
|
nAdd = Max( nAdd, static_cast<SwTxtFrm&>(rThis).GetLineSpace() );
|
2004-03-31 14:08:26 +00:00
|
|
|
}
|
2004-02-26 16:00:05 +00:00
|
|
|
nUpper += nAdd;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
// new consideration:
|
|
|
|
// Only the proportional line spacing of the previous
|
|
|
|
// text frame is considered for the upper spacing and
|
|
|
|
// the line spacing values are add up instead of
|
|
|
|
// building its maximum.
|
|
|
|
if ( pOwn->IsTxtFrm() )
|
2004-03-31 14:08:26 +00:00
|
|
|
{
|
2004-02-26 16:00:05 +00:00
|
|
|
nAdd += static_cast<SwTxtFrm&>(rThis).GetLineSpace( true );
|
2004-03-31 14:08:26 +00:00
|
|
|
}
|
2004-02-26 16:00:05 +00:00
|
|
|
nUpper += nAdd;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2004-03-31 14:08:26 +00:00
|
|
|
nUpper = Max( static_cast<long>(nPrevLowerSpace),
|
|
|
|
static_cast<long>(pAttrs->GetULSpace().GetUpper()) );
|
2004-02-26 16:00:05 +00:00
|
|
|
// OD 07.01.2004 #i11859# - consideration of the line spacing
|
|
|
|
// for the upper spacing of a text frame
|
|
|
|
if ( bUseFormerLineSpacing )
|
|
|
|
{
|
|
|
|
// former consideration
|
|
|
|
if ( pOwn->IsTxtFrm() )
|
|
|
|
nUpper = Max( nUpper, ((SwTxtFrm*)pOwn)->GetLineSpace() );
|
2004-03-31 14:08:26 +00:00
|
|
|
if ( nPrevLineSpacing != 0 )
|
|
|
|
{
|
|
|
|
nUpper = Max( nUpper, nPrevLineSpacing );
|
|
|
|
}
|
2004-02-26 16:00:05 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
// new consideration:
|
|
|
|
// Only the proportional line spacing of the previous
|
|
|
|
// text frame is considered for the upper spacing and
|
|
|
|
// the line spacing values are add up and added to
|
|
|
|
// the paragraph spacing instead of building the
|
|
|
|
// maximum of the line spacings and the paragraph spacing.
|
2004-03-31 14:08:26 +00:00
|
|
|
SwTwips nAdd = nPrevLineSpacing;
|
2004-02-26 16:00:05 +00:00
|
|
|
if ( pOwn->IsTxtFrm() )
|
2004-03-31 14:08:26 +00:00
|
|
|
{
|
2004-02-26 16:00:05 +00:00
|
|
|
nAdd += static_cast<SwTxtFrm&>(rThis).GetLineSpace( true );
|
2004-03-31 14:08:26 +00:00
|
|
|
}
|
2004-02-26 16:00:05 +00:00
|
|
|
nUpper += nAdd;
|
|
|
|
}
|
|
|
|
}
|
2000-09-18 23:08:29 +00:00
|
|
|
}
|
2006-08-14 15:25:22 +00:00
|
|
|
else if ( pIDSA->get(IDocumentSettingAccess::PARA_SPACE_MAX_AT_PAGES) &&
|
2004-02-26 16:00:05 +00:00
|
|
|
CastFlowFrm( pOwn )->HasParaSpaceAtPages( rThis.IsSctFrm() ) )
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
2004-02-26 16:00:05 +00:00
|
|
|
nUpper = pAttrs->GetULSpace().GetUpper();
|
2000-09-18 23:08:29 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2004-03-31 14:08:26 +00:00
|
|
|
// OD 2004-02-26 #i25029# - pass previous frame <pPrevFrm>
|
|
|
|
// to method <GetTopLine(..)>, if parameter <pPr> is set.
|
2004-03-09 08:30:35 +00:00
|
|
|
// Note: parameter <pPr> is set, if method is called from <SwTxtFrm::WouldFit(..)>
|
2004-03-31 14:08:26 +00:00
|
|
|
nUpper += pAttrs->GetTopLine( rThis, (pPr ? pPrevFrm : 0L) );
|
|
|
|
|
|
|
|
// OD 2004-03-12 #i11860# - consider value of new parameter <_bConsiderGrid>
|
|
|
|
// and use new method <GetUpperSpaceAmountConsideredForPageGrid(..)>
|
2008-03-07 15:26:19 +00:00
|
|
|
|
|
|
|
//consider grid in square page mode
|
|
|
|
if ( _bConsiderGrid && rThis.GetUpper()->GetFmt()->GetDoc()->IsSquaredPageMode() )
|
2004-03-31 14:08:26 +00:00
|
|
|
{
|
|
|
|
nUpper += _GetUpperSpaceAmountConsideredForPageGrid( nUpper );
|
|
|
|
}
|
|
|
|
|
|
|
|
delete pAccess;
|
|
|
|
return nUpper;
|
|
|
|
}
|
|
|
|
|
|
|
|
/** method to detemine the upper space amount, which is considered for
|
|
|
|
the page grid
|
2000-09-18 23:08:29 +00:00
|
|
|
|
2004-03-31 14:08:26 +00:00
|
|
|
OD 2004-03-12 #i11860#
|
|
|
|
Precondition: Position of frame is valid.
|
|
|
|
|
|
|
|
@author OD
|
|
|
|
*/
|
|
|
|
SwTwips SwFlowFrm::_GetUpperSpaceAmountConsideredForPageGrid(
|
|
|
|
const SwTwips _nUpperSpaceWithoutGrid ) const
|
|
|
|
{
|
|
|
|
SwTwips nUpperSpaceAmountConsideredForPageGrid = 0;
|
|
|
|
|
|
|
|
if ( rThis.IsInDocBody() && rThis.GetAttrSet()->GetParaGrid().GetValue() )
|
2002-01-24 15:21:17 +00:00
|
|
|
{
|
2004-03-31 14:08:26 +00:00
|
|
|
const SwPageFrm* pPageFrm = rThis.FindPageFrm();
|
|
|
|
GETGRID( pPageFrm )
|
2002-02-05 14:00:23 +00:00
|
|
|
if( pGrid )
|
2002-01-24 15:21:17 +00:00
|
|
|
{
|
2004-03-31 14:08:26 +00:00
|
|
|
const SwFrm* pBodyFrm = pPageFrm->FindBodyCont();
|
|
|
|
if ( pBodyFrm )
|
2002-01-24 15:21:17 +00:00
|
|
|
{
|
2004-03-31 14:08:26 +00:00
|
|
|
const long nGridLineHeight =
|
|
|
|
pGrid->GetBaseHeight() + pGrid->GetRubyHeight();
|
|
|
|
|
2002-01-31 13:23:16 +00:00
|
|
|
SWRECTFN( (&rThis) )
|
2004-03-31 14:08:26 +00:00
|
|
|
const SwTwips nBodyPrtTop = (pBodyFrm->*fnRect->fnGetPrtTop)();
|
|
|
|
const SwTwips nProposedPrtTop =
|
|
|
|
(*fnRect->fnYInc)( (rThis.Frm().*fnRect->fnGetTop)(),
|
|
|
|
_nUpperSpaceWithoutGrid );
|
|
|
|
|
|
|
|
const SwTwips nSpaceAbovePrtTop =
|
|
|
|
(*fnRect->fnYDiff)( nProposedPrtTop, nBodyPrtTop );
|
|
|
|
const SwTwips nSpaceOfCompleteLinesAbove =
|
|
|
|
nGridLineHeight * ( nSpaceAbovePrtTop / nGridLineHeight );
|
|
|
|
SwTwips nNewPrtTop =
|
|
|
|
(*fnRect->fnYInc)( nBodyPrtTop, nSpaceOfCompleteLinesAbove );
|
|
|
|
if ( (*fnRect->fnYDiff)( nProposedPrtTop, nNewPrtTop ) > 0 )
|
2002-01-24 15:21:17 +00:00
|
|
|
{
|
2004-03-31 14:08:26 +00:00
|
|
|
nNewPrtTop = (*fnRect->fnYInc)( nNewPrtTop, nGridLineHeight );
|
2002-01-24 15:21:17 +00:00
|
|
|
}
|
2004-03-31 14:08:26 +00:00
|
|
|
|
|
|
|
const SwTwips nNewUpperSpace =
|
|
|
|
(*fnRect->fnYDiff)( nNewPrtTop,
|
|
|
|
(rThis.Frm().*fnRect->fnGetTop)() );
|
|
|
|
|
|
|
|
nUpperSpaceAmountConsideredForPageGrid =
|
|
|
|
nNewUpperSpace - _nUpperSpaceWithoutGrid;
|
|
|
|
|
|
|
|
ASSERT( nUpperSpaceAmountConsideredForPageGrid >= 0,
|
|
|
|
"<SwFlowFrm::GetUpperSpaceAmountConsideredForPageGrid(..)> - negative space considered for page grid!" );
|
2002-01-24 15:21:17 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2004-03-31 14:08:26 +00:00
|
|
|
return nUpperSpaceAmountConsideredForPageGrid;
|
|
|
|
}
|
2002-01-24 15:21:17 +00:00
|
|
|
|
2004-03-31 14:08:26 +00:00
|
|
|
/** method to determent the upper space amount, which is considered for
|
|
|
|
the previous frame
|
|
|
|
|
|
|
|
OD 2004-03-11 #i11860#
|
|
|
|
|
|
|
|
@author OD
|
|
|
|
*/
|
|
|
|
SwTwips SwFlowFrm::_GetUpperSpaceAmountConsideredForPrevFrm() const
|
|
|
|
{
|
|
|
|
SwTwips nUpperSpaceAmountOfPrevFrm = 0;
|
|
|
|
|
|
|
|
const SwFrm* pPrevFrm = _GetPrevFrmForUpperSpaceCalc();
|
|
|
|
if ( pPrevFrm )
|
|
|
|
{
|
|
|
|
SwTwips nPrevLowerSpace = 0;
|
|
|
|
SwTwips nPrevLineSpacing = 0;
|
2004-08-02 13:08:38 +00:00
|
|
|
GetSpacingValuesOfFrm( (*pPrevFrm), nPrevLowerSpace, nPrevLineSpacing );
|
2004-03-31 14:08:26 +00:00
|
|
|
if ( nPrevLowerSpace > 0 || nPrevLineSpacing > 0 )
|
|
|
|
{
|
2006-08-14 15:25:22 +00:00
|
|
|
const IDocumentSettingAccess* pIDSA = rThis.GetUpper()->GetFmt()->getIDocumentSettingAccess();
|
|
|
|
if ( pIDSA->get(IDocumentSettingAccess::PARA_SPACE_MAX) ||
|
|
|
|
!pIDSA->get(IDocumentSettingAccess::OLD_LINE_SPACING) )
|
2004-03-31 14:08:26 +00:00
|
|
|
{
|
|
|
|
nUpperSpaceAmountOfPrevFrm = nPrevLowerSpace + nPrevLineSpacing;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
nUpperSpaceAmountOfPrevFrm = Max( nPrevLowerSpace, nPrevLineSpacing );
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return nUpperSpaceAmountOfPrevFrm;
|
|
|
|
}
|
|
|
|
|
|
|
|
/** method to determine the upper space amount, which is considered for
|
|
|
|
the previous frame and the page grid, if option 'Use former object
|
|
|
|
positioning' is OFF
|
|
|
|
|
|
|
|
OD 2004-03-18 #i11860#
|
|
|
|
|
|
|
|
@author OD
|
|
|
|
*/
|
|
|
|
SwTwips SwFlowFrm::GetUpperSpaceAmountConsideredForPrevFrmAndPageGrid() const
|
|
|
|
{
|
|
|
|
SwTwips nUpperSpaceAmountConsideredForPrevFrmAndPageGrid = 0;
|
|
|
|
|
2006-08-14 15:25:22 +00:00
|
|
|
if ( !rThis.GetUpper()->GetFmt()->getIDocumentSettingAccess()->get(IDocumentSettingAccess::USE_FORMER_OBJECT_POS) )
|
2004-03-31 14:08:26 +00:00
|
|
|
{
|
|
|
|
nUpperSpaceAmountConsideredForPrevFrmAndPageGrid =
|
|
|
|
_GetUpperSpaceAmountConsideredForPrevFrm() +
|
|
|
|
_GetUpperSpaceAmountConsideredForPageGrid( CalcUpperSpace( 0L, 0L, false ) );
|
|
|
|
}
|
|
|
|
|
|
|
|
return nUpperSpaceAmountConsideredForPrevFrmAndPageGrid;
|
2000-09-18 23:08:29 +00:00
|
|
|
}
|
|
|
|
|
2004-03-23 10:25:05 +00:00
|
|
|
/** calculation of lower space
|
|
|
|
|
|
|
|
OD 2004-03-02 #106629#
|
|
|
|
|
|
|
|
@author OD
|
|
|
|
*/
|
|
|
|
SwTwips SwFlowFrm::CalcLowerSpace( const SwBorderAttrs* _pAttrs ) const
|
|
|
|
{
|
|
|
|
SwTwips nLowerSpace = 0;
|
|
|
|
|
|
|
|
SwBorderAttrAccess* pAttrAccess = 0L;
|
|
|
|
if ( !_pAttrs )
|
|
|
|
{
|
|
|
|
pAttrAccess = new SwBorderAttrAccess( SwFrm::GetCache(), &rThis );
|
|
|
|
_pAttrs = pAttrAccess->Get();
|
|
|
|
}
|
|
|
|
|
|
|
|
sal_Bool bCommonBorder = sal_True;
|
|
|
|
if ( rThis.IsInSct() && rThis.GetUpper()->IsColBodyFrm() )
|
|
|
|
{
|
|
|
|
const SwSectionFrm* pSectFrm = rThis.FindSctFrm();
|
|
|
|
bCommonBorder = pSectFrm->GetFmt()->GetBalancedColumns().GetValue();
|
|
|
|
}
|
|
|
|
nLowerSpace = bCommonBorder ?
|
2004-03-24 11:27:17 +00:00
|
|
|
_pAttrs->GetBottomLine( rThis ) :
|
2004-03-23 10:25:05 +00:00
|
|
|
_pAttrs->CalcBottomLine();
|
|
|
|
|
2004-08-02 12:07:25 +00:00
|
|
|
// --> OD 2004-07-16 #i26250#
|
|
|
|
// - correct consideration of table frames
|
|
|
|
// - use new method <CalcAddLowerSpaceAsLastInTableCell(..)>
|
|
|
|
if ( ( ( rThis.IsTabFrm() && rThis.GetUpper()->IsInTab() ) ||
|
2004-12-23 09:07:01 +00:00
|
|
|
// --> OD 2004-11-16 #115759# - no lower spacing, if frame has a follow
|
|
|
|
( rThis.IsInTab() && !GetFollow() ) ) &&
|
|
|
|
// <--
|
2004-08-02 12:07:25 +00:00
|
|
|
!rThis.GetIndNext() )
|
2004-03-23 10:25:05 +00:00
|
|
|
{
|
2004-08-02 12:07:25 +00:00
|
|
|
nLowerSpace += CalcAddLowerSpaceAsLastInTableCell( _pAttrs );
|
2004-03-23 10:25:05 +00:00
|
|
|
}
|
2004-08-02 12:07:25 +00:00
|
|
|
// <--
|
2004-03-23 10:25:05 +00:00
|
|
|
|
|
|
|
delete pAttrAccess;
|
|
|
|
|
|
|
|
return nLowerSpace;
|
|
|
|
}
|
|
|
|
|
2004-08-02 12:07:25 +00:00
|
|
|
/** calculation of the additional space to be considered, if flow frame
|
|
|
|
is the last inside a table cell
|
|
|
|
|
|
|
|
OD 2004-07-16 #i26250#
|
|
|
|
|
|
|
|
@author OD
|
|
|
|
*/
|
|
|
|
SwTwips SwFlowFrm::CalcAddLowerSpaceAsLastInTableCell(
|
|
|
|
const SwBorderAttrs* _pAttrs ) const
|
|
|
|
{
|
|
|
|
SwTwips nAdditionalLowerSpace = 0;
|
|
|
|
|
2006-08-14 15:25:22 +00:00
|
|
|
if ( rThis.GetUpper()->GetFmt()->getIDocumentSettingAccess()->get(IDocumentSettingAccess::ADD_PARA_SPACING_TO_TABLE_CELLS) )
|
2004-08-02 12:07:25 +00:00
|
|
|
{
|
|
|
|
const SwFrm* pFrm = &rThis;
|
|
|
|
if ( pFrm->IsSctFrm() )
|
|
|
|
{
|
|
|
|
const SwSectionFrm* pSectFrm = static_cast<const SwSectionFrm*>(pFrm);
|
|
|
|
pFrm = pSectFrm->FindLastCntnt();
|
|
|
|
if ( pFrm && pFrm->IsInTab() )
|
|
|
|
{
|
|
|
|
const SwTabFrm* pTableFrm = pFrm->FindTabFrm();
|
|
|
|
if ( pSectFrm->IsAnLower( pTableFrm ) )
|
|
|
|
{
|
|
|
|
pFrm = pTableFrm;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
SwBorderAttrAccess* pAttrAccess = 0L;
|
|
|
|
if ( !_pAttrs || pFrm != &rThis )
|
|
|
|
{
|
|
|
|
pAttrAccess = new SwBorderAttrAccess( SwFrm::GetCache(), pFrm );
|
|
|
|
_pAttrs = pAttrAccess->Get();
|
|
|
|
}
|
|
|
|
|
|
|
|
nAdditionalLowerSpace += _pAttrs->GetULSpace().GetLower();
|
|
|
|
|
|
|
|
delete pAttrAccess;
|
|
|
|
}
|
|
|
|
|
|
|
|
return nAdditionalLowerSpace;
|
|
|
|
}
|
|
|
|
|
2000-09-18 23:08:29 +00:00
|
|
|
/*************************************************************************
|
|
|
|
|*
|
|
|
|
|* BOOL SwFlowFrm::CheckMoveFwd()
|
|
|
|
|*
|
|
|
|
|* Beschreibung Moved den Frm vorwaerts wenn es durch die aktuellen
|
|
|
|
|* Bedingungen und Attribute notwendig erscheint.
|
|
|
|
|* Ersterstellung MA 05. Dec. 96
|
|
|
|
|* Letzte Aenderung MA 09. Mar. 98
|
|
|
|
|*
|
|
|
|
|*************************************************************************/
|
|
|
|
|
|
|
|
|
2007-09-27 08:01:58 +00:00
|
|
|
BOOL SwFlowFrm::CheckMoveFwd( BOOL &rbMakePage, BOOL bKeep, BOOL )
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
|
|
|
const SwFrm* pNxt = rThis.GetIndNext();
|
|
|
|
|
|
|
|
if ( bKeep && //!bMovedBwd &&
|
|
|
|
( !pNxt || ( pNxt->IsTxtFrm() && ((SwTxtFrm*)pNxt)->IsEmptyMaster() ) ) &&
|
|
|
|
( 0 != (pNxt = rThis.FindNext()) ) && IsKeepFwdMoveAllowed() )
|
|
|
|
{
|
|
|
|
if( pNxt->IsSctFrm() )
|
|
|
|
{ // Nicht auf leere SectionFrms hereinfallen
|
|
|
|
const SwFrm* pTmp = NULL;
|
|
|
|
while( pNxt && pNxt->IsSctFrm() &&
|
|
|
|
( !((SwSectionFrm*)pNxt)->GetSection() ||
|
2007-09-27 08:01:58 +00:00
|
|
|
0 == ( pTmp = ((SwSectionFrm*)pNxt)->ContainsAny() ) ) )
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
|
|
|
pNxt = pNxt->FindNext();
|
|
|
|
pTmp = NULL;
|
|
|
|
}
|
|
|
|
if( pTmp )
|
|
|
|
pNxt = pTmp; // the content of the next notempty sectionfrm
|
|
|
|
}
|
|
|
|
if( pNxt && pNxt->GetValidPosFlag() )
|
|
|
|
{
|
|
|
|
BOOL bMove = FALSE;
|
|
|
|
const SwSectionFrm *pSct = rThis.FindSctFrm();
|
|
|
|
if( pSct && !pSct->GetValidSizeFlag() )
|
|
|
|
{
|
|
|
|
const SwSectionFrm* pNxtSct = pNxt->FindSctFrm();
|
|
|
|
if( pNxtSct && pSct->IsAnFollow( pNxtSct ) )
|
|
|
|
bMove = TRUE;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
bMove = TRUE;
|
|
|
|
if( bMove )
|
|
|
|
{
|
|
|
|
//Keep together with the following frame
|
|
|
|
MoveFwd( rbMakePage, FALSE );
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
BOOL bMovedFwd = FALSE;
|
|
|
|
|
|
|
|
if ( rThis.GetIndPrev() )
|
|
|
|
{
|
|
|
|
if ( IsPrevObjMove() ) //Auf Objekte des Prev Ruecksicht nehmen?
|
|
|
|
{
|
|
|
|
bMovedFwd = TRUE;
|
|
|
|
if ( !MoveFwd( rbMakePage, FALSE ) )
|
|
|
|
rbMakePage = FALSE;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
if ( IsPageBreak( FALSE ) )
|
|
|
|
{
|
|
|
|
while ( MoveFwd( rbMakePage, TRUE ) )
|
|
|
|
/* do nothing */;
|
|
|
|
rbMakePage = FALSE;
|
|
|
|
bMovedFwd = TRUE;
|
|
|
|
}
|
|
|
|
else if ( IsColBreak ( FALSE ) )
|
|
|
|
{
|
|
|
|
const SwPageFrm *pPage = rThis.FindPageFrm();
|
|
|
|
SwFrm *pCol = rThis.FindColFrm();
|
|
|
|
do
|
|
|
|
{ MoveFwd( rbMakePage, FALSE );
|
|
|
|
SwFrm *pTmp = rThis.FindColFrm();
|
|
|
|
if( pTmp != pCol )
|
|
|
|
{
|
|
|
|
bMovedFwd = TRUE;
|
|
|
|
pCol = pTmp;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
break;
|
|
|
|
} while ( IsColBreak( FALSE ) );
|
|
|
|
if ( pPage != rThis.FindPageFrm() )
|
|
|
|
rbMakePage = FALSE;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return bMovedFwd;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*************************************************************************
|
|
|
|
|*
|
|
|
|
|* BOOL SwFlowFrm::MoveFwd()
|
|
|
|
|*
|
|
|
|
|* Beschreibung Returnwert sagt, ob der Frm die Seite gewechselt hat.
|
|
|
|
|* Ersterstellung MA 05. Dec. 96
|
|
|
|
|* Letzte Aenderung MA 05. Dec. 96
|
|
|
|
|*
|
|
|
|
|*************************************************************************/
|
|
|
|
|
|
|
|
|
|
|
|
BOOL SwFlowFrm::MoveFwd( BOOL bMakePage, BOOL bPageBreak, BOOL bMoveAlways )
|
|
|
|
{
|
|
|
|
//!!!!MoveFtnCntFwd muss ggf. mitgepflegt werden.
|
|
|
|
SwFtnBossFrm *pOldBoss = rThis.FindFtnBossFrm();
|
|
|
|
if ( rThis.IsInFtn() )
|
|
|
|
return ((SwCntntFrm&)rThis).MoveFtnCntFwd( bMakePage, pOldBoss );
|
|
|
|
|
|
|
|
if( !IsFwdMoveAllowed() && !bMoveAlways )
|
|
|
|
{
|
|
|
|
BOOL bNoFwd = TRUE;
|
|
|
|
if( rThis.IsInSct() )
|
|
|
|
{
|
|
|
|
SwFtnBossFrm* pBoss = rThis.FindFtnBossFrm();
|
|
|
|
bNoFwd = !pBoss->IsInSct() || ( !pBoss->Lower()->GetNext() &&
|
|
|
|
!pBoss->GetPrev() );
|
|
|
|
}
|
2007-02-28 14:47:32 +00:00
|
|
|
|
2004-06-01 06:44:04 +00:00
|
|
|
// Allow the MoveFwd even if we do not have an IndPrev in these cases:
|
|
|
|
if ( rThis.IsInTab() &&
|
|
|
|
( !rThis.IsTabFrm() ||
|
|
|
|
( rThis.GetUpper()->IsInTab() &&
|
|
|
|
rThis.GetUpper()->FindTabFrm()->IsFwdMoveAllowed() ) ) &&
|
2007-02-28 14:47:32 +00:00
|
|
|
0 != const_cast<SwFrm&>(rThis).GetNextCellLeaf( MAKEPAGE_NONE ) )
|
|
|
|
/*
|
|
|
|
&&
|
|
|
|
// NEW TABLES
|
|
|
|
// Have a look at our main competitor: We don't move inside row span cells:
|
|
|
|
( !rThis.GetUpper()->IsCellFrm() || !rThis.GetUpper()->IsLeaveUpperAllowed() ) )*/
|
2004-01-13 12:13:45 +00:00
|
|
|
{
|
|
|
|
bNoFwd = FALSE;
|
|
|
|
}
|
2007-02-28 14:47:32 +00:00
|
|
|
|
2000-09-18 23:08:29 +00:00
|
|
|
if( bNoFwd )
|
|
|
|
{
|
|
|
|
//Fuer PageBreak ist das Moven erlaubt, wenn der Frm nicht
|
|
|
|
//bereits der erste der Seite ist.
|
|
|
|
if ( !bPageBreak )
|
|
|
|
return FALSE;
|
|
|
|
|
|
|
|
const SwFrm *pCol = rThis.FindColFrm();
|
|
|
|
if ( !pCol || !pCol->GetPrev() )
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
BOOL bSamePage = TRUE;
|
|
|
|
SwLayoutFrm *pNewUpper =
|
|
|
|
rThis.GetLeaf( bMakePage ? MAKEPAGE_INSERT : MAKEPAGE_NONE, TRUE );
|
|
|
|
|
|
|
|
if ( pNewUpper )
|
|
|
|
{
|
|
|
|
PROTOCOL_ENTER( &rThis, PROT_MOVE_FWD, 0, 0 );
|
|
|
|
SwPageFrm *pOldPage = pOldBoss->FindPageFrm();
|
|
|
|
//Wir moven uns und alle direkten Nachfolger vor den ersten
|
|
|
|
//CntntFrm unterhalb des neuen Uppers.
|
|
|
|
|
|
|
|
// Wenn unser NewUpper in einem SectionFrm liegt, muessen wir
|
|
|
|
// verhindern, dass sich dieser im Calc selbst zerstoert
|
|
|
|
SwSectionFrm* pSect = pNewUpper->FindSctFrm();
|
|
|
|
BOOL bUnlock = FALSE;
|
|
|
|
if( pSect )
|
|
|
|
{
|
|
|
|
// Wenn wir nur innerhalb unseres SectionFrms die Spalte wechseln,
|
|
|
|
// rufen wir lieber kein Calc, sonst wird noch der SectionFrm
|
|
|
|
// formatiert, der wiederum uns ruft etc.
|
|
|
|
if( pSect != rThis.FindSctFrm() )
|
|
|
|
{
|
|
|
|
bUnlock = !pSect->IsColLocked();
|
|
|
|
pSect->ColLock();
|
|
|
|
pNewUpper->Calc();
|
|
|
|
if( bUnlock )
|
|
|
|
pSect->ColUnlock();
|
|
|
|
}
|
|
|
|
}
|
2004-01-13 12:13:45 +00:00
|
|
|
// Do not calculate split cell frames.
|
|
|
|
else if ( !pNewUpper->IsCellFrm() || ((SwLayoutFrm*)pNewUpper)->Lower() )
|
2000-09-18 23:08:29 +00:00
|
|
|
pNewUpper->Calc();
|
|
|
|
|
|
|
|
SwFtnBossFrm *pNewBoss = pNewUpper->FindFtnBossFrm();
|
|
|
|
BOOL bBossChg = pNewBoss != pOldBoss;
|
|
|
|
pNewBoss = pNewBoss->FindFtnBossFrm( TRUE );
|
|
|
|
pOldBoss = pOldBoss->FindFtnBossFrm( TRUE );
|
|
|
|
SwPageFrm* pNewPage = pOldPage;
|
|
|
|
|
2004-06-04 07:44:36 +00:00
|
|
|
// First, we move the footnotes.
|
2000-09-18 23:08:29 +00:00
|
|
|
BOOL bFtnMoved = FALSE;
|
2004-08-02 12:07:25 +00:00
|
|
|
|
|
|
|
// --> FME 2004-07-15 #i26831#
|
|
|
|
// If pSect has just been created, the printing area of pSect has
|
|
|
|
// been calculated based on the first content of its follow.
|
|
|
|
// In this case we prefer to call a SimpleFormat for this new
|
|
|
|
// section after we inserted the contents. Otherwise the section
|
|
|
|
// frame will invalidate its lowers, if its printing area changes
|
|
|
|
// in SwSectionFrm::Format, which can cause loops.
|
|
|
|
const bool bForceSimpleFormat = pSect && pSect->HasFollow() &&
|
|
|
|
!pSect->ContainsAny();
|
|
|
|
// <--
|
2004-06-04 07:44:36 +00:00
|
|
|
|
2000-09-18 23:08:29 +00:00
|
|
|
if ( pNewBoss != pOldBoss )
|
|
|
|
{
|
|
|
|
pNewPage = pNewBoss->FindPageFrm();
|
|
|
|
bSamePage = pNewPage == pOldPage;
|
|
|
|
//Damit die Fussnoten nicht auf dumme Gedanken kommen
|
|
|
|
//setzen wir hier die Deadline.
|
2001-10-05 11:36:10 +00:00
|
|
|
SWRECTFN( pOldBoss )
|
|
|
|
SwSaveFtnHeight aHeight( pOldBoss,
|
|
|
|
(pOldBoss->Frm().*fnRect->fnGetBottom)() );
|
2000-09-18 23:08:29 +00:00
|
|
|
SwCntntFrm* pStart = rThis.IsCntntFrm() ?
|
|
|
|
(SwCntntFrm*)&rThis : ((SwLayoutFrm&)rThis).ContainsCntnt();
|
2004-01-13 12:13:45 +00:00
|
|
|
ASSERT( pStart || ( rThis.IsTabFrm() && !((SwTabFrm&)rThis).Lower() ),
|
|
|
|
"MoveFwd: Missing Content" );
|
2000-09-18 23:08:29 +00:00
|
|
|
SwLayoutFrm* pBody = pStart ? ( pStart->IsTxtFrm() ?
|
|
|
|
(SwLayoutFrm*)((SwTxtFrm*)pStart)->FindBodyFrm() : 0 ) : 0;
|
|
|
|
if( pBody )
|
|
|
|
bFtnMoved = pBody->MoveLowerFtns( pStart, pOldBoss, pNewBoss,
|
|
|
|
FALSE);
|
|
|
|
}
|
|
|
|
// Bei SectionFrms ist es moeglich, dass wir selbst durch pNewUpper->Calc()
|
|
|
|
// bewegt wurden, z. B. in den pNewUpper.
|
|
|
|
// MoveSubTree bzw. PasteTree ist auf so etwas nicht vorbereitet.
|
|
|
|
if( pNewUpper != rThis.GetUpper() )
|
|
|
|
{
|
2004-08-02 12:07:25 +00:00
|
|
|
// --> FME 2004-04-19 #i27145#
|
2004-06-04 07:44:36 +00:00
|
|
|
SwSectionFrm* pOldSct = 0;
|
2004-08-02 12:07:25 +00:00
|
|
|
if ( rThis.GetUpper()->IsSctFrm() )
|
2004-06-28 12:08:52 +00:00
|
|
|
{
|
2004-08-02 12:07:25 +00:00
|
|
|
pOldSct = static_cast<SwSectionFrm*>(rThis.GetUpper());
|
2004-06-28 12:08:52 +00:00
|
|
|
}
|
2004-08-02 12:07:25 +00:00
|
|
|
// <--
|
2004-06-04 07:44:36 +00:00
|
|
|
|
2000-09-18 23:08:29 +00:00
|
|
|
MoveSubTree( pNewUpper, pNewUpper->Lower() );
|
2002-11-13 08:40:43 +00:00
|
|
|
|
2004-08-02 12:07:25 +00:00
|
|
|
// --> FME 2004-04-19 #i27145#
|
|
|
|
if ( pOldSct && pOldSct->GetSection() )
|
2004-06-04 07:44:36 +00:00
|
|
|
{
|
2004-08-02 12:07:25 +00:00
|
|
|
// Prevent loops by setting the new height at
|
2004-06-04 07:44:36 +00:00
|
|
|
// the section frame if footnotes have been moved.
|
|
|
|
// Otherwise the call of SwLayNotify::~SwLayNotify() for
|
|
|
|
// the (invalid) section frame will invalidate the first
|
|
|
|
// lower of its follow, because it grows due to the removed
|
|
|
|
// footnotes.
|
2004-08-02 12:07:25 +00:00
|
|
|
// Note: If pOldSct has become empty during MoveSubTree, it
|
|
|
|
// has already been scheduled for removal. No SimpleFormat
|
|
|
|
// for these.
|
2004-06-04 07:44:36 +00:00
|
|
|
pOldSct->SimpleFormat();
|
|
|
|
}
|
2004-08-02 12:07:25 +00:00
|
|
|
// <--
|
|
|
|
|
|
|
|
// --> FME 2004-07-15 #i26831#
|
|
|
|
if ( bForceSimpleFormat )
|
|
|
|
{
|
|
|
|
pSect->SimpleFormat();
|
|
|
|
}
|
|
|
|
// <--
|
2004-06-04 07:44:36 +00:00
|
|
|
|
2000-09-18 23:08:29 +00:00
|
|
|
if ( bFtnMoved && !bSamePage )
|
|
|
|
{
|
|
|
|
pOldPage->UpdateFtnNum();
|
|
|
|
pNewPage->UpdateFtnNum();
|
|
|
|
}
|
|
|
|
|
|
|
|
if( bBossChg )
|
|
|
|
{
|
|
|
|
rThis.Prepare( PREP_BOSS_CHGD, 0, FALSE );
|
|
|
|
if( !bSamePage )
|
|
|
|
{
|
|
|
|
ViewShell *pSh = rThis.GetShell();
|
|
|
|
if ( pSh && !pSh->Imp()->IsUpdateExpFlds() )
|
2006-08-14 15:25:22 +00:00
|
|
|
pSh->GetDoc()->SetNewFldLst(true); //Wird von CalcLayout() hinterher erledigt!
|
2006-07-10 14:29:29 +00:00
|
|
|
|
2000-09-18 23:08:29 +00:00
|
|
|
pNewPage->InvalidateSpelling();
|
2007-01-02 15:48:46 +00:00
|
|
|
pNewPage->InvalidateSmartTags(); // SMARTTAGS
|
2000-09-18 23:08:29 +00:00
|
|
|
pNewPage->InvalidateAutoCompleteWords();
|
2006-07-10 14:29:29 +00:00
|
|
|
pNewPage->InvalidateWordCount();
|
2000-09-18 23:08:29 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2002-11-01 10:43:00 +00:00
|
|
|
// OD 30.10.2002 #97265# - no <CheckPageDesc(..)> in online layout
|
2006-08-14 15:25:22 +00:00
|
|
|
if ( !pNewPage->GetFmt()->getIDocumentSettingAccess()->get(IDocumentSettingAccess::BROWSE_MODE) )
|
2002-11-01 10:43:00 +00:00
|
|
|
{
|
|
|
|
//Bei Sections kann es passieren, das wir gleich in den Follow geflutscht
|
|
|
|
//sind. Dadurch wird nicht vom GetLeaf fuer die richtige Seite gesorgt.
|
|
|
|
//Das muessen wir fuer diesen Fall pruefen.
|
|
|
|
if ( !bSamePage && pNewUpper->IsInSct() &&
|
|
|
|
( rThis.GetAttrSet()->GetPageDesc().GetPageDesc() ||
|
|
|
|
pOldPage->GetPageDesc()->GetFollow() != pNewPage->GetPageDesc() ) )
|
|
|
|
SwFrm::CheckPageDescs( pNewPage, FALSE );
|
|
|
|
}
|
2000-09-18 23:08:29 +00:00
|
|
|
}
|
|
|
|
return bSamePage;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*************************************************************************
|
|
|
|
|*
|
|
|
|
|* BOOL SwFlowFrm::MoveBwd()
|
|
|
|
|*
|
|
|
|
|* Beschreibung Returnwert sagt, ob der Frm die Seite wechseln soll.
|
|
|
|
|* Sollte von abgeleiteten Klassen gerufen werden.
|
|
|
|
|* Das moven selbst muessen die abgeleiteten uebernehmen.
|
|
|
|
|* Ersterstellung MA 05. Dec. 96
|
|
|
|
|* Letzte Aenderung MA 05. Dec. 96
|
|
|
|
|*
|
|
|
|
|*************************************************************************/
|
|
|
|
|
|
|
|
BOOL SwFlowFrm::MoveBwd( BOOL &rbReformat )
|
|
|
|
{
|
|
|
|
SwFlowFrm::SetMoveBwdJump( FALSE );
|
|
|
|
|
|
|
|
SwFtnFrm* pFtn = rThis.FindFtnFrm();
|
|
|
|
if ( pFtn && pFtn->IsBackMoveLocked() )
|
|
|
|
return FALSE;
|
|
|
|
|
2004-12-23 09:07:01 +00:00
|
|
|
// --> OD 2004-11-29 #115759# - text frames, which are directly inside
|
|
|
|
// tables aren't allowed to move backward.
|
|
|
|
if ( rThis.IsTxtFrm() && rThis.IsInTab() )
|
|
|
|
{
|
|
|
|
const SwLayoutFrm* pUpperFrm = rThis.GetUpper();
|
|
|
|
while ( pUpperFrm )
|
|
|
|
{
|
|
|
|
if ( pUpperFrm->IsTabFrm() )
|
|
|
|
{
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
else if ( pUpperFrm->IsColumnFrm() && pUpperFrm->IsInSct() )
|
|
|
|
{
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
pUpperFrm = pUpperFrm->GetUpper();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
// <--
|
|
|
|
|
2000-09-18 23:08:29 +00:00
|
|
|
SwFtnBossFrm * pOldBoss = rThis.FindFtnBossFrm();
|
|
|
|
SwPageFrm * const pOldPage = pOldBoss->FindPageFrm();
|
|
|
|
SwLayoutFrm *pNewUpper = 0;
|
2007-09-27 08:01:58 +00:00
|
|
|
BOOL bCheckPageDescs = FALSE;
|
2004-02-16 10:58:00 +00:00
|
|
|
bool bCheckPageDescOfNextPage = false;
|
2000-09-18 23:08:29 +00:00
|
|
|
|
|
|
|
if ( pFtn )
|
|
|
|
{
|
|
|
|
//Wenn die Fussnote bereits auf der gleichen Seite/Spalte wie die Referenz
|
|
|
|
//steht, ist nix mit zurueckfliessen. Die breaks brauche fuer die
|
|
|
|
//Fussnoten nicht geprueft zu werden.
|
2004-12-23 09:07:01 +00:00
|
|
|
|
|
|
|
// --> FME 2004-11-15 #i37084# FindLastCntnt does not necessarily
|
|
|
|
// have to have a result != 0
|
|
|
|
SwFrm* pRef = 0;
|
CWS-TOOLING: integrate CWS odfmetadata2
2009-06-22 11:48:36 +0200 mst r273206 : - connectivity/source/drivers/mozab/mozillasrc/MNSInclude.hxx:
+ add "include ustrbuf.hxx" to work around warning caused by
solaris <sys/kstat.h> declaring a global "long l ;"
2009-06-19 14:25:25 +0200 mst r273159 : - scp2/source/ooo/file_library_ooo.scp:
+ fix MinGW build
2009-06-08 12:52:33 +0200 mst r272727 : - redland/raptor-1.4.18.patch.mingw, redland/raptor/makefile.mk:
+ disable parsers that do not build on MinGW (thanks for patch by tono)
2009-05-15 17:31:07 +0200 mst r271957 : fix typos
2009-05-15 17:28:57 +0200 mst r271956 : #i101965#
- offapi/com/sun/star/text/TextPortion:
+ add missing properties:
SoftPageBreak, DocumentIndexMark, ReferenceMark, Footnote, TextField
+ fix read-only status of properties: Bookmark, IsStart, IsCollapsed
- offapi/type_reference/{typelibrary_history.txt,types.rdb}:
+ update reference types.rdb
2009-05-07 14:41:38 +0200 mst r271669 : - sw/inc/{fmtftn.hxx,unocoll.hxx,doc.hxx,editsh.hxx,ftninfo.hxx},
sw/source/core/layout/{flowfrm.cxx,ftnfrm.cxx},
sw/source/core/doc/docftn.cxx, sw/source/core/edit/edattr.cxx,
sw/source/core/txtnode/atrftn.cxx, sw/source/core/unocore/unocoll.cxx,
sw/source/ui/fldui/fldref.cxx:
+ fix warning ... the hard way
+ also fix signature of SwDoc::SetCurFtn
2009-05-05 19:52:55 +0200 mst r271556 : - sw/inc/undobj.hxx:
+ make some members const
2009-05-05 19:34:40 +0200 mst r271555 : - sw/inc/rolbck.hxx, sw/source/core/undo/rolbck.cxx:
+ make some members const
2009-05-05 19:13:14 +0200 mst r271553 : - sw/inc/{undobj.hxx,rolbck.hxx},
sw/source/core/undo/{unbkmk.cxx,rolbck.cxx}:
+ fix rebase merge error
+ rename SwHstryBookmark to SwHistoryBookmark
+ clean up SwUndoBookmark
2009-05-05 19:05:53 +0200 mst r271552 : - sw/source/core/unocore/unoportenum.cxx:
+ fix annoying assertion
2009-05-05 15:34:48 +0200 mst r271522 : CWS-TOOLING: rebase CWS odfmetadata2 to trunk@271427 (milestone: DEV300:m47)
2009-05-04 12:37:01 +0200 mst r271444 : trivial
2009-04-22 13:30:37 +0200 mst r271102 : - sfx2/inc/sfx2/dinfdlg.hxx:
+ trivial change
2009-04-21 16:46:58 +0200 mst r271043 : - sw/inc/hintids.hxx:
+ introduce some predicates for the various hints, and use them
2009-04-21 16:19:03 +0200 mst r271041 : - sw/inc/undobj.hxx,
sw/source/core/doc/{docfly.cxx,docfmt.cxx,docftn.cxx,doctxm.cxx},
sw/source/core/undo/{unattr.cxx,unins.cxx}:
+ clean up unattr.cxx:
remove/fix casts, prefix members, use auto_ptr, etc.
2009-04-21 15:34:23 +0200 mst r271039 : - sw/inc/{rolbck.hxx,undobj.hxx},
sw/source/core/doc/docfmt.cxx,
sw/source/core/txtnode/{thints.cxx,txtedt.cxx},
sw/source/core/undo/{rolbck.cxx,undel.cxx,undobj.cxx,unins.cxx,unmove.cxx,
unovwr.cxx,unsect.cxx,unspnd.cxx,untbl.cxx,untblk.cxx,unattr.cxx}:
+ clean up SwHistory, SwRegHistory and SwHistoryHint etc.:
remove/fix casts, prefix members, remove wrong const annotations,
use auto_ptr, remove unused members, etc.
2009-04-20 19:17:36 +0200 mst r271013 : - sw/inc/ndhints.hxx,
sw/source/core/text/{itrtxt.cxx,txtftn.cxx,itratr.cxx,porfly.cxx,
txtfrm.cxx,txtdrop.cxx,frmform.cxx},
sw/source/core/txtnode/{ndtxt.cxx,ndhints.cxx,thints.cxx,txtedt.cxx},
sw/source/core/edit/acorrect.cxx,
sw/source/core/doc/{docedt.cxx,docfmt.cxx},
sw/source/filter/html/swhtml.cxx:
+ clean up SwHintsArray and its subclasses: remove/fix casts, prefix members
2009-04-20 18:42:07 +0200 mst r271007 : - sw/source/core/text/txtio.cxx, sw/source/core/edit/edattr.cxx,
sw/source/core/undo/rolbck.cxx:
+ remove JP_NEWCORE dead code
2009-04-20 18:38:09 +0200 mst r271006 : - sw/source/core/unocore/unochart.cxx:
+ silence unxlngi warning (debug=t)
2009-04-20 16:36:13 +0200 mst r270991 : - sfx2/inc/sfx2/dinfdlg.hxx, sfx2/source/dialog/dinfdlg.cxx,
sfx2/source/doc/objserv.cxx, sw/source/ui/fldui/flddinf.hxx:
+ trivial cleanups
2009-04-20 15:28:52 +0200 mst r270990 : - sfx2/inc/sfx2/dinfdlg.hxx, sfx2/source/dialog/dinfdlg.cxx,
sfx2/source/doc/objserv.cxx:
+ fix bug: replaying a macro with a DocumentInfoItem removes all
user-defined properties
2009-03-10 15:08:20 +0100 mst r269273 : - sfx2/source/doc/Metadatable.cxx:
+ add missing SolarMutex guards
2009-03-10 14:46:29 +0100 mst r269272 : - unoxml/source/rdf/librdf_repository.cxx:
+ never free rdf_world because that would call libxm2 xmlCleanupParser
(and, to add insult to injury, other libxml2 functions later...)
2009-03-06 19:02:44 +0100 mst r269041 : argh! undo...
2009-03-06 19:00:58 +0100 mst r269040 : fix #i99931#
- sw/source/ui/uno/unomod.cxx:
+ SwXViewSettings::_getSingleValue returns uninitialized memory
for the ZoomType property if the value is PAGE_WIDTH_EXACT
2009-03-06 18:59:28 +0100 mst r269039 : - sw/inc/ndtxt.hxx, sw/source/core/txtnode/ndtxt.cxx,
sw/source/core/unocore/unoportenum.cxx:
+ fix some more wntmsci12 warnings...
2009-03-06 18:56:46 +0100 mst r269038 : - sd/source/ui/slidesorter/model/SlsPageEnumerationProvider.cxx:
+ work around spurious warning on unxsoli4 debug=t
2009-03-05 14:02:01 +0100 mst r268902 : - sw/inc/txatbase.hxx:
+ back to c-style casts, they also compile on wntmsci12...
2009-03-05 10:23:25 +0100 mst r268882 : - comphelper/inc/comphelper/processfactory.hxx,
comphelper/source/processfactory/processfactory.cxx:
+ revert change of return type of comphelper_getProcessComponentContext
to Reference: does not build on wntmsci12
2009-03-04 19:08:09 +0100 mst r268861 : - sw/source/core/txtnode/{atrtox.cxx,ndtxt.cxx}:
+ fix initialization
2009-03-04 14:37:30 +0100 mst r268831 : - solenv/inc/target.mk:
+ fix CLASSPATH so complex tests run (fix by sb)
2009-03-04 14:36:30 +0100 mst r268830 : - sw/inc/unoobj.hxx,
sw/source/core/unocore/{unoparagraph.cxx,unoobj.cxx,unoobj2.cxx}:
+ SwXParaFrameEnumeration constructor now takes SwPaM, not SwUnoCrsr
+ move SwParaSelection into unoparagraph.cxx, as it is only used there
+ bugfix: replace SwUnoCrsrs on stack with SwCursors
2009-03-04 14:34:46 +0100 mst r268829 : - sw/inc/pam.hxx, sw/source/core/crsr/pam.cxx,
sw/source/core/edit/eddel.cxx, sw/source/core/doc/docredln.cxx,
sw/source/core/undo/{untbl.cxx,undel.cxx}, sw/source/filter/rtf/swparrtf.cxx:
+ clean up SwPaM: prefix members
+ new constructor SwPosition(SwCntntNode&, xub_StrLen)
+ fix several broken SwPosition and SwPaM constructors
+ SwPam::DeleteMark now actually resets the unused position to default
2009-03-02 12:07:09 +0100 mst r268646 : - sw/inc/fmtcol.hxx:
+ fix annoying warning (gcc 4)
2009-03-02 12:06:27 +0100 mst r268645 : - odk/util/check.pl, odk/examples/DevelopersGuide/Text/TextDocuments.java:
+ rename module from FieldMaster to fieldmaster
2009-02-27 19:49:56 +0100 mst r268614 : - sfx2/inc/sfx2/Metadatable.hxx, sfx2/prj/d.lst,
sfx2/source/doc/{Metadatable.cxx,makefile.mk},
sw/inc/{SwMetadatable.hxx,unoobj.hxx,undobj.hxx,ndtxt.hxx},
sw/source/core/doc/{SwMetadatable.cxx,makefile.mk,docnew.cxx},
sw/source/core/undo/{untbl.cxx,unins.cxx},
sw/source/core/unocore/unoparagraph.cxx, sw/source/ui/app/docsh.cxx:
+ move Metadatable implementation from sw to sfx2
2009-02-27 17:58:55 +0100 mst r268608 : - sw/inc/{SwMetadatable.hxx,undobj.hxx}, sw/source/core/doc/SwMetadatable.cxx,
sw/source/core/undo/{untbl.cxx,unins.cxx,undel.cxx}:
+ CreateUndo now returns an opaque MetadatableUndo object
2009-02-27 13:15:44 +0100 mst r268587 : - sw/inc/ndtxt.hxx, sw/source/core/doc/docfmt.cxx,
sw/source/core/text/{itratr.cxx,porlay.cxx},
sw/source/core/txtnode/{txtedt.cxx,ndtxt.cxx,thints.cxx}:
+ clean up SwTxtNode: fix casts, prefix members
+ factor out inline function SwTxtNode::TryDeleteSwpHints()
2009-02-27 13:14:30 +0100 mst r268586 : - svx/inc/svx/emphitem.hxx:
+ fix borken header guard
2009-02-27 13:13:56 +0100 mst r268585 : - sfx2/source/bastyp/progress.cxx:
+ fix use of compiler specific macro
2009-02-27 11:00:32 +0100 mst r268564 : - sw/inc/{txatbase.hxx,txtatr.hxx,txtinet.hxx,txtfld.hxx,txtftn.hxx,
txtflcnt.hxx,txttxmrk.hxx,txtrfmrk.hxx},
sw/source/core/txtnode/{atrtox.cxx,atrref.cxx,atrflyin.cxx,atrftn.cxx,
txtatr2.cxx,txatbase.cxx,atrfld.cxx,txtedt.cxx},
sw/source/core/text/atrstck.cxx, sw/source/core/access/acchyperlink.cxx,
sw/source/core/doc/visiturl.cxx, sw/source/ui/wrtsh/wrtsh2.cxx:
+ clean up SwTxtAttr and its subclasses: remove/fix casts, prefix members
+ SwTxtINetFmt: remove unused member bColor
- sw/source/core/text/txtfld.cxx:
+ move SwTxtFld methods to atrfld.cxx
2009-02-27 10:58:44 +0100 mst r268563 : - sfx2/inc/sfx2/sfxbasemodel.hxx:
+ don't privately inherit BaseMutex, ScModelObj wants to access it
2009-02-27 10:58:02 +0100 mst r268562 : - xmloff/source/core/{RDFaExportHelper.cxx,RDFaImportHelper.cxx}:
+ arrrgh!!! someone thought it would be a good idea to have 2 different
versions of boost in external! and they're NOT compatible!!!
insert an ugly fragile hack that maybe works with both...
2009-02-26 17:42:26 +0100 mst r268544 : - comphelper/inc/comphelper/storagehelper.hxx.
sfx2/source/doc/DocumentMetadataAccess.cxx:
+ someone made IsValidZipEntryFileName a static method and didn't tell me
2009-02-26 15:52:56 +0100 mst r268529 : redland: split up patches
2009-02-26 13:17:56 +0100 mst r268509 : migration of cws odfmetadata2 from CVS (resync to m42): module sw
#i95863#
- sw/inc/segdefs{,_}.hxx:
+ remove obsolete files
- sw/source/ui/inc/itemdef.hxx:
+ remove itemdef.hxx
- sw/source/ui/app/[apphdl.cxx,docsh.cxx}, sw/source/ui/misc/glshell.cxx,
sw/source/ui/shells/*.cxx, sw/source/ui/uiview/*.cxx, sw/source/ui/web/*.cxx:
+ use sfx2/msg.hxx instead of itemdef.hxx
- sw/source/core/edit/eddel.cxx:
+ @ JP: SwEditShell::Replace:
you're right, deleting the text to be replaced first, and then inserting
a space, and then replacing that space is unnecessary.
whew, i'm so happy that we finally answered that question after 11 years.
- sw/inc/edimp.hxx:
+ remove FOREACHCURSOR_START, FOREACHCURSOR_END
- sw/inc/{swcrsr.hxx,unocrsr.hxx,viscrs.hxx},
sw/source/core/crsr/{crsrsh.cxx,swcrsr.cxx,trvlreg.cxx,trvltbl.cxx,
unocrsr.cxx,viscrs.cxx},
sw/source/core/doc/{docbm.cxx,doccorr.cxx},
sw/source/core/docnode/{ndtbl.cxx,ndtbl1.cxx},
sw/source/core/edit/editsh.cxx,
sw/source/core/frmedt/{fefly1.cxx,fetab.cxx,tblsel.cxx},
sw/source/core/layout/trvlfrm.cxx,
sw/source/core/unocore/{unochart.cxx,unoobj2.cxx,unoparagraph.cxx,
unoportenum.cxx,unotbl.cxx},
sw/source/core/view/vprint.cxx:
+ remove the hideous virtual operator SwFooCursor*
+ make SwCursor::IsReadOnlyAvailable() virtual
+ make SwUnoCrsr::Clone() virtual
+ refactor SwCursor methods IsSelOver(), LeftRight(), UpDown(), GotoTable():
replace dynamic_cast<...>(this) with new virtual methods
2009-02-26 13:14:58 +0100 mst r268508 : migration of cws odfmetadata2 from CVS (resync to m42): module sw
- sw/source/filter/xml/swxml.cxx:
+ XMLReader::Read: load RDF metadata of the ODF document
- sw/source/filter/xml/wrtxml.cxx:
+ SwXMLWriter::_Write: write RDF metadata of the ODF document if ODF >= 1.2
#i90620#: import xml:id in text tables (does not actually work yet)
- sw/source/filter/xml/xmltbli{.hxx,.cxx}:
+ SwXMLTableCellAttrTokens,aTableCellAttrTokenMap: add XML_TOK_TABLE_XMLID
+ SwXMLTableCellContext_Impl::SwXMLTableCellContext_Impl: attribute xml:id
+ SwXMLTableCellContext_Impl::CreateChildContext: attribute xml:id
+ SwXMLTableColContext_Impl::SwXMLTableColContext_Impl: attribute xml:id
+ SwXMLTableContext::SwXMLTableContext: attribute xml:id
fix #i98530#
- sw/inc/unoport.hxx, sw/source/core/unocore/unoport.cxx:
+ SwXTextPortion: make constructor params const&
- sw/source/core/unocore/unoportenum.cxx:
+ refactor to remove some code duplication
+ fix bug: paragraph w/out hints: bookmark before frame gets lost
#i97274# handle invalid tables
- sw/source/core/layout/tabfrm.cxx, sw/source/filter/xml/xmltbli.cxx:
+ SwXMLTableContext::MakeTable():
check that the table actually contains cells,
and abort (removing the inserted table nodes) if not
2009-02-26 13:11:48 +0100 mst r268507 : migration of cws odfmetadata2 from CVS (resync to m42): module sw
refactor SwXTextRange and SwXParagraph
- sw/inc/unoobj.hxx, sw/source/core/unocore/unoobj2.cxx:
+ remove 3 constructors of SwXTextRange
+ new method SwXTextRange::CreateParentXText
+ refactor SwXTextRange::CreateTextRangeFromPosition and
SwXTextRange::getText
- sw/inc/unoobj.hxx, sw/source/core/unocore/unoparagraph.cxx:
+ SwXParagraph no longer uses a cursor; it registers directly at SwTxtNode
+ replace SwXParagraph::GetCrsr with SwXParagraph::GetTxtNode
- sw/source/core/unocore/unotext.cxx, sw/source/ui/uno/unotxvw.cxx:
+ adapt to new SwXParagraph
#i90620#
- sw/inc/SwMetadatable.hxx,
sw/source/core/doc/SwMetadatable.cxx:
+ new files: base classes sw::Metadatable and sw::MetadatableMixin;
also, 2 implementations of IXmlIdRegistry:
sw::XmlIdRegistryDocument and sw::XmlIdRegistryClipboard
+ setMetadataReference: handle empty stream name as auto-detect
- sw/source/core/doc/makefile.mk:
+ add SwMetadatable
add a XmlIdRegistry to SwDoc
- sw/inc/doc.hxx:
+ SwDoc: add member m_pXmlIdRegistry, method GetXmlIdRegistry()
- sw/source/core/doc/docnew.cxx:
+ initialize XmlIdRegistry in SwDoc::GetXmlIdRegistry, not in constructor,
because the constructor is not told whether the SwDoc is a clipboard
- sw/inc/docsh.hxx, sw/source/ui/app/docsh.cxx:
+ SwDocShell: override GetXmlIdRegistry()
#i91563#: make the SwTxtNode metadatable
- sw/inc/ndtxt.hxx
+ SwTxtNode inherits sw::Metadatable
- sw/inc/unoobj.hxx, sw/source/core/unocore/unoparagraph.cxx:
+ SwXParagraph inherits sw::MetadatableMixin
#i91563#: handle SwTxtNode's metadata for delete
- sw/source/core/txtnode/ndtxt.cxx:
+ SwTxtNode::SplitCntntNode: handle XmlId
+ SwTxtNode::JoinNext: merge XmlIds
- sw/source/core/doc/docedt.cxx:
+ lcl_GetJoinFlags: document postcondition
+ SwDoc::Delete: remove XmlId only if SwTxtNode _becomes_ empty
#i91563#: handle SwTxtNode's metadata for delete with undo
- sw/inc/undobj.hxx
+ SwUndoDelete: new members m_pMetadataUndoStart, m_pMetadataUndoEnd
- sw/source/core/undo/undel.cxx:
+ SwUndoDelete::SaveCntnt: save XmlIds for start and end SwTxtNode
+ SwUndoDelete::SaveCntnt: remove XmlId only if SwTxtNode _becomes_ empty
+ SwUndoDelete::Undo: restore saved XmlIds for start and end SwTxtNode
- sw/source/core/docnode/ndcopy.cxx:
+ SwTxtNode::MakeCopy: register copy at XmlIdRegistry
#i91563#: handle SwTxtNode's metadata for find/replace with undo
- sw/source/core/undo/unins.cxx:
+ _UnReplaceData: rename members: add prefix m_
+ _UnReplaceData: new members m_pMetadataUndoStart, m_pMetadataUndoEnd
+ _UnReplaceData::_UnReplaceData: save XmlIds for start and end SwTxtNode
+ _UnReplaceData::Undo: restore saved XmlIds for start and end SwTxtNode
#i91563#: handle SwTxtNode's metadata for table-to-text with undo
- sw/source/core/undo/untbl.cxx:
+ SwTblToTxtSave: rename members: add prefix m_
+ SwTblToTxtSave: new members m_pMetadataUndoStart, m_pMetadataUndoEnd
+ SwTblToTxtSave::SwTblToTxtSave: save XmlIds for start and end SwTxtNode
+ SwTblToTxtSave::SwTblToTxtSave, SwNodes::UndoTableToText:
always store the index of the first SwTxtNode in the cell, instead of
the index of the first SwTxtNode in case of the first cell in a row,
and the cell start node in other cases
+ SwNodes::UndoTableToText: restore saved XmlIds for start and end SwTxtNode
- sw/source/core/docnode/ndtbl.cxx:
+ lcl_DelBox: simplify for refactored start index handling in SwTblToTxtSave
2009-02-26 13:02:28 +0100 mst r268505 : migration of cws odfmetadata2 from CVS (resync to m42): module sd
- sd/source/ui/table/tableobjectbar.cxx,sd/source/ui/view/*.cxx:
+ remove invocations of SFX_DECL_TYPE
- sd/source/ui/slideshow/SlideShowRestarter.cxx,
sd/source/ui/toolpanel/LayoutMenu.cxx,
sd/source/ui/unoidl/DrawController.cxx,
sd/source/ui/view/{ViewShellBase.cxx,ViewTabBar.cxx,frmview.cxx}:
+ fix abuses of comphelper_getProcessComponentContext (missing release)
2009-02-26 13:01:24 +0100 mst r268504 : migration of cws odfmetadata2 from CVS (resync to m42): module starmath
- starmath/source/document.cxx:
+ don't touch SfxObjectShell's privates
2009-02-26 13:00:37 +0100 mst r268503 : migration of cws odfmetadata2 from CVS (resync to m42): module sfx2
#i90620#
- sfx2/inc/sfx2/XmlIdRegistry.hxx:
+ new file: interfaces sfx2::IXmlIdRegistry and sfx2::IXmlIdRegistrySupplier
and a couple of utility functions
- sfx2/inc/sfx2/DocumentMetadataAccess.hxx,
sfx2/source/doc/DocumentMetadataAccess.cxx:
+ new class sfx2::DocumentMetadataAccess, implements XDocumentMetadataAccess
+ the URI of the DocumentMetadataAccess is now the URI from which the
document was loaded; for a new document, use a vnd.sun.star.tdoc URI
+ add new function sfx2::createBaseURI()
+ prevent using reserved file names
+ try not to recurse into embedded subdocuments
- sfx2/source/doc/makefile.mk:
+ add DocumentMetadataAccess
- sfx2/util/makefile.mk:
+ link libsfx2 against libxml2 (needed for xmlValidateNCName)
- sfx2/source/doc/makefile.mk:
+ add LIBXML_CFLAGS to CFLAGS
- sfx2/prj/build.lst:
+ add dependence on libxml2
- sfx2/prj/d.lst:
+ add XmlIdRegistry.hxx, DocumentMetadataAccess.hxx
- sfx2/inc/sfx2/objsh.hxx, sfx2/source/doc/objxtor.cxx:
+ make SfxObjectShell's members private
+ new method SfxObjectShell::GetAutoStyleFilterIndex
+ SfxObjectShell inherits sfx2::IXmlIdRegistrySupplier
- sfx2/source/dialog/templdlg.cxx, sfx2/source/doc/sfxbasemodel.cxx:
+ don't touch SfxObjectShell's privates
- sfx2/inc/sfx2/sfxbasemodel.hxx, sfx2/source/doc/sfxbasemodel.cxx:
+ SfxBaseModel inherits BaseMutex instead of IMPL_SfxBaseModel_MutexContainer
+ SfxBaseModel implements additional interface XDocumentMetadataAccess
+ IMPL_SfxBaseModel_DataContainer has new member:
a sfx2::DocumentMetadataAccess
+ implementation of XDocumentMetadataAccess forwards to
the sfx2::DocumentMetadataAccess member
- sfx2/qa/complex/DocumentMetadataAccessTest.java,
sfx2/qa/complex/{tests.sce,makefile.mk},
sfx2/qa/complex/testdocuments/TESTRDFA.odt:
+ add complex test: DocumentMetadataAccessTest
+ add RDFa test document
#i95863#
- sfx2/inc/sfx2/dinfdlg.hxx, sfx2/source/dialog/dinfdlg.cxx:
+ refactor SfxDocumentItem so it no longer requires a XDocumentInfo
+ move struct CustomProperty to implementation file
+ remove class SfxDocumentUserPage
+ QueryValue,PutValue: remove MID_DOCINFO_FIELD*
- sfx2/source/doc/objserv.cxx:
+ adapt to SfxDocumentItem change
- sfx2/inc/sfx2/sfx.hrc, sfx2/sdi/sfxslots.sdi, sfx2/inc/sfx2/msg.hxx:
+ remove MID_DOCINFO_FIELD*
+ put all invocations of SFX_DECL_TYPE in msg.hxx, and undef SFX_DECL_TYPE
- sfx2/source/doc/objxtor.cxx:
+ fix abuses of comphelper_getProcessComponentContext (missing release)
- sfx2/source/doc/docfile.cxx:
+ SfxMedium::SfxMedium: don't dereference NULL, throw exception instead
- sfx2/source/doc/objstor.cxx:
+ SfxObjectShell::DoLoad: fix bug: DocumentBaseURI is not initialized
2009-02-26 12:58:07 +0100 mst r268502 : migration of cws odfmetadata2 from CVS (resync to m42): module xmloff
#i90620#: implement RDFa import (interface change)
- xmloff/inc/xmloff/xmlimp.hxx. xmloff/source/core/xmlimp.cxx:
+ make SvXMLImport::GetAbsoluteReference() const
+ add SvXMLImport::GetComponentContext()
+ SvXMLImport::_InitCtor(): add RDFa namespace
+ add SvXMLImport::AddRDFa()
+ SvXMLImport::endDocument() inserts RDFa into document repository
- xmloff/inc/xmloff/xmltoken.hxx, xmloff/source/core/xmltoken.cxx:
+ new tokens for RDFa: XML_ABOUT, XML_DATATYPE
- xmloff/inc/RDFaImportHelper.hxx, xmloff/source/core/RDFaImportHelper.cxx:
+ new class RDFaImportHelper
+ adapt the code to the bleak reality of broken C++ implementations
+ handle empty xhtml:about attributes properly, which are actually
valid relative URIs
+ work around broken SvXMLImport::GetAbsoluteReference
- xmloff/source/core/makefile.mk:
+ add RDFaImportHelper.cxx
#i90620#: implement RDFa export
- xmloff/inc/xmloff/xmlexp.hxx, xmloff/source/core/xmlexp.cxx:
+ add SvXMLExport::EnsureNamespace(), and a stack of namespace maps
+ add SvXMLExport::GetComponentContext()
+ add SvXMLExport::AddAttributesRDFa()
- xmloff/inc/RDFaExportHelper.hxx, xmloff/source/core/RDFaExportHelper.cxx:
+ new class RDFaExportHelper
+ don't use std::map::data_type, which is actually called
std::map::mapped_type by libstdc++
- xmloff/source/core/makefile.mk:
+ add RDFaExportHelper.cxx
#i91563#
- xmloff/inc/xmloff/txtimp.hxx, xmloff/source/text/txtimp.cxx:
+ XMLTextPAttrTokens: add RDFa tokens
- xmloff/source/text/txtparai{.hxx,.cxx}:
+ import RDFa for text:p
- xmloff/source/text/txtparae.cxx:
+ export RDFa for text:p
interface change: use XHTML namespace instead of RDFA
- xmloff/inc/xmlnmspe.hxx, xmloff/inc/xmloff/xmltoken.hxx,
xmloff/source/core/{xmltoken.cxx,xmlimp.cxx,xmlexp.cxx,RDFaExportHelper.cxx},
xmloff/source/text/txtimp.cxx:
+ use XHTML namespace instead of RDFA
#i91565#, #i91566#: (preliminary) import for text:meta, text:meta-field
- xmloff/source/text/txtparai.cxx:
+ new class XMLMetaImportContextBase with subclasses to import
text:meta and text:meta-field
- xmloff/source/text/XMLTextMarkImportContext.cxx:
+ change XMLTextMarkImportContext::CreateAndInsertMark to handle marks
with no name (text:meta)
#i91565#, #i91566#: (preliminary) export for text:meta, text:meta-field
- xmloff/inc/txtflde.hxx, xmloff/source/text/txtflde.cxx:
+ add FIELD_ID_META to FieldIdEnum
+ new method XMLTextFieldExport::ExportMetaField()
+ change XMLTextFieldExport::ExportField{,AutoStyle,Helper}
to take additional parameter for progress bar
- xmloff/inc/xmloff/txtparae.hxx, xmloff/source/text/txtparae.cxx:
+ make XMLTextParagraphExport::exportTextRangeEnumeration() public
+ new method XMLTextParagraphExport::exportMeta()
#i90620#
- xmloff/inc/xmloff/xmlimp.hxx, xmloff/source/core/xmlimp.cxx,
xmloff/inc/xmloff/xmlexp.hxx, xmloff/source/core/xmlexp.cxx:
+ rename SvXML{Im,Ex}port::GetStreamPath() to GetStreamName()
+ fix xml:id {im,ex}port for embedded documents and non-packages
+ adapt to API change: XMetadatable
#i90620# GRDDL
- xmloff/inc/xmlnmspe.hxx, xmloff/inc/xmloff/xmltoken.hxx,
xmloff/source/core/{xmltoken.cxx,xmlexp.cxx}:
+ add GRDDL namespace
+ add token XML_TRANSFORMATION
+ add grddl:transformation attribute to root elements for meta.xml,
content.xml and styles.xml
2009-02-26 12:54:40 +0100 mst r268501 : migration of cws odfmetadata2 from CVS (resync to m42): module unoxml
#i90620#
- unoxml/source/rdf/librdf_repository.cxx:
+ librdf_Repository::importGraph: allocate buffer sized length of stream
+ switch from one librdf_world per repository to a single static world
because redland has global variables with a brain-damaged life-cycle...
+ exportGraph: use new raptor 1.4.18 feature to disable writing
an xml:base attribute in RDF/XML files
- unoxml/source/rdf/librdf_repository.cxx:
unoxml/qa/complex/RDFRepositoryTest.java:
+ adapt to predicate is URI change
+ adapt to RDFa API change
+ adapt to API change: RDFa has multiple predicates...
+ adapt to API change: XMetadatable derives from XURI
+ allow xhtml:datatype without xhtml:content
+ adapt to API change: attribute MetadataReference is StringPair
- unoxml/source/rdf/CURI.cxx:
+ add some more URI constants
2009-02-26 12:53:32 +0100 mst r268500 : migration of cws odfmetadata2 from CVS (resync to m42): module package
- package/inc/ImplValidCharacters.hxx:
+ remove (moved to comphelper)
2009-02-26 12:52:49 +0100 mst r268499 : migration of cws odfmetadata2 from CVS (resync to m42): module comphelper
- comphelper/inc/comphelper/processfactory.hxx,
comphelper/source/processfactory/processfactory.cxx:
+ add getProcessComponentContext()
+ change return type of comphelper_getProcessComponentContext to Reference
- comphelper/inc/comphelper/stl_types.hxx:
+ add OUStringBufferAppender
+ add algorithm intersperse
- comphelper/source/misc/string.cxx:
+ rewrite convertCommaSeparated with intersperse and OUStringBufferAppender
- comphelper/inc/comphelper/stlunosequence.hxx:
+ fix bug: begin() on empty sequence != end()
2009-02-26 12:50:47 +0100 mst r268498 : migration of cws odfmetadata2 from CVS (resync to m42): module offapi
#i96209#
- offapi/com/sun/star/text/fieldmaster/*.idl:
+ rename module from FieldMaster to fieldmaster
- offapi/type_reference/{typelibrary_history.txt,types.rdb}:
+ update reference types.rdb
#i90620#
- offapi/com/sun/star/rdf/{XMetadatable.idl,XDocumentMetadataAccess.idl}:
+ API change: XMetadatable derives from XURI
+ API change: replace XmlId (string) with MetadataReference (StringPair)
- offapi/com/sun/star/rdf/{Statement.idl,XDocumentRepository.idl,
XNamedGraph.idl,XRepository.idl}:
+ the predicate of a statement is a URI, not a Resource
- offapi/com/sun/star/rdf/XDocumentMetadataAccess.idl:
+ rename: s/Package/Document/
+ remove uuid
+ remove everything related to mapping
+ graph names are now generated from base URI and file names
+ load methods: improve error handling with XInteractionHandler
- offapi/com/sun/star/rdf/XDocumentRepository.idl:
+ change: RDFa permits using multiple predicates in one attribute
+ setStatementRDFa: subject is now XResource, object is now XMetadatable
- offapi/com/sun/star/rdf/URIs.idl:
+ add some more URI constants
- offapi/com/sun/star/rdf:
+ fix @since tags and replace <method> with <member>
2009-02-26 12:47:24 +0100 mst r268497 : migration of cws odfmetadata2 from CVS (resync to m42): module redland
fix #i93768#
- redland/raptor-1.4.17.patch, redland/raptor/makefile.mk:
+ disable GRDDL parser to prevent call to libxslt
xsltSetDefaultSecurityPrefs, which breaks xmlhelp
- redland/raptor/makefile.mk, redland/raptor-1.4.17.patch,
redland/raptor-1.4.18.patch:
+ upgrade raptor to 1.4.18
+ deactivate serializer for RSS/Atom (does not build)
- redland/rasqal/makefile.mk, redland/rasqal-0.9.15.patch,
redland/rasqal-0.9.16.patch,
+ upgrade rasqal to 0.9.16
- redland/redland/makefile.mk, redland/redland-1.0.7.patch,
redland/redland-1.0.8.patch:
+ upgrade redland to 1.0.8
- redland/redlandversion.mk:
+ the librasqal SONAME has changed
2009-07-02 09:05:03 +00:00
|
|
|
const bool bEndnote = pFtn->GetAttr()->GetFtn().IsEndNote();
|
2004-12-23 09:07:01 +00:00
|
|
|
if( bEndnote && pFtn->IsInSct() )
|
|
|
|
{
|
|
|
|
SwSectionFrm* pSect = pFtn->FindSctFrm();
|
|
|
|
if( pSect->IsEndnAtEnd() )
|
|
|
|
pRef = pSect->FindLastCntnt( FINDMODE_LASTCNT );
|
|
|
|
}
|
|
|
|
if( !pRef )
|
|
|
|
pRef = pFtn->GetRef();
|
|
|
|
// <--
|
|
|
|
|
2000-09-18 23:08:29 +00:00
|
|
|
ASSERT( pRef, "MoveBwd: Endnote for an empty section?" );
|
2004-12-23 09:07:01 +00:00
|
|
|
|
2000-09-18 23:08:29 +00:00
|
|
|
if( !bEndnote )
|
|
|
|
pOldBoss = pOldBoss->FindFtnBossFrm( TRUE );
|
|
|
|
SwFtnBossFrm *pRefBoss = pRef->FindFtnBossFrm( !bEndnote );
|
2002-11-11 08:46:51 +00:00
|
|
|
if ( pOldBoss != pRefBoss &&
|
|
|
|
// OD 08.11.2002 #104840# - use <SwLayoutFrm::IsBefore(..)>
|
|
|
|
( !bEndnote ||
|
|
|
|
pRefBoss->IsBefore( pOldBoss ) )
|
|
|
|
)
|
2000-09-18 23:08:29 +00:00
|
|
|
pNewUpper = rThis.GetLeaf( MAKEPAGE_FTN, FALSE );
|
|
|
|
}
|
|
|
|
else if ( IsPageBreak( TRUE ) ) //PageBreak zu beachten?
|
|
|
|
{
|
|
|
|
//Wenn auf der vorhergehenden Seite kein Frm im Body steht,
|
|
|
|
//so ist das Zurueckfliessen trotz Pagebreak sinnvoll
|
|
|
|
//(sonst: leere Seite).
|
|
|
|
//Natuerlich muessen Leereseiten geflissentlich uebersehen werden!
|
|
|
|
const SwFrm *pFlow = &rThis;
|
|
|
|
do
|
2006-05-24 12:54:43 +00:00
|
|
|
{
|
|
|
|
pFlow = pFlow->FindPrev();
|
|
|
|
} while ( pFlow &&
|
|
|
|
( pFlow->FindPageFrm() == pOldPage ||
|
|
|
|
!pFlow->IsInDocBody() ) );
|
2000-09-18 23:08:29 +00:00
|
|
|
if ( pFlow )
|
|
|
|
{
|
|
|
|
long nDiff = pOldPage->GetPhyPageNum() - pFlow->GetPhyPageNum();
|
|
|
|
if ( nDiff > 1 )
|
|
|
|
{
|
|
|
|
if ( ((SwPageFrm*)pOldPage->GetPrev())->IsEmptyPage() )
|
|
|
|
nDiff -= 1;
|
|
|
|
if ( nDiff > 1 )
|
|
|
|
{
|
|
|
|
pNewUpper = rThis.GetLeaf( MAKEPAGE_NONE, FALSE );
|
2006-05-24 12:54:43 +00:00
|
|
|
// --> OD 2006-05-08 #i53139#
|
|
|
|
// Now <pNewUpper> is a previous layout frame, which contains
|
|
|
|
// content. But the new upper layout frame has to be the next one.
|
|
|
|
// Thus, hack for issue i14206 no longer needed, but fix for issue 114442
|
|
|
|
// --> OD 2006-05-17 #136024# - correct fix for i53139:
|
|
|
|
// Check for wrong page description before using next new upper.
|
2006-07-13 10:31:19 +00:00
|
|
|
// --> OD 2006-06-06 #i66051# - further correction of fix for i53139
|
|
|
|
// Check for correct type of new next upper layout frame
|
|
|
|
// --> OD 2006-06-08 #136538# - another correction of fix for i53139
|
|
|
|
// Assumption, that in all cases <pNewUpper> is a previous
|
|
|
|
// layout frame, which contains content, is wrong.
|
|
|
|
// --> OD 2006-07-05 #136538# - another correction of fix for i53139
|
|
|
|
// Beside type check, check also, if proposed new next upper
|
|
|
|
// frame is inside the same frame types.
|
2007-01-22 10:53:11 +00:00
|
|
|
// --> OD 2007-01-10 #i73194# - and yet another correction
|
|
|
|
// of fix for i53139:
|
|
|
|
// Assure that the new next upper layout frame doesn't
|
|
|
|
// equal the current one.
|
|
|
|
// E.g.: content is on page 3, on page 2 is only a 'ghost'
|
|
|
|
// section and on page 1 is normal content. Method <FindPrev(..)>
|
|
|
|
// will find the last content of page 1, but <GetLeaf(..)>
|
|
|
|
// returns new upper on page 2.
|
2006-07-13 10:31:19 +00:00
|
|
|
if ( pNewUpper->Lower() )
|
2003-07-01 14:11:27 +00:00
|
|
|
{
|
2006-07-13 10:31:19 +00:00
|
|
|
SwLayoutFrm* pNewNextUpper = pNewUpper->GetLeaf( MAKEPAGE_NONE, TRUE );
|
|
|
|
if ( pNewNextUpper &&
|
2007-01-22 10:53:11 +00:00
|
|
|
pNewNextUpper != rThis.GetUpper() &&
|
2006-07-13 10:31:19 +00:00
|
|
|
pNewNextUpper->GetType() == pNewUpper->GetType() &&
|
|
|
|
pNewNextUpper->IsInDocBody() == pNewUpper->IsInDocBody() &&
|
|
|
|
pNewNextUpper->IsInFtn() == pNewUpper->IsInFtn() &&
|
|
|
|
pNewNextUpper->IsInTab() == pNewUpper->IsInTab() &&
|
|
|
|
pNewNextUpper->IsInSct() == pNewUpper->IsInSct() &&
|
|
|
|
!rThis.WrongPageDesc( pNewNextUpper->FindPageFrm() ) )
|
|
|
|
{
|
|
|
|
pNewUpper = pNewNextUpper;
|
|
|
|
bCheckPageDescOfNextPage = true;
|
|
|
|
}
|
2003-07-01 14:11:27 +00:00
|
|
|
}
|
2006-05-24 12:54:43 +00:00
|
|
|
// <--
|
2003-07-01 14:11:27 +00:00
|
|
|
|
2000-09-18 23:08:29 +00:00
|
|
|
bCheckPageDescs = TRUE;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else if ( IsColBreak( TRUE ) )
|
|
|
|
{
|
|
|
|
//Wenn in der vorhergehenden Spalte kein CntntFrm steht, so ist
|
|
|
|
//das Zurueckfliessen trotz ColumnBreak sinnvoll
|
|
|
|
//(sonst: leere Spalte).
|
|
|
|
if( rThis.IsInSct() )
|
|
|
|
{
|
|
|
|
pNewUpper = rThis.GetLeaf( MAKEPAGE_NONE, FALSE );
|
|
|
|
if( pNewUpper && !SwFlowFrm::IsMoveBwdJump() &&
|
|
|
|
( pNewUpper->ContainsCntnt() ||
|
|
|
|
( ( !pNewUpper->IsColBodyFrm() ||
|
|
|
|
!pNewUpper->GetUpper()->GetPrev() ) &&
|
|
|
|
!pNewUpper->FindSctFrm()->GetPrev() ) ) )
|
2006-05-24 12:54:43 +00:00
|
|
|
{
|
2000-09-18 23:08:29 +00:00
|
|
|
pNewUpper = 0;
|
2006-05-24 12:54:43 +00:00
|
|
|
}
|
|
|
|
// --> OD 2006-05-08 #i53139#
|
2006-09-13 10:31:47 +00:00
|
|
|
// --> OD 2006-09-11 #i69409# - check <pNewUpper>
|
2006-12-01 13:25:31 +00:00
|
|
|
// --> OD 2006-11-02 #i71065# - check <SwFlowFrm::IsMoveBwdJump()>
|
|
|
|
else if ( pNewUpper && !SwFlowFrm::IsMoveBwdJump() )
|
2006-09-13 10:31:47 +00:00
|
|
|
// <--
|
2006-05-24 12:54:43 +00:00
|
|
|
{
|
|
|
|
// Now <pNewUpper> is a previous layout frame, which
|
|
|
|
// contains content. But the new upper layout frame
|
|
|
|
// has to be the next one.
|
|
|
|
// --> OD 2006-05-17 #136024# - correct fix for i53139
|
2006-07-13 10:31:19 +00:00
|
|
|
// Check for wrong page description before using next new upper.
|
|
|
|
// --> OD 2006-06-06 #i66051# - further correction of fix for i53139
|
|
|
|
// Check for correct type of new next upper layout frame
|
|
|
|
// --> OD 2006-07-05 #136538# - another correction of fix for i53139
|
|
|
|
// Beside type check, check also, if proposed new next upper
|
|
|
|
// frame is inside the same frame types.
|
|
|
|
SwLayoutFrm* pNewNextUpper = pNewUpper->GetLeaf( MAKEPAGE_NOSECTION, TRUE );
|
2006-05-24 12:54:43 +00:00
|
|
|
if ( pNewNextUpper &&
|
2006-07-13 10:31:19 +00:00
|
|
|
pNewNextUpper->GetType() == pNewUpper->GetType() &&
|
|
|
|
pNewNextUpper->IsInDocBody() == pNewUpper->IsInDocBody() &&
|
|
|
|
pNewNextUpper->IsInFtn() == pNewUpper->IsInFtn() &&
|
|
|
|
pNewNextUpper->IsInTab() == pNewUpper->IsInTab() &&
|
|
|
|
pNewNextUpper->IsInSct() == pNewUpper->IsInSct() &&
|
2006-05-24 12:54:43 +00:00
|
|
|
!rThis.WrongPageDesc( pNewNextUpper->FindPageFrm() ) )
|
|
|
|
{
|
|
|
|
pNewUpper = pNewNextUpper;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
// <--
|
2000-09-18 23:08:29 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
const SwFrm *pCol = rThis.FindColFrm();
|
|
|
|
BOOL bGoOn = TRUE;
|
|
|
|
BOOL bJump = FALSE;
|
|
|
|
do
|
|
|
|
{
|
|
|
|
if ( pCol->GetPrev() )
|
|
|
|
pCol = pCol->GetPrev();
|
|
|
|
else
|
|
|
|
{
|
|
|
|
bGoOn = FALSE;
|
|
|
|
pCol = rThis.GetLeaf( MAKEPAGE_NONE, FALSE );
|
|
|
|
}
|
|
|
|
if ( pCol )
|
|
|
|
{
|
|
|
|
// ColumnFrms jetzt mit BodyFrm
|
|
|
|
SwLayoutFrm* pColBody = pCol->IsColumnFrm() ?
|
|
|
|
(SwLayoutFrm*)((SwLayoutFrm*)pCol)->Lower() :
|
|
|
|
(SwLayoutFrm*)pCol;
|
|
|
|
if ( pColBody->ContainsCntnt() )
|
|
|
|
{
|
|
|
|
bGoOn = FALSE; // Hier gibt's Inhalt, wir akzeptieren diese
|
|
|
|
// nur, wenn GetLeaf() das MoveBwdJump-Flag gesetzt hat.
|
|
|
|
if( SwFlowFrm::IsMoveBwdJump() )
|
2006-05-24 12:54:43 +00:00
|
|
|
{
|
2000-09-18 23:08:29 +00:00
|
|
|
pNewUpper = pColBody;
|
2006-05-24 12:54:43 +00:00
|
|
|
// --> OD 2006-05-08 #i53139#
|
|
|
|
// Now <pNewUpper> is a previous layout frame, which
|
|
|
|
// contains content. But the new upper layout frame
|
|
|
|
// has to be the next one.
|
|
|
|
// --> OD 2006-05-17 #136024# - correct fix for i53139
|
2006-07-13 10:31:19 +00:00
|
|
|
// Check for wrong page description before using next new upper.
|
|
|
|
// --> OD 2006-06-06 #i66051# - further correction of fix for i53139
|
|
|
|
// Check for correct type of new next upper layout frame
|
|
|
|
// --> OD 2006-07-05 #136538# - another correction of fix for i53139
|
|
|
|
// Beside type check, check also, if proposed new next upper
|
|
|
|
// frame is inside the same frame types.
|
2006-12-01 13:25:31 +00:00
|
|
|
// --> OD 2006-11-02 #i71065#
|
|
|
|
// Check that the proposed new next upper layout
|
|
|
|
// frame isn't the current one.
|
2006-05-24 12:54:43 +00:00
|
|
|
SwLayoutFrm* pNewNextUpper = pNewUpper->GetLeaf( MAKEPAGE_NONE, TRUE );
|
|
|
|
if ( pNewNextUpper &&
|
2006-12-01 13:25:31 +00:00
|
|
|
pNewNextUpper != rThis.GetUpper() &&
|
2006-07-13 10:31:19 +00:00
|
|
|
pNewNextUpper->GetType() == pNewUpper->GetType() &&
|
|
|
|
pNewNextUpper->IsInDocBody() == pNewUpper->IsInDocBody() &&
|
|
|
|
pNewNextUpper->IsInFtn() == pNewUpper->IsInFtn() &&
|
|
|
|
pNewNextUpper->IsInTab() == pNewUpper->IsInTab() &&
|
|
|
|
pNewNextUpper->IsInSct() == pNewUpper->IsInSct() &&
|
2006-05-24 12:54:43 +00:00
|
|
|
!rThis.WrongPageDesc( pNewNextUpper->FindPageFrm() ) )
|
|
|
|
{
|
|
|
|
pNewUpper = pNewNextUpper;
|
|
|
|
}
|
|
|
|
// <--
|
|
|
|
}
|
2000-09-18 23:08:29 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
if( pNewUpper ) // Wir hatten schon eine leere Spalte, haben
|
|
|
|
bJump = TRUE; // also eine uebersprungen
|
|
|
|
pNewUpper = pColBody; // Diese leere Spalte kommt in Frage,
|
|
|
|
// trotzdem weitersuchen
|
|
|
|
}
|
|
|
|
}
|
|
|
|
} while( bGoOn );
|
|
|
|
if( bJump )
|
|
|
|
SwFlowFrm::SetMoveBwdJump( TRUE );
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else //Keine Breaks also kann ich zurueckfliessen
|
|
|
|
pNewUpper = rThis.GetLeaf( MAKEPAGE_NONE, FALSE );
|
|
|
|
|
2004-08-02 13:08:38 +00:00
|
|
|
// --> OD 2004-06-23 #i27801# - no move backward of 'master' text frame,
|
|
|
|
// if - due to its object positioning - it isn't allowed to be on the new page frame
|
2005-03-23 11:59:05 +00:00
|
|
|
// --> OD 2005-03-07 #i44049# - add another condition for not moving backward:
|
|
|
|
// If one of its objects has restarted the layout process, moving backward
|
|
|
|
// isn't sensible either.
|
2005-04-20 11:22:40 +00:00
|
|
|
// --> OD 2005-04-19 #i47697# - refine condition made for issue i44049:
|
|
|
|
// - allow move backward as long as the anchored object is only temporarily
|
|
|
|
// positions considering its wrapping style.
|
2004-08-02 13:08:38 +00:00
|
|
|
if ( pNewUpper &&
|
|
|
|
rThis.IsTxtFrm() && !IsFollow() )
|
|
|
|
{
|
|
|
|
sal_uInt32 nToPageNum( 0L );
|
|
|
|
const bool bMoveFwdByObjPos = SwLayouter::FrmMovedFwdByObjPos(
|
|
|
|
*(pOldPage->GetFmt()->GetDoc()),
|
|
|
|
static_cast<SwTxtFrm&>(rThis),
|
|
|
|
nToPageNum );
|
|
|
|
if ( bMoveFwdByObjPos &&
|
|
|
|
pNewUpper->FindPageFrm()->GetPhyPageNum() < nToPageNum )
|
|
|
|
{
|
|
|
|
pNewUpper = 0;
|
|
|
|
}
|
2005-03-23 11:59:05 +00:00
|
|
|
// --> OD 2005-03-07 #i44049# - check, if one of its anchored objects
|
|
|
|
// has restarted the layout process.
|
|
|
|
else if ( rThis.GetDrawObjs() )
|
|
|
|
{
|
|
|
|
sal_uInt32 i = 0;
|
|
|
|
for ( ; i < rThis.GetDrawObjs()->Count(); ++i )
|
|
|
|
{
|
|
|
|
SwAnchoredObject* pAnchoredObj = (*rThis.GetDrawObjs())[i];
|
2005-04-20 11:22:40 +00:00
|
|
|
// --> OD 2005-04-19 #i47697# - refine condition - see above
|
|
|
|
if ( pAnchoredObj->RestartLayoutProcess() &&
|
|
|
|
!pAnchoredObj->IsTmpConsiderWrapInfluence() )
|
|
|
|
// <--
|
2005-03-23 11:59:05 +00:00
|
|
|
{
|
|
|
|
pNewUpper = 0;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
// <--
|
2004-08-02 13:08:38 +00:00
|
|
|
}
|
|
|
|
// <--
|
|
|
|
|
2000-09-18 23:08:29 +00:00
|
|
|
//Fuer Follows ist das zurueckfliessen nur dann erlaubt wenn in der
|
|
|
|
//neuen Umgebung kein Nachbar existiert (denn dieses waere der Master).
|
|
|
|
//(6677)Wenn allerdings leere Blaetter uebersprungen wurden wird doch gemoved.
|
|
|
|
if ( pNewUpper && IsFollow() && pNewUpper->Lower() )
|
|
|
|
{
|
2007-10-16 10:38:16 +00:00
|
|
|
// --> OD 2007-09-05 #i79774#, #b6596954#
|
|
|
|
// neglect empty sections in proposed new upper frame
|
|
|
|
bool bProposedNewUpperContainsOnlyEmptySections( true );
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
2007-10-16 10:38:16 +00:00
|
|
|
const SwFrm* pLower( pNewUpper->Lower() );
|
|
|
|
while ( pLower )
|
|
|
|
{
|
|
|
|
if ( pLower->IsSctFrm() &&
|
|
|
|
!dynamic_cast<const SwSectionFrm*>(pLower)->GetSection() )
|
|
|
|
{
|
|
|
|
pLower = pLower->GetNext();
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
bProposedNewUpperContainsOnlyEmptySections = false;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
2000-09-18 23:08:29 +00:00
|
|
|
}
|
2007-10-16 10:38:16 +00:00
|
|
|
if ( !bProposedNewUpperContainsOnlyEmptySections )
|
|
|
|
{
|
|
|
|
if ( SwFlowFrm::IsMoveBwdJump() )
|
|
|
|
{
|
|
|
|
//Nicht hinter den Master sondern in das naechstfolgende leere
|
|
|
|
//Blatt moven.
|
|
|
|
SwFrm *pFrm = pNewUpper->Lower();
|
|
|
|
while ( pFrm->GetNext() )
|
|
|
|
pFrm = pFrm->GetNext();
|
|
|
|
pNewUpper = pFrm->GetLeaf( MAKEPAGE_INSERT, TRUE );
|
|
|
|
if( pNewUpper == rThis.GetUpper() ) //Landen wir wieder an der gleichen Stelle?
|
|
|
|
pNewUpper = NULL; //dann eruebrigt sich das Moven
|
|
|
|
}
|
|
|
|
else
|
|
|
|
pNewUpper = 0;
|
|
|
|
}
|
|
|
|
// <--
|
2000-09-18 23:08:29 +00:00
|
|
|
}
|
|
|
|
if ( pNewUpper && !ShouldBwdMoved( pNewUpper, TRUE, rbReformat ) )
|
|
|
|
{
|
|
|
|
if( !pNewUpper->Lower() )
|
|
|
|
{
|
|
|
|
if( pNewUpper->IsFtnContFrm() )
|
|
|
|
{
|
|
|
|
pNewUpper->Cut();
|
|
|
|
delete pNewUpper;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
SwSectionFrm* pSectFrm = pNewUpper->FindSctFrm();
|
2006-01-27 13:35:52 +00:00
|
|
|
// --> OD 2006-01-04 #126020# - adjust check for empty section
|
2006-02-06 15:30:31 +00:00
|
|
|
// --> OD 2006-02-01 #130797# - correct fix #126020#
|
|
|
|
if ( pSectFrm && !pSectFrm->IsColLocked() &&
|
|
|
|
!pSectFrm->ContainsCntnt() && !pSectFrm->ContainsAny( true ) )
|
2006-01-27 13:35:52 +00:00
|
|
|
// <--
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
|
|
|
pSectFrm->DelEmpty( TRUE );
|
|
|
|
delete pSectFrm;
|
|
|
|
rThis.bValidPos = TRUE;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
pNewUpper = 0;
|
|
|
|
}
|
2004-06-28 12:08:52 +00:00
|
|
|
|
|
|
|
// OD 2004-05-26 #i21478# - don't move backward, if flow frame wants to
|
|
|
|
// keep with next frame and next frame is locked.
|
2005-01-05 13:30:18 +00:00
|
|
|
// --> OD 2004-12-08 #i38232# - If next frame is a table, do *not* check,
|
|
|
|
// if it's locked.
|
2004-06-28 12:08:52 +00:00
|
|
|
if ( pNewUpper && !IsFollow() &&
|
|
|
|
rThis.GetAttrSet()->GetKeep().GetValue() && rThis.GetIndNext() )
|
|
|
|
{
|
|
|
|
SwFrm* pIndNext = rThis.GetIndNext();
|
2005-01-05 13:30:18 +00:00
|
|
|
// --> OD 2004-12-08 #i38232#
|
|
|
|
if ( !pIndNext->IsTabFrm() )
|
2004-06-28 12:08:52 +00:00
|
|
|
{
|
2005-01-05 13:30:18 +00:00
|
|
|
// get first content of section, while empty sections are skipped
|
|
|
|
while ( pIndNext && pIndNext->IsSctFrm() )
|
2004-06-28 12:08:52 +00:00
|
|
|
{
|
2005-01-05 13:30:18 +00:00
|
|
|
if( static_cast<SwSectionFrm*>(pIndNext)->GetSection() )
|
2004-06-28 12:08:52 +00:00
|
|
|
{
|
2005-01-05 13:30:18 +00:00
|
|
|
SwFrm* pTmp = static_cast<SwSectionFrm*>(pIndNext)->ContainsAny();
|
|
|
|
if ( pTmp )
|
|
|
|
{
|
|
|
|
pIndNext = pTmp;
|
|
|
|
break;
|
|
|
|
}
|
2004-06-28 12:08:52 +00:00
|
|
|
}
|
2005-01-05 13:30:18 +00:00
|
|
|
pIndNext = pIndNext->GetIndNext();
|
|
|
|
}
|
|
|
|
ASSERT( !pIndNext || pIndNext->ISA(SwTxtFrm),
|
|
|
|
"<SwFlowFrm::MovedBwd(..)> - incorrect next found." );
|
|
|
|
if ( pIndNext && pIndNext->IsFlowFrm() &&
|
|
|
|
SwFlowFrm::CastFlowFrm(pIndNext)->IsJoinLocked() )
|
|
|
|
{
|
|
|
|
pNewUpper = 0L;
|
2004-06-28 12:08:52 +00:00
|
|
|
}
|
|
|
|
}
|
2005-01-05 13:30:18 +00:00
|
|
|
// <--
|
2004-06-28 12:08:52 +00:00
|
|
|
}
|
|
|
|
|
2006-06-02 11:11:54 +00:00
|
|
|
// --> OD 2006-05-10 #i65250#
|
|
|
|
// layout loop control for flowing content again and again moving
|
|
|
|
// backward under the same layout condition.
|
|
|
|
if ( pNewUpper && !IsFollow() &&
|
2007-01-22 10:53:11 +00:00
|
|
|
pNewUpper != rThis.GetUpper() &&
|
2006-06-02 11:11:54 +00:00
|
|
|
SwLayouter::MoveBwdSuppressed( *(pOldPage->GetFmt()->GetDoc()),
|
|
|
|
*this, *pNewUpper ) )
|
|
|
|
{
|
|
|
|
SwLayoutFrm* pNextNewUpper = pNewUpper->GetLeaf(
|
|
|
|
( !rThis.IsSctFrm() && rThis.IsInSct() )
|
|
|
|
? MAKEPAGE_NOSECTION
|
|
|
|
: MAKEPAGE_NONE,
|
|
|
|
TRUE );
|
2007-01-22 10:53:11 +00:00
|
|
|
// --> OD 2007-01-10 #i73194# - make code robust
|
|
|
|
ASSERT( pNextNewUpper, "<SwFlowFrm::MoveBwd(..)> - missing next new upper" );
|
|
|
|
if ( pNextNewUpper &&
|
|
|
|
( pNextNewUpper == rThis.GetUpper() ||
|
|
|
|
pNextNewUpper->GetType() != rThis.GetUpper()->GetType() ) )
|
|
|
|
// <--
|
2006-06-02 11:11:54 +00:00
|
|
|
{
|
|
|
|
pNewUpper = 0L;
|
|
|
|
#if OSL_DEBUG_LEVEL > 1
|
|
|
|
ASSERT( false,
|
|
|
|
"<SwFlowFrm::MoveBwd(..)> - layout loop control for layout action <Move Backward> applied!" );
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
}
|
|
|
|
// <--
|
|
|
|
|
2007-01-22 10:53:11 +00:00
|
|
|
ASSERT( pNewUpper != rThis.GetUpper(),
|
|
|
|
"<SwFlowFrm::MoveBwd(..)> - moving backward to the current upper frame!? -> Please inform OD." );
|
2000-09-18 23:08:29 +00:00
|
|
|
if ( pNewUpper )
|
|
|
|
{
|
|
|
|
PROTOCOL_ENTER( &rThis, PROT_MOVE_BWD, 0, 0 );
|
|
|
|
if ( pNewUpper->IsFtnContFrm() )
|
|
|
|
{
|
|
|
|
//Kann sein, dass ich einen Container bekam.
|
|
|
|
SwFtnFrm *pOld = rThis.FindFtnFrm();
|
|
|
|
SwFtnFrm *pNew = new SwFtnFrm( pOld->GetFmt(),
|
|
|
|
pOld->GetRef(), pOld->GetAttr() );
|
|
|
|
if ( pOld->GetMaster() )
|
|
|
|
{
|
|
|
|
pNew->SetMaster( pOld->GetMaster() );
|
|
|
|
pOld->GetMaster()->SetFollow( pNew );
|
|
|
|
}
|
|
|
|
pNew->SetFollow( pOld );
|
|
|
|
pOld->SetMaster( pNew );
|
|
|
|
pNew->Paste( pNewUpper );
|
|
|
|
pNewUpper = pNew;
|
|
|
|
}
|
|
|
|
if( pNewUpper->IsFtnFrm() && rThis.IsInSct() )
|
|
|
|
{
|
|
|
|
SwSectionFrm* pSct = rThis.FindSctFrm();
|
|
|
|
//Wenn wir in einem Bereich in einer Fussnote stecken, muss im
|
|
|
|
//neuen Upper ggf. ein SwSectionFrm angelegt werden
|
|
|
|
if( pSct->IsInFtn() )
|
|
|
|
{
|
|
|
|
SwFrm* pTmp = pNewUpper->Lower();
|
|
|
|
if( pTmp )
|
|
|
|
{
|
|
|
|
while( pTmp->GetNext() )
|
|
|
|
pTmp = pTmp->GetNext();
|
|
|
|
if( !pTmp->IsSctFrm() ||
|
|
|
|
((SwSectionFrm*)pTmp)->GetFollow() != pSct )
|
|
|
|
pTmp = NULL;
|
|
|
|
}
|
|
|
|
if( pTmp )
|
|
|
|
pNewUpper = (SwSectionFrm*)pTmp;
|
|
|
|
else
|
|
|
|
{
|
|
|
|
pSct = new SwSectionFrm( *pSct, TRUE );
|
|
|
|
pSct->Paste( pNewUpper );
|
2001-11-13 14:21:55 +00:00
|
|
|
pSct->Init();
|
2000-09-18 23:08:29 +00:00
|
|
|
pNewUpper = pSct;
|
|
|
|
pSct->SimpleFormat();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
BOOL bUnlock = FALSE;
|
2007-09-27 08:01:58 +00:00
|
|
|
BOOL bFollow = FALSE;
|
2000-09-18 23:08:29 +00:00
|
|
|
//Section locken, sonst kann sie bei Fluss des einzigen Cntnt etwa
|
|
|
|
//von zweiter in die erste Spalte zerstoert werden.
|
|
|
|
SwSectionFrm* pSect = pNewUpper->FindSctFrm();
|
|
|
|
if( pSect )
|
|
|
|
{
|
|
|
|
bUnlock = !pSect->IsColLocked();
|
|
|
|
pSect->ColLock();
|
|
|
|
bFollow = pSect->HasFollow();
|
|
|
|
}
|
|
|
|
pNewUpper->Calc();
|
|
|
|
rThis.Cut();
|
2005-03-23 10:52:56 +00:00
|
|
|
// --> OD 2005-02-23 #b6229852#
|
|
|
|
// optimization: format section, if its size is invalidated and if it's
|
|
|
|
// the new parent of moved backward frame.
|
|
|
|
bool bFormatSect( false );
|
|
|
|
// <--
|
2000-09-18 23:08:29 +00:00
|
|
|
if( bUnlock )
|
|
|
|
{
|
2005-03-23 10:52:56 +00:00
|
|
|
pSect->ColUnlock();
|
2000-09-18 23:08:29 +00:00
|
|
|
if( pSect->HasFollow() != bFollow )
|
2005-03-23 10:52:56 +00:00
|
|
|
{
|
2004-03-17 11:48:53 +00:00
|
|
|
pSect->InvalidateSize();
|
2005-03-23 10:52:56 +00:00
|
|
|
// --> OD 2005-02-23 #b6229852# - optimization
|
|
|
|
if ( pSect == pNewUpper )
|
|
|
|
bFormatSect = true;
|
|
|
|
// <--
|
|
|
|
}
|
2000-09-18 23:08:29 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
rThis.Paste( pNewUpper );
|
2005-03-23 10:52:56 +00:00
|
|
|
// --> OD 2005-02-23 #b6229852# - optimization
|
|
|
|
if ( bFormatSect )
|
|
|
|
pSect->Calc();
|
|
|
|
// <--
|
2000-09-18 23:08:29 +00:00
|
|
|
|
2001-07-16 12:03:07 +00:00
|
|
|
SwPageFrm *pNewPage = rThis.FindPageFrm();
|
2000-09-18 23:08:29 +00:00
|
|
|
if( pNewPage != pOldPage )
|
|
|
|
{
|
|
|
|
rThis.Prepare( PREP_BOSS_CHGD, (const void*)pOldPage, FALSE );
|
|
|
|
ViewShell *pSh = rThis.GetShell();
|
|
|
|
if ( pSh && !pSh->Imp()->IsUpdateExpFlds() )
|
2006-08-14 15:25:22 +00:00
|
|
|
pSh->GetDoc()->SetNewFldLst(true); //Wird von CalcLayout() hinterher eledigt!
|
2006-07-10 14:29:29 +00:00
|
|
|
|
2000-09-18 23:08:29 +00:00
|
|
|
pNewPage->InvalidateSpelling();
|
2007-01-02 15:48:46 +00:00
|
|
|
pNewPage->InvalidateSmartTags(); // SMARTTAGS
|
2000-09-18 23:08:29 +00:00
|
|
|
pNewPage->InvalidateAutoCompleteWords();
|
2006-07-10 14:29:29 +00:00
|
|
|
pNewPage->InvalidateWordCount();
|
|
|
|
|
2002-11-01 10:43:00 +00:00
|
|
|
// OD 30.10.2002 #97265# - no <CheckPageDesc(..)> in online layout
|
2006-08-14 15:25:22 +00:00
|
|
|
if ( !pNewPage->GetFmt()->getIDocumentSettingAccess()->get(IDocumentSettingAccess::BROWSE_MODE) )
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
2002-11-01 10:43:00 +00:00
|
|
|
if ( bCheckPageDescs && pNewPage->GetNext() )
|
2004-02-16 10:58:00 +00:00
|
|
|
{
|
|
|
|
SwPageFrm* pStartPage = bCheckPageDescOfNextPage ?
|
|
|
|
pNewPage :
|
|
|
|
(SwPageFrm*)pNewPage->GetNext();
|
|
|
|
SwFrm::CheckPageDescs( pStartPage, FALSE);
|
|
|
|
}
|
2002-11-01 10:43:00 +00:00
|
|
|
else if ( rThis.GetAttrSet()->GetPageDesc().GetPageDesc() )
|
|
|
|
{
|
|
|
|
//Erste Seite wird etwa durch Ausblenden eines Bereiches leer
|
|
|
|
SwFrm::CheckPageDescs( (SwPageFrm*)pNewPage, FALSE);
|
|
|
|
}
|
2000-09-18 23:08:29 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return pNewUpper != 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*************************************************************************
|
|
|
|
|*
|
|
|
|
|* SwFlowFrm::CastFlowFrm
|
|
|
|
|*
|
|
|
|
|* Ersterstellung MA 03. May. 95
|
|
|
|
|* Letzte Aenderung AMA 02. Dec. 97
|
|
|
|
|*
|
|
|
|
|*************************************************************************/
|
|
|
|
|
|
|
|
SwFlowFrm *SwFlowFrm::CastFlowFrm( SwFrm *pFrm )
|
|
|
|
{
|
|
|
|
if ( pFrm->IsCntntFrm() )
|
|
|
|
return (SwCntntFrm*)pFrm;
|
|
|
|
if ( pFrm->IsTabFrm() )
|
|
|
|
return (SwTabFrm*)pFrm;
|
|
|
|
if ( pFrm->IsSctFrm() )
|
|
|
|
return (SwSectionFrm*)pFrm;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
const SwFlowFrm *SwFlowFrm::CastFlowFrm( const SwFrm *pFrm )
|
|
|
|
{
|
|
|
|
if ( pFrm->IsCntntFrm() )
|
|
|
|
return (SwCntntFrm*)pFrm;
|
|
|
|
if ( pFrm->IsTabFrm() )
|
|
|
|
return (SwTabFrm*)pFrm;
|
|
|
|
if ( pFrm->IsSctFrm() )
|
|
|
|
return (SwSectionFrm*)pFrm;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|