[Libreoffice-commits] core.git: vcl/source

[Caolán McNamara (via logerrit)]

 vcl/source/filter/svm/SvmConverter.cxx |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit cd91de9d23106ad5170bb83ce71b74342b42d02f
Author:     Caolán McNamara <caol...@redhat.com>
AuthorDate: Fri Apr 1 15:07:40 2022 +0100
Commit:     Caolán McNamara <caol...@redhat.com>
CommitDate: Fri Apr 1 20:57:34 2022 +0200

    ofz: Invalid-enum-value
    
    Change-Id: I315223371d3b52981a0db109933f3a0e93903980
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132430
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caol...@redhat.com>

diff --git a/vcl/source/filter/svm/SvmConverter.cxx 
b/vcl/source/filter/svm/SvmConverter.cxx
index 2204b738ab0d..78ba871d448e 100644
--- a/vcl/source/filter/svm/SvmConverter.cxx
+++ b/vcl/source/filter/svm/SvmConverter.cxx
@@ -676,8 +676,8 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, 
GDIMetaFile& rMtf )
                 aFont.SetAlignment( static_cast<TextAlign>(nAlign) );
                 aFont.SetWeight( ( nWeight == 1 ) ? WEIGHT_LIGHT : ( nWeight 
== 2 ) ? WEIGHT_NORMAL :
                                  ( nWeight == 3 ) ? WEIGHT_BOLD : 
WEIGHT_DONTKNOW );
-                aFont.SetUnderline( static_cast<FontLineStyle>(nUnderline) );
-                aFont.SetStrikeout( static_cast<FontStrikeout>(nStrikeout) );
+                aFont.SetUnderline( static_cast<FontLineStyle>(nUnderline & 
SAL_MAX_ENUM) );
+                aFont.SetStrikeout( static_cast<FontStrikeout>(nStrikeout & 
SAL_MAX_ENUM) );
                 aFont.SetItalic( bItalic ? ITALIC_NORMAL : ITALIC_NONE );
                 aFont.SetOutline( bOutline );
                 aFont.SetShadow( bShadow );
@@ -1187,8 +1187,8 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, 
GDIMetaFile& rMtf )
                 rIStm.ReadInt32(nWidth 
).ReadUInt32(nStrikeout).ReadUInt32(nUnderline).ReadInt32(nFollowingActionCount);
                 ImplSkipActions(rIStm, nFollowingActionCount);
                 rMtf.AddAction( new MetaTextLineAction( aStartPt, nWidth,
-                                                        
static_cast<FontStrikeout>(nStrikeout),
-                                                        
static_cast<FontLineStyle>(nUnderline),
+                                                        
static_cast<FontStrikeout>(nStrikeout & SAL_MAX_ENUM),
+                                                        
static_cast<FontLineStyle>(nUnderline & SAL_MAX_ENUM),
                                                         LINESTYLE_NONE ) );
 
                 i = SkipActions(i, nFollowingActionCount, nActions);