XFillStyle -> css::drawing::FillStyle

Change-Id: I6b2fabd72fd34f4ac1b3a18f386c90794bc39ce4

7 files changed, 105 insertions, 92 deletions

diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx
index fba635332ad8..a478dfc9d6b0 100644
--- a/cui/source/tabpages/backgrnd.cxx
+++ b/cui/source/tabpages/backgrnd.cxx
@@ -17,6 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <com/sun/star/drawing/FillStyle.hpp>
 #include <unotools/pathoptions.hxx>
 #include <vcl/builder.hxx>
 #include <vcl/msgbox.hxx>
@@ -130,16 +131,16 @@ static void lcl_SetTransparency(SvxBrushItem& rBrush, long nTransparency)
 }
 
 /// Returns the fill style of the currently selected entry.
-static XFillStyle lcl_getFillStyle(ListBox* pLbSelect)
+static drawing::FillStyle lcl_getFillStyle(ListBox* pLbSelect)
 {
-    return (XFillStyle)(sal_uLong)pLbSelect->GetEntryData(pLbSelect->GetSelectEntryPos());
+    return (drawing::FillStyle)(sal_uLong)pLbSelect->GetEntryData(pLbSelect->GetSelectEntryPos());
 }
 
 // Selects the entry matching the specified fill style.
-static void lcl_setFillStyle(ListBox* pLbSelect, XFillStyle eStyle)
+static void lcl_setFillStyle(ListBox* pLbSelect, drawing::FillStyle eStyle)
 {
     for (int i = 0; i < pLbSelect->GetEntryCount(); ++i)
-        if ((XFillStyle)(sal_uLong)pLbSelect->GetEntryData(i) == eStyle)
+        if ((drawing::FillStyle)(sal_uLong)pLbSelect->GetEntryData(i) == eStyle)
         {
             pLbSelect->SelectEntryPos(i);
             return;
@@ -555,7 +556,7 @@ void SvxBackgroundTabPage::Reset( const SfxItemSet* rSet )
     {
         m_pSelectTxt->Hide();
         m_pLbSelect->Hide();
-        lcl_setFillStyle(m_pLbSelect, XFILL_SOLID);
+        lcl_setFillStyle(m_pLbSelect, drawing::FillStyle_SOLID);
         ShowColorUI_Impl();
 
         const SfxPoolItem* pOld = GetOldItem( *rSet, SID_ATTR_BRUSH );
@@ -681,7 +682,7 @@ void SvxBackgroundTabPage::ResetFromWallpaperItem( const SfxItemSet& rSet )
     }
     else
     {
-        lcl_setFillStyle(m_pLbSelect, XFILL_SOLID);
+        lcl_setFillStyle(m_pLbSelect, drawing::FillStyle_SOLID);
         ShowColorUI_Impl();
 
         const SfxPoolItem* pOld = GetOldItem( rSet, SID_VIEW_FLD_PIC );
@@ -773,7 +774,7 @@ bool SvxBackgroundTabPage::FillItemSet( SfxItemSet* rCoreSet )
     {
         const SvxBrushItem& rOldItem    = (const SvxBrushItem&)*pOld;
         SvxGraphicPosition  eOldPos     = rOldItem.GetGraphicPos();
-        const bool          bIsBrush    = ( XFILL_SOLID == lcl_getFillStyle(m_pLbSelect) );
+        const bool          bIsBrush    = ( drawing::FillStyle_SOLID == lcl_getFillStyle(m_pLbSelect) );
 
         // transparency has to be set if enabled, the color not already set to "No fill" and
         if( bColTransparency &&
@@ -981,7 +982,7 @@ bool SvxBackgroundTabPage::FillItemSetWithWallpaperItem( SfxItemSet& rCoreSet, s
 
     SvxBrushItem        rOldItem( (const CntWallpaperItem&)*pOld, nWhich );
     SvxGraphicPosition  eOldPos     = rOldItem.GetGraphicPos();
-    const bool          bIsBrush    = ( XFILL_SOLID == lcl_getFillStyle(m_pLbSelect) );
+    const bool          bIsBrush    = ( drawing::FillStyle_SOLID == lcl_getFillStyle(m_pLbSelect) );
     bool                bModified = false;
 
     if (   ( (GPOS_NONE == eOldPos) && bIsBrush  )
@@ -1329,7 +1330,7 @@ IMPL_LINK_NOARG(SvxBackgroundTabPage, BackgroundColorHdl_Impl)
 
 IMPL_LINK_NOARG(SvxBackgroundTabPage, SelectHdl_Impl)
 {
-    if ( XFILL_SOLID == lcl_getFillStyle(m_pLbSelect) )
+    if ( drawing::FillStyle_SOLID == lcl_getFillStyle(m_pLbSelect) )
     {
         ShowColorUI_Impl();
         m_pParaLBox->Enable(); // drawing background can't be a bitmap
@@ -1571,7 +1572,7 @@ IMPL_LINK( SvxBackgroundTabPage, TblDestinationHdl_Impl, ListBox*, pBox )
             xItemHolder.reset(new SvxBrushItem(nWhich));
             pActItem = xItemHolder.get();
         }
-        if(XFILL_SOLID == lcl_getFillStyle(m_pLbSelect))  // brush selected
+        if(drawing::FillStyle_SOLID == lcl_getFillStyle(m_pLbSelect))  // brush selected
         {
             *pActItem = SvxBrushItem( aBgdColor, nWhich );
         }
@@ -1651,7 +1652,7 @@ IMPL_LINK( SvxBackgroundTabPage, ParaDestinationHdl_Impl, ListBox*, pBox )
             return 0;
         }
         pParaBck_Impl->nActPos = nSelPos;
-        if(XFILL_SOLID == lcl_getFillStyle(m_pLbSelect))  // brush selected
+        if(drawing::FillStyle_SOLID == lcl_getFillStyle(m_pLbSelect))  // brush selected
         {
             sal_uInt16 nWhich = pActItem->Which();
             *pActItem = SvxBrushItem( aBgdColor, nWhich );
@@ -1714,7 +1715,7 @@ void SvxBackgroundTabPage::FillControls_Impl( const SvxBrushItem& rBgdAttr,
 
     if ( GPOS_NONE == ePos || !m_pLbSelect->IsVisible() )
     {
-        lcl_setFillStyle(m_pLbSelect, XFILL_SOLID);
+        lcl_setFillStyle(m_pLbSelect, drawing::FillStyle_SOLID);
         ShowColorUI_Impl();
         Color aTrColor( COL_TRANSPARENT );
         aBgdColor = rColor;
@@ -1751,7 +1752,7 @@ void SvxBackgroundTabPage::FillControls_Impl( const SvxBrushItem& rBgdAttr,
         const OUString  aStrLink   = rBgdAttr.GetGraphicLink();
         const OUString  aStrFilter = rBgdAttr.GetGraphicFilter();
 
-        lcl_setFillStyle(m_pLbSelect, XFILL_BITMAP);
+        lcl_setFillStyle(m_pLbSelect, drawing::FillStyle_BITMAP);
         ShowBitmapUI_Impl();
 
         if ( !aStrLink.isEmpty() )
diff --git a/cui/source/tabpages/tparea.cxx b/cui/source/tabpages/tparea.cxx
index 1fdcbe5a7404..cc89a4924677 100644
--- a/cui/source/tabpages/tparea.cxx
+++ b/cui/source/tabpages/tparea.cxx
@@ -45,6 +45,8 @@
 #include "sfx2/opengrf.hxx"
 #include <vcl/msgbox.hxx>
 
+using namespace com::sun::star;
+
 // static ----------------------------------------------------------------
 
 static const sal_uInt16 pAreaRanges[] =
@@ -517,7 +519,7 @@ bool SvxTransparenceTabPage::InitPreview ( const SfxItemSet& rSet )
     m_pCtlXRectPreview->SetAttributes( aXFillAttr.GetItemSet() );
     m_pCtlBitmapPreview->SetAttributes( aXFillAttr.GetItemSet() );
 
-    bBitmap = ( ( ( XFillStyleItem& )rSet.Get(XATTR_FILLSTYLE) ).GetValue() == XFILL_BITMAP );
+    bBitmap = ( ( ( XFillStyleItem& )rSet.Get(XATTR_FILLSTYLE) ).GetValue() == drawing::FillStyle_BITMAP );
 
     // show the right preview window
     if ( bBitmap )
@@ -715,7 +717,7 @@ SvxAreaTabPage::SvxAreaTabPage( Window* pParent, const SfxItemSet& rInAttrs ) :
     ePoolUnit = pPool->GetMetric( XATTR_FILLBMP_SIZEX );
 
     // setting the output device
-    rXFSet.Put( XFillStyleItem( XFILL_SOLID ) );
+    rXFSet.Put( XFillStyleItem( drawing::FillStyle_SOLID ) );
     rXFSet.Put( XFillColorItem( OUString(), COL_BLACK ) );
     m_pCtlXRectPreview->SetAttributes( aXFillAttr.GetItemSet() );
     m_pCtlBitmapPreview->SetAttributes( aXFillAttr.GetItemSet() );
@@ -900,30 +902,30 @@ void SvxAreaTabPage::ActivatePage( const SfxItemSet& rSet )
             }
 
             // evaluate if any other Tabpage set another filltype
-            if( m_pTypeLB->GetSelectEntryPos() > XFILL_NONE)
+            if( m_pTypeLB->GetSelectEntryPos() > drawing::FillStyle_NONE)
             {
                 switch( nPageType )
                 {
                     case PT_GRADIENT:
-                        m_pTypeLB->SelectEntryPos( XFILL_GRADIENT );
+                        m_pTypeLB->SelectEntryPos( drawing::FillStyle_GRADIENT );
                         m_pLbGradient->SelectEntryPos( _nPos );
                         ClickGradientHdl_Impl();
                     break;
 
                     case PT_HATCH:
-                        m_pTypeLB->SelectEntryPos( XFILL_HATCH );
+                        m_pTypeLB->SelectEntryPos( drawing::FillStyle_HATCH );
                         m_pLbHatching->SelectEntryPos( _nPos );
                         ClickHatchingHdl_Impl();
                     break;
 
                     case PT_BITMAP:
-                        m_pTypeLB->SelectEntryPos( XFILL_BITMAP );
+                        m_pTypeLB->SelectEntryPos( drawing::FillStyle_BITMAP );
                         m_pLbBitmap->SelectEntryPos( _nPos );
                         ClickBitmapHdl_Impl();
                     break;
 
                     case PT_COLOR:
-                        m_pTypeLB->SelectEntryPos( XFILL_SOLID );
+                        m_pTypeLB->SelectEntryPos( drawing::FillStyle_SOLID );
                         m_pLbColor->SelectEntryPos( _nPos );
                         m_pLbHatchBckgrdColor->SelectEntryPos( _nPos );
                         ClickColorHdl_Impl();
@@ -942,10 +944,10 @@ int SvxAreaTabPage::DeactivatePage( SfxItemSet* _pSet )
     if( nDlgType == 0 ) // area dialog
     {
         sal_Int32 nPosOrig = nPos;
-        XFillStyle eStyle = (XFillStyle) m_pTypeLB->GetSelectEntryPos();
+        drawing::FillStyle eStyle = (drawing::FillStyle) m_pTypeLB->GetSelectEntryPos();
         switch( eStyle )
         {
-            case XFILL_GRADIENT:
+            case drawing::FillStyle_GRADIENT:
             {
                         nPageType = PT_GRADIENT;
                         nPos = m_pLbGradient->GetSelectEntryPos();
@@ -953,7 +955,7 @@ int SvxAreaTabPage::DeactivatePage( SfxItemSet* _pSet )
                             *pnGradientListState |= CT_MODIFIED;
             }
             break;
-            case XFILL_HATCH:
+            case drawing::FillStyle_HATCH:
             {
                 nPageType = PT_HATCH;
                 nPos = m_pLbHatching->GetSelectEntryPos();
@@ -961,7 +963,7 @@ int SvxAreaTabPage::DeactivatePage( SfxItemSet* _pSet )
                     *pnHatchingListState |= CT_MODIFIED;
             }
             break;
-            case XFILL_BITMAP:
+            case drawing::FillStyle_BITMAP:
             {
                 nPageType = PT_BITMAP;
                 nPos = m_pLbBitmap->GetSelectEntryPos();
@@ -969,7 +971,7 @@ int SvxAreaTabPage::DeactivatePage( SfxItemSet* _pSet )
                     *pnBitmapListState |= CT_MODIFIED;
             }
             break;
-            case XFILL_SOLID:
+            case drawing::FillStyle_SOLID:
             {
                 nPageType = PT_COLOR;
                 nPos = m_pLbColor->GetSelectEntryPos();
@@ -997,15 +999,16 @@ bool SvxAreaTabPage::FillItemSet( SfxItemSet* rAttrs )
     if( nDlgType != 0 || *pbAreaTP )
     {
         const SfxPoolItem* pOld = NULL;
-        XFillStyle eStyle = (XFillStyle) m_pTypeLB->GetSelectEntryPos();
-        XFillStyle eSavedStyle = (XFillStyle) m_pTypeLB->GetSavedValue();
+        drawing::FillStyle eStyle = (drawing::FillStyle) m_pTypeLB->GetSelectEntryPos();
+        drawing::FillStyle eSavedStyle = (drawing::FillStyle) m_pTypeLB->GetSavedValue();
         switch( eStyle )
         {
-            case XFILL_NONE:
+            default:
+            case drawing::FillStyle_NONE:
             {
                 if(  eSavedStyle != eStyle )
                 {
-                    XFillStyleItem aStyleItem( XFILL_NONE );
+                    XFillStyleItem aStyleItem( drawing::FillStyle_NONE );
                     pOld = GetOldItem( *rAttrs, XATTR_FILLSTYLE );
                     if ( !pOld || !( *(const XFillStyleItem*)pOld == aStyleItem ) )
                     {
@@ -1015,7 +1018,7 @@ bool SvxAreaTabPage::FillItemSet( SfxItemSet* rAttrs )
                 }
             }
             break;
-            case XFILL_SOLID:
+            case drawing::FillStyle_SOLID:
             {
                 _nPos = m_pLbColor->GetSelectEntryPos();
                  if( _nPos != LISTBOX_ENTRY_NOTFOUND &&
@@ -1035,7 +1038,7 @@ bool SvxAreaTabPage::FillItemSet( SfxItemSet* rAttrs )
                      ( bModified ||
                        SFX_ITEM_SET == rOutAttrs.GetItemState( GetWhich( XATTR_FILLCOLOR ), true ) ) )
                  {
-                     XFillStyleItem aStyleItem( XFILL_SOLID );
+                     XFillStyleItem aStyleItem( drawing::FillStyle_SOLID );
                      pOld = GetOldItem( *rAttrs, XATTR_FILLSTYLE );
                      if ( !pOld || !( *(const XFillStyleItem*)pOld == aStyleItem ) )
                      {
@@ -1045,7 +1048,7 @@ bool SvxAreaTabPage::FillItemSet( SfxItemSet* rAttrs )
                  }
             }
             break;
-            case XFILL_GRADIENT:
+            case drawing::FillStyle_GRADIENT:
             {
                 _nPos = m_pLbGradient->GetSelectEntryPos();
                 if( _nPos != LISTBOX_ENTRY_NOTFOUND &&
@@ -1066,7 +1069,7 @@ bool SvxAreaTabPage::FillItemSet( SfxItemSet* rAttrs )
                     ( bModified ||
                       SFX_ITEM_SET == rOutAttrs.GetItemState( GetWhich( XATTR_FILLGRADIENT ), true ) ) )
                 {
-                    XFillStyleItem aStyleItem( XFILL_GRADIENT );
+                    XFillStyleItem aStyleItem( drawing::FillStyle_GRADIENT );
                     pOld = GetOldItem( *rAttrs, XATTR_FILLSTYLE );
                     if ( !pOld || !( *(const XFillStyleItem*)pOld == aStyleItem ) )
                     {
@@ -1076,7 +1079,7 @@ bool SvxAreaTabPage::FillItemSet( SfxItemSet* rAttrs )
                 }
             }
             break;
-            case XFILL_HATCH:
+            case drawing::FillStyle_HATCH:
             {
                 _nPos = m_pLbHatching->GetSelectEntryPos();
                 if( _nPos != LISTBOX_ENTRY_NOTFOUND &&
@@ -1112,7 +1115,7 @@ bool SvxAreaTabPage::FillItemSet( SfxItemSet* rAttrs )
                     ( bModified ||
                       SFX_ITEM_SET == rOutAttrs.GetItemState( GetWhich( XATTR_FILLHATCH ), true ) ) )
                 {
-                    XFillStyleItem aStyleItem( XFILL_HATCH );
+                    XFillStyleItem aStyleItem( drawing::FillStyle_HATCH );
                     pOld = GetOldItem( *rAttrs, XATTR_FILLSTYLE );
                     if ( !pOld || !( *(const XFillStyleItem*)pOld == aStyleItem ) )
                     {
@@ -1122,13 +1125,13 @@ bool SvxAreaTabPage::FillItemSet( SfxItemSet* rAttrs )
                 }
             }
             break;
-            case XFILL_BITMAP:
+            case drawing::FillStyle_BITMAP:
             {
                 //UUUU
                 if(mbDirectGraphicSet && GRAPHIC_NONE != maDirectGraphic.GetType())
                 {
                     const XFillBitmapItem aXBmpItem(maDirectName, maDirectGraphic);
-                    rAttrs->Put(XFillStyleItem(XFILL_BITMAP));
+                    rAttrs->Put(XFillStyleItem(drawing::FillStyle_BITMAP));
                     rAttrs->Put(aXBmpItem);
                     bModified = true;
                 }
@@ -1153,7 +1156,7 @@ bool SvxAreaTabPage::FillItemSet( SfxItemSet* rAttrs )
                         ( bModified ||
                           SFX_ITEM_SET == rOutAttrs.GetItemState( GetWhich( XATTR_FILLBITMAP ), true ) ) )
                     {
-                            XFillStyleItem aStyleItem( XFILL_BITMAP );
+                            XFillStyleItem aStyleItem( drawing::FillStyle_BITMAP );
                             pOld = GetOldItem( *rAttrs, XATTR_FILLSTYLE );
                             if ( !pOld || !( *(const XFillStyleItem*)pOld == aStyleItem ) )
                             {
@@ -1442,10 +1445,10 @@ void SvxAreaTabPage::Reset( const SfxItemSet* rAttrs )
     bool isMissingHatching(false);
     bool isMissingGradient(false);
     bool isMissingBitmap(false);
-    XFillStyle eXFS;
+    drawing::FillStyle eXFS;
     if( rAttrs->GetItemState( XATTR_FILLSTYLE ) != SFX_ITEM_DONTCARE )
     {
-        eXFS = (XFillStyle) ( ( ( const XFillStyleItem& ) rAttrs->
+        eXFS = (drawing::FillStyle) ( ( ( const XFillStyleItem& ) rAttrs->
                                 Get( GetWhich( XATTR_FILLSTYLE ) ) ).GetValue() );
         m_pTypeLB->SelectEntryPos( sal::static_int_cast< sal_Int32 >( eXFS ) );
 
@@ -1504,24 +1507,24 @@ void SvxAreaTabPage::Reset( const SfxItemSet* rAttrs )
 
         switch( eXFS )
         {
-            case XFILL_NONE:
+            case drawing::FillStyle_NONE:
                 ClickInvisibleHdl_Impl();
             break;
 
-            case XFILL_SOLID:
+            case drawing::FillStyle_SOLID:
                 ClickColorHdl_Impl();
             break;
 
-            case XFILL_GRADIENT:
+            case drawing::FillStyle_GRADIENT:
                 ClickGradientHdl_Impl();
             break;
 
-            case XFILL_HATCH:
+            case drawing::FillStyle_HATCH:
                 ClickHatchingHdl_Impl();
                 ToggleHatchBckgrdColorHdl_Impl( this );
             break;
 
-            case XFILL_BITMAP:
+            case drawing::FillStyle_BITMAP:
             {
                 ClickBitmapHdl_Impl();
             }
@@ -1730,7 +1733,7 @@ void SvxAreaTabPage::Reset( const SfxItemSet* rAttrs )
         m_pMtrFldYOffset->SetText( "" );
 
     // not earlier so that tile and stretch are considered
-    if( m_pTypeLB->GetSelectEntryPos() == XFILL_BITMAP )
+    if( m_pTypeLB->GetSelectEntryPos() == drawing::FillStyle_BITMAP )
         ClickBitmapHdl_Impl();
 
     m_pTypeLB->SaveValue();
@@ -1772,13 +1775,14 @@ const sal_uInt16* SvxAreaTabPage::GetRanges()
 
 IMPL_LINK_NOARG(SvxAreaTabPage, SelectDialogTypeHdl_Impl)
 {
-    switch( (XFillStyle)m_pTypeLB->GetSelectEntryPos() )
+    switch( (drawing::FillStyle)m_pTypeLB->GetSelectEntryPos() )
     {
-        case XFILL_NONE: ClickInvisibleHdl_Impl(); break;
-        case XFILL_SOLID: ClickColorHdl_Impl(); break;
-        case XFILL_GRADIENT: ClickGradientHdl_Impl(); break;
-        case XFILL_HATCH: ClickHatchingHdl_Impl(); break;
-        case XFILL_BITMAP: ClickBitmapHdl_Impl(); break;
+        default:
+        case drawing::FillStyle_NONE: ClickInvisibleHdl_Impl(); break;
+        case drawing::FillStyle_SOLID: ClickColorHdl_Impl(); break;
+        case drawing::FillStyle_GRADIENT: ClickGradientHdl_Impl(); break;
+        case drawing::FillStyle_HATCH: ClickHatchingHdl_Impl(); break;
+        case drawing::FillStyle_BITMAP: ClickBitmapHdl_Impl(); break;
     }
 
     return 0;
@@ -1798,7 +1802,7 @@ void SvxAreaTabPage::ClickInvisibleHdl_Impl()
     // Controls for Hatch-Background
     m_pFlHatchBckgrd->Hide();
 
-    rXFSet.Put( XFillStyleItem( XFILL_NONE ) );
+    rXFSet.Put( XFillStyleItem( drawing::FillStyle_NONE ) );
     m_pCtlXRectPreview->SetAttributes( aXFillAttr.GetItemSet() );
     m_pCtlBitmapPreview->SetAttributes( aXFillAttr.GetItemSet() );
 
@@ -1839,18 +1843,18 @@ IMPL_LINK_NOARG(SvxAreaTabPage, ModifyColorHdl_Impl)
     m_pLbHatchBckgrdColor->SelectEntryPos( _nPos );
     if( _nPos != LISTBOX_ENTRY_NOTFOUND )
     {
-        rXFSet.Put( XFillStyleItem( XFILL_SOLID ) );
+        rXFSet.Put( XFillStyleItem( drawing::FillStyle_SOLID ) );
         rXFSet.Put( XFillColorItem( OUString(), m_pLbColor->GetSelectEntryColor() ) );
     }
     // NEW
     else if( SFX_ITEM_SET == rOutAttrs.GetItemState( GetWhich( XATTR_FILLCOLOR ), true, &pPoolItem ) )
     {
-        rXFSet.Put( XFillStyleItem( XFILL_SOLID ) );
+        rXFSet.Put( XFillStyleItem( drawing::FillStyle_SOLID ) );
         Color aColor( ( ( const XFillColorItem* ) pPoolItem )->GetColorValue() );
         rXFSet.Put( XFillColorItem( OUString(), aColor ) );
     }
     else
-        rXFSet.Put( XFillStyleItem( XFILL_NONE ) );
+        rXFSet.Put( XFillStyleItem( drawing::FillStyle_NONE ) );
 
     m_pCtlXRectPreview->SetAttributes( aXFillAttr.GetItemSet() );
     m_pCtlXRectPreview->Invalidate();
@@ -1897,16 +1901,16 @@ IMPL_LINK_NOARG(SvxAreaTabPage, ModifyGradientHdl_Impl)
         // fill ItemSet and pass it on to aCtlXRectPreview
         XGradientEntry* pEntry = pGradientList->GetGradient( _nPos );
 
-        rXFSet.Put( XFillStyleItem( XFILL_GRADIENT ) );
+        rXFSet.Put( XFillStyleItem( drawing::FillStyle_GRADIENT ) );
         rXFSet.Put( XFillGradientItem( OUString(), pEntry->GetGradient() ) );
     }
     else if( SFX_ITEM_SET == rOutAttrs.GetItemState( GetWhich( XATTR_FILLGRADIENT ), true, &pPoolItem ) )
     {
-        rXFSet.Put( XFillStyleItem( XFILL_GRADIENT ) );
+        rXFSet.Put( XFillStyleItem( drawing::FillStyle_GRADIENT ) );
         rXFSet.Put( XFillGradientItem( OUString(), ( ( const XFillGradientItem* ) pPoolItem )->GetGradientValue() ) );
     }
     else
-        rXFSet.Put( XFillStyleItem( XFILL_NONE ) );
+        rXFSet.Put( XFillStyleItem( drawing::FillStyle_NONE ) );
 
     m_pCtlXRectPreview->SetAttributes( aXFillAttr.GetItemSet() );
     m_pCtlXRectPreview->Invalidate();
@@ -1953,16 +1957,16 @@ IMPL_LINK_NOARG(SvxAreaTabPage, ModifyHatchingHdl_Impl)
         // fill ItemSet and pass it on to aCtlXRectPreview
         XHatchEntry* pEntry = pHatchingList->GetHatch( _nPos );
 
-        rXFSet.Put( XFillStyleItem( XFILL_HATCH ) );
+        rXFSet.Put( XFillStyleItem( drawing::FillStyle_HATCH ) );
         rXFSet.Put( XFillHatchItem( OUString(), pEntry->GetHatch() ) );
     }
     else if( SFX_ITEM_SET == rOutAttrs.GetItemState( GetWhich( XATTR_FILLHATCH ), true, &pPoolItem ) )
     {
-        rXFSet.Put( XFillStyleItem( XFILL_HATCH ) );
+        rXFSet.Put( XFillStyleItem( drawing::FillStyle_HATCH ) );
         rXFSet.Put( XFillHatchItem( OUString(), ( ( const XFillHatchItem* ) pPoolItem )->GetHatchValue() ) );
     }
     else
-        rXFSet.Put( XFillStyleItem( XFILL_NONE ) );
+        rXFSet.Put( XFillStyleItem( drawing::FillStyle_NONE ) );
 
     m_pCtlXRectPreview->SetAttributes( aXFillAttr.GetItemSet() );
     m_pCtlXRectPreview->Invalidate();
@@ -1987,7 +1991,7 @@ IMPL_LINK_NOARG(SvxAreaTabPage, ModifyHatchBckgrdColorHdl_Impl)
         rXFSet.Put( XFillColorItem( OUString(), aColor ) );
     }
     else
-        rXFSet.Put( XFillStyleItem( XFILL_NONE ) );
+        rXFSet.Put( XFillStyleItem( drawing::FillStyle_NONE ) );
 
     m_pCtlXRectPreview->SetAttributes( aXFillAttr.GetItemSet() );
     m_pCtlXRectPreview->Invalidate();
@@ -2083,16 +2087,16 @@ IMPL_LINK_NOARG(SvxAreaTabPage, ModifyBitmapHdl_Impl)
         // fill ItemSet and pass it on to aCtlXRectPreview
         const XBitmapEntry* pEntry = pBitmapList->GetBitmap(_nPos);
 
-        rXFSet.Put(XFillStyleItem(XFILL_BITMAP));
+        rXFSet.Put(XFillStyleItem(drawing::FillStyle_BITMAP));
         rXFSet.Put(XFillBitmapItem(OUString(), pEntry->GetGraphicObject()));
     }
     else if( SFX_ITEM_SET == rOutAttrs.GetItemState( GetWhich( XATTR_FILLBITMAP ), true, &pPoolItem ) )
     {
-        rXFSet.Put(XFillStyleItem(XFILL_BITMAP));
+        rXFSet.Put(XFillStyleItem(drawing::FillStyle_BITMAP));
         rXFSet.Put(XFillBitmapItem(OUString(), ((const XFillBitmapItem*)pPoolItem)->GetGraphicObject()));
     }
     else
-        rXFSet.Put( XFillStyleItem( XFILL_NONE ) );
+        rXFSet.Put( XFillStyleItem( drawing::FillStyle_NONE ) );
 
     m_pCtlBitmapPreview->SetAttributes( aXFillAttr.GetItemSet() );
     m_pCtlBitmapPreview->Invalidate();
@@ -2151,7 +2155,7 @@ IMPL_LINK_NOARG( SvxAreaTabPage, ClickImportHdl_Impl )
 
             // use loaded graphic
             const XFillBitmapItem aXBmpItem(maDirectName, maDirectGraphic);
-            rXFSet.Put(XFillStyleItem(XFILL_BITMAP));
+            rXFSet.Put(XFillStyleItem(drawing::FillStyle_BITMAP));
             rXFSet.Put(aXBmpItem);
 
             // trigger state flag for directly loaded graphic
diff --git a/cui/source/tabpages/tpbitmap.cxx b/cui/source/tabpages/tpbitmap.cxx
index 953993c7a352..2cfc700b6230 100644
--- a/cui/source/tabpages/tpbitmap.cxx
+++ b/cui/source/tabpages/tpbitmap.cxx
@@ -48,6 +48,8 @@
 #include "sfx2/opengrf.hxx"
 #include "paragrph.hrc"
 
+using namespace com::sun::star;
+
 SvxBitmapTabPage::SvxBitmapTabPage(  Window* pParent, const SfxItemSet& rInAttrs) :
 
     SvxTabPage          ( pParent,
@@ -65,7 +67,7 @@ SvxBitmapTabPage::SvxBitmapTabPage(  Window* pParent, const SfxItemSet& rInAttrs
     bBmpChanged         ( false ),
 
     pXPool              ( (XOutdevItemPool*) rInAttrs.GetPool() ),
-    aXFStyleItem        ( XFILL_BITMAP ),
+    aXFStyleItem        ( drawing::FillStyle_BITMAP ),
     aXBitmapItem        ( OUString(), Graphic() ),
     aXFillAttr          ( pXPool ),
     rXFSet              ( aXFillAttr.GetItemSet() )
@@ -231,7 +233,7 @@ bool SvxBitmapTabPage::FillItemSet( SfxItemSet* _rOutAttrs )
     {
         if(PT_BITMAP == *pPageType)
         {
-            _rOutAttrs->Put(XFillStyleItem(XFILL_BITMAP));
+            _rOutAttrs->Put(XFillStyleItem(drawing::FillStyle_BITMAP));
             sal_Int32 nPos = m_pLbBitmaps->GetSelectEntryPos();
             if(LISTBOX_ENTRY_NOTFOUND != nPos)
             {
@@ -312,9 +314,9 @@ IMPL_LINK_NOARG(SvxBitmapTabPage, ChangeBitmapHdl_Impl)
 
         if(SFX_ITEM_SET == rOutAttrs.GetItemState(GetWhich(XATTR_FILLSTYLE), true, &pPoolItem))
         {
-            const XFillStyle eXFS((XFillStyle)((const XFillStyleItem*)pPoolItem)->GetValue());
+            const drawing::FillStyle eXFS((drawing::FillStyle)((const XFillStyleItem*)pPoolItem)->GetValue());
 
-            if((XFILL_BITMAP == eXFS) && (SFX_ITEM_SET == rOutAttrs.GetItemState(GetWhich(XATTR_FILLBITMAP), true, &pPoolItem)))
+            if((drawing::FillStyle_BITMAP == eXFS) && (SFX_ITEM_SET == rOutAttrs.GetItemState(GetWhich(XATTR_FILLBITMAP), true, &pPoolItem)))
             {
                 pGraphicObject = new GraphicObject(((const XFillBitmapItem*)pPoolItem)->GetGraphicObject());
             }
diff --git a/cui/source/tabpages/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx
index 5c2ecd7bc6b4..2e016dfdcdb6 100644
--- a/cui/source/tabpages/tpcolor.cxx
+++ b/cui/source/tabpages/tpcolor.cxx
@@ -47,6 +47,7 @@
 #include <svx/dialmgr.hxx>
 #include <svx/dialogs.hrc>
 
+using namespace com::sun::star;
 
 XPropertyListRef SvxColorTabPage::GetList()
 {
@@ -312,7 +313,7 @@ SvxColorTabPage::SvxColorTabPage(Window* pParent, const SfxItemSet& rInAttrs)
     , nDlgType( 0 )
     , pPos( NULL )
     , pbAreaTP( NULL )
-    , aXFStyleItem( XFILL_SOLID )
+    , aXFStyleItem( drawing::FillStyle_SOLID )
     , aXFillColorItem( OUString(), Color( COL_BLACK ) )
     , aXFillAttr( (XOutdevItemPool*) rInAttrs.GetPool() )
     , rXFSet( aXFillAttr.GetItemSet() )
@@ -576,7 +577,7 @@ bool SvxColorTabPage::FillItemSet( SfxItemSet* rSet )
             aColor.SetColor (aCurrentColor.GetColor());
         }
         rSet->Put( XFillColorItem( aString, aColor ) );
-        rSet->Put( XFillStyleItem( XFILL_SOLID ) );
+        rSet->Put( XFillStyleItem( drawing::FillStyle_SOLID ) );
     }
 
     return true;
diff --git a/cui/source/tabpages/tpgradnt.cxx b/cui/source/tabpages/tpgradnt.cxx
index 96c48ffc747c..1fd7706680a7 100644
--- a/cui/source/tabpages/tpgradnt.cxx
+++ b/cui/source/tabpages/tpgradnt.cxx
@@ -42,6 +42,8 @@
 #include <svx/dialogs.hrc>
 #include "paragrph.hrc"
 
+using namespace com::sun::star;
+
 SvxGradientTabPage::SvxGradientTabPage
 (
     Window* pParent,
@@ -59,7 +61,7 @@ SvxGradientTabPage::SvxGradientTabPage
     pbAreaTP            ( 0 ),
 
     pXPool              ( (XOutdevItemPool*) rInAttrs.GetPool() ),
-    aXFStyleItem        ( XFILL_GRADIENT ),
+    aXFStyleItem        ( drawing::FillStyle_GRADIENT ),
     aXGradientItem      ( OUString(), XGradient( COL_BLACK, COL_WHITE ) ),
     aXFillAttr          ( pXPool ),
     rXFSet              ( aXFillAttr.GetItemSet() )
@@ -335,7 +337,7 @@ bool SvxGradientTabPage::FillItemSet( SfxItemSet* rSet )
                         (sal_uInt16) m_pMtrColorTo->GetValue() );
         }
         DBG_ASSERT( pXGradient, "XGradient konnte nicht erzeugt werden" );
-        rSet->Put( XFillStyleItem( XFILL_GRADIENT ) );
+        rSet->Put( XFillStyleItem( drawing::FillStyle_GRADIENT ) );
         rSet->Put( XFillGradientItem( aString, *pXGradient ) );
 
         delete pXGradient;
@@ -780,7 +782,7 @@ IMPL_LINK_NOARG(SvxGradientTabPage, ChangeGradientHdl_Impl)
         const SfxPoolItem* pPoolItem = NULL;
         if( SFX_ITEM_SET == rOutAttrs.GetItemState( GetWhich( XATTR_FILLSTYLE ), true, &pPoolItem ) )
         {
-            if( ( XFILL_GRADIENT == (XFillStyle) ( ( const XFillStyleItem* ) pPoolItem )->GetValue() ) &&
+            if( ( drawing::FillStyle_GRADIENT == (drawing::FillStyle) ( ( const XFillStyleItem* ) pPoolItem )->GetValue() ) &&
                 ( SFX_ITEM_SET == rOutAttrs.GetItemState( GetWhich( XATTR_FILLGRADIENT ), true, &pPoolItem ) ) )
             {
                 pGradient = new XGradient( ( ( const XFillGradientItem* ) pPoolItem )->GetGradientValue() );
diff --git a/cui/source/tabpages/tphatch.cxx b/cui/source/tabpages/tphatch.cxx
index 0cdff356e37e..f2d591ebef6b 100644
--- a/cui/source/tabpages/tphatch.cxx
+++ b/cui/source/tabpages/tphatch.cxx
@@ -44,6 +44,8 @@
 #include "paragrph.hrc"
 #include <svx/dialogs.hrc>
 
+using namespace com::sun::star;
+
 SvxHatchTabPage::SvxHatchTabPage
 (
     Window* pParent,
@@ -62,7 +64,7 @@ SvxHatchTabPage::SvxHatchTabPage
     pbAreaTP            ( 0 ),
 
     pXPool              ( (XOutdevItemPool*) rInAttrs.GetPool() ),
-    aXFStyleItem        ( XFILL_HATCH ),
+    aXFStyleItem        ( drawing::FillStyle_HATCH ),
     aXHatchItem         ( OUString(), XHatch() ),
     aXFillAttr          ( pXPool ),
     rXFSet              ( aXFillAttr.GetItemSet() )
@@ -303,7 +305,7 @@ bool SvxHatchTabPage::FillItemSet( SfxItemSet* rSet )
                                  static_cast<long>(m_pMtrAngle->GetValue() * 10) );
             }
             DBG_ASSERT( pXHatch, "XHatch konnte nicht erzeugt werden" );
-            rSet->Put( XFillStyleItem( XFILL_HATCH ) );
+            rSet->Put( XFillStyleItem( drawing::FillStyle_HATCH ) );
             rSet->Put( XFillHatchItem( aString, *pXHatch ) );
 
             delete pXHatch;
@@ -393,7 +395,7 @@ IMPL_LINK_NOARG(SvxHatchTabPage, ChangeHatchHdl_Impl)
         const SfxPoolItem* pPoolItem = NULL;
         if( SFX_ITEM_SET == rOutAttrs.GetItemState( GetWhich( XATTR_FILLSTYLE ), true, &pPoolItem ) )
         {
-            if( ( XFILL_HATCH == (XFillStyle) ( ( const XFillStyleItem* ) pPoolItem )->GetValue() ) &&
+            if( ( drawing::FillStyle_HATCH == (drawing::FillStyle) ( ( const XFillStyleItem* ) pPoolItem )->GetValue() ) &&
                 ( SFX_ITEM_SET == rOutAttrs.GetItemState( GetWhich( XATTR_FILLHATCH ), true, &pPoolItem ) ) )
             {
                 pHatch = new XHatch( ( ( const XFillHatchItem* ) pPoolItem )->GetHatchValue() );
diff --git a/cui/source/tabpages/tpshadow.cxx b/cui/source/tabpages/tpshadow.cxx
index b623734bba4c..d1dfe228d8c2 100644
--- a/cui/source/tabpages/tpshadow.cxx
+++ b/cui/source/tabpages/tpshadow.cxx
@@ -35,6 +35,8 @@
 #include <svx/xlineit0.hxx>
 #include <sfx2/request.hxx>
 
+using namespace com::sun::star;
+
 static const sal_uInt16 pShadowRanges[] =
 {
     SDRATTR_SHADOWCOLOR,
@@ -90,16 +92,14 @@ SvxShadowTabPage::SvxShadowTabPage( Window* pParent, const SfxItemSet& rInAttrs
     ePoolUnit = pPool->GetMetric( SDRATTR_SHADOWXDIST );
 
     // setting the output device
-    XFillStyle eXFS = XFILL_SOLID;
+    drawing::FillStyle eXFS = drawing::FillStyle_SOLID;
     if( rOutAttrs.GetItemState( XATTR_FILLSTYLE ) != SFX_ITEM_DONTCARE )
     {
-        eXFS = (XFillStyle) ( ( ( const XFillStyleItem& ) rOutAttrs.
+        eXFS = (drawing::FillStyle) ( ( ( const XFillStyleItem& ) rOutAttrs.
                                 Get( GetWhich( XATTR_FILLSTYLE ) ) ).GetValue() );
         switch( eXFS )
         {
-            //case XFILL_NONE: --> NOTHING
-
-            case XFILL_SOLID:
+            case drawing::FillStyle_SOLID:
                 if( SFX_ITEM_DONTCARE != rOutAttrs.GetItemState( XATTR_FILLCOLOR ) )
                 {
                     XFillColorItem aColorItem( ( const XFillColorItem& )
@@ -108,7 +108,7 @@ SvxShadowTabPage::SvxShadowTabPage( Window* pParent, const SfxItemSet& rInAttrs
                 }
             break;
 
-            case XFILL_GRADIENT:
+            case drawing::FillStyle_GRADIENT:
                 if( SFX_ITEM_DONTCARE != rOutAttrs.GetItemState( XATTR_FILLGRADIENT ) )
                 {
                     XFillGradientItem aGradientItem( ( ( const XFillGradientItem& )
@@ -117,7 +117,7 @@ SvxShadowTabPage::SvxShadowTabPage( Window* pParent, const SfxItemSet& rInAttrs
                 }
             break;
 
-            case XFILL_HATCH:
+            case drawing::FillStyle_HATCH:
                 if( SFX_ITEM_DONTCARE != rOutAttrs.GetItemState( XATTR_FILLHATCH ) )
                 {
                     XFillHatchItem aHatchItem( ( ( const XFillHatchItem& )
@@ -126,7 +126,7 @@ SvxShadowTabPage::SvxShadowTabPage( Window* pParent, const SfxItemSet& rInAttrs
                 }
             break;
 
-            case XFILL_BITMAP:
+            case drawing::FillStyle_BITMAP:
             {
                 if( SFX_ITEM_DONTCARE != rOutAttrs.GetItemState( XATTR_FILLBITMAP ) )
                 {
@@ -136,7 +136,8 @@ SvxShadowTabPage::SvxShadowTabPage( Window* pParent, const SfxItemSet& rInAttrs
                 }
             }
             break;
-            case XFILL_NONE : break;
+            case drawing::FillStyle_NONE : break;
+            default: break;
         }
     }
     else
@@ -144,13 +145,13 @@ SvxShadowTabPage::SvxShadowTabPage( Window* pParent, const SfxItemSet& rInAttrs
         rXFSet.Put( XFillColorItem( OUString(), COL_LIGHTRED ) );
     }
 
-    if(XFILL_NONE == eXFS)
+    if(drawing::FillStyle_NONE == eXFS)
     {
         // #i96350#
         // fallback to solid fillmode when no fill mode is provided to have
         // a reasonable shadow preview. The used color will be a set one or
         // the default (currently blue8)
-        eXFS = XFILL_SOLID;
+        eXFS = drawing::FillStyle_SOLID;
     }
 
     rXFSet.Put( XFillStyleItem( eXFS ) );
@@ -493,9 +494,9 @@ IMPL_LINK_NOARG(SvxShadowTabPage, ClickShadowHdl_Impl)
 IMPL_LINK_NOARG(SvxShadowTabPage, ModifyShadowHdl_Impl)
 {
     if( m_pTsbShowShadow->GetState() == TRISTATE_TRUE )
-        rXFSet.Put( XFillStyleItem( XFILL_SOLID ) );
+        rXFSet.Put( XFillStyleItem( drawing::FillStyle_SOLID ) );
     else
-        rXFSet.Put( XFillStyleItem( XFILL_NONE ) );
+        rXFSet.Put( XFillStyleItem( drawing::FillStyle_NONE ) );
 
     sal_Int32 nPos = m_pLbShadowColor->GetSelectEntryPos();
     if( nPos != LISTBOX_ENTRY_NOTFOUND )