[Libreoffice-commits] core.git: filter/source include/filter

[Caolán McNamara (via logerrit)]

 filter/source/msfilter/msdffimp.cxx  |    6 +++---
 include/filter/msfilter/msdffimp.hxx |    2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit f189d87c37fe80338b2d8d0e6cbea3f1d4570244
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Sat Jan 11 16:50:10 2020 +0000
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Sat Jan 11 21:24:51 2020 +0100

    ofz#20025 Invalid-enum-value
    
    Change-Id: Ia1972a283b7d1d27a60ac763498eb175530b0c4b
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86612
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx
index dca72ee06689..9f0db88ee889 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -1321,7 +1321,7 @@ void DffPropertyReader::ApplyFillAttributes( SvStream& rIn, SfxItemSet& rSet, co
 
     if ( nFillFlags & 0x10 )
     {
-        MSO_FillType eMSO_FillType = static_cast<MSO_FillType>(GetPropertyValue( DFF_Prop_fillType, mso_fillSolid ));
+        auto eMSO_FillType = GetPropertyValue(DFF_Prop_fillType, mso_fillSolid);
         drawing::FillStyle eXFill = drawing::FillStyle_NONE;
         switch( eMSO_FillType )
         {
@@ -2705,7 +2705,7 @@ void DffPropertyReader::ApplyAttributes( SvStream& rIn, SfxItemSet& rSet, DffObj
                 nFillFlags &= ~0x10;
             if ( nFillFlags & 0x10 )
             {
-                MSO_FillType eMSO_FillType = static_cast<MSO_FillType>(GetPropertyValue( DFF_Prop_fillType, mso_fillSolid ));
+                auto eMSO_FillType = GetPropertyValue(DFF_Prop_fillType, mso_fillSolid);
                 switch( eMSO_FillType )
                 {
                     case mso_fillSolid :
@@ -2836,7 +2836,7 @@ void DffPropertyReader::CheckAndCorrectExcelTextRotation( SvStream& rIn, SfxItem
 }
 
 
-void DffPropertyReader::ImportGradientColor( SfxItemSet& aSet,MSO_FillType eMSO_FillType, double dTrans , double dBackTrans) const
+void DffPropertyReader::ImportGradientColor( SfxItemSet& aSet, sal_uInt32 eMSO_FillType, double dTrans , double dBackTrans) const
 {
     //MS Focus prop will impact the start and end color position. And AOO does not
     //support this prop. So need some swap for the two color to keep fidelity with AOO and MS shape.
diff --git a/include/filter/msfilter/msdffimp.hxx b/include/filter/msfilter/msdffimp.hxx
index 593a79b145f6..48feab870805 100644
--- a/include/filter/msfilter/msdffimp.hxx
+++ b/include/filter/msfilter/msdffimp.hxx
@@ -113,7 +113,7 @@ public:
     void SetDefaultPropSet( SvStream& rIn, sal_uInt32 nOffDgg ) const;
     void ApplyAttributes( SvStream& rIn, SfxItemSet& rSet ) const;
     void ApplyAttributes( SvStream& rIn, SfxItemSet& rSet, DffObjData const & rObjData ) const;
-    void ImportGradientColor( SfxItemSet& aSet, MSO_FillType eMSO_FillType, double dTrans, double dBackTrans ) const;
+    void ImportGradientColor( SfxItemSet& aSet, sal_uInt32 eMSO_FillType, double dTrans, double dBackTrans ) const;
 };
 
 #define COL_DEFAULT ::Color( 0xFA, 0xFB, 0xFC )