XFillStyle -> css::drawing::FillStyle

Change-Id: I6b2fabd72fd34f4ac1b3a18f386c90794bc39ce4

7 files changed, 21 insertions, 13 deletions

diff --git a/sc/source/core/data/postit.cxx b/sc/source/core/data/postit.cxx
index 49f04cdc1814..b89c22b80ad9 100644
--- a/sc/source/core/data/postit.cxx
+++ b/sc/source/core/data/postit.cxx
@@ -48,6 +48,8 @@
 
 #include <utility>
 
+using namespace com::sun::star;
+
 namespace {
 
 const long SC_NOTECAPTION_WIDTH             =  2900;    /// Default width of note caption textbox.
@@ -113,7 +115,7 @@ void ScCaptionUtil::SetDefaultItems( SdrCaptionObj& rCaption, ScDocument& rDoc )
     aItemSet.Put( XLineStartItem( OUString(), ::basegfx::B2DPolyPolygon( aTriangle ) ) );
     aItemSet.Put( XLineStartWidthItem( 200 ) );
     aItemSet.Put( XLineStartCenterItem( false ) );
-    aItemSet.Put( XFillStyleItem( XFILL_SOLID ) );
+    aItemSet.Put( XFillStyleItem( drawing::FillStyle_SOLID ) );
     aItemSet.Put( XFillColorItem( OUString(), ScDetectiveFunc::GetCommentColor() ) );
     aItemSet.Put( SdrCaptionEscDirItem( SDRCAPT_ESCBESTFIT ) );
 
diff --git a/sc/source/core/tool/detfunc.cxx b/sc/source/core/tool/detfunc.cxx
index 39e4bbd531ef..a4ac8cb6f619 100644
--- a/sc/source/core/tool/detfunc.cxx
+++ b/sc/source/core/tool/detfunc.cxx
@@ -73,6 +73,7 @@
 #include <boost/scoped_array.hpp>
 
 using ::std::vector;
+using namespace com::sun::star;
 
 // line ends are now created with an empty name.
 // The checkForUniqueItem method then finds a unique name for the item's value.
@@ -141,7 +142,7 @@ ScDetectiveData::ScDetectiveData( SdrModel* pModel ) :
     nMaxLevel = 0;
 
     aBoxSet.Put( XLineColorItem( EMPTY_OUSTRING, Color( ScDetectiveFunc::GetArrowColor() ) ) );
-    aBoxSet.Put( XFillStyleItem( XFILL_NONE ) );
+    aBoxSet.Put( XFillStyleItem( drawing::FillStyle_NONE ) );
 
     //  Standard-Linienenden (wie aus XLineEndList::Create) selber zusammenbasteln,
     //  um von den konfigurierten Linienenden unabhaengig zu sein
@@ -186,7 +187,7 @@ ScDetectiveData::ScDetectiveData( SdrModel* pModel ) :
     aFromTabSet.Put( XLineEndCenterItem( false ) );
 
     aCircleSet.Put( XLineColorItem( OUString(), Color( ScDetectiveFunc::GetErrorColor() ) ) );
-    aCircleSet.Put( XFillStyleItem( XFILL_NONE ) );
+    aCircleSet.Put( XFillStyleItem( drawing::FillStyle_NONE ) );
     sal_uInt16 nWidth = 55;     // 54 = 1 Pixel
     aCircleSet.Put( XLineWidthItem( nWidth ) );
 }
@@ -205,7 +206,7 @@ ScCommentData::ScCommentData( ScDocument& rDoc, SdrModel* pModel ) :
     aCaptionSet.Put( XLineStartItem( aName, basegfx::B2DPolyPolygon(aTriangle) ) );
     aCaptionSet.Put( XLineStartWidthItem( 200 ) );
     aCaptionSet.Put( XLineStartCenterItem( false ) );
-    aCaptionSet.Put( XFillStyleItem( XFILL_SOLID ) );
+    aCaptionSet.Put( XFillStyleItem( drawing::FillStyle_SOLID ) );
     Color aYellow( ScDetectiveFunc::GetCommentColor() );
     aCaptionSet.Put( XFillColorItem( OUString(), aYellow ) );
 
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;
diff --git a/sc/source/ui/drawfunc/fuconcustomshape.cxx b/sc/source/ui/drawfunc/fuconcustomshape.cxx
index 9acf314744d7..ce2e45294f4d 100644
--- a/sc/source/ui/drawfunc/fuconcustomshape.cxx
+++ b/sc/source/ui/drawfunc/fuconcustomshape.cxx
@@ -35,6 +35,8 @@
 
 #include <math.h>
 
+using namespace com::sun::star;
+
 FuConstCustomShape::FuConstCustomShape( ScTabViewShell* pViewSh, Window* pWin, ScDrawView* pViewP, SdrModel* pDoc, SfxRequest& rReq )
     : FuConstruct( pViewSh, pWin, pViewP, pDoc, rReq )
 {
@@ -88,7 +90,7 @@ bool FuConstCustomShape::MouseButtonDown(const MouseEvent& rMEvt)
             if ( ((SdrObjCustomShape*)pObj)->UseNoFillStyle() )
                 bForceNoFillStyle = true;
             if ( bForceNoFillStyle )
-                pObj->SetMergedItem( XFillStyleItem( XFILL_NONE ) );
+                pObj->SetMergedItem( XFillStyleItem( drawing::FillStyle_NONE ) );
             pObj->SetGridOffset( aGridOff );
         }
 
diff --git a/sc/source/ui/view/drawview.cxx b/sc/source/ui/view/drawview.cxx
index 7f4ef96f6ae9..2dc101875926 100644
--- a/sc/source/ui/view/drawview.cxx
+++ b/sc/source/ui/view/drawview.cxx
@@ -975,7 +975,7 @@ SdrObject* ScDrawView::ApplyGraphicToObject(
 
         SfxItemSet aSet(GetModel()->GetItemPool(), XATTR_FILLSTYLE, XATTR_FILLBITMAP);
 
-        aSet.Put(XFillStyleItem(XFILL_BITMAP));
+        aSet.Put(XFillStyleItem(drawing::FillStyle_BITMAP));
         aSet.Put(XFillBitmapItem(OUString(), rGraphic));
         rHitObject.SetMergedItemSetAndBroadcast(aSet);
         return &rHitObject;