diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-01-27 13:35:17 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-01-27 13:35:17 +0000 |
| commit | acd7eaa1e2e48699901bcefec7ea0f610c262cfc (patch) | |
| tree | d2b90c9e689a9923d543ee315d23bb382ff91675 /sw/source/core/layout/anchoredobject.cxx | |
| parent | 33d82ea6b383fbd9099d0fa507b9c67591253ed8 (diff) | |
INTEGRATION: CWS swqbf50 (1.17.102); FILE MERGED
2006/01/02 13:21:45 od 1.17.102.1: #125977# <SwAnchoredObject::SetPageFrm(..)>
- clear member <mpVertPosOrientFrm>, if it doesn't fit to new
page frame.
Diffstat (limited to 'sw/source/core/layout/anchoredobject.cxx')
| -rw-r--r-- | sw/source/core/layout/anchoredobject.cxx | 21 |
1 files changed, 18 insertions, 3 deletions
diff --git a/sw/source/core/layout/anchoredobject.cxx b/sw/source/core/layout/anchoredobject.cxx index 606a996ce8e5..9745b5dd3133 100644 --- a/sw/source/core/layout/anchoredobject.cxx +++ b/sw/source/core/layout/anchoredobject.cxx @@ -4,9 +4,9 @@ * * $RCSfile: anchoredobject.cxx,v $ * - * $Revision: 1.17 $ + * $Revision: 1.18 $ * - * last change: $Author: hr $ $Date: 2005-10-27 16:01:12 $ + * last change: $Author: hr $ $Date: 2006-01-27 14:35:17 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -241,7 +241,22 @@ const SwPageFrm* SwAnchoredObject::GetPageFrm() const void SwAnchoredObject::SetPageFrm( SwPageFrm* _pNewPageFrm ) { - mpPageFrm = _pNewPageFrm; + // --> OD 2006-01-02 #125977# + if ( mpPageFrm != _pNewPageFrm ) + { + // clear member, which denotes the layout frame at which the vertical + // position is oriented at, if it doesn't fit to the new page frame. + if ( GetVertPosOrientFrm() && + ( !_pNewPageFrm || + _pNewPageFrm != GetVertPosOrientFrm()->FindPageFrm() ) ) + { + ClearVertPosOrientFrm(); + } + + // assign new page frame + mpPageFrm = _pNewPageFrm; + } + // <-- } // ============================================================================= |