XFillStyle -> css::drawing::FillStyle

Change-Id: I6b2fabd72fd34f4ac1b3a18f386c90794bc39ce4

3 files changed, 10 insertions, 7 deletions

diff --git a/sc/source/filter/excel/xeescher.cxx b/sc/source/filter/excel/xeescher.cxx
index 3b6a2f8d02b0..1223057cba01 100644
--- a/sc/source/filter/excel/xeescher.cxx
+++ b/sc/source/filter/excel/xeescher.cxx
@@ -80,6 +80,7 @@
 #include <oox/export/utils.hxx>
 #include <boost/shared_ptr.hpp>
 
+using namespace com::sun::star;
 using ::com::sun::star::uno::UNO_QUERY;
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::Sequence;
@@ -1234,7 +1235,7 @@ XclExpNote::XclExpNote( const XclExpRoot& rRoot, const ScAddress& rScPos,
 
                     // AutoFill style would change if Postit.cxx object creation values are changed
                     OUString aCol(((XFillColorItem &)GETITEM(aItemSet, XFillColorItem , XATTR_FILLCOLOR)).GetValue());
-                    mbAutoFill  = aCol.isEmpty() && (GETITEMVALUE(aItemSet, XFillStyleItem, XATTR_FILLSTYLE, sal_uLong) == XFILL_SOLID);
+                    mbAutoFill  = aCol.isEmpty() && (GETITEMVALUE(aItemSet, XFillStyleItem, XATTR_FILLSTYLE, sal_uLong) == drawing::FillStyle_SOLID);
                     mbAutoLine  = true;
                     mbRowHidden = (rRoot.GetDoc().RowHidden(maScPos.Row(),maScPos.Tab()));
                     mbColHidden = (rRoot.GetDoc().ColHidden(maScPos.Col(),maScPos.Tab()));
diff --git a/sc/source/filter/excel/xiescher.cxx b/sc/source/filter/excel/xiescher.cxx
index 86f14a106ca3..e9366ff6be3c 100644
--- a/sc/source/filter/excel/xiescher.cxx
+++ b/sc/source/filter/excel/xiescher.cxx
@@ -110,6 +110,7 @@
 #include <boost/shared_ptr.hpp>
 #include <sfx2/docfile.hxx>
 
+using namespace com::sun::star;
 using ::com::sun::star::uno::makeAny;
 using ::com::sun::star::uno::Any;
 using ::com::sun::star::beans::XPropertySet;
@@ -702,7 +703,7 @@ void XclImpDrawObjBase::ConvertFillStyle( SdrObject& rSdrObj, const XclObjFillDa
     }
     else if( rFillData.mnPattern == EXC_PATT_NONE )
     {
-        rSdrObj.SetMergedItem( XFillStyleItem( XFILL_NONE ) );
+        rSdrObj.SetMergedItem( XFillStyleItem( drawing::FillStyle_NONE ) );
     }
     else
     {
@@ -710,7 +711,7 @@ void XclImpDrawObjBase::ConvertFillStyle( SdrObject& rSdrObj, const XclObjFillDa
         Color aBackColor = GetPalette().GetColor( rFillData.mnBackColorIdx );
         if( (rFillData.mnPattern == EXC_PATT_SOLID) || (aPattColor == aBackColor) )
         {
-            rSdrObj.SetMergedItem( XFillStyleItem( XFILL_SOLID ) );
+            rSdrObj.SetMergedItem( XFillStyleItem( drawing::FillStyle_SOLID ) );
             rSdrObj.SetMergedItem( XFillColorItem( EMPTY_OUSTRING, aPattColor ) );
         }
         else
@@ -757,7 +758,7 @@ void XclImpDrawObjBase::ConvertFillStyle( SdrObject& rSdrObj, const XclObjFillDa
             aXOBitmap.Array2Bitmap();
             aBitmap = aXOBitmap.GetBitmap();
 
-            rSdrObj.SetMergedItem(XFillStyleItem(XFILL_BITMAP));
+            rSdrObj.SetMergedItem(XFillStyleItem(drawing::FillStyle_BITMAP));
             rSdrObj.SetMergedItem(XFillBitmapItem(EMPTY_OUSTRING, Graphic(aBitmap)));
         }
     }
diff --git a/sc/source/filter/excel/xlchart.cxx b/sc/source/filter/excel/xlchart.cxx
index de9b15711333..52307ac5b2f5 100644
--- a/sc/source/filter/excel/xlchart.cxx
+++ b/sc/source/filter/excel/xlchart.cxx
@@ -50,6 +50,7 @@
 #include "xlroot.hxx"
 #include "xlstyle.hxx"
 
+using namespace com::sun::star;
 using ::com::sun::star::uno::Any;
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::UNO_QUERY;
@@ -1021,7 +1022,7 @@ void XclChPropSetHelper::WriteEscherProperties( ScfPropertySet& rPropSet,
         {
             switch( pStyleItem->GetValue() )
             {
-                case XFILL_SOLID:
+                case drawing::FillStyle_SOLID:
                     // #i84812# Excel 2007 writes Escher properties for solid fill
                     if( const XFillColorItem* pColorItem = static_cast< const XFillColorItem* >( rEscherFmt.mxItemSet->GetItem( XATTR_FILLCOLOR, false ) ) )
                     {
@@ -1035,7 +1036,7 @@ void XclChPropSetHelper::WriteEscherProperties( ScfPropertySet& rPropSet,
                         rAreaHlp.WriteToPropertySet( rPropSet );
                     }
                 break;
-                case XFILL_GRADIENT:
+                case drawing::FillStyle_GRADIENT:
                     if( const XFillGradientItem* pGradItem = static_cast< const XFillGradientItem* >( rEscherFmt.mxItemSet->GetItem( XATTR_FILLGRADIENT, false ) ) )
                     {
                         Any aGradientAny;
@@ -1053,7 +1054,7 @@ void XclChPropSetHelper::WriteEscherProperties( ScfPropertySet& rPropSet,
                         }
                     }
                 break;
-                case XFILL_BITMAP:
+                case drawing::FillStyle_BITMAP:
                     if( const XFillBitmapItem* pBmpItem = static_cast< const XFillBitmapItem* >( rEscherFmt.mxItemSet->GetItem( XATTR_FILLBITMAP, false ) ) )
                     {
                         Any aBitmapAny;