diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2005-03-23 11:59:05 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2005-03-23 11:59:05 +0000 |
| commit | afc7589e8f6c5cb0b92de8641648c1942d4dbb7e (patch) | |
| tree | 168a36760375fbb09742e659ac5187c0869e459f /sw/source/core/layout/flowfrm.cxx | |
| parent | 89346146385189938f69c789233a3681ad622d46 (diff) | |
INTEGRATION: CWS swqbugfixes17 (1.45.148); FILE MERGED
2005/03/08 14:23:44 od 1.45.148.1: #i44049# <SwFlowFrm::MoveBwd(..)> - no move backward of text frame, if
one of its anchored objects has restarted the layout process.
Diffstat (limited to 'sw/source/core/layout/flowfrm.cxx')
| -rw-r--r-- | sw/source/core/layout/flowfrm.cxx | 24 |
1 files changed, 21 insertions, 3 deletions
diff --git a/sw/source/core/layout/flowfrm.cxx b/sw/source/core/layout/flowfrm.cxx index 712010c885a4..2225276ad7fb 100644 --- a/sw/source/core/layout/flowfrm.cxx +++ b/sw/source/core/layout/flowfrm.cxx @@ -2,9 +2,9 @@ * * $RCSfile: flowfrm.cxx,v $ * - * $Revision: 1.46 $ + * $Revision: 1.47 $ * - * last change: $Author: vg $ $Date: 2005-03-23 11:52:56 $ + * last change: $Author: vg $ $Date: 2005-03-23 12:59:05 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -58,7 +58,6 @@ * * ************************************************************************/ - #pragma hdrstop #include "pam.hxx" @@ -2268,6 +2267,9 @@ BOOL SwFlowFrm::MoveBwd( BOOL &rbReformat ) // --> 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 + // --> 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. if ( pNewUpper && rThis.IsTxtFrm() && !IsFollow() ) { @@ -2281,6 +2283,22 @@ BOOL SwFlowFrm::MoveBwd( BOOL &rbReformat ) { pNewUpper = 0; } + // --> 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]; + if ( pAnchoredObj->RestartLayoutProcess() ) + { + pNewUpper = 0; + break; + } + } + } + // <-- } // <-- |