Kaydet (Commit) d9b4a8f5 authored tarafından Zolnai Tamás's avatar Zolnai Tamás

Vertical content alignment of frames anchored as character

Change-Id: Idf05edd102475675c8f0781af1f966043f342bb7
üst 66882c88
...@@ -220,7 +220,7 @@ void SwFlyInCntFrm::MakeAll() ...@@ -220,7 +220,7 @@ void SwFlyInCntFrm::MakeAll()
if ( IsClipped() ) if ( IsClipped() )
mbValidSize = bHeightClipped = bWidthClipped = sal_False; mbValidSize = bHeightClipped = bWidthClipped = sal_False;
while ( !mbValidPos || !mbValidSize || !mbValidPrtArea ) while ( !mbValidPos || !mbValidSize || !mbValidPrtArea || !m_bValidContentPos )
{ {
//Only stop, if the flag is set!! //Only stop, if the flag is set!!
if ( !mbValidSize ) if ( !mbValidSize )
...@@ -229,7 +229,10 @@ void SwFlyInCntFrm::MakeAll() ...@@ -229,7 +229,10 @@ void SwFlyInCntFrm::MakeAll()
} }
if ( !mbValidPrtArea ) if ( !mbValidPrtArea )
{
MakePrtArea( rAttrs ); MakePrtArea( rAttrs );
m_bValidContentPos = false;
}
if ( !mbValidSize ) if ( !mbValidSize )
Format( &rAttrs ); Format( &rAttrs );
...@@ -239,6 +242,9 @@ void SwFlyInCntFrm::MakeAll() ...@@ -239,6 +242,9 @@ void SwFlyInCntFrm::MakeAll()
MakeObjPos(); MakeObjPos();
} }
if ( !m_bValidContentPos )
MakeContentPos( rAttrs );
// re-activate clipping of as-character anchored Writer fly frames // re-activate clipping of as-character anchored Writer fly frames
// depending on compatibility option <ClipAsCharacterAnchoredWriterFlyFrames> // depending on compatibility option <ClipAsCharacterAnchoredWriterFlyFrames>
if ( mbValidPos && mbValidSize && if ( mbValidPos && mbValidSize &&
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment