diff options
author | Caolán McNamara <caolanm@redhat.com> | 2020-05-30 15:06:01 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2020-05-30 17:21:45 +0200 |
commit | bc6ce96f7994a25f3789a9035e877bba41e1cda3 (patch) | |
tree | bca5871f287857232ffc03d3519c563b43599c0f /filter | |
parent | 04273a7d21ebbda2fdaa664ce70cf23c3cd3366a (diff) |
ofz#22813 Invalid-enum-value
Change-Id: Ia9b0a674bc9e7cd00498ec46962826e7ed08a721
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95187
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'filter')
-rw-r--r-- | filter/source/msfilter/msdffimp.cxx | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx index da5b636172c9..3899b89a1dbd 100644 --- a/filter/source/msfilter/msdffimp.cxx +++ b/filter/source/msfilter/msdffimp.cxx @@ -1467,7 +1467,7 @@ void DffPropertyReader::ApplyCustomShapeTextAttributes( SfxItemSet& rSet ) const if ( IsProperty( DFF_Prop_txflTextFlow ) ) { - MSO_TextFlow eTextFlow = static_cast<MSO_TextFlow>( GetPropertyValue( DFF_Prop_txflTextFlow, 0 ) & 0xFFFF ); + auto eTextFlow = GetPropertyValue(DFF_Prop_txflTextFlow, 0) & 0xFFFF; switch( eTextFlow ) { case mso_txflTtoBA : /* #68110# */ // Top to Bottom @-font, oben -> unten @@ -1630,7 +1630,7 @@ void DffPropertyReader::ApplyCustomShapeGeometryAttributes( SvStream& rIn, SfxIt if ( IsProperty( DFF_Prop_txflTextFlow ) || IsProperty( DFF_Prop_cdirFont ) ) { sal_Int32 nTextRotateAngle = 0; - MSO_TextFlow eTextFlow = static_cast<MSO_TextFlow>( GetPropertyValue( DFF_Prop_txflTextFlow, 0 ) & 0xFFFF ); + auto eTextFlow = GetPropertyValue(DFF_Prop_txflTextFlow, 0) & 0xFFFF; if ( eTextFlow == mso_txflBtoT ) // Bottom to Top non-@ nTextRotateAngle += 90; @@ -5298,8 +5298,7 @@ SdrObject* SvxMSDffManager::ProcessObj(SvStream& rSt, bool bVerticalText = false; if ( IsProperty( DFF_Prop_txflTextFlow ) ) { - MSO_TextFlow eTextFlow = static_cast<MSO_TextFlow>(GetPropertyValue( - DFF_Prop_txflTextFlow, 0) & 0xFFFF); + auto eTextFlow = GetPropertyValue(DFF_Prop_txflTextFlow, 0) & 0xFFFF; switch( eTextFlow ) { case mso_txflBtoT: |