XFillStyle -> css::drawing::FillStyle

Change-Id: I6b2fabd72fd34f4ac1b3a18f386c90794bc39ce4

23 files changed, 113 insertions, 92 deletions

diff --git a/sd/qa/unit/import-tests.cxx b/sd/qa/unit/import-tests.cxx
index 51b5fcc1af17..d1ae4e875a71 100644
--- a/sd/qa/unit/import-tests.cxx
+++ b/sd/qa/unit/import-tests.cxx
@@ -423,7 +423,7 @@ void SdFiltersTest::testFdo77027()
         // check that the fill style/color was actually imported
         const XFillStyleItem& rStyleItem = dynamic_cast<const XFillStyleItem&>(
                 pObj->GetMergedItem(XATTR_FILLSTYLE));
-        CPPUNIT_ASSERT_EQUAL(XFILL_SOLID, rStyleItem.GetValue());
+        CPPUNIT_ASSERT_EQUAL(drawing::FillStyle_SOLID, rStyleItem.GetValue());
         const XFillColorItem& rColorItem = dynamic_cast<const XFillColorItem&>(
                 pObj->GetMergedItem(XATTR_FILLCOLOR));
         CPPUNIT_ASSERT_EQUAL(Color(0xff6600), rColorItem.GetColorValue());
diff --git a/sd/source/core/drawdoc4.cxx b/sd/source/core/drawdoc4.cxx
index 59c7832a7977..11a20a10a081 100644
--- a/sd/source/core/drawdoc4.cxx
+++ b/sd/source/core/drawdoc4.cxx
@@ -163,7 +163,7 @@ void SdDrawDocument::CreateLayoutTemplates()
     rISet.Put(SdrTextHorzAdjustItem(SDRTEXTHORZADJUST_BLOCK));
 
                     // Fill attributes (Extended OutputDevice)
-    rISet.Put(XFillStyleItem(XFILL_SOLID));
+    rISet.Put(XFillStyleItem(drawing::FillStyle_SOLID));
     rISet.Put(XFillColorItem(OUString(), RGB_Color(COL_DEFAULT_SHAPE_FILLING)));
 
     rISet.Put( XFillGradientItem( aNullGrad) );
@@ -295,7 +295,7 @@ void SdDrawDocument::CreateLayoutTemplates()
     pSheet->SetHelpId( aHelpFile, HID_POOLSHEET_OBJWITHOUTFILL );
     pISet = &pSheet->GetItemSet();
 
-    pISet->Put(XFillStyleItem(XFILL_NONE));
+    pISet->Put(XFillStyleItem(drawing::FillStyle_NONE));
     pISet->Put(XLineColorItem(OUString(), RGB_Color(COL_BLACK)));
 
     // Object no fill no line
@@ -306,7 +306,7 @@ void SdDrawDocument::CreateLayoutTemplates()
     pSheet->SetHelpId( aHelpFile, HID_POOLSHEET_OBJNOLINENOFILL );
     pISet = &pSheet->GetItemSet();
 
-    pISet->Put(XFillStyleItem(XFILL_NONE));
+    pISet->Put(XFillStyleItem(drawing::FillStyle_NONE));
     pISet->Put(XLineStyleItem(XLINE_NONE));
 
     // Text
@@ -318,7 +318,7 @@ void SdDrawDocument::CreateLayoutTemplates()
     pISet = &pSheet->GetItemSet();
 
     pISet->Put(XLineStyleItem(XLINE_NONE));
-    pISet->Put(XFillStyleItem(XFILL_NONE));
+    pISet->Put(XFillStyleItem(drawing::FillStyle_NONE));
 
     // Text body
     aName = SD_RESSTR(STR_POOLSHEET_TEXTBODY);
@@ -328,7 +328,7 @@ void SdDrawDocument::CreateLayoutTemplates()
     pISet = &pSheet->GetItemSet();
 
     pISet->Put(XLineStyleItem(XLINE_NONE));
-    pISet->Put(XFillStyleItem(XFILL_NONE));
+    pISet->Put(XFillStyleItem(drawing::FillStyle_NONE));
 
     pISet->Put(SvxFontHeightItem(564, 100, EE_CHAR_FONTHEIGHT));        // 16 pt
 
@@ -340,7 +340,7 @@ void SdDrawDocument::CreateLayoutTemplates()
     pISet = &pSheet->GetItemSet();
 
     pISet->Put(XLineStyleItem(XLINE_NONE));
-    pISet->Put(XFillStyleItem(XFILL_NONE));
+    pISet->Put(XFillStyleItem(drawing::FillStyle_NONE));
 
     pISet->Put(SvxAdjustItem(SVX_ADJUST_BLOCK, EE_PARA_JUST ));
 
@@ -352,7 +352,7 @@ void SdDrawDocument::CreateLayoutTemplates()
     pISet = &pSheet->GetItemSet();
 
     pISet->Put(XLineStyleItem(XLINE_NONE));
-    pISet->Put(XFillStyleItem(XFILL_NONE));
+    pISet->Put(XFillStyleItem(drawing::FillStyle_NONE));
 
     SvxLRSpaceItem aLRSpaceItem( EE_PARA_LRSPACE );
     aLRSpaceItem.SetTxtFirstLineOfst(600);      // Indentation of first line: 6mm; right: 0
@@ -367,7 +367,7 @@ void SdDrawDocument::CreateLayoutTemplates()
     pISet = &pSheet->GetItemSet();
 
     pISet->Put(XLineStyleItem(XLINE_NONE));
-    pISet->Put(XFillStyleItem(XFILL_NONE));
+    pISet->Put(XFillStyleItem(drawing::FillStyle_NONE));
 
     pISet->Put(SvxFontHeightItem(1551, 100, EE_CHAR_FONTHEIGHT ));      // 44 pt
 
@@ -379,7 +379,7 @@ void SdDrawDocument::CreateLayoutTemplates()
     pISet = &pSheet->GetItemSet();
 
     pISet->Put(XLineStyleItem(XLINE_NONE));
-    pISet->Put(XFillStyleItem(XFILL_SOLID));
+    pISet->Put(XFillStyleItem(drawing::FillStyle_SOLID));
     pISet->Put(XFillColorItem(OUString(), RGB_Color(COL_CYAN)));
 
     pISet->Put(SdrShadowItem(true));
@@ -429,7 +429,7 @@ void SdDrawDocument::CreateLayoutTemplates()
     pISet = &pSheet->GetItemSet();
 
     pISet->Put(XLineStyleItem(XLINE_NONE));
-    pISet->Put(XFillStyleItem(XFILL_NONE));
+    pISet->Put(XFillStyleItem(drawing::FillStyle_NONE));
 
     pISet->Put(SvxFontHeightItem(846, 100, EE_CHAR_FONTHEIGHT ));        // 24 pt
 
@@ -444,7 +444,7 @@ void SdDrawDocument::CreateLayoutTemplates()
     pISet = &pSheet->GetItemSet();
 
     pISet->Put(XLineStyleItem(XLINE_NONE));
-    pISet->Put(XFillStyleItem(XFILL_NONE));
+    pISet->Put(XFillStyleItem(drawing::FillStyle_NONE));
 
     pISet->Put(SvxWeightItem(WEIGHT_BOLD, EE_CHAR_WEIGHT ));
 
@@ -461,7 +461,7 @@ void SdDrawDocument::CreateLayoutTemplates()
     pISet = &pSheet->GetItemSet();
 
     pISet->Put(XLineStyleItem(XLINE_NONE));
-    pISet->Put(XFillStyleItem(XFILL_NONE));
+    pISet->Put(XFillStyleItem(drawing::FillStyle_NONE));
 
     pISet->Put(SvxPostureItem(ITALIC_NORMAL, EE_CHAR_ITALIC ));
     pISet->Put(SvxWeightItem(WEIGHT_BOLD, EE_CHAR_WEIGHT));
@@ -478,7 +478,7 @@ void SdDrawDocument::CreateLayoutTemplates()
     pSheet->SetHelpId( aHelpFile, HID_POOLSHEET_MEASURE );
     pISet = &pSheet->GetItemSet();
 
-    pISet->Put(XFillStyleItem(XFILL_NONE));
+    pISet->Put(XFillStyleItem(drawing::FillStyle_NONE));
     pISet->Put(XLineColorItem(OUString(), RGB_Color(COL_BLACK)));
 
     pISet->Put(SvxFontHeightItem(423, 100, EE_CHAR_FONTHEIGHT ));         // 12 pt
@@ -500,7 +500,7 @@ static Any implMakeSolidCellStyle( SdStyleSheetPool* pSSPool, const OUString& rN
     SfxStyleSheetBase* pSheet = &(pSSPool->Make(rName, SD_STYLE_FAMILY_CELL, SFXSTYLEBIT_AUTO));
     pSheet->SetParent(rParent);
     SfxItemSet* pISet = &pSheet->GetItemSet();
-    pISet->Put(XFillStyleItem(XFILL_SOLID));
+    pISet->Put(XFillStyleItem(drawing::FillStyle_SOLID));
     pISet->Put(XFillColorItem(OUString(), rColor));
 
     return Any( Reference< XStyle >( static_cast< XWeak* >( pSheet ), UNO_QUERY ) );
@@ -557,7 +557,7 @@ void SdDrawDocument::CreateDefaultCellStyles()
               aNullGrad.SetEndIntens( 100 );
     XHatch    aNullHatch(aNullCol);
 
-    rISet.Put(XFillStyleItem(XFILL_SOLID));
+    rISet.Put(XFillStyleItem(drawing::FillStyle_SOLID));
     rISet.Put(XFillColorItem(OUString(), RGB_Color(0x00ccccff)));
 
     Font aLatinFont, aCJKFont, aCTLFont;
diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx
index bfe91d37ceb9..a33bdccb4c85 100644
--- a/sd/source/core/sdpage.cxx
+++ b/sd/source/core/sdpage.cxx
@@ -232,9 +232,9 @@ void SdPage::EnsureMasterPageDefaultBackground()
         }
         else
         {
-            // no style found, assert and set at least XFILL_NONE
+            // no style found, assert and set at least drawing::FillStyle_NONE
             OSL_FAIL("No Style for MasterPageBackground fill found (!)");
-            getSdrPageProperties().PutItem(XFillStyleItem(XFILL_NONE));
+            getSdrPageProperties().PutItem(XFillStyleItem(drawing::FillStyle_NONE));
         }
     }
 }
diff --git a/sd/source/core/stlpool.cxx b/sd/source/core/stlpool.cxx
index 77e2e026400e..bee0b1efd394 100644
--- a/sd/source/core/stlpool.cxx
+++ b/sd/source/core/stlpool.cxx
@@ -66,6 +66,7 @@
 #include <svl/itemset.hxx>
 #include "app.hrc"
 
+using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::style;
@@ -252,7 +253,7 @@ void SdStyleSheetPool::CreateLayoutStyleSheets(const OUString& rLayoutName, bool
                 rSet.Put( SvxColorItem( Color(COL_AUTO), EE_CHAR_COLOR) );
                 rSet.Put( SvxBackgroundColorItem( Color (COL_AUTO), EE_CHAR_BKGCOLOR )  );
                 rSet.Put( XLineStyleItem(XLINE_NONE) );
-                rSet.Put( XFillStyleItem(XFILL_NONE) );
+                rSet.Put( XFillStyleItem(drawing::FillStyle_NONE) );
                 rSet.Put( SdrTextFitToSizeTypeItem(SDRTEXTFIT_AUTOFIT) );
                 rSet.Put( SdrTextAutoGrowHeightItem(false) );
                 // #i16874# enable kerning by default but only for new documents
@@ -346,7 +347,7 @@ void SdStyleSheetPool::CreateLayoutStyleSheets(const OUString& rLayoutName, bool
         pSheet->SetParent( OUString() );
         SfxItemSet& rTitleSet = pSheet->GetItemSet();
         rTitleSet.Put(XLineStyleItem(XLINE_NONE));
-        rTitleSet.Put(XFillStyleItem(XFILL_NONE));
+        rTitleSet.Put(XFillStyleItem(drawing::FillStyle_NONE));
         rTitleSet.Put(aSvxFontItem);
         rTitleSet.Put(aSvxFontItemCJK);
         rTitleSet.Put(aSvxFontItemCTL);
@@ -392,7 +393,7 @@ void SdStyleSheetPool::CreateLayoutStyleSheets(const OUString& rLayoutName, bool
         pSheet->SetParent( OUString() );
         SfxItemSet& rSubtitleSet = pSheet->GetItemSet();
         rSubtitleSet.Put(XLineStyleItem(XLINE_NONE));
-        rSubtitleSet.Put(XFillStyleItem(XFILL_NONE));
+        rSubtitleSet.Put(XFillStyleItem(drawing::FillStyle_NONE));
         rSubtitleSet.Put(aSvxFontItem);
         rSubtitleSet.Put(aSvxFontItemCJK);
         rSubtitleSet.Put(aSvxFontItemCTL);
@@ -441,7 +442,7 @@ void SdStyleSheetPool::CreateLayoutStyleSheets(const OUString& rLayoutName, bool
         pSheet->SetParent( OUString() );
         SfxItemSet& rNotesSet = pSheet->GetItemSet();
         rNotesSet.Put(XLineStyleItem(XLINE_NONE));
-        rNotesSet.Put(XFillStyleItem(XFILL_NONE));
+        rNotesSet.Put(XFillStyleItem(drawing::FillStyle_NONE));
         rNotesSet.Put(aSvxFontItem);
         rNotesSet.Put(aSvxFontItemCJK);
         rNotesSet.Put(aSvxFontItemCTL);
@@ -508,7 +509,7 @@ void SdStyleSheetPool::CreateLayoutStyleSheets(const OUString& rLayoutName, bool
         pSheet->SetParent( OUString() );
         SfxItemSet& rBackgroundSet = pSheet->GetItemSet();
         rBackgroundSet.Put(XLineStyleItem(XLINE_NONE));
-        rBackgroundSet.Put(XFillStyleItem(XFILL_NONE));
+        rBackgroundSet.Put(XFillStyleItem(drawing::FillStyle_NONE));
         // #i16874# enable kerning by default but only for new documents
         rBackgroundSet.Put( SvxAutoKernItem( true, EE_CHAR_PAIRKERNING ) );
     }
diff --git a/sd/source/filter/cgm/sdcgmfilter.cxx b/sd/source/filter/cgm/sdcgmfilter.cxx
index 1e4159023abb..eeb0107c353a 100644
--- a/sd/source/filter/cgm/sdcgmfilter.cxx
+++ b/sd/source/filter/cgm/sdcgmfilter.cxx
@@ -35,6 +35,7 @@
 
 #define CGM_BIG_ENDIAN      0x00020000
 
+using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::task;
 using namespace ::com::sun::star::frame;
@@ -98,7 +99,7 @@ bool SdCGMFilter::Import()
                     // set PageFill to given color
                     const Color aColor((sal_uInt8)(nRetValue >> 16), (sal_uInt8)(nRetValue >> 8), (sal_uInt8)(nRetValue >> 16));
                     pSdPage->getSdrPageProperties().PutItem(XFillColorItem(OUString(), aColor));
-                    pSdPage->getSdrPageProperties().PutItem(XFillStyleItem(XFILL_SOLID));
+                    pSdPage->getSdrPageProperties().PutItem(XFillStyleItem(drawing::FillStyle_SOLID));
                 }
             }
         }
diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx
index 82303cf9cded..e5e637721535 100644
--- a/sd/source/filter/ppt/pptin.cxx
+++ b/sd/source/filter/ppt/pptin.cxx
@@ -2564,10 +2564,10 @@ SdrObject* ImplSdPPTImport::ProcessObj( SvStream& rSt, DffObjData& rObjData, voi
                                         {
                                             const SfxItemSet& rObjItemSet = pObj->GetMergedItemSet();
 
-                                            XFillStyle eFillStyle = ((XFillStyleItem&)(rObjItemSet.Get(XATTR_FILLSTYLE))).GetValue();
+                                            drawing::FillStyle eFillStyle = ((XFillStyleItem&)(rObjItemSet.Get(XATTR_FILLSTYLE))).GetValue();
                                             XLineStyle eLineStyle = ((XLineStyleItem&)(rObjItemSet.Get(XATTR_LINESTYLE))).GetValue();
 
-                                            if ( ( eFillStyle == XFILL_NONE ) && ( eLineStyle == XLINE_NONE ) )
+                                            if ( ( eFillStyle == drawing::FillStyle_NONE ) && ( eLineStyle == XLINE_NONE ) )
                                                 bDontAnimateInvisibleShape = true;
                                         }
                                     }
diff --git a/sd/source/ui/animations/motionpathtag.cxx b/sd/source/ui/animations/motionpathtag.cxx
index 29ecd77b1f81..19b3f5ac0716 100644
--- a/sd/source/ui/animations/motionpathtag.cxx
+++ b/sd/source/ui/animations/motionpathtag.cxx
@@ -57,6 +57,7 @@
 #include <svx/sdr/overlay/overlayprimitive2dsequenceobject.hxx>
 
 using ::sdr::PolyPolygonEditor;
+using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::util;
@@ -360,7 +361,7 @@ MotionPathTag::MotionPathTag( CustomAnimationPane& rPane, ::sd::View& rView, con
     mpPathObj->SetMergedItem( XLineDashItem( aEmpty, aDash ) );
     mpPathObj->SetMergedItem( XLineStyleItem( XLINE_DASH ) );
     mpPathObj->SetMergedItem( XLineColorItem(aEmpty, ::Color(COL_GRAY)) );
-    mpPathObj->SetMergedItem( XFillStyleItem( XFILL_NONE ) );
+    mpPathObj->SetMergedItem( XFillStyleItem( drawing::FillStyle_NONE ) );
 
     ::basegfx::B2DPolygon aStartArrow;
     aStartArrow.append(::basegfx::B2DPoint(20.0, 0.0));
diff --git a/sd/source/ui/dlg/morphdlg.cxx b/sd/source/ui/dlg/morphdlg.cxx
index efe77093e9c4..f8895e2efb71 100644
--- a/sd/source/ui/dlg/morphdlg.cxx
+++ b/sd/source/ui/dlg/morphdlg.cxx
@@ -30,6 +30,8 @@
 #include <svl/itemset.hxx>
 #include <svl/itempool.hxx>
 
+using namespace com::sun::star;
+
 namespace sd {
 
 MorphDlg::MorphDlg( ::Window* pParent, const SdrObject* pObj1, const SdrObject* pObj2 )
@@ -51,11 +53,11 @@ MorphDlg::MorphDlg( ::Window* pParent, const SdrObject* pObj1, const SdrObject*
 
     const XLineStyle    eLineStyle1 = ( (const XLineStyleItem&) aSet1.Get( XATTR_LINESTYLE ) ).GetValue();
     const XLineStyle    eLineStyle2 = ( (const XLineStyleItem&) aSet2.Get( XATTR_LINESTYLE ) ).GetValue();
-    const XFillStyle    eFillStyle1 = ( (const XFillStyleItem&) aSet1.Get( XATTR_FILLSTYLE ) ).GetValue();
-    const XFillStyle    eFillStyle2 = ( (const XFillStyleItem&) aSet2.Get( XATTR_FILLSTYLE ) ).GetValue();
+    const drawing::FillStyle eFillStyle1 = ( (const XFillStyleItem&) aSet1.Get( XATTR_FILLSTYLE ) ).GetValue();
+    const drawing::FillStyle eFillStyle2 = ( (const XFillStyleItem&) aSet2.Get( XATTR_FILLSTYLE ) ).GetValue();
 
     if ( ( ( eLineStyle1 == XLINE_NONE ) || ( eLineStyle2 == XLINE_NONE ) ) &&
-         ( ( eFillStyle1 != XFILL_SOLID ) || ( eFillStyle2 != XFILL_SOLID ) ) )
+         ( ( eFillStyle1 != drawing::FillStyle_SOLID ) || ( eFillStyle2 != drawing::FillStyle_SOLID ) ) )
     {
         m_pCbxAttributes->Disable();
     }
diff --git a/sd/source/ui/func/fuconarc.cxx b/sd/source/ui/func/fuconarc.cxx
index b044b454bc13..461eee36dec9 100644
--- a/sd/source/ui/func/fuconarc.cxx
+++ b/sd/source/ui/func/fuconarc.cxx
@@ -41,6 +41,8 @@
 
 #include <svx/sxciaitm.hxx>
 
+using namespace com::sun::star;
+
 namespace sd {
 
 TYPEINIT1( FuConstructArc, FuConstruct );
@@ -251,7 +253,7 @@ SdrObject* FuConstructArc::CreateDefaultObject(const sal_uInt16 nID, const Recta
                 SID_DRAW_ELLIPSECUT_NOFILL == nID ||
                 SID_DRAW_CIRCLECUT_NOFILL == nID)
             {
-                aAttr.Put(XFillStyleItem(XFILL_NONE));
+                aAttr.Put(XFillStyleItem(drawing::FillStyle_NONE));
             }
 
             pObj->SetMergedItemSet(aAttr);
diff --git a/sd/source/ui/func/fuconstr.cxx b/sd/source/ui/func/fuconstr.cxx
index b77aad877b74..8a16803424af 100644
--- a/sd/source/ui/func/fuconstr.cxx
+++ b/sd/source/ui/func/fuconstr.cxx
@@ -40,6 +40,8 @@
 #include "stlpool.hxx"
 #include <svx/globl3d.hxx>
 
+using namespace com::sun::star;
+
 namespace sd {
 
 TYPEINIT1( FuConstruct, FuDraw );
@@ -348,13 +350,13 @@ void FuConstruct::SetStyleSheet( SfxItemSet& rAttr, SdrObject* pObj,
             const XFillStyleItem& rFillStyle = (const XFillStyleItem&)rSet.Get(XATTR_FILLSTYLE);
             if ( bForceFillStyle )
             {
-                if (rFillStyle.GetValue() == XFILL_NONE)
-                    rAttr.Put(XFillStyleItem(XFILL_SOLID));
+                if (rFillStyle.GetValue() == drawing::FillStyle_NONE)
+                    rAttr.Put(XFillStyleItem(drawing::FillStyle_SOLID));
             }
             else if ( bForceNoFillStyle )
             {
-                if (rFillStyle.GetValue() != XFILL_NONE)
-                    rAttr.Put(XFillStyleItem(XFILL_NONE));
+                if (rFillStyle.GetValue() != drawing::FillStyle_NONE)
+                    rAttr.Put(XFillStyleItem(drawing::FillStyle_NONE));
             }
         }
     }
@@ -380,7 +382,7 @@ void FuConstruct::SetStyleSheet( SfxItemSet& rAttr, SdrObject* pObj,
             else
             {
                 SfxItemSet aAttr(*mpView->GetDefaultAttr().Clone());
-                rAttr.Put(XFillStyleItem(XFILL_NONE));
+                rAttr.Put(XFillStyleItem(drawing::FillStyle_NONE));
                 pObj->SetMergedItemSet(aAttr);
             }
         }
diff --git a/sd/source/ui/func/fucopy.cxx b/sd/source/ui/func/fucopy.cxx
index 800ce2f78be8..a93d7ded0d6f 100644
--- a/sd/source/ui/func/fucopy.cxx
+++ b/sd/source/ui/func/fucopy.cxx
@@ -40,6 +40,8 @@
 #include "sdabstdlg.hxx"
 #include <boost/scoped_ptr.hpp>
 
+using namespace com::sun::star;
+
 namespace sd {
 
 TYPEINIT1( FuCopy, FuPoor );
@@ -84,9 +86,9 @@ void FuCopy::DoExecute( SfxRequest& rReq )
 
             if( SFX_ITEM_SET == aAttr.GetItemState( XATTR_FILLSTYLE, true, &pPoolItem ) )
             {
-                XFillStyle eStyle = ( ( const XFillStyleItem* ) pPoolItem )->GetValue();
+                drawing::FillStyle eStyle = ( ( const XFillStyleItem* ) pPoolItem )->GetValue();
 
-                if( eStyle == XFILL_SOLID &&
+                if( eStyle == drawing::FillStyle_SOLID &&
                     SFX_ITEM_SET == aAttr.GetItemState( XATTR_FILLCOLOR, true, &pPoolItem ) )
                 {
                     const XFillColorItem* pItem = ( const XFillColorItem* ) pPoolItem;
@@ -209,7 +211,7 @@ void FuCopy::DoExecute( SfxRequest& rReq )
             if( ( 1 == i ) && bColor )
             {
                 SfxItemSet aNewSet( mpViewShell->GetPool(), XATTR_FILLSTYLE, XATTR_FILLCOLOR, 0L );
-                aNewSet.Put( XFillStyleItem( XFILL_SOLID ) );
+                aNewSet.Put( XFillStyleItem( drawing::FillStyle_SOLID ) );
                 aNewSet.Put( XFillColorItem( OUString(), aStartColor ) );
                 mpView->SetAttributes( aNewSet );
             }
@@ -271,7 +273,7 @@ void FuCopy::DoExecute( SfxRequest& rReq )
                 sal_uInt8 nBlue = aStartColor.GetBlue() + (sal_uInt8) ( ( (long) aEndColor.GetBlue() - (long) aStartColor.GetBlue() ) * (long) i / (long) nNumber );
                 Color aNewColor( nRed, nGreen, nBlue );
                 SfxItemSet aNewSet( mpViewShell->GetPool(), XATTR_FILLSTYLE, XATTR_FILLCOLOR, 0L );
-                aNewSet.Put( XFillStyleItem( XFILL_SOLID ) );
+                aNewSet.Put( XFillStyleItem( drawing::FillStyle_SOLID ) );
                 aNewSet.Put( XFillColorItem( OUString(), aNewColor ) );
                 mpView->SetAttributes( aNewSet );
             }
diff --git a/sd/source/ui/func/fuexpand.cxx b/sd/source/ui/func/fuexpand.cxx
index 1c058089d46f..83cc83713cf9 100644
--- a/sd/source/ui/func/fuexpand.cxx
+++ b/sd/source/ui/func/fuexpand.cxx
@@ -43,6 +43,8 @@
 #include <sfx2/dispatch.hxx>
 #include <editeng/eeitem.hxx>
 
+using namespace com::sun::star;
+
 namespace sd {
 
 TYPEINIT1( FuExpandPage, FuPoor );
@@ -238,7 +240,7 @@ void FuExpandPage::DoExecute( SfxRequest& )
                         // remove hard attributes (Flag to sal_True)
                         SfxItemSet aAttr(mpDoc->GetPool());
                         aAttr.Put(XLineStyleItem(XLINE_NONE));
-                        aAttr.Put(XFillStyleItem(XFILL_NONE));
+                        aAttr.Put(XFillStyleItem(drawing::FillStyle_NONE));
                         pOutlineObj->SetMergedItemSet(aAttr);
                     }
                 }
diff --git a/sd/source/ui/func/fumorph.cxx b/sd/source/ui/func/fumorph.cxx
index 799ceb7f1a48..5aa763ab8864 100644
--- a/sd/source/ui/func/fumorph.cxx
+++ b/sd/source/ui/func/fumorph.cxx
@@ -45,6 +45,8 @@
 #include <basegfx/color/bcolor.hxx>
 #include <boost/scoped_ptr.hpp>
 
+using namespace com::sun::star;
+
 namespace sd {
 
 #define  ITEMVALUE( ItemSet, Id, Cast ) ( ( (const Cast&) (ItemSet).Get( (Id) ) ).GetValue() )
@@ -354,8 +356,8 @@ void FuMorph::ImpInsertPolygons(
 
     const XLineStyle eLineStyle1 = ITEMVALUE( aSet1, XATTR_LINESTYLE, XLineStyleItem );
     const XLineStyle eLineStyle2 = ITEMVALUE( aSet2, XATTR_LINESTYLE, XLineStyleItem );
-    const XFillStyle eFillStyle1 = ITEMVALUE( aSet1, XATTR_FILLSTYLE, XFillStyleItem );
-    const XFillStyle eFillStyle2 = ITEMVALUE( aSet2, XATTR_FILLSTYLE, XFillStyleItem );
+    const drawing::FillStyle eFillStyle1 = ITEMVALUE( aSet1, XATTR_FILLSTYLE, XFillStyleItem );
+    const drawing::FillStyle eFillStyle2 = ITEMVALUE( aSet2, XATTR_FILLSTYLE, XFillStyleItem );
 
     if ( bAttributeFade )
     {
@@ -374,7 +376,7 @@ void FuMorph::ImpInsertPolygons(
         else if ( ( eLineStyle1 == XLINE_NONE ) && ( eLineStyle2 == XLINE_NONE ) )
             bIgnoreLine = true;
 
-        if ( ( eFillStyle1 == XFILL_SOLID ) && ( eFillStyle2 == XFILL_SOLID ) )
+        if ( ( eFillStyle1 == drawing::FillStyle_SOLID ) && ( eFillStyle2 == drawing::FillStyle_SOLID ) )
         {
             bFillColor = true;
             aStartFillCol = static_cast< XFillColorItem const & >(
@@ -382,7 +384,7 @@ void FuMorph::ImpInsertPolygons(
             aEndFillCol = static_cast< XFillColorItem const & >(
                 aSet2.Get(XATTR_FILLCOLOR)).GetColorValue();
         }
-        else if ( ( eFillStyle1 == XFILL_NONE ) && ( eFillStyle2 == XFILL_NONE ) )
+        else if ( ( eFillStyle1 == drawing::FillStyle_NONE ) && ( eFillStyle2 == drawing::FillStyle_NONE ) )
             bIgnoreFill = true;
     }
 
@@ -397,7 +399,7 @@ void FuMorph::ImpInsertPolygons(
         double          fFactor = fStep;
 
         aSet.Put( XLineStyleItem( XLINE_SOLID ) );
-        aSet.Put( XFillStyleItem( XFILL_SOLID ) );
+        aSet.Put( XFillStyleItem( drawing::FillStyle_SOLID ) );
 
         for ( size_t i = 0; i < nCount; i++, fFactor += fStep )
         {
@@ -420,7 +422,7 @@ void FuMorph::ImpInsertPolygons(
                 aSet.Put( XFillColorItem( aEmptyStr, Color(aFillColor)));
             }
             else if ( bIgnoreFill )
-                aSet.Put( XFillStyleItem( XFILL_NONE ) );
+                aSet.Put( XFillStyleItem( drawing::FillStyle_NONE ) );
 
             // line width
             if ( bLineWidth )
diff --git a/sd/source/ui/func/fupage.cxx b/sd/source/ui/func/fupage.cxx
index 3337c8e276c1..bd11ce897861 100644
--- a/sd/source/ui/func/fupage.cxx
+++ b/sd/source/ui/func/fupage.cxx
@@ -69,6 +69,8 @@
 
 #include <boost/scoped_ptr.hpp>
 
+using namespace com::sun::star;
+
 namespace sd {
 
 class Window;
@@ -255,7 +257,7 @@ const SfxItemSet* FuPage::ExecuteDialog( Window* pParent )
             // Only this page, get attributes for background fill
             const SfxItemSet& rBackgroundAttributes = mpPage->getSdrPageProperties().GetItemSet();
 
-            if(XFILL_NONE != ((const XFillStyleItem&)rBackgroundAttributes.Get(XATTR_FILLSTYLE)).GetValue())
+            if(drawing::FillStyle_NONE != ((const XFillStyleItem&)rBackgroundAttributes.Get(XATTR_FILLSTYLE)).GetValue())
             {
                 // page attributes are used, take them
                 aMergedAttr.Put(rBackgroundAttributes);
@@ -263,7 +265,7 @@ const SfxItemSet* FuPage::ExecuteDialog( Window* pParent )
             else
             {
                 if(pStyleSheet
-                    && XFILL_NONE != ((const XFillStyleItem&)pStyleSheet->GetItemSet().Get(XATTR_FILLSTYLE)).GetValue())
+                    && drawing::FillStyle_NONE != ((const XFillStyleItem&)pStyleSheet->GetItemSet().Get(XATTR_FILLSTYLE)).GetValue())
                 {
                     // if the page has no fill style, use the settings from the
                     // background stylesheet (if used)
@@ -272,7 +274,7 @@ const SfxItemSet* FuPage::ExecuteDialog( Window* pParent )
                 else
                 {
                     // no fill style from page, start with no fill style
-                    aMergedAttr.Put(XFillStyleItem(XFILL_NONE));
+                    aMergedAttr.Put(XFillStyleItem(drawing::FillStyle_NONE));
                 }
             }
         }
@@ -292,7 +294,7 @@ const SfxItemSet* FuPage::ExecuteDialog( Window* pParent )
             {
                 pTempSet.reset( new SfxItemSet( mpDoc->GetPool(), XATTR_FILL_FIRST, XATTR_FILL_LAST, 0) );
 
-                pTempSet->Put( XFillStyleItem( XFILL_BITMAP ) );
+                pTempSet->Put( XFillStyleItem( drawing::FillStyle_BITMAP ) );
 
                 // MigrateItemSet makes sure the XFillBitmapItem will have a unique name
                 SfxItemSet aMigrateSet( mpDoc->GetPool(), XATTR_FILLBITMAP, XATTR_FILLBITMAP );
@@ -335,9 +337,9 @@ const SfxItemSet* FuPage::ExecuteDialog( Window* pParent )
             }
 
             // if the background for this page was set to invisible, the background-object has to be deleted, too.
-            if( ( ( (XFillStyleItem*) pTempSet->GetItem( XATTR_FILLSTYLE ) )->GetValue() == XFILL_NONE ) ||
+            if( ( ( (XFillStyleItem*) pTempSet->GetItem( XATTR_FILLSTYLE ) )->GetValue() == drawing::FillStyle_NONE ) ||
                 ( ( pTempSet->GetItemState( XATTR_FILLSTYLE ) == SFX_ITEM_DEFAULT ) &&
-                    ( ( (XFillStyleItem*) aMergedAttr.GetItem( XATTR_FILLSTYLE ) )->GetValue() == XFILL_NONE ) ) )
+                    ( ( (XFillStyleItem*) aMergedAttr.GetItem( XATTR_FILLSTYLE ) )->GetValue() == drawing::FillStyle_NONE ) ) )
                 mbPageBckgrdDeleted = true;
 
             bool bSetToAllPages = false;
@@ -370,7 +372,7 @@ const SfxItemSet* FuPage::ExecuteDialog( Window* pParent )
                         rPageProperties.ClearItem( XATTR_FILLBITMAP );
                         rPageProperties.ClearItem( XATTR_FILLGRADIENT );
                         rPageProperties.ClearItem( XATTR_FILLHATCH );
-                        rPageProperties.PutItem(XFillStyleItem(XFILL_NONE));
+                        rPageProperties.PutItem(XFillStyleItem(drawing::FillStyle_NONE));
                     }
                 }
             }
@@ -418,7 +420,7 @@ const SfxItemSet* FuPage::ExecuteDialog( Window* pParent )
                     SdPage *pPage = mpDoc->GetSdPage(i, ePageKind);
 
                     const SfxItemSet& rFillAttributes = pPage->getSdrPageProperties().GetItemSet();
-                       if(XFILL_NONE != ((const XFillStyleItem&)rFillAttributes.Get(XATTR_FILLSTYLE)).GetValue())
+                       if(drawing::FillStyle_NONE != ((const XFillStyleItem&)rFillAttributes.Get(XATTR_FILLSTYLE)).GetValue())
                     {
                         SdBackgroundObjUndoAction *pBackgroundObjUndoAction = new SdBackgroundObjUndoAction(*mpDoc, *pPage, rFillAttributes);
                         pUndoGroup->AddAction(pBackgroundObjUndoAction);
@@ -427,7 +429,7 @@ const SfxItemSet* FuPage::ExecuteDialog( Window* pParent )
                         rPageProperties.ClearItem( XATTR_FILLBITMAP );
                         rPageProperties.ClearItem( XATTR_FILLGRADIENT );
                         rPageProperties.ClearItem( XATTR_FILLHATCH );
-                        rPageProperties.PutItem(XFillStyleItem(XFILL_NONE));
+                        rPageProperties.PutItem(XFillStyleItem(drawing::FillStyle_NONE));
 
                         pPage->ActionChanged();
                     }
@@ -445,7 +447,7 @@ const SfxItemSet* FuPage::ExecuteDialog( Window* pParent )
                 {
                     pTempSet->ClearItem( nWhich );
                 }
-                pTempSet->Put(XFillStyleItem(XFILL_NONE));
+                pTempSet->Put(XFillStyleItem(drawing::FillStyle_NONE));
             }
 
             const SfxPoolItem *pItem;
diff --git a/sd/source/ui/func/fusel.cxx b/sd/source/ui/func/fusel.cxx
index cc0031723afd..6347f5189778 100644
--- a/sd/source/ui/func/fusel.cxx
+++ b/sd/source/ui/func/fusel.cxx
@@ -1198,7 +1198,7 @@ bool FuSelection::AnimateObj(SdrObject* pObj, const Point& rPos)
         aSet.Put(pObj->GetMergedItemSet());
 
         const XFillStyleItem& rFillStyle = (const XFillStyleItem&) aSet.Get(XATTR_FILLSTYLE);
-        bFilled = rFillStyle.GetValue() != XFILL_NONE;
+        bFilled = rFillStyle.GetValue() != drawing::FillStyle_NONE;
     }
 
     const SetOfByte* pVisiLayer = &mpView->GetSdrPageView()->GetVisibleLayers();
diff --git a/sd/source/ui/func/fusumry.cxx b/sd/source/ui/func/fusumry.cxx
index 4789946d578f..da0a333c7539 100644
--- a/sd/source/ui/func/fusumry.cxx
+++ b/sd/source/ui/func/fusumry.cxx
@@ -38,6 +38,8 @@
 #include "optsitem.hxx"
 #include "DrawViewShell.hxx"
 
+using namespace com::sun::star;
+
 namespace sd {
 
 TYPEINIT1( FuSummaryPage, FuPoor );
@@ -209,7 +211,7 @@ void FuSummaryPage::DoExecute( SfxRequest& )
     // remove hard attributes (Flag to sal_True)
     SfxItemSet aAttr(mpDoc->GetPool());
     aAttr.Put(XLineStyleItem(XLINE_NONE));
-    aAttr.Put(XFillStyleItem(XFILL_NONE));
+    aAttr.Put(XFillStyleItem(drawing::FillStyle_NONE));
     pTextObj->SetMergedItemSet(aAttr);
 
     if( bBegUndo )
diff --git a/sd/source/ui/sidebar/DocumentHelper.cxx b/sd/source/ui/sidebar/DocumentHelper.cxx
index 0b59b8330edf..3b0cc0969be7 100644
--- a/sd/source/ui/sidebar/DocumentHelper.cxx
+++ b/sd/source/ui/sidebar/DocumentHelper.cxx
@@ -418,7 +418,7 @@ void DocumentHelper::AssignMasterPageToPage (
             new SdBackgroundObjUndoAction(
                 *pDocument, *pPage, pPage->getSdrPageProperties().GetItemSet()),
             true);
-        pPage->getSdrPageProperties().PutItem(XFillStyleItem(XFILL_NONE));
+        pPage->getSdrPageProperties().PutItem(XFillStyleItem(drawing::FillStyle_NONE));
 
         pDocument->SetMasterPage (
             (pPage->GetPageNum()-1)/2,
diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx
index c0184896f2e8..074485519c34 100644
--- a/sd/source/ui/unoidl/unopage.cxx
+++ b/sd/source/ui/unoidl/unopage.cxx
@@ -2476,8 +2476,8 @@ void SdDrawPage::setBackground( const Any& rValue )
 
     if( !xSet.is() )
     {
-        // the easy case, no background set. Set XFILL_NONE to represent this
-        GetPage()->getSdrPageProperties().PutItem(XFillStyleItem(XFILL_NONE));
+        // the easy case, no background set. Set drawing::FillStyle_NONE to represent this
+        GetPage()->getSdrPageProperties().PutItem(XFillStyleItem(drawing::FillStyle_NONE));
         return;
     }
 
@@ -2517,8 +2517,8 @@ void SdDrawPage::setBackground( const Any& rValue )
 
     if( aSet.Count() == 0 )
     {
-        // no background fill, represent by setting XFILL_NONE
-        GetPage()->getSdrPageProperties().PutItem(XFillStyleItem(XFILL_NONE));
+        // no background fill, represent by setting drawing::FillStyle_NONE
+        GetPage()->getSdrPageProperties().PutItem(XFillStyleItem(drawing::FillStyle_NONE));
     }
     else
     {
@@ -2556,9 +2556,9 @@ void SdDrawPage::getBackground( Any& rValue ) throw()
 {
     const SfxItemSet& rFillAttributes = GetPage()->getSdrPageProperties().GetItemSet();
 
-       if(XFILL_NONE == ((const XFillStyleItem&)rFillAttributes.Get(XATTR_FILLSTYLE)).GetValue())
+       if(drawing::FillStyle_NONE == ((const XFillStyleItem&)rFillAttributes.Get(XATTR_FILLSTYLE)).GetValue())
     {
-        // no fill set (switched off by XFILL_NONE), clear rValue to represent this
+        // no fill set (switched off by drawing::FillStyle_NONE), clear rValue to represent this
         rValue.clear();
     }
     else
@@ -2976,7 +2976,7 @@ void SdMasterPage::getBackground( Any& rValue ) throw()
             // should NOT happen and is an error
             const SfxItemSet& rFallbackItemSet(SvxFmDrawPage::mpPage->getSdrPageProperties().GetItemSet());
 
-            if(XFILL_NONE == ((const XFillStyleItem&)rFallbackItemSet.Get(XATTR_FILLSTYLE)).GetValue())
+            if(drawing::FillStyle_NONE == ((const XFillStyleItem&)rFallbackItemSet.Get(XATTR_FILLSTYLE)).GetValue())
             {
                 rValue <<= Reference< beans::XPropertySet >(
                     new SdUnoPageBackground(GetModel()->GetDoc(), &rFallbackItemSet));
diff --git a/sd/source/ui/view/drviews9.cxx b/sd/source/ui/view/drviews9.cxx
index 76075ee56188..11912682007d 100644
--- a/sd/source/ui/view/drviews9.cxx
+++ b/sd/source/ui/view/drviews9.cxx
@@ -59,6 +59,8 @@
 #include <com/sun/star/gallery/GalleryItemType.hpp>
 #include <boost/scoped_ptr.hpp>
 
+using namespace com::sun::star;
+
 namespace sd {
 
 void DrawViewShell::ExecGallery(SfxRequest& rReq)
@@ -215,10 +217,10 @@ void DrawViewShell::AttrExec (SfxRequest &rReq)
                 if (pArgs->Count () == 1)
                 {
                     SFX_REQUEST_ARG (rReq, pFillStyle, SfxUInt32Item, ID_VAL_STYLE, false);
-                    if (CHECK_RANGE (XFILL_NONE, (sal_Int32)pFillStyle->GetValue (), XFILL_BITMAP))
+                    if (CHECK_RANGE (drawing::FillStyle_NONE, (sal_Int32)pFillStyle->GetValue (), drawing::FillStyle_BITMAP))
                     {
                         pAttr->ClearItem (XATTR_FILLSTYLE);
-                        pAttr->Put (XFillStyleItem ((XFillStyle) pFillStyle->GetValue ()), XATTR_FILLSTYLE);
+                        pAttr->Put (XFillStyleItem ((drawing::FillStyle) pFillStyle->GetValue ()), XATTR_FILLSTYLE);
                         rBindings.Invalidate (SID_ATTR_FILL_STYLE);
                     }
 #ifndef DISABLE_SCRIPTING
@@ -283,7 +285,7 @@ void DrawViewShell::AttrExec (SfxRequest &rReq)
                                                            (sal_uInt8) pGreen->GetValue (),
                                                            (sal_uInt8) pBlue->GetValue ())),
                                 XATTR_FILLCOLOR);
-                    pAttr->Put (XFillStyleItem (XFILL_SOLID), XATTR_FILLSTYLE);
+                    pAttr->Put (XFillStyleItem (drawing::FillStyle_SOLID), XATTR_FILLSTYLE);
                     rBindings.Invalidate (SID_ATTR_FILL_COLOR);
                     rBindings.Invalidate (SID_ATTR_FILL_STYLE);
                     break;
@@ -345,7 +347,7 @@ void DrawViewShell::AttrExec (SfxRequest &rReq)
                             if (rReq.GetSlot () == SID_SETGRADSTARTCOLOR) aGradient.SetStartColor (aColor);
                             else aGradient.SetEndColor (aColor);
 
-                            pAttr->Put (XFillStyleItem (XFILL_GRADIENT), XATTR_FILLSTYLE);
+                            pAttr->Put (XFillStyleItem (drawing::FillStyle_GRADIENT), XATTR_FILLSTYLE);
                             pAttr->Put (XFillGradientItem (pName->GetValue (), aGradient), XATTR_FILLGRADIENT);
                             break;
                         }
@@ -363,7 +365,7 @@ void DrawViewShell::AttrExec (SfxRequest &rReq)
 
                         GetDoc()->GetGradientList ()->Insert (new XGradientEntry (aGradient, pName->GetValue ()));
 
-                        pAttr->Put (XFillStyleItem (XFILL_GRADIENT), XATTR_FILLSTYLE);
+                        pAttr->Put (XFillStyleItem (drawing::FillStyle_GRADIENT), XATTR_FILLSTYLE);
                         pAttr->Put (XFillGradientItem (pName->GetValue (), aGradient), XATTR_FILLGRADIENT);
                     }
 
@@ -405,7 +407,7 @@ void DrawViewShell::AttrExec (SfxRequest &rReq)
 
                             aHatch.SetColor (aColor);
 
-                            pAttr->Put (XFillStyleItem (XFILL_HATCH), XATTR_FILLSTYLE);
+                            pAttr->Put (XFillStyleItem (drawing::FillStyle_HATCH), XATTR_FILLSTYLE);
                             pAttr->Put (XFillHatchItem (pName->GetValue (), aHatch), XATTR_FILLHATCH);
                             break;
                         }
@@ -417,7 +419,7 @@ void DrawViewShell::AttrExec (SfxRequest &rReq)
 
                         GetDoc()->GetHatchList ()->Insert (new XHatchEntry (aHatch, pName->GetValue ()));
 
-                        pAttr->Put (XFillStyleItem (XFILL_HATCH), XATTR_FILLSTYLE);
+                        pAttr->Put (XFillStyleItem (drawing::FillStyle_HATCH), XATTR_FILLSTYLE);
                         pAttr->Put (XFillHatchItem (pName->GetValue (), aHatch), XATTR_FILLHATCH);
                     }
 
@@ -525,7 +527,7 @@ void DrawViewShell::AttrExec (SfxRequest &rReq)
                                 aGradient.SetStartIntens ((short) pStart->GetValue ());
                                 aGradient.SetEndIntens ((short) pEnd->GetValue ());
 
-                                pAttr->Put (XFillStyleItem (XFILL_GRADIENT), XATTR_FILLSTYLE);
+                                pAttr->Put (XFillStyleItem (drawing::FillStyle_GRADIENT), XATTR_FILLSTYLE);
                                 pAttr->Put (XFillGradientItem (pName->GetValue (), aGradient), XATTR_FILLGRADIENT);
                                 break;
                             }
@@ -540,7 +542,7 @@ void DrawViewShell::AttrExec (SfxRequest &rReq)
                                                  (short) pStart->GetValue (), (short) pEnd->GetValue ());
 
                             pGradientList->Insert (new XGradientEntry (aGradient, pName->GetValue ()));
-                            pAttr->Put (XFillStyleItem (XFILL_GRADIENT), XATTR_FILLSTYLE);
+                            pAttr->Put (XFillStyleItem (drawing::FillStyle_GRADIENT), XATTR_FILLSTYLE);
                             pAttr->Put (XFillGradientItem (pName->GetValue (), aGradient), XATTR_FILLGRADIENT);
                         }
 
@@ -589,7 +591,7 @@ void DrawViewShell::AttrExec (SfxRequest &rReq)
                                 aHatch.SetDistance (pDistance->GetValue ());
                                 aHatch.SetAngle (pAngle->GetValue () * 10);
 
-                                pAttr->Put (XFillStyleItem (XFILL_HATCH), XATTR_FILLSTYLE);
+                                pAttr->Put (XFillStyleItem (drawing::FillStyle_HATCH), XATTR_FILLSTYLE);
                                 pAttr->Put (XFillHatchItem (pName->GetValue (), aHatch), XATTR_FILLHATCH);
                                 break;
                             }
@@ -602,7 +604,7 @@ void DrawViewShell::AttrExec (SfxRequest &rReq)
                                            pAngle->GetValue () * 10);
 
                             pHatchList->Insert (new XHatchEntry (aHatch, pName->GetValue ()));
-                            pAttr->Put (XFillStyleItem (XFILL_HATCH), XATTR_FILLSTYLE);
+                            pAttr->Put (XFillStyleItem (drawing::FillStyle_HATCH), XATTR_FILLSTYLE);
                             pAttr->Put (XFillHatchItem (pName->GetValue (), aHatch), XATTR_FILLHATCH);
                         }
 
@@ -638,7 +640,7 @@ void DrawViewShell::AttrExec (SfxRequest &rReq)
                         {
                             pAttr->ClearItem (XATTR_FILLGRADIENT);
                             pAttr->ClearItem (XATTR_FILLSTYLE);
-                            pAttr->Put (XFillStyleItem (XFILL_GRADIENT), XATTR_FILLSTYLE);
+                            pAttr->Put (XFillStyleItem (drawing::FillStyle_GRADIENT), XATTR_FILLSTYLE);
                             pAttr->Put (XFillGradientItem (pName->GetValue (), pEntry->GetGradient ()), XATTR_FILLGRADIENT);
 
                             rBindings.Invalidate (SID_ATTR_FILL_GRADIENT);
@@ -673,7 +675,7 @@ void DrawViewShell::AttrExec (SfxRequest &rReq)
                         {
                             pAttr->ClearItem (XATTR_FILLHATCH);
                             pAttr->ClearItem (XATTR_FILLSTYLE);
-                            pAttr->Put (XFillStyleItem (XFILL_HATCH), XATTR_FILLSTYLE);
+                            pAttr->Put (XFillStyleItem (drawing::FillStyle_HATCH), XATTR_FILLSTYLE);
                             pAttr->Put (XFillHatchItem (pName->GetValue (), pEntry->GetHatch ()), XATTR_FILLHATCH);
 
                             rBindings.Invalidate (SID_ATTR_FILL_HATCH);
diff --git a/sd/source/ui/view/drviewsi.cxx b/sd/source/ui/view/drviewsi.cxx
index c87934adf35d..73ce8d718f09 100644
--- a/sd/source/ui/view/drviewsi.cxx
+++ b/sd/source/ui/view/drviewsi.cxx
@@ -144,9 +144,9 @@ void DrawViewShell::AssignFrom3DWindow()
 
                     // Determine if a FILL attribute is set.
                     // If not, hard set a fill attribute
-                    XFillStyle eFillStyle = ITEMVALUE( aSet, XATTR_FILLSTYLE, XFillStyleItem );
-                    if(eFillStyle == XFILL_NONE)
-                        aSet.Put(XFillStyleItem (XFILL_SOLID));
+                    drawing::FillStyle eFillStyle = ITEMVALUE( aSet, XATTR_FILLSTYLE, XFillStyleItem );
+                    if(eFillStyle == drawing::FillStyle_NONE)
+                        aSet.Put(XFillStyleItem (drawing::FillStyle_SOLID));
 
                     // remove some 3DSCENE attributes since these were
                     // created by convert to 3D and may not be changed
diff --git a/sd/source/ui/view/sdview.cxx b/sd/source/ui/view/sdview.cxx
index 3828c82ad752..ebd7b0fbc21c 100644
--- a/sd/source/ui/view/sdview.cxx
+++ b/sd/source/ui/view/sdview.cxx
@@ -990,11 +990,11 @@ bool View::IsMorphingAllowed() const
             aSet1.Put(pObj1->GetMergedItemSet());
             aSet2.Put(pObj2->GetMergedItemSet());
 
-            const XFillStyle    eFillStyle1 = ( (const XFillStyleItem&) aSet1.Get( XATTR_FILLSTYLE ) ).GetValue();
-            const XFillStyle    eFillStyle2 = ( (const XFillStyleItem&) aSet2.Get( XATTR_FILLSTYLE ) ).GetValue();
+            const drawing::FillStyle eFillStyle1 = ( (const XFillStyleItem&) aSet1.Get( XATTR_FILLSTYLE ) ).GetValue();
+            const drawing::FillStyle eFillStyle2 = ( (const XFillStyleItem&) aSet2.Get( XATTR_FILLSTYLE ) ).GetValue();
 
-            if( ( eFillStyle1 == XFILL_NONE || eFillStyle1 == XFILL_SOLID ) &&
-                ( eFillStyle2 == XFILL_NONE || eFillStyle2 == XFILL_SOLID ) )
+            if( ( eFillStyle1 == drawing::FillStyle_NONE || eFillStyle1 == drawing::FillStyle_SOLID ) &&
+                ( eFillStyle2 == drawing::FillStyle_NONE || eFillStyle2 == drawing::FillStyle_SOLID ) )
                 bRet = true;
         }
     }
diff --git a/sd/source/ui/view/sdview3.cxx b/sd/source/ui/view/sdview3.cxx
index 47f962c50557..163970e20736 100644
--- a/sd/source/ui/view/sdview3.cxx
+++ b/sd/source/ui/view/sdview3.cxx
@@ -761,7 +761,7 @@ bool View::InsertData( const TransferableDataHelper& rDataHelper,
                             {
                                 // If we have a graphic as source object, use it's graphic
                                 // content as fill style
-                                aSet.Put(XFillStyleItem(XFILL_BITMAP));
+                                aSet.Put(XFillStyleItem(drawing::FillStyle_BITMAP));
                                 aSet.Put(XFillBitmapItem(&mrDoc.GetPool(), pSdrGrafObj->GetGraphic()));
                             }
 
@@ -1314,9 +1314,9 @@ bool View::InsertData( const TransferableDataHelper& rDataHelper,
 
             XFillAttrSetItem*   pSetItem = aFillData.GetXFillAttrSetItem();
             SfxItemSet          rSet = pSetItem->GetItemSet();
-            XFillStyle          eFill= ( (XFillStyleItem&) rSet.Get( XATTR_FILLSTYLE ) ).GetValue();
+            drawing::FillStyle eFill= ( (XFillStyleItem&) rSet.Get( XATTR_FILLSTYLE ) ).GetValue();
 
-            if( eFill == XFILL_SOLID || eFill == XFILL_NONE )
+            if( eFill == drawing::FillStyle_SOLID || eFill == drawing::FillStyle_NONE )
             {
                 const XFillColorItem&   rColItem = (XFillColorItem&) rSet.Get( XATTR_FILLCOLOR );
                 Color                   aColor( rColItem.GetColorValue() );
@@ -1345,7 +1345,7 @@ bool View::InsertData( const TransferableDataHelper& rDataHelper,
                     SdrObjectPrimitiveHit(*pPickObj, aHitPosB, nHitLog, *GetSdrPageView(), pVisiLayer, false) )
                 {
                     // area fill
-                    if(eFill == XFILL_SOLID )
+                    if(eFill == drawing::FillStyle_SOLID )
                         aSet.Put(XFillColorItem(aName, aColor));
 
                     aSet.Put( XFillStyleItem( eFill ) );
diff --git a/sd/source/ui/view/sdview4.cxx b/sd/source/ui/view/sdview4.cxx
index b15b44fa111f..4e02e56ecfee 100644
--- a/sd/source/ui/view/sdview4.cxx
+++ b/sd/source/ui/view/sdview4.cxx
@@ -162,7 +162,7 @@ SdrGrafObj* View::InsertGraphic( const Graphic& rGraphic, sal_Int8& rAction,
 
         SfxItemSet aSet(mpDocSh->GetPool(), XATTR_FILLSTYLE, XATTR_FILLBITMAP);
 
-        aSet.Put(XFillStyleItem(XFILL_BITMAP));
+        aSet.Put(XFillStyleItem(drawing::FillStyle_BITMAP));
         aSet.Put(XFillBitmapItem(&mpDocSh->GetPool(), rGraphic));
         pPickObj->SetMergedItemSetAndBroadcast(aSet);
     }