filter/source/msfilter/msdffimp.cxx | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
New commits: commit bc6ce96f7994a25f3789a9035e877bba41e1cda3 Author: Caolán McNamara <[email protected]> AuthorDate: Sat May 30 15:06:01 2020 +0100 Commit: Caolán McNamara <[email protected]> CommitDate: Sat May 30 17:21:45 2020 +0200 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 <[email protected]> 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: _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
