diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-12-10 10:46:19 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-12-11 06:57:12 +0100 |
commit | 412ca1ff72d2031d327df658a94e63bdcb8583b0 (patch) | |
tree | 7f6b173d04d94967d6ac114c216a72e0e44a4940 /sw/source/core/layout/wsfrm.cxx | |
parent | d5d8fa63282a433da9c49d811f04390b8d6ab9cc (diff) |
convert SwFrameSize to scoped enum
Change-Id: I7e1e641ff180035c7dcefdcfdd185eadbae32142
Reviewed-on: https://gerrit.libreoffice.org/84850
Tested-by: Jenkins
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 | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sw/source/core/layout/wsfrm.cxx b/sw/source/core/layout/wsfrm.cxx index 0775d895143f..272306df1ba3 100644 --- a/sw/source/core/layout/wsfrm.cxx +++ b/sw/source/core/layout/wsfrm.cxx @@ -1977,8 +1977,8 @@ void SwFrame::ImplInvalidateLineNum() void SwFrame::ReinitializeFrameSizeAttrFlags() { const SwFormatFrameSize &rFormatSize = GetAttrSet()->GetFrameSize(); - if ( ATT_VAR_SIZE == rFormatSize.GetHeightSizeType() || - ATT_MIN_SIZE == rFormatSize.GetHeightSizeType()) + if ( SwFrameSize::Variable == rFormatSize.GetHeightSizeType() || + SwFrameSize::Minimum == rFormatSize.GetHeightSizeType()) { mbFixSize = false; if ( GetType() & (SwFrameType::Header | SwFrameType::Footer | SwFrameType::Row) ) @@ -2004,7 +2004,7 @@ void SwFrame::ReinitializeFrameSizeAttrFlags() } } } - else if ( rFormatSize.GetHeightSizeType() == ATT_FIX_SIZE ) + else if ( rFormatSize.GetHeightSizeType() == SwFrameSize::Fixed ) { if( IsVertical() ) ChgSize( Size( rFormatSize.GetWidth(), getFrameArea().Height())); @@ -2525,7 +2525,7 @@ SwLayoutFrame::SwLayoutFrame(SwFrameFormat *const pFormat, SwFrame *const pSib) , m_pLower(nullptr) { const SwFormatFrameSize &rFormatSize = pFormat->GetFrameSize(); - if ( rFormatSize.GetHeightSizeType() == ATT_FIX_SIZE ) + if ( rFormatSize.GetHeightSizeType() == SwFrameSize::Fixed ) mbFixSize = true; } @@ -3392,7 +3392,7 @@ void SwLayoutFrame::Format( vcl::RenderContext* /*pRenderContext*/, const SwBord { const SwTwips nBorder = nUpper + nLower; const SwFormatFrameSize &rSz = GetFormat()->GetFrameSize(); - SwTwips nMinHeight = rSz.GetHeightSizeType() == ATT_MIN_SIZE ? rSz.GetHeight() : 0; + SwTwips nMinHeight = rSz.GetHeightSizeType() == SwFrameSize::Minimum ? rSz.GetHeight() : 0; do { setFrameAreaSizeValid(true); |