diff options
| author | Oliver Bolte <obo@openoffice.org> | 2004-09-09 09:58:18 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2004-09-09 09:58:18 +0000 |
| commit | a79ecbbac163de2387e4f22924fbf803cd0b5ccd (patch) | |
| tree | 09988d880e5f6c5357347afbaa49552da233be4c /sw/source/core/layout/objectformattertxtfrm.cxx | |
| parent | 7eb0ccf31b402c47e19281e20425678fb905d72d (diff) | |
INTEGRATION: CWS swqbugfixes06 (1.2.6); FILE MERGED
2004/08/25 15:02:48 od 1.2.6.1: #i3317# - consider anchored object, for which temporarly the straightforward
positioning process is applied.
Diffstat (limited to 'sw/source/core/layout/objectformattertxtfrm.cxx')
| -rw-r--r-- | sw/source/core/layout/objectformattertxtfrm.cxx | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/sw/source/core/layout/objectformattertxtfrm.cxx b/sw/source/core/layout/objectformattertxtfrm.cxx index ddba6907a587..01805007a908 100644 --- a/sw/source/core/layout/objectformattertxtfrm.cxx +++ b/sw/source/core/layout/objectformattertxtfrm.cxx @@ -2,9 +2,9 @@ * * $RCSfile: objectformattertxtfrm.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: kz $ $Date: 2004-08-02 14:11:47 $ + * last change: $Author: obo $ $Date: 2004-09-09 10:58:18 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -179,11 +179,15 @@ bool SwObjectFormatterTxtFrm::DoFormatObj( SwAnchoredObject& _rAnchoredObj ) // format anchor text frame, if wrapping style influence of the object // has to be considered and it's <NONE_SUCCESSIVE_POSITIONED> + // --> OD 2004-08-25 #i3317# - consider also anchored objects, whose + // wrapping style influence is temporarly considered. if ( bSuccess && - _rAnchoredObj.ConsiderObjWrapInfluenceOnObjPos() && - _rAnchoredObj.GetFrmFmt().GetWrapInfluenceOnObjPos(). - GetWrapInfluenceOnObjPos() == - text::WrapInfluenceOnPosition::NONE_SUCCESSIVE_POSITIONED ) + ( ( _rAnchoredObj.ConsiderObjWrapInfluenceOnObjPos() && + _rAnchoredObj.GetFrmFmt().GetWrapInfluenceOnObjPos(). + GetWrapInfluenceOnObjPos() == + text::WrapInfluenceOnPosition::NONE_SUCCESSIVE_POSITIONED ) || + _rAnchoredObj.IsTmpConsiderWrapInfluence() ) ) + // <-- { mrAnchorTxtFrm.Calc(); } |