diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-03-02 09:22:44 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-03-02 07:58:24 +0000 |
| commit | 1e2bd1771808da00ec959995ab1284c6193a57f5 (patch) | |
| tree | 67f08641cc63649d1e072b48e1269eb187f509ec /sw/source/core/layout/wsfrm.cxx | |
| parent | add test for own basic function (diff) | |
| download | core-1e2bd1771808da00ec959995ab1284c6193a57f5.tar.gz core-1e2bd1771808da00ec959995ab1284c6193a57f5.zip | |
elide the SwSurround enum
no point in redeclaring an existing enum exactly
Change-Id: I4fb367e4b27e36601f1f36b629097a87b5f00096
Reviewed-on: https://gerrit.libreoffice.org/34773
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sw/source/core/layout/wsfrm.cxx')
| -rw-r--r-- | sw/source/core/layout/wsfrm.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sw/source/core/layout/wsfrm.cxx b/sw/source/core/layout/wsfrm.cxx index 050c00e6f878..7863e2ea8d2e 100644 --- a/sw/source/core/layout/wsfrm.cxx +++ b/sw/source/core/layout/wsfrm.cxx @@ -1900,7 +1900,7 @@ SwTwips SwContentFrame::ShrinkFrame( SwTwips nDist, bool bTst, bool bInfo ) if( aBound.IsOver( aRect ) ) { const SwFrameFormat& rFormat = pAnchoredObj->GetFrameFormat(); - if( SURROUND_THROUGHT != rFormat.GetSurround().GetSurround() ) + if( css::text::WrapTextMode_THROUGHT != rFormat.GetSurround().GetSurround() ) { const SwFrame* pAnchor = pAnchoredObj->GetAnchorFrame(); if ( pAnchor && pAnchor->FindFooterOrHeader() == GetUpper() ) @@ -3087,7 +3087,7 @@ static void InvaPercentFlys( SwFrame *pFrame, SwTwips nDiff ) if( pFly->Frame().Height()*10 > ( nDiff + pRel->Prt().Height() )*9 && pFly->GetFormat()->GetSurround().GetSurround() != - SURROUND_THROUGHT ) + css::text::WrapTextMode_THROUGHT ) bNotify = false; } if( bNotify ) |