XFillStyle -> css::drawing::FillStyle

Change-Id: I6b2fabd72fd34f4ac1b3a18f386c90794bc39ce4

20 files changed, 90 insertions, 80 deletions

diff --git a/svx/source/svdraw/sdrmasterpagedescriptor.cxx b/svx/source/svdraw/sdrmasterpagedescriptor.cxx
index 9b44726a31dd..598388375dc6 100644
--- a/svx/source/svdraw/sdrmasterpagedescriptor.cxx
+++ b/svx/source/svdraw/sdrmasterpagedescriptor.cxx
@@ -24,6 +24,7 @@
 #include <svx/xfillit0.hxx>
 #include <svl/itemset.hxx>
 
+using namespace com::sun::star;
 
 namespace sdr
 {
@@ -106,7 +107,7 @@ namespace sdr
         const SdrPage* pCorrectPage = &GetOwnerPage();
         const SdrPageProperties* pCorrectProperties = &pCorrectPage->getSdrPageProperties();
 
-        if(XFILL_NONE == ((const XFillStyleItem&)pCorrectProperties->GetItemSet().Get(XATTR_FILLSTYLE)).GetValue())
+        if(drawing::FillStyle_NONE == ((const XFillStyleItem&)pCorrectProperties->GetItemSet().Get(XATTR_FILLSTYLE)).GetValue())
         {
             pCorrectPage = &GetUsedPage();
             pCorrectProperties = &pCorrectPage->getSdrPageProperties();
diff --git a/svx/source/svdraw/svdcrtv.cxx b/svx/source/svdraw/svdcrtv.cxx
index de53aa3c0a19..b8ed6cbf3f5a 100644
--- a/svx/source/svdraw/svdcrtv.cxx
+++ b/svx/source/svdraw/svdcrtv.cxx
@@ -41,7 +41,7 @@
 #include <svx/sdr/overlay/overlayprimitive2dsequenceobject.hxx>
 #include <basegfx/matrix/b2dhommatrixtools.hxx>
 
-
+using namespace com::sun::star;
 
 class ImplConnectMarkerOverlay
 {
@@ -457,7 +457,7 @@ bool SdrCreateView::ImpBegCreateObj(sal_uInt32 nInvent, sal_uInt16 nIdent, const
                 {
                     SfxItemSet aSet(pMod->GetItemPool());
                     aSet.Put(XFillColorItem(OUString(),Color(COL_WHITE))); // in case someone turns on Solid
-                    aSet.Put(XFillStyleItem(XFILL_NONE));
+                    aSet.Put(XFillStyleItem(drawing::FillStyle_NONE));
 
                     pAktCreate->SetMergedItemSet(aSet);
                 }
@@ -467,7 +467,7 @@ bool SdrCreateView::ImpBegCreateObj(sal_uInt32 nInvent, sal_uInt16 nIdent, const
                     // default for all text frames: no background, no border
                     SfxItemSet aSet(pMod->GetItemPool());
                     aSet.Put(XFillColorItem(OUString(),Color(COL_WHITE))); // in case someone turns on Solid
-                    aSet.Put(XFillStyleItem(XFILL_NONE));
+                    aSet.Put(XFillStyleItem(drawing::FillStyle_NONE));
                     aSet.Put(XLineColorItem(OUString(),Color(COL_BLACK))); // in case someone turns on Solid
                     aSet.Put(XLineStyleItem(XLINE_NONE));
 
@@ -767,10 +767,10 @@ void SdrCreateView::ShowCreateObj(/*OutputDevice* pOut, sal_Bool bFull*/)
             if(bUseSolidDragging)
             {
                 const SfxItemSet& rSet = pAktCreate->GetMergedItemSet();
-                const XFillStyle eFill(((XFillStyleItem&)(rSet.Get(XATTR_FILLSTYLE))).GetValue());
+                const drawing::FillStyle eFill(((XFillStyleItem&)(rSet.Get(XATTR_FILLSTYLE))).GetValue());
                 const XLineStyle eLine(((XLineStyleItem&)(rSet.Get(XATTR_LINESTYLE))).GetValue());
 
-                if(XLINE_NONE == eLine && XFILL_NONE == eFill)
+                if(XLINE_NONE == eLine && drawing::FillStyle_NONE == eFill)
                 {
                     bUseSolidDragging = false;
                 }
diff --git a/svx/source/svdraw/svdedtv.cxx b/svx/source/svdraw/svdedtv.cxx
index 9daebbe48723..802e0fafd88c 100644
--- a/svx/source/svdraw/svdedtv.cxx
+++ b/svx/source/svdraw/svdedtv.cxx
@@ -36,6 +36,8 @@
 #include <svx/svdview.hxx>
 #include <clonelist.hxx>
 
+using namespace com::sun::star;
+
 void SdrEditView::ImpResetPossibilityFlags()
 {
     bReadOnly               =false;
@@ -522,9 +524,9 @@ void SdrEditView::CheckPossibilities()
                 if(SFX_ITEM_DONTCARE != eState)
                 {
                     // If state is not DONTCARE, test the item
-                    XFillStyle eFillStyle = ((XFillStyleItem&)(rSet.Get(XATTR_FILLSTYLE))).GetValue();
+                    drawing::FillStyle eFillStyle = ((XFillStyleItem&)(rSet.Get(XATTR_FILLSTYLE))).GetValue();
 
-                    if(eFillStyle != XFILL_GRADIENT)
+                    if(eFillStyle != drawing::FillStyle_GRADIENT)
                     {
                         bGradientAllowed = false;
                     }
diff --git a/svx/source/svdraw/svdedtv2.cxx b/svx/source/svdraw/svdedtv2.cxx
index 4b73e5ae6295..bb31717c6584 100644
--- a/svx/source/svdraw/svdedtv2.cxx
+++ b/svx/source/svdraw/svdedtv2.cxx
@@ -45,6 +45,7 @@
 #include <boost/scoped_ptr.hpp>
 #include <vector>
 using ::std::vector;
+using namespace com::sun::star;
 
 SdrObject* SdrEditView::GetMaxToTopObj(SdrObject* /*pObj*/) const
 {
@@ -1313,12 +1314,12 @@ void SdrEditView::CombineMarkedObjects(bool bNoPolyPoly)
 
         // If LineStyle of pAttrObj is XLINE_NONE force to XLINE_SOLID to make visible.
         const XLineStyle eLineStyle = ((const XLineStyleItem&)pAttrObj->GetMergedItem(XATTR_LINESTYLE)).GetValue();
-        const XFillStyle eFillStyle = ((const XFillStyleItem&)pAttrObj->GetMergedItem(XATTR_FILLSTYLE)).GetValue();
+        const drawing::FillStyle eFillStyle = ((const XFillStyleItem&)pAttrObj->GetMergedItem(XATTR_FILLSTYLE)).GetValue();
 
         // Take fill style/closed state of pAttrObj in account when deciding to change the line style
         bool bIsClosedPathObj(pAttrObj->ISA(SdrPathObj) && ((SdrPathObj*)pAttrObj)->IsClosed());
 
-        if(XLINE_NONE == eLineStyle && (XFILL_NONE == eFillStyle || !bIsClosedPathObj))
+        if(XLINE_NONE == eLineStyle && (drawing::FillStyle_NONE == eFillStyle || !bIsClosedPathObj))
         {
             pPath->SetMergedItem(XLineStyleItem(XLINE_SOLID));
         }
@@ -1572,7 +1573,7 @@ void SdrEditView::ImpDismantleOneObject(const SdrObject* pObj, SdrObjList& rOL,
 
                     // clear fill and line style
                     aTargetItemSet.Put(XLineStyleItem(XLINE_NONE));
-                    aTargetItemSet.Put(XFillStyleItem(XFILL_NONE));
+                    aTargetItemSet.Put(XFillStyleItem(drawing::FillStyle_NONE));
 
                     // get the text bounds and set at text object
                     Rectangle aTextBounds = pCustomShape->GetSnapRect();
diff --git a/svx/source/svdraw/svdetc.cxx b/svx/source/svdraw/svdetc.cxx
index b68c76fbdf16..ec9245379231 100644
--- a/svx/source/svdraw/svdetc.cxx
+++ b/svx/source/svdraw/svdetc.cxx
@@ -296,19 +296,19 @@ void SdrLinkList::RemoveLink(const Link& rLink)
 
 bool GetDraftFillColor(const SfxItemSet& rSet, Color& rCol)
 {
-    XFillStyle eFill=((XFillStyleItem&)rSet.Get(XATTR_FILLSTYLE)).GetValue();
+    drawing::FillStyle eFill=((XFillStyleItem&)rSet.Get(XATTR_FILLSTYLE)).GetValue();
     bool bRetval = false;
 
     switch(eFill)
     {
-        case XFILL_SOLID:
+        case drawing::FillStyle_SOLID:
         {
             rCol = ((XFillColorItem&)rSet.Get(XATTR_FILLCOLOR)).GetColorValue();
             bRetval = true;
 
             break;
         }
-        case XFILL_HATCH:
+        case drawing::FillStyle_HATCH:
         {
             Color aCol1(((XFillHatchItem&)rSet.Get(XATTR_FILLHATCH)).GetHatchValue().GetColor());
             Color aCol2(COL_WHITE);
@@ -326,7 +326,7 @@ bool GetDraftFillColor(const SfxItemSet& rSet, Color& rCol)
 
             break;
         }
-        case XFILL_GRADIENT: {
+        case drawing::FillStyle_GRADIENT: {
             const XGradient& rGrad=((XFillGradientItem&)rSet.Get(XATTR_FILLGRADIENT)).GetGradientValue();
             Color aCol1(rGrad.GetStartColor());
             Color aCol2(rGrad.GetEndColor());
@@ -336,7 +336,7 @@ bool GetDraftFillColor(const SfxItemSet& rSet, Color& rCol)
 
             break;
         }
-        case XFILL_BITMAP:
+        case drawing::FillStyle_BITMAP:
         {
             Bitmap aBitmap(((XFillBitmapItem&)rSet.Get(XATTR_FILLBITMAP)).GetGraphicObject().GetGraphic().GetBitmapEx().GetBitmap());
             const Size aSize(aBitmap.GetSizePixel());
diff --git a/svx/source/svdraw/svdfmtf.cxx b/svx/source/svdraw/svdfmtf.cxx
index ef3874a21515..b0ef005f4e07 100644
--- a/svx/source/svdraw/svdfmtf.cxx
+++ b/svx/source/svdraw/svdfmtf.cxx
@@ -71,7 +71,7 @@
 #include <svx/svditer.hxx>
 #include <svx/svdogrp.hxx>
 
-
+using namespace com::sun::star;
 
 ImpSdrGDIMetaFileImport::ImpSdrGDIMetaFileImport(
     SdrModel& rModel,
@@ -395,12 +395,12 @@ void ImpSdrGDIMetaFileImport::SetAttributes(SdrObject* pObj, bool bForceTextAttr
     {
         if(maVD.IsFillColor())
         {
-            mpFillAttr->Put(XFillStyleItem(XFILL_SOLID));
+            mpFillAttr->Put(XFillStyleItem(drawing::FillStyle_SOLID));
             mpFillAttr->Put(XFillColorItem(OUString(), maVD.GetFillColor()));
         }
         else
         {
-            mpFillAttr->Put(XFillStyleItem(XFILL_NONE));
+            mpFillAttr->Put(XFillStyleItem(drawing::FillStyle_NONE));
         }
     }
     else
@@ -600,7 +600,7 @@ void ImpSdrGDIMetaFileImport::InsertObj(SdrObject* pObj, bool bScale)
                             aClipTopLeft,
                             aClipSize);
 
-                        pObj->SetMergedItem(XFillStyleItem(XFILL_BITMAP));
+                        pObj->SetMergedItem(XFillStyleItem(drawing::FillStyle_BITMAP));
                         pObj->SetMergedItem(XFillBitmapItem(OUString(), Graphic(aClippedBitmap)));
                         pObj->SetMergedItem(XFillBmpTileItem(false));
                         pObj->SetMergedItem(XFillBmpStretchItem(true));
@@ -1046,7 +1046,7 @@ void ImpSdrGDIMetaFileImport::ImportText( const Point& rPos, const OUString& rSt
     if (!aFnt.IsTransparent())
     {
         SfxItemSet aAttr(*mpFillAttr->GetPool(), XATTR_FILL_FIRST, XATTR_FILL_LAST, 0, 0);
-        aAttr.Put(XFillStyleItem(XFILL_SOLID));
+        aAttr.Put(XFillStyleItem(drawing::FillStyle_SOLID));
         aAttr.Put(XFillColorItem(OUString(), aFnt.GetFillColor()));
         pText->SetMergedItemSet(aAttr);
     }
@@ -1091,7 +1091,7 @@ void ImpSdrGDIMetaFileImport::DoAction(MetaBmpAction& rAct)
 
     // This action is not creating line and fill, set directly, do not use SetAttributes(..)
     pGraf->SetMergedItem(XLineStyleItem(XLINE_NONE));
-    pGraf->SetMergedItem(XFillStyleItem(XFILL_NONE));
+    pGraf->SetMergedItem(XFillStyleItem(drawing::FillStyle_NONE));
     InsertObj(pGraf);
 }
 
@@ -1103,7 +1103,7 @@ void ImpSdrGDIMetaFileImport::DoAction(MetaBmpScaleAction& rAct)
 
     // This action is not creating line and fill, set directly, do not use SetAttributes(..)
     pGraf->SetMergedItem(XLineStyleItem(XLINE_NONE));
-    pGraf->SetMergedItem(XFillStyleItem(XFILL_NONE));
+    pGraf->SetMergedItem(XFillStyleItem(drawing::FillStyle_NONE));
     InsertObj(pGraf);
 }
 
@@ -1115,7 +1115,7 @@ void ImpSdrGDIMetaFileImport::DoAction(MetaBmpExAction& rAct)
 
     // This action is not creating line and fill, set directly, do not use SetAttributes(..)
     pGraf->SetMergedItem(XLineStyleItem(XLINE_NONE));
-    pGraf->SetMergedItem(XFillStyleItem(XFILL_NONE));
+    pGraf->SetMergedItem(XFillStyleItem(drawing::FillStyle_NONE));
     InsertObj(pGraf);
 }
 
@@ -1127,7 +1127,7 @@ void ImpSdrGDIMetaFileImport::DoAction(MetaBmpExScaleAction& rAct)
 
     // This action is not creating line and fill, set directly, do not use SetAttributes(..)
     pGraf->SetMergedItem(XLineStyleItem(XLINE_NONE));
-    pGraf->SetMergedItem(XFillStyleItem(XFILL_NONE));
+    pGraf->SetMergedItem(XFillStyleItem(drawing::FillStyle_NONE));
     InsertObj(pGraf);
 }
 
@@ -1173,7 +1173,7 @@ void ImpSdrGDIMetaFileImport::DoAction( MetaHatchAction& rAct )
             }
 
             SetAttributes(pPath);
-            aHatchAttr.Put(XFillStyleItem(XFILL_HATCH));
+            aHatchAttr.Put(XFillStyleItem(drawing::FillStyle_HATCH));
             aHatchAttr.Put(XFillHatchItem(&mpModel->GetItemPool(), XHatch(rHatch.GetColor(), eStyle, rHatch.GetDistance(), rHatch.GetAngle())));
             pPath->SetMergedItemSet(aHatchAttr);
 
@@ -1263,7 +1263,7 @@ void ImpSdrGDIMetaFileImport::DoAction( MetaCommentAction& rAct, GDIMetaFile& rM
                     aGradAttr.Put(XLineStyleItem(XLINE_NONE));
 
                     // add detected gradient fillstyle
-                    aGradAttr.Put(XFillStyleItem(XFILL_GRADIENT));
+                    aGradAttr.Put(XFillStyleItem(drawing::FillStyle_GRADIENT));
                     aGradAttr.Put(XFillGradientItem(aXGradient));
 
                     pPath->SetMergedItemSet(aGradAttr);
@@ -1310,7 +1310,7 @@ void ImpSdrGDIMetaFileImport::DoAction(MetaBmpScalePartAction& rAct)
 
     // This action is not creating line and fill, set directly, do not use SetAttributes(..)
     pGraf->SetMergedItem(XLineStyleItem(XLINE_NONE));
-    pGraf->SetMergedItem(XFillStyleItem(XFILL_NONE));
+    pGraf->SetMergedItem(XFillStyleItem(drawing::FillStyle_NONE));
     InsertObj(pGraf);
 }
 
@@ -1326,7 +1326,7 @@ void ImpSdrGDIMetaFileImport::DoAction(MetaBmpExScalePartAction& rAct)
 
     // This action is not creating line and fill, set directly, do not use SetAttributes(..)
     pGraf->SetMergedItem(XLineStyleItem(XLINE_NONE));
-    pGraf->SetMergedItem(XFillStyleItem(XFILL_NONE));
+    pGraf->SetMergedItem(XFillStyleItem(drawing::FillStyle_NONE));
     InsertObj(pGraf);
 }
 
@@ -1340,7 +1340,7 @@ void ImpSdrGDIMetaFileImport::DoAction(MetaMaskAction& rAct)
 
     // This action is not creating line and fill, set directly, do not use SetAttributes(..)
     pGraf->SetMergedItem(XLineStyleItem(XLINE_NONE));
-    pGraf->SetMergedItem(XFillStyleItem(XFILL_NONE));
+    pGraf->SetMergedItem(XFillStyleItem(drawing::FillStyle_NONE));
     InsertObj(pGraf);
 }
 
@@ -1354,7 +1354,7 @@ void ImpSdrGDIMetaFileImport::DoAction(MetaMaskScaleAction& rAct)
 
     // This action is not creating line and fill, set directly, do not use SetAttributes(..)
     pGraf->SetMergedItem(XLineStyleItem(XLINE_NONE));
-    pGraf->SetMergedItem(XFillStyleItem(XFILL_NONE));
+    pGraf->SetMergedItem(XFillStyleItem(drawing::FillStyle_NONE));
     InsertObj(pGraf);
 }
 
@@ -1369,7 +1369,7 @@ void ImpSdrGDIMetaFileImport::DoAction(MetaMaskScalePartAction& rAct)
 
     // This action is not creating line and fill, set directly, do not use SetAttributes(..)
     pGraf->SetMergedItem(XLineStyleItem(XLINE_NONE));
-    pGraf->SetMergedItem(XFillStyleItem(XFILL_NONE));
+    pGraf->SetMergedItem(XFillStyleItem(drawing::FillStyle_NONE));
     InsertObj(pGraf);
 }
 
@@ -1431,7 +1431,7 @@ void ImpSdrGDIMetaFileImport::DoAction(MetaGradientAction& rAct)
                 rGradient.GetSteps()));
 
         SetAttributes(pRect);
-        aGradientAttr.Put(XFillStyleItem(XFILL_GRADIENT)); // #i125211#
+        aGradientAttr.Put(XFillStyleItem(drawing::FillStyle_GRADIENT)); // #i125211#
         aGradientAttr.Put(aXFillGradientItem);
         pRect->SetMergedItemSet(aGradientAttr);
 
@@ -1501,7 +1501,7 @@ void ImpSdrGDIMetaFileImport::DoAction(MetaGradientExAction& rAct)
                     rGradient.GetSteps()));
 
             SetAttributes(pPath);
-            aGradientAttr.Put(XFillStyleItem(XFILL_GRADIENT)); // #i125211#
+            aGradientAttr.Put(XFillStyleItem(drawing::FillStyle_GRADIENT)); // #i125211#
             aGradientAttr.Put(aXFillGradientItem);
             pPath->SetMergedItemSet(aGradientAttr);
 
@@ -1690,7 +1690,7 @@ void ImpSdrGDIMetaFileImport::DoAction(MetaFloatTransparentAction& rAct)
             // since these metafile content is not used to draw line/fill
             // dependent of these setting at the device content
             pGraf->SetMergedItem(XLineStyleItem(XLINE_NONE));
-            pGraf->SetMergedItem(XFillStyleItem(XFILL_NONE));
+            pGraf->SetMergedItem(XFillStyleItem(drawing::FillStyle_NONE));
             InsertObj(pGraf);
         }
     }
diff --git a/svx/source/svdraw/svdibrow.cxx b/svx/source/svdraw/svdibrow.cxx
index be7047d07358..9f1322c98781 100644
--- a/svx/source/svdraw/svdibrow.cxx
+++ b/svx/source/svdraw/svdibrow.cxx
@@ -55,6 +55,8 @@
 #include <svx/xlnstwit.hxx>
 #include <svx/xtextit0.hxx>
 
+using namespace com::sun::star;
+
 #define ITEMBROWSER_WHICHCOL_ID 1
 #define ITEMBROWSER_STATECOL_ID 2
 #define ITEMBROWSER_TYPECOL_ID  3
@@ -639,12 +641,12 @@ bool IsItemIneffective(sal_uInt16 nWhich, const SfxItemSet* pSet, sal_uInt16& rI
         {
             rIndent=1;
             if (ImpGetItem(*pSet,XATTR_FILLSTYLE,pItem)) {
-                XFillStyle eFillStyle=((const XFillStyleItem*)pItem)->GetValue();
-                if (eFillStyle==XFILL_NONE) return true;
+                drawing::FillStyle eFillStyle=((const XFillStyleItem*)pItem)->GetValue();
+                if (eFillStyle==drawing::FillStyle_NONE) return true;
                 // transparency currently only for SolidFill
-                if (eFillStyle!=XFILL_SOLID && (nWhich==XATTR_FILLCOLOR || nWhich==XATTR_FILLTRANSPARENCE)) return true;
-                if (eFillStyle!=XFILL_GRADIENT && (nWhich==XATTR_FILLGRADIENT || nWhich==XATTR_GRADIENTSTEPCOUNT)) return true;
-                if (eFillStyle!=XFILL_HATCH && (nWhich==XATTR_FILLHATCH || nWhich==XATTR_FILLBACKGROUND)) return true;
+                if (eFillStyle!=drawing::FillStyle_SOLID && (nWhich==XATTR_FILLCOLOR || nWhich==XATTR_FILLTRANSPARENCE)) return true;
+                if (eFillStyle!=drawing::FillStyle_GRADIENT && (nWhich==XATTR_FILLGRADIENT || nWhich==XATTR_GRADIENTSTEPCOUNT)) return true;
+                if (eFillStyle!=drawing::FillStyle_HATCH && (nWhich==XATTR_FILLHATCH || nWhich==XATTR_FILLBACKGROUND)) return true;
             }
         } break;
         case XATTR_FILLBITMAP          :
@@ -660,8 +662,8 @@ bool IsItemIneffective(sal_uInt16 nWhich, const SfxItemSet* pSet, sal_uInt16& rI
         case XATTR_FILLBMP_POSOFFSETY  : { /* only if TILE=sal_True*/
             rIndent=1;
             if (ImpGetItem(*pSet,XATTR_FILLSTYLE,pItem)) {
-                XFillStyle eFillStyle=((const XFillStyleItem*)pItem)->GetValue();
-                if (eFillStyle!=XFILL_BITMAP) return true;
+                drawing::FillStyle eFillStyle=((const XFillStyleItem*)pItem)->GetValue();
+                if (eFillStyle!=drawing::FillStyle_BITMAP) return true;
             }
             if (nWhich==XATTR_FILLBITMAP || nWhich==XATTR_FILLBMP_TILE) {
                 return false; // always selectable
diff --git a/svx/source/svdraw/svdmrkv.cxx b/svx/source/svdraw/svdmrkv.cxx
index 230cceb516bf..acfbcab68ad0 100644
--- a/svx/source/svdraw/svdmrkv.cxx
+++ b/svx/source/svdraw/svdmrkv.cxx
@@ -52,6 +52,7 @@
 
 #include <editeng/editdata.hxx>
 
+using namespace com::sun::star;
 
 // Migrate Marking of Objects, Points and GluePoints
 
@@ -991,9 +992,9 @@ void SdrMarkView::AddDragModeHdl(SdrDragMode eMode)
             {
                 SdrObject* pObj = GetMarkedObjectByIndex(0);
                 const SfxItemSet& rSet = pObj->GetMergedItemSet();
-                XFillStyle eFillStyle = ((XFillStyleItem&)(rSet.Get(XATTR_FILLSTYLE))).GetValue();
+                drawing::FillStyle eFillStyle = ((XFillStyleItem&)(rSet.Get(XATTR_FILLSTYLE))).GetValue();
 
-                if(eFillStyle == XFILL_GRADIENT)
+                if(eFillStyle == drawing::FillStyle_GRADIENT)
                 {
                     // set values and transform to vector set
                     GradTransformer aGradTransformer;
diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx
index 9e021dc819d8..c2257f279914 100644
--- a/svx/source/svdraw/svdoashp.cxx
+++ b/svx/source/svdraw/svdoashp.cxx
@@ -230,7 +230,7 @@ SdrObject* ImpCreateShadowObjectClone(const SdrObject& rOriginal, const SfxItemS
         while(aIterator.IsMore())
         {
             SdrObject* pObj = aIterator.Next();
-            XFillStyle eFillStyle = ((XFillStyleItem&)(pObj->GetMergedItem(XATTR_FILLSTYLE))).GetValue();
+            drawing::FillStyle eFillStyle = ((XFillStyleItem&)(pObj->GetMergedItem(XATTR_FILLSTYLE))).GetValue();
 
             if(!bLineUsed)
             {
@@ -244,22 +244,22 @@ SdrObject* ImpCreateShadowObjectClone(const SdrObject& rOriginal, const SfxItemS
 
             if(!bAllFillUsed)
             {
-                if(!bSolidFillUsed && XFILL_SOLID == eFillStyle)
+                if(!bSolidFillUsed && drawing::FillStyle_SOLID == eFillStyle)
                 {
                     bSolidFillUsed = true;
                     bAllFillUsed = (bSolidFillUsed && bGradientFillUsed && bHatchFillUsed && bBitmapFillUsed);
                 }
-                if(!bGradientFillUsed && XFILL_GRADIENT == eFillStyle)
+                if(!bGradientFillUsed && drawing::FillStyle_GRADIENT == eFillStyle)
                 {
                     bGradientFillUsed = true;
                     bAllFillUsed = (bSolidFillUsed && bGradientFillUsed && bHatchFillUsed && bBitmapFillUsed);
                 }
-                if(!bHatchFillUsed && XFILL_HATCH == eFillStyle)
+                if(!bHatchFillUsed && drawing::FillStyle_HATCH == eFillStyle)
                 {
                     bHatchFillUsed = true;
                     bAllFillUsed = (bSolidFillUsed && bGradientFillUsed && bHatchFillUsed && bBitmapFillUsed);
                 }
-                if(!bBitmapFillUsed && XFILL_BITMAP == eFillStyle)
+                if(!bBitmapFillUsed && drawing::FillStyle_BITMAP == eFillStyle)
                 {
                     bBitmapFillUsed = true;
                     bAllFillUsed = (bSolidFillUsed && bGradientFillUsed && bHatchFillUsed && bBitmapFillUsed);
diff --git a/svx/source/svdraw/svdoattr.cxx b/svx/source/svdraw/svdoattr.cxx
index ba7e8b1aad6e..0ecea696cc1e 100644
--- a/svx/source/svdraw/svdoattr.cxx
+++ b/svx/source/svdraw/svdoattr.cxx
@@ -72,7 +72,7 @@
 #include <basegfx/polygon/b2dpolygon.hxx>
 #include "svx/xlinjoit.hxx"
 
-
+using namespace com::sun::star;
 
 sdr::properties::BaseProperties* SdrAttrObj::CreateObjectSpecificProperties()
 {
@@ -154,7 +154,7 @@ sal_Int32 SdrAttrObj::ImpGetLineWdt() const
 
 bool SdrAttrObj::HasFill() const
 {
-    return bClosedObj && ((XFillStyleItem&)(GetProperties().GetObjectItemSet().Get(XATTR_FILLSTYLE))).GetValue()!=XFILL_NONE;
+    return bClosedObj && ((XFillStyleItem&)(GetProperties().GetObjectItemSet().Get(XATTR_FILLSTYLE))).GetValue()!=drawing::FillStyle_NONE;
 }
 
 bool SdrAttrObj::HasLine() const
diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx
index dea52a782230..18cc1bce95f6 100644
--- a/svx/source/svdraw/svdobj.cxx
+++ b/svx/source/svdraw/svdobj.cxx
@@ -1180,7 +1180,7 @@ basegfx::B2DPolyPolygon SdrObject::TakeContour() const
     basegfx::B2DPolyPolygon aRetval;
 
     // create cloned object without text, but with XLINE_SOLID,
-    // COL_BLACK as line color and XFILL_NONE
+    // COL_BLACK as line color and drawing::FillStyle_NONE
     SdrObject* pClone = Clone();
 
     if(pClone)
@@ -1224,7 +1224,7 @@ basegfx::B2DPolyPolygon SdrObject::TakeContour() const
         // solid black lines and no fill
         aNewSet.Put(XLineStyleItem(XLINE_SOLID));
         aNewSet.Put(XLineColorItem(OUString(), Color(COL_BLACK)));
-        aNewSet.Put(XFillStyleItem(XFILL_NONE));
+        aNewSet.Put(XFillStyleItem(drawing::FillStyle_NONE));
         pClone->SetMergedItemSet(aNewSet);
 
         // get sequence from clone
@@ -2546,7 +2546,7 @@ SdrObject* SdrObject::ImpConvertToContourObj(SdrObject* pRet, bool bForceLineDas
         if(aMergedLineFillPolyPolygon.count() || (bForceLineDash && aMergedHairlinePolyPolygon.count()))
         {
             SfxItemSet aSet(pRet->GetMergedItemSet());
-            XFillStyle eOldFillStyle = ((const XFillStyleItem&)(aSet.Get(XATTR_FILLSTYLE))).GetValue();
+            drawing::FillStyle eOldFillStyle = ((const XFillStyleItem&)(aSet.Get(XATTR_FILLSTYLE))).GetValue();
             SdrPathObj* aLinePolygonPart = NULL;
             SdrPathObj* aLineHairlinePart = NULL;
             bool bBuildGroup(false);
@@ -2563,7 +2563,7 @@ SdrObject* SdrObject::ImpConvertToContourObj(SdrObject* pRet, bool bForceLineDas
                 Color aColorLine = ((const XLineColorItem&)(aSet.Get(XATTR_LINECOLOR))).GetColorValue();
                 sal_uInt16 nTransLine = ((const XLineTransparenceItem&)(aSet.Get(XATTR_LINETRANSPARENCE))).GetValue();
                 aSet.Put(XFillColorItem(OUString(), aColorLine));
-                aSet.Put(XFillStyleItem(XFILL_SOLID));
+                aSet.Put(XFillStyleItem(drawing::FillStyle_SOLID));
                 aSet.Put(XFillTransparenceItem(nTransLine));
 
                 aLinePolygonPart->SetMergedItemSet(aSet);
@@ -2579,7 +2579,7 @@ SdrObject* SdrObject::ImpConvertToContourObj(SdrObject* pRet, bool bForceLineDas
                 aLineHairlinePart->SetModel(pRet->GetModel());
 
                 aSet.Put(XLineWidthItem(0L));
-                aSet.Put(XFillStyleItem(XFILL_NONE));
+                aSet.Put(XFillStyleItem(drawing::FillStyle_NONE));
                 aSet.Put(XLineStyleItem(XLINE_SOLID));
 
                 // it is also necessary to switch off line start and ends here
@@ -2600,7 +2600,7 @@ SdrObject* SdrObject::ImpConvertToContourObj(SdrObject* pRet, bool bForceLineDas
 
             if(pPath && pPath->IsClosed())
             {
-                if(eOldFillStyle != XFILL_NONE)
+                if(eOldFillStyle != drawing::FillStyle_NONE)
                 {
                     bAddOriginalGeometry = true;
                 }
@@ -3215,10 +3215,10 @@ bool SdrObject::IsInDestruction() const
     return false;
 }
 
-// return if fill is != XFILL_NONE
+// return if fill is != drawing::FillStyle_NONE
 bool SdrObject::HasFillStyle() const
 {
-    return (((const XFillStyleItem&)GetObjectItem(XATTR_FILLSTYLE)).GetValue() != XFILL_NONE);
+    return (((const XFillStyleItem&)GetObjectItem(XATTR_FILLSTYLE)).GetValue() != drawing::FillStyle_NONE);
 }
 
 bool SdrObject::HasLineStyle() const
diff --git a/svx/source/svdraw/svdocirc.cxx b/svx/source/svdraw/svdocirc.cxx
index 1cdf8be3403b..db836dd721e0 100644
--- a/svx/source/svdraw/svdocirc.cxx
+++ b/svx/source/svdraw/svdocirc.cxx
@@ -50,7 +50,7 @@
 #include <svx/xlnwtit.hxx>
 #include <svx/xpool.hxx>
 
-
+using namespace com::sun::star;
 
 Point GetWinkPnt(const Rectangle& rR, long nWink)
 {
@@ -194,8 +194,8 @@ bool SdrCircObj::PaintNeedsXPolyCirc() const
     // XPoly is necessary if Fill !=None and !=Solid
     if(!bNeed && meCircleKind != OBJ_CARC)
     {
-        XFillStyle eFill=((XFillStyleItem&)(rSet.Get(XATTR_FILLSTYLE))).GetValue();
-        bNeed = eFill != XFILL_NONE && eFill != XFILL_SOLID;
+        drawing::FillStyle eFill=((XFillStyleItem&)(rSet.Get(XATTR_FILLSTYLE))).GetValue();
+        bNeed = eFill != drawing::FillStyle_NONE && eFill != drawing::FillStyle_SOLID;
     }
 
     if(!bNeed && meCircleKind != OBJ_CIRC && nStartWink == nEndWink)
diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx
index 54776a56598d..f5c263246b17 100644
--- a/svx/source/svdraw/svdograf.cxx
+++ b/svx/source/svdraw/svdograf.cxx
@@ -982,7 +982,7 @@ void SdrGrafObj::SetPage( SdrPage* pNewPage )
         }
         else
         {
-            SetMergedItem(XFillStyleItem(XFILL_NONE));
+            SetMergedItem(XFillStyleItem(drawing::FillStyle_NONE));
             SetMergedItem(XLineStyleItem(XLINE_NONE));
         }
     }
@@ -1176,7 +1176,7 @@ SdrObject* SdrGrafObj::DoConvertToPolyObj(bool bBezier, bool bAddText ) const
                 // retrieve bitmap for the fill
                 SfxItemSet aSet(GetObjectItemSet());
 
-                aSet.Put(XFillStyleItem(XFILL_BITMAP));
+                aSet.Put(XFillStyleItem(drawing::FillStyle_BITMAP));
                 const BitmapEx aBitmapEx(GetTransformedGraphic().GetBitmapEx());
                 aSet.Put(XFillBitmapItem(OUString(), Graphic(aBitmapEx)));
                 aSet.Put(XFillBmpTileItem(false));
diff --git a/svx/source/svdraw/svdoole2.cxx b/svx/source/svdraw/svdoole2.cxx
index 0d3ed8a27113..d1348c648b0d 100644
--- a/svx/source/svdraw/svdoole2.cxx
+++ b/svx/source/svdraw/svdoole2.cxx
@@ -1364,7 +1364,7 @@ SdrObject* SdrOle2Obj::createSdrGrafObjReplacement(bool bAddText, bool /* bUseHC
         pClone->SetMergedItem(XLineColorItem(OUString(), aColor.nColor));
 
         // bitmap fill
-        pClone->SetMergedItem(XFillStyleItem(XFILL_BITMAP));
+        pClone->SetMergedItem(XFillStyleItem(drawing::FillStyle_BITMAP));
         pClone->SetMergedItem(XFillBitmapItem(OUString(), GetEmptyOLEReplacementGraphic()));
         pClone->SetMergedItem(XFillBmpTileItem(false));
         pClone->SetMergedItem(XFillBmpStretchItem(false));
@@ -1493,7 +1493,7 @@ void SdrOle2Obj::SetPage(SdrPage* pNewPage)
         }
         else
         {
-            SetMergedItem(XFillStyleItem(XFILL_NONE));
+            SetMergedItem(XFillStyleItem(drawing::FillStyle_NONE));
             SetMergedItem(XLineStyleItem(XLINE_NONE));
         }
     }
diff --git a/svx/source/svdraw/svdorect.cxx b/svx/source/svdraw/svdorect.cxx
index 45f9f01fed81..387f57910cde 100644
--- a/svx/source/svdraw/svdorect.cxx
+++ b/svx/source/svdraw/svdorect.cxx
@@ -44,6 +44,7 @@
 #include <basegfx/polygon/b2dpolygon.hxx>
 #include <basegfx/polygon/b2dpolygontools.hxx>
 
+using namespace com::sun::star;
 
 // BaseProperties section
 
@@ -180,8 +181,8 @@ void SdrRectObj::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const
     rInfo.bTransparenceAllowed = true;
 
     // gradient depends on fillstyle
-    XFillStyle eFillStyle = ((XFillStyleItem&)(GetObjectItem(XATTR_FILLSTYLE))).GetValue();
-    rInfo.bGradientAllowed = (eFillStyle == XFILL_GRADIENT);
+    drawing::FillStyle eFillStyle = ((XFillStyleItem&)(GetObjectItem(XATTR_FILLSTYLE))).GetValue();
+    rInfo.bGradientAllowed = (eFillStyle == drawing::FillStyle_GRADIENT);
 
     rInfo.bShearAllowed     =bNoTextFrame;
     rInfo.bEdgeRadiusAllowed=true;
diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx
index 0c6e8ca63560..219fc6398e35 100644
--- a/svx/source/svdraw/svdotext.cxx
+++ b/svx/source/svdraw/svdotext.cxx
@@ -444,8 +444,8 @@ void SdrTextObj::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const
     rInfo.bTransparenceAllowed = true;
 
     // gradient depends on fillstyle
-    XFillStyle eFillStyle = ((XFillStyleItem&)(GetObjectItem(XATTR_FILLSTYLE))).GetValue();
-    rInfo.bGradientAllowed = (eFillStyle == XFILL_GRADIENT);
+    drawing::FillStyle eFillStyle = ((XFillStyleItem&)(GetObjectItem(XATTR_FILLSTYLE))).GetValue();
+    rInfo.bGradientAllowed = (eFillStyle == drawing::FillStyle_GRADIENT);
     rInfo.bShearAllowed     =bNoTextFrame;
     rInfo.bEdgeRadiusAllowed=true;
     bool bCanConv=ImpCanConvTextToCurve();
diff --git a/svx/source/svdraw/svdotextdecomposition.cxx b/svx/source/svdraw/svdotextdecomposition.cxx
index 2f7c4e1dfede..b4d52033e06c 100644
--- a/svx/source/svdraw/svdotextdecomposition.cxx
+++ b/svx/source/svdraw/svdotextdecomposition.cxx
@@ -50,6 +50,7 @@
 #include <editeng/outlobj.hxx>
 #include <basegfx/matrix/b2dhommatrixtools.hxx>
 
+using namespace com::sun::star;
 
 // helpers
 
@@ -895,14 +896,14 @@ void SdrTextObj::impDecomposeBlockTextPrimitive(
     Color aOriginalBackColor(rOutliner.GetBackgroundColor());
     const SfxItemSet* pBackgroundFillSet = &GetObjectItemSet();
 
-    if (XFILL_NONE == ((const XFillStyleItem&)pBackgroundFillSet->Get(XATTR_FILLSTYLE)).GetValue())
+    if (drawing::FillStyle_NONE == ((const XFillStyleItem&)pBackgroundFillSet->Get(XATTR_FILLSTYLE)).GetValue())
     {
         SdrPage *pOwnerPage = GetPage();
         if (pOwnerPage)
         {
             pBackgroundFillSet = &pOwnerPage->getSdrPageProperties().GetItemSet();
 
-            if (XFILL_NONE == ((const XFillStyleItem&)pBackgroundFillSet->Get(XATTR_FILLSTYLE)).GetValue())
+            if (drawing::FillStyle_NONE == ((const XFillStyleItem&)pBackgroundFillSet->Get(XATTR_FILLSTYLE)).GetValue())
             {
                 if (!pOwnerPage->IsMasterPage() && pOwnerPage->TRG_HasMasterPage())
                 {
@@ -912,7 +913,7 @@ void SdrTextObj::impDecomposeBlockTextPrimitive(
         }
     }
 
-    if (XFILL_NONE != ((const XFillStyleItem&)pBackgroundFillSet->Get(XATTR_FILLSTYLE)).GetValue())
+    if (drawing::FillStyle_NONE != ((const XFillStyleItem&)pBackgroundFillSet->Get(XATTR_FILLSTYLE)).GetValue())
     {
         Color aColor(rOutliner.GetBackgroundColor());
         GetDraftFillColor(*pBackgroundFillSet, aColor);
diff --git a/svx/source/svdraw/svdotxtr.cxx b/svx/source/svdraw/svdotxtr.cxx
index 25997de5c3af..22bc44f4be8a 100644
--- a/svx/source/svdraw/svdotxtr.cxx
+++ b/svx/source/svdraw/svdotxtr.cxx
@@ -38,6 +38,7 @@
 #include <svx/xlnclit.hxx>
 #include <svx/xlnwtit.hxx>
 
+using namespace com::sun::star;
 
 void SdrTextObj::NbcSetSnapRect(const Rectangle& rRect)
 {
@@ -378,7 +379,7 @@ SdrObject* SdrTextObj::ImpConvertContainedTextToSdrPathObjs(bool bToPoly) const
                         // set needed items
                         aAttributeSet.Put(XFillColorItem(OUString(), Color(rCandidate.getBColor())));
                         aAttributeSet.Put(XLineStyleItem(XLINE_NONE));
-                        aAttributeSet.Put(XFillStyleItem(XFILL_SOLID));
+                        aAttributeSet.Put(XFillStyleItem(drawing::FillStyle_SOLID));
 
                         // create filled SdrPathObj
                         pPathObj = new SdrPathObj(OBJ_PATHFILL, aPolyPolygon);
@@ -389,7 +390,7 @@ SdrObject* SdrTextObj::ImpConvertContainedTextToSdrPathObjs(bool bToPoly) const
                         aAttributeSet.Put(XLineColorItem(OUString(), Color(rCandidate.getBColor())));
                         aAttributeSet.Put(XLineStyleItem(XLINE_SOLID));
                         aAttributeSet.Put(XLineWidthItem(0));
-                        aAttributeSet.Put(XFillStyleItem(XFILL_NONE));
+                        aAttributeSet.Put(XFillStyleItem(drawing::FillStyle_NONE));
 
                         // create line SdrPathObj
                         pPathObj = new SdrPathObj(OBJ_PATHLINE, aPolyPolygon);
diff --git a/svx/source/svdraw/svdpage.cxx b/svx/source/svdraw/svdpage.cxx
index 04f52ebcd2a4..f56886bd10ca 100644
--- a/svx/source/svdraw/svdpage.cxx
+++ b/svx/source/svdraw/svdpage.cxx
@@ -1157,7 +1157,7 @@ SdrPageProperties::SdrPageProperties(SdrPage& rSdrPage)
 {
     if(!rSdrPage.IsMasterPage())
     {
-        mpProperties->Put(XFillStyleItem(XFILL_NONE));
+        mpProperties->Put(XFillStyleItem(drawing::FillStyle_NONE));
     }
 }
 
@@ -1815,7 +1815,7 @@ Color SdrPage::GetPageBackgroundColor( SdrPageView* pView, bool bScreenDisplay )
 
     if(!IsMasterPage() && TRG_HasMasterPage())
     {
-        if(XFILL_NONE == ((const XFillStyleItem&)pBackgroundFill->Get(XATTR_FILLSTYLE)).GetValue())
+        if(drawing::FillStyle_NONE == ((const XFillStyleItem&)pBackgroundFill->Get(XATTR_FILLSTYLE)).GetValue())
         {
             pBackgroundFill = &TRG_GetMasterPage().getSdrPageProperties().GetItemSet();
         }
diff --git a/svx/source/svdraw/svdxcgv.cxx b/svx/source/svdraw/svdxcgv.cxx
index 5b3c57b14944..e6f179f1c24f 100644
--- a/svx/source/svdraw/svdxcgv.cxx
+++ b/svx/source/svdraw/svdxcgv.cxx
@@ -55,7 +55,7 @@
 #include <svx/sdr/contact/objectcontactofobjlistpainter.hxx>
 #include <svx/sdr/contact/displayinfo.hxx>
 
-
+using namespace com::sun::star;
 
 SdrExchangeView::SdrExchangeView(SdrModel* pModel1, OutputDevice* pOut):
     SdrObjEditView(pModel1,pOut)
@@ -153,7 +153,7 @@ bool SdrExchangeView::Paste(const OUString& rStr, const Point& rPos, SdrObjList*
 
     SfxItemSet aTempAttr(pMod->GetItemPool());  // no fill, no line
     aTempAttr.Put(XLineStyleItem(XLINE_NONE));
-    aTempAttr.Put(XFillStyleItem(XFILL_NONE));
+    aTempAttr.Put(XFillStyleItem(drawing::FillStyle_NONE));
 
     pObj->SetMergedItemSet(aTempAttr);
 
@@ -189,7 +189,7 @@ bool SdrExchangeView::Paste(SvStream& rInput, const OUString& rBaseURL, sal_uInt
 
     SfxItemSet aTempAttr(pMod->GetItemPool());  // no fill, no line
     aTempAttr.Put(XLineStyleItem(XLINE_NONE));
-    aTempAttr.Put(XFillStyleItem(XFILL_NONE));
+    aTempAttr.Put(XFillStyleItem(drawing::FillStyle_NONE));
 
     pObj->SetMergedItemSet(aTempAttr);