diff options
| author | Armin Le Grand <Armin.Le.Grand@cib.de> | 2017-10-26 10:40:43 +0200 |
|---|---|---|
| committer | Armin Le Grand <Armin.Le.Grand@cib.de> | 2017-10-30 12:13:14 +0100 |
| commit | f6edddfa230d6478571ef67ebdc506c54f589648 (patch) | |
| tree | 02c90218c08315726943bb42a03e1a167fee9ac6 /sw/source/core/layout/flylay.cxx | |
| parent | 46d233c026fd104f449bb99c1c6f80de34c9a4c6 (diff) | |
Migrated from SwFrame::PrintWA to setPrint
Change-Id: Ieea3b467f296a190de5b5f47721bef148bebf60b
Diffstat (limited to 'sw/source/core/layout/flylay.cxx')
| -rw-r--r-- | sw/source/core/layout/flylay.cxx | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/sw/source/core/layout/flylay.cxx b/sw/source/core/layout/flylay.cxx index f49909a16e86..937f2cf9bd7b 100644 --- a/sw/source/core/layout/flylay.cxx +++ b/sw/source/core/layout/flylay.cxx @@ -441,12 +441,14 @@ void SwFlyFreeFrame::CheckClip( const SwFormatFrameSize &rSz ) aFrm.Width ( std::max( long(MINLAY), aFrameRect.Width() ) ); setFrame(aFrm); + SwRect aPrt(PrintRA()); + if ( Lower() && Lower()->IsColumnFrame() ) { ColLock(); //lock grow/shrink - const Size aTmpOldSize( PrintRA().SSize() ); - PrintWA().Height( FrameRA().Height() - nPrtHeightDiff ); - PrintWA().Width ( FrameRA().Width() - nPrtWidthDiff ); + const Size aTmpOldSize( aPrt.SSize() ); + aPrt.Height( FrameRA().Height() - nPrtHeightDiff ); + aPrt.Width ( FrameRA().Width() - nPrtWidthDiff ); ChgLowersProp( aTmpOldSize ); SwFrame *pLow = Lower(); do @@ -463,9 +465,11 @@ void SwFlyFreeFrame::CheckClip( const SwFormatFrameSize &rSz ) } else { - PrintWA().Height( FrameRA().Height() - nPrtHeightDiff ); - PrintWA().Width ( FrameRA().Width() - nPrtWidthDiff ); + aPrt.Height( FrameRA().Height() - nPrtHeightDiff ); + aPrt.Width ( FrameRA().Width() - nPrtWidthDiff ); } + + setPrint(aPrt); } } |