XFillStyle -> css::drawing::FillStyle

Change-Id: I6b2fabd72fd34f4ac1b3a18f386c90794bc39ce4

2 files changed, 26 insertions, 25 deletions

diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx
index fa8672fc9c9e..0956d125faff 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -1248,16 +1248,16 @@ void DffPropertyReader::ApplyFillAttributes( SvStream& rIn, SfxItemSet& rSet, co
     if ( nFillFlags & 0x10 )
     {
         MSO_FillType eMSO_FillType = (MSO_FillType)GetPropertyValue( DFF_Prop_fillType, mso_fillSolid );
-        XFillStyle eXFill = XFILL_NONE;
+        drawing::FillStyle eXFill = drawing::FillStyle_NONE;
         switch( eMSO_FillType )
         {
             case mso_fillSolid :            // Fill with a solid color
-                eXFill = XFILL_SOLID;
+                eXFill = drawing::FillStyle_SOLID;
             break;
             case mso_fillPattern :          // Fill with a pattern (bitmap)
             case mso_fillTexture :          // A texture (pattern with its own color map)
             case mso_fillPicture :          // Center a picture in the shape
-                eXFill = XFILL_BITMAP;
+                eXFill = drawing::FillStyle_BITMAP;
             break;
             case mso_fillShadeCenter :      // Shade from bounding rectangle to end point
             {
@@ -1265,16 +1265,16 @@ void DffPropertyReader::ApplyFillAttributes( SvStream& rIn, SfxItemSet& rSet, co
                 //But the gradient look well comparing with imported as gradient. And rotate with shape
                 //also works better. So here just keep it.
                 if ( rObjData.aBoundRect.IsEmpty() )// size of object needed to be able
-                    eXFill = XFILL_GRADIENT;        // to create a bitmap substitution
+                    eXFill = drawing::FillStyle_GRADIENT;        // to create a bitmap substitution
                 else
-                    eXFill = XFILL_BITMAP;
+                    eXFill = drawing::FillStyle_BITMAP;
             }
             break;
             case mso_fillShade :            // Shade from start to end points
             case mso_fillShadeShape :       // Shade from shape outline to end point
             case mso_fillShadeScale :       // Similar to mso_fillShade, but the fillAngle
             case mso_fillShadeTitle :       // special type - shade to title ---  for PP
-                eXFill = XFILL_GRADIENT;
+                eXFill = drawing::FillStyle_GRADIENT;
             break;
 //          case mso_fillBackground :       // Use the background fill color/pattern
             default: break;
@@ -1286,7 +1286,7 @@ void DffPropertyReader::ApplyFillAttributes( SvStream& rIn, SfxItemSet& rSet, co
         if (IsProperty(DFF_Prop_fillOpacity))
         {
             dTrans = GetPropertyValue(DFF_Prop_fillOpacity) / 65536.0;
-            if ( eXFill != XFILL_GRADIENT )
+            if ( eXFill != drawing::FillStyle_GRADIENT )
             {
                 dTrans = dTrans * 100;
                 rSet.Put(XFillTransparenceItem(
@@ -1297,15 +1297,15 @@ void DffPropertyReader::ApplyFillAttributes( SvStream& rIn, SfxItemSet& rSet, co
         if ( IsProperty(DFF_Prop_fillBackOpacity) )
             dBackTrans = GetPropertyValue(DFF_Prop_fillBackOpacity) / 65536.0;
 
-        if ( ( eMSO_FillType == mso_fillShadeCenter ) && ( eXFill == XFILL_BITMAP ) )
+        if ( ( eMSO_FillType == mso_fillShadeCenter ) && ( eXFill == drawing::FillStyle_BITMAP ) )
         {
             ApplyRectangularGradientAsBitmap( rManager, rIn, rSet, aShadeColors, rObjData, mnFix16Angle );
         }
-        else if ( eXFill == XFILL_GRADIENT )
+        else if ( eXFill == drawing::FillStyle_GRADIENT )
         {
             ImportGradientColor ( rSet, eMSO_FillType, dTrans , dBackTrans );
         }
-        else if ( eXFill == XFILL_BITMAP )
+        else if ( eXFill == drawing::FillStyle_BITMAP )
         {
             if( IsProperty( DFF_Prop_fillBlip ) )
             {
@@ -1370,7 +1370,7 @@ void DffPropertyReader::ApplyFillAttributes( SvStream& rIn, SfxItemSet& rSet, co
         }
     }
     else
-        rSet.Put( XFillStyleItem( XFILL_NONE ) );
+        rSet.Put( XFillStyleItem( drawing::FillStyle_NONE ) );
 }
 
 void DffPropertyReader::ApplyCustomShapeTextAttributes( SfxItemSet& rSet ) const
diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx
index 3fba7dad3348..1426da8d0d77 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -1045,7 +1045,7 @@ SdrObject* SdrEscherImport::ProcessObj( SvStream& rSt, DffObjData& rObjData, voi
                     if ( pRet )
                     {
                         pTObj->SetMergedItem( XLineStyleItem( XLINE_NONE ) );
-                        pTObj->SetMergedItem( XFillStyleItem( XFILL_NONE ) );
+                        pTObj->SetMergedItem( XFillStyleItem( drawing::FillStyle_NONE ) );
                     }
                     if ( bVerticalText )
                     {
@@ -2972,7 +2972,7 @@ SdrObject* SdrPowerPointImport::ImportPageBackgroundObject( const SdrPage& rPage
         if ( !pSet )
         {
             pSet.reset(new SfxItemSet( pSdrModel->GetItemPool() ));
-            pSet->Put( XFillStyleItem( XFILL_NONE ) );
+            pSet->Put( XFillStyleItem( drawing::FillStyle_NONE ) );
         }
         pSet->Put( XLineStyleItem( XLINE_NONE ) );
         Rectangle aRect( rPage.GetLftBorder(), rPage.GetUppBorder(), rPage.GetWdt()-rPage.GetRgtBorder(), rPage.GetHgt()-rPage.GetLwrBorder() );
@@ -5578,10 +5578,10 @@ void PPTPortionObj::ApplyTo(  SfxItemSet& rSet, SdrPowerPointImport& rManager, s
                         pItemSet->GetItemState( XATTR_FILLSTYLE, false, &pFillStyleItem );
                         if ( pFillStyleItem )
                         {
-                            XFillStyle eFillStyle = ((XFillStyleItem*)pFillStyleItem)->GetValue();
+                            drawing::FillStyle eFillStyle = ((XFillStyleItem*)pFillStyleItem)->GetValue();
                             switch( eFillStyle )
                             {
-                                case XFILL_SOLID :
+                                case drawing::FillStyle_SOLID :
                                 {
                                     const SfxPoolItem* pFillColorItem = NULL;
                                     pItemSet->GetItemState( XATTR_FILLCOLOR, false, &pFillColorItem );
@@ -5589,7 +5589,7 @@ void PPTPortionObj::ApplyTo(  SfxItemSet& rSet, SdrPowerPointImport& rManager, s
                                         aDefColor = ((XColorItem*)pFillColorItem)->GetColorValue();
                                 }
                                 break;
-                                case XFILL_GRADIENT :
+                                case drawing::FillStyle_GRADIENT :
                                 {
                                     const SfxPoolItem* pGradientItem = NULL;
                                     pItemSet->GetItemState( XATTR_FILLGRADIENT, false, &pGradientItem );
@@ -5597,8 +5597,8 @@ void PPTPortionObj::ApplyTo(  SfxItemSet& rSet, SdrPowerPointImport& rManager, s
                                         aDefColor = ((XFillGradientItem*)pGradientItem)->GetGradientValue().GetStartColor();
                                 }
                                 break;
-                                case XFILL_HATCH :
-                                case XFILL_BITMAP :
+                                case drawing::FillStyle_HATCH :
+                                case drawing::FillStyle_BITMAP :
                                     aDefColor = Color( COL_WHITE );
                                 break;
                                 default: break;
@@ -7267,11 +7267,11 @@ void ApplyCellAttributes( const SdrObject* pObj, Reference< XCell >& xCell )
             xPropSet->setPropertyValue(  sWritingMode , Any( ::com::sun::star::text::WritingMode_TB_RL ) );
         }
         SfxItemSet aSet( pObj->GetMergedItemSet() );
-        XFillStyle eFillStyle(((XFillStyleItem&)pObj->GetMergedItem( XATTR_FILLSTYLE )).GetValue());
+        drawing::FillStyle eFillStyle(((XFillStyleItem&)pObj->GetMergedItem( XATTR_FILLSTYLE )).GetValue());
         ::com::sun::star::drawing::FillStyle eFS( com::sun::star::drawing::FillStyle_NONE );
         switch( eFillStyle )
         {
-            case XFILL_SOLID :
+            case drawing::FillStyle_SOLID :
                 {
                     static const OUString sFillColor( "FillColor" );
                     eFS = com::sun::star::drawing::FillStyle_SOLID;
@@ -7280,7 +7280,7 @@ void ApplyCellAttributes( const SdrObject* pObj, Reference< XCell >& xCell )
                     xPropSet->setPropertyValue( sFillColor, Any( nFillColor ) );
                 }
                 break;
-            case XFILL_GRADIENT :
+            case drawing::FillStyle_GRADIENT :
                 {
                     eFS = com::sun::star::drawing::FillStyle_GRADIENT;
                     XGradient aXGradient(((const XFillGradientItem&)pObj->GetMergedItem(XATTR_FILLGRADIENT)).GetGradientValue());
@@ -7301,10 +7301,10 @@ void ApplyCellAttributes( const SdrObject* pObj, Reference< XCell >& xCell )
                     xPropSet->setPropertyValue( sFillGradient, Any( aGradient ) );
                 }
                 break;
-            case XFILL_HATCH :
+            case drawing::FillStyle_HATCH :
                 eFS = com::sun::star::drawing::FillStyle_HATCH;
             break;
-            case XFILL_BITMAP :
+            case drawing::FillStyle_BITMAP :
                 {
                     eFS = com::sun::star::drawing::FillStyle_BITMAP;
 
@@ -7326,14 +7326,15 @@ void ApplyCellAttributes( const SdrObject* pObj, Reference< XCell >& xCell )
                         xPropSet->setPropertyValue( "FillBitmapMode", Any( com::sun::star::drawing::BitmapMode_NO_REPEAT ) );
                 }
             break;
-            case XFILL_NONE :
+            default:
+            case drawing::FillStyle_NONE :
                 eFS = com::sun::star::drawing::FillStyle_NONE;
             break;
 
         }
         static const OUString sFillStyle( "FillStyle" );
         xPropSet->setPropertyValue( sFillStyle, Any( eFS ) );
-        if ( eFillStyle != XFILL_NONE )
+        if ( eFillStyle != drawing::FillStyle_NONE )
         {
             sal_Int16 nFillTransparence( ( (const XFillTransparenceItem&)pObj->GetMergedItem( XATTR_FILLTRANSPARENCE ) ).GetValue() );
             static const OUString sFillTransparence( "FillTransparence" );