diff options
| author | Zolnai Tamás <tamas.zolnai@collabora.com> | 2014-03-06 20:00:17 +0100 |
|---|---|---|
| committer | Zolnai Tamás <tamas.zolnai@collabora.com> | 2014-03-06 20:03:41 +0100 |
| commit | d9b4a8f5933fd4e7110717b0cdf5f3935203cc00 (patch) | |
| tree | 85d35c0e57a8cba0c2ef63d712a161f064289d9f /sw | |
| parent | 66882c88a26a1fb82f536f153b36e6a5049bda34 (diff) | |
Vertical content alignment of frames anchored as character
Change-Id: Idf05edd102475675c8f0781af1f966043f342bb7
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/core/layout/flyincnt.cxx | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/sw/source/core/layout/flyincnt.cxx b/sw/source/core/layout/flyincnt.cxx index ba7f5c538117..0fa9b59404fc 100644 --- a/sw/source/core/layout/flyincnt.cxx +++ b/sw/source/core/layout/flyincnt.cxx @@ -220,7 +220,7 @@ void SwFlyInCntFrm::MakeAll() if ( IsClipped() ) mbValidSize = bHeightClipped = bWidthClipped = sal_False; - while ( !mbValidPos || !mbValidSize || !mbValidPrtArea ) + while ( !mbValidPos || !mbValidSize || !mbValidPrtArea || !m_bValidContentPos ) { //Only stop, if the flag is set!! if ( !mbValidSize ) @@ -229,7 +229,10 @@ void SwFlyInCntFrm::MakeAll() } if ( !mbValidPrtArea ) + { MakePrtArea( rAttrs ); + m_bValidContentPos = false; + } if ( !mbValidSize ) Format( &rAttrs ); @@ -239,6 +242,9 @@ void SwFlyInCntFrm::MakeAll() MakeObjPos(); } + if ( !m_bValidContentPos ) + MakeContentPos( rAttrs ); + // re-activate clipping of as-character anchored Writer fly frames // depending on compatibility option <ClipAsCharacterAnchoredWriterFlyFrames> if ( mbValidPos && mbValidSize && |