10 files changed, 106 insertions, 90 deletions

diff --git a/svx/source/sdr/primitive2d/sdrattributecreator.cxx b/svx/source/sdr/primitive2d/sdrattributecreator.cxx
index 35fe3354574e..94db008d6b49 100644
--- a/svx/source/sdr/primitive2d/sdrattributecreator.cxx
+++ b/svx/source/sdr/primitive2d/sdrattributecreator.cxx
@@ -82,33 +82,33 @@ namespace drawinglayer
 {
     namespace
     {
-        attribute::GradientStyle XGradientStyleToGradientStyle(XGradientStyle eStyle)
+        attribute::GradientStyle XGradientStyleToGradientStyle(css::awt::GradientStyle eStyle)
         {
             switch(eStyle)
             {
-                case XGRAD_LINEAR :
+                case css::awt::GradientStyle_LINEAR :
                 {
                     return attribute::GRADIENTSTYLE_LINEAR;
                 }
-                case XGRAD_AXIAL :
+                case css::awt::GradientStyle_AXIAL :
                 {
                     return attribute::GRADIENTSTYLE_AXIAL;
                 }
-                case XGRAD_RADIAL :
+                case css::awt::GradientStyle_RADIAL :
                 {
                     return attribute::GRADIENTSTYLE_RADIAL;
                 }
-                case XGRAD_ELLIPTICAL :
+                case css::awt::GradientStyle_ELLIPTICAL :
                 {
                     return attribute::GRADIENTSTYLE_ELLIPTICAL;
                 }
-                case XGRAD_SQUARE :
+                case css::awt::GradientStyle_SQUARE :
                 {
                     return attribute::GRADIENTSTYLE_SQUARE;
                 }
                 default :
                 {
-                    return attribute::GRADIENTSTYLE_RECT; // XGRAD_RECT
+                    return attribute::GRADIENTSTYLE_RECT; // css::awt::GradientStyle_RECT
                 }
             }
         }
diff --git a/svx/source/sidebar/area/AreaPropertyPanel.cxx b/svx/source/sidebar/area/AreaPropertyPanel.cxx
index 63467d2f3209..d95eaee471f8 100644
--- a/svx/source/sidebar/area/AreaPropertyPanel.cxx
+++ b/svx/source/sidebar/area/AreaPropertyPanel.cxx
@@ -128,22 +128,22 @@ void AreaPropertyPanel::Initialize()
     maGradientLinear.SetStartColor(Color(DEFAULT_STARTVALUE));
     maGradientLinear.SetEndColor(Color(DEFAULT_ENDVALUE));
     maGradientLinear.SetBorder(DEFAULT_BORDER);
-    maGradientLinear.SetGradientStyle(XGRAD_LINEAR);
+    maGradientLinear.SetGradientStyle(css::awt::GradientStyle_LINEAR);
 
     maGradientAxial = maGradientLinear;
-    maGradientAxial.SetGradientStyle(XGRAD_AXIAL);
+    maGradientAxial.SetGradientStyle(css::awt::GradientStyle_AXIAL);
 
     maGradientRadial = maGradientLinear;
-    maGradientRadial.SetGradientStyle(XGRAD_RADIAL);
+    maGradientRadial.SetGradientStyle(css::awt::GradientStyle_RADIAL);
 
     maGradientElliptical = maGradientLinear;
-    maGradientElliptical.SetGradientStyle(XGRAD_ELLIPTICAL);
+    maGradientElliptical.SetGradientStyle(css::awt::GradientStyle_ELLIPTICAL);
 
     maGradientSquare = maGradientLinear;
-    maGradientSquare.SetGradientStyle(XGRAD_SQUARE);
+    maGradientSquare.SetGradientStyle(css::awt::GradientStyle_SQUARE);
 
     maGradientRect = maGradientLinear;
-    maGradientRect.SetGradientStyle(XGRAD_RECT);
+    maGradientRect.SetGradientStyle(css::awt::GradientStyle_RECT);
 
     mpLbFillType->SetAccessibleName(OUString( "Fill"));    //wj acc
     mpLbFillAttr->SetAccessibleName(OUString( "Fill"));    //wj acc
@@ -581,42 +581,44 @@ void AreaPropertyPanel::ImpUpdateTransparencies()
 
                 switch(rGradient.GetGradientStyle())
                 {
-                    case XGRAD_LINEAR:
+                    case css::awt::GradientStyle_LINEAR:
                     {
                         nEntryPos = 2;
                         pImage = &maImgLinear;
                         break;
                     }
-                    case XGRAD_AXIAL:
+                    case css::awt::GradientStyle_AXIAL:
                     {
                         nEntryPos = 3;
                         pImage = &maImgAxial;
                         break;
                     }
-                    case XGRAD_RADIAL:
+                    case css::awt::GradientStyle_RADIAL:
                     {
                         nEntryPos = 4;
                         pImage = &maImgRadial;
                         break;
                     }
-                    case XGRAD_ELLIPTICAL:
+                    case css::awt::GradientStyle_ELLIPTICAL:
                     {
                         nEntryPos = 5;
                         pImage = &maImgElli;
                         break;
                     }
-                    case XGRAD_SQUARE:
+                    case css::awt::GradientStyle_SQUARE:
                     {
                         nEntryPos = 6;
                         pImage = &maImgQuad;
                         break;
                     }
-                    case XGRAD_RECT:
+                    case css::awt::GradientStyle_RECT:
                     {
                         nEntryPos = 7;
                         pImage = &maImgSquare;
                         break;
                     }
+                    default:
+                        break;
                 }
 
                 const sal_uInt16 nIdGradient = mpBTNGradient->GetItemId(UNO_SIDEBARGRADIENT);
@@ -1155,24 +1157,26 @@ IMPL_LINK(AreaPropertyPanel, ChangeTrgrTypeHdl_Impl, void *, EMPTYARG)
 
     switch(nSelectType)
     {
-        case XGRAD_LINEAR:
+        case css::awt::GradientStyle_LINEAR:
             aTmpGradient = maGradientLinear;
             break;
-        case XGRAD_AXIAL:
+        case css::awt::GradientStyle_AXIAL:
             aTmpGradient = maGradientAxial;
             break;
-        case XGRAD_RADIAL:
+        case css::awt::GradientStyle_RADIAL:
             aTmpGradient = maGradientRadial;
             break;
-        case XGRAD_ELLIPTICAL:
+        case css::awt::GradientStyle_ELLIPTICAL:
             aTmpGradient = maGradientElliptical;
             break;
-        case XGRAD_SQUARE:
+        case css::awt::GradientStyle_SQUARE:
             aTmpGradient = maGradientSquare;
             break;
-        case XGRAD_RECT:
+        case css::awt::GradientStyle_RECT:
             aTmpGradient = maGradientRect;
             break;
+        default:
+            break;
     }
 
     SfxItemPool* pPool = 0;
@@ -1206,22 +1210,22 @@ IMPL_LINK(AreaPropertyPanel, ModifyTransparentHdl_Impl, void*, EMPTYARG)
 
 
 
-XGradient AreaPropertyPanel::GetGradient (const XGradientStyle eStyle) const
+XGradient AreaPropertyPanel::GetGradient (const css::awt::GradientStyle eStyle) const
 {
     switch (eStyle)
     {
         default:
-        case XGRAD_LINEAR:
+        case css::awt::GradientStyle_LINEAR:
             return maGradientLinear;
-        case XGRAD_AXIAL:
+        case css::awt::GradientStyle_AXIAL:
             return maGradientAxial;
-        case XGRAD_RADIAL:
+        case css::awt::GradientStyle_RADIAL:
             return maGradientRadial;
-        case XGRAD_ELLIPTICAL:
+        case css::awt::GradientStyle_ELLIPTICAL:
             return maGradientElliptical;
-        case XGRAD_SQUARE:
+        case css::awt::GradientStyle_SQUARE:
             return maGradientSquare;
-        case XGRAD_RECT:
+        case css::awt::GradientStyle_RECT:
             return maGradientRect;
     }
 }
@@ -1233,24 +1237,26 @@ void AreaPropertyPanel::SetGradient (const XGradient& rGradient)
 {
     switch (rGradient.GetGradientStyle())
     {
-        case XGRAD_LINEAR:
+        case css::awt::GradientStyle_LINEAR:
             maGradientLinear = rGradient;
             break;
-        case XGRAD_AXIAL:
+        case css::awt::GradientStyle_AXIAL:
             maGradientAxial = rGradient;
             break;
-        case XGRAD_RADIAL:
+        case css::awt::GradientStyle_RADIAL:
             maGradientRadial = rGradient;
             break;
-        case XGRAD_ELLIPTICAL:
+        case css::awt::GradientStyle_ELLIPTICAL:
             maGradientElliptical = rGradient;
             break;
-        case XGRAD_SQUARE:
+        case css::awt::GradientStyle_SQUARE:
             maGradientSquare = rGradient;
             break;
-        case XGRAD_RECT:
+        case css::awt::GradientStyle_RECT:
             maGradientRect = rGradient;
             break;
+        default:
+            break;
     }
 }
 
diff --git a/svx/source/sidebar/area/AreaPropertyPanel.hxx b/svx/source/sidebar/area/AreaPropertyPanel.hxx
index 3bc035358ca7..a2a9f42ffca0 100644
--- a/svx/source/sidebar/area/AreaPropertyPanel.hxx
+++ b/svx/source/sidebar/area/AreaPropertyPanel.hxx
@@ -76,7 +76,7 @@ public:
     const static sal_Int32 DEFAULT_ENDVALUE;
     const static sal_Int32 DEFAULT_BORDER;
 
-    XGradient GetGradient (const XGradientStyle eStyle) const;
+    XGradient GetGradient (const css::awt::GradientStyle eStyle) const;
     void SetGradient (const XGradient& rGradient);
     sal_Int32 GetSelectedTransparencyTypeIndex (void) const;
 
diff --git a/svx/source/sidebar/area/AreaTransparencyGradientControl.cxx b/svx/source/sidebar/area/AreaTransparencyGradientControl.cxx
index 7c6a10383b5e..400b20d61868 100644
--- a/svx/source/sidebar/area/AreaTransparencyGradientControl.cxx
+++ b/svx/source/sidebar/area/AreaTransparencyGradientControl.cxx
@@ -116,7 +116,7 @@ void AreaTransparencyGradientControl::Rearrange(XFillFloatTransparenceItem* pGra
 {
     InitStatus(pGradientItem);
     const XGradient& rGradient = pGradientItem->GetGradientValue();
-    XGradientStyle eXGS(rGradient.GetGradientStyle());
+    css::awt::GradientStyle eXGS(rGradient.GetGradientStyle());
     Size aSize(POP_WIDTH,POP_HEIGHT);
     aSize = LogicToPixel( aSize, MapMode(MAP_APPFONT) );
     Size aSize2(POP_WIDTH,POP_HEIGHT2);
@@ -128,8 +128,8 @@ void AreaTransparencyGradientControl::Rearrange(XFillFloatTransparenceItem* pGra
 
     switch(eXGS)
     {
-    case XGRAD_LINEAR:
-    case XGRAD_AXIAL:
+    case css::awt::GradientStyle_LINEAR:
+    case css::awt::GradientStyle_AXIAL:
         maFtTrgrCenterX.Hide();
         maMtrTrgrCenterX.Hide();
         maFtTrgrCenterY.Hide();
@@ -157,7 +157,7 @@ void AreaTransparencyGradientControl::Rearrange(XFillFloatTransparenceItem* pGra
         SetSizePixel(aSize2);
         break;
 
-    case XGRAD_RADIAL:
+    case css::awt::GradientStyle_RADIAL:
         maFtTrgrCenterX.Show();
         maFtTrgrCenterX.SetPosPixel(APOS1_1);
         maMtrTrgrCenterX.Show();
@@ -182,9 +182,9 @@ void AreaTransparencyGradientControl::Rearrange(XFillFloatTransparenceItem* pGra
 
         break;
 
-    case XGRAD_ELLIPTICAL:
-    case XGRAD_SQUARE:
-    case XGRAD_RECT:
+    case css::awt::GradientStyle_ELLIPTICAL:
+    case css::awt::GradientStyle_SQUARE:
+    case css::awt::GradientStyle_RECT:
         maFtTrgrCenterX.Show();
         maFtTrgrCenterX.SetPosPixel(APOS1_1);
         maMtrTrgrCenterX.Show();
@@ -217,6 +217,9 @@ void AreaTransparencyGradientControl::Rearrange(XFillFloatTransparenceItem* pGra
         SetSizePixel(aSize);
 
         break;
+
+    default:
+        break;
     }
 }
 
@@ -268,7 +271,7 @@ void AreaTransparencyGradientControl::ExecuteValueModify( sal_uInt8 nStartCol, s
     XGradient aTmpGradient(
         Color(nStartCol, nStartCol, nStartCol),
         Color(nEndCol, nEndCol, nEndCol),
-        (XGradientStyle)(mrAreaPropertyPanel.GetSelectedTransparencyTypeIndex()-2),
+        (css::awt::GradientStyle)(mrAreaPropertyPanel.GetSelectedTransparencyTypeIndex()-2),
         (sal_uInt16)maMtrTrgrAngle.GetValue() * 10,
         (sal_uInt16)maMtrTrgrCenterX.GetValue(),
         (sal_uInt16)maMtrTrgrCenterY.GetValue(),
diff --git a/svx/source/sidebar/area/AreaTransparencyGradientControl.hxx b/svx/source/sidebar/area/AreaTransparencyGradientControl.hxx
index 1a8d31b16573..8a526175b999 100644
--- a/svx/source/sidebar/area/AreaTransparencyGradientControl.hxx
+++ b/svx/source/sidebar/area/AreaTransparencyGradientControl.hxx
@@ -26,6 +26,7 @@
 #include <vcl/field.hxx>
 #include <vcl/toolbox.hxx>
 #include <svx/xenum.hxx>
+#include <com/sun/star/awt/GradientStyle.hpp>
 
 class XFillFloatTransparenceItem;
 class SfxBindings;
@@ -45,7 +46,7 @@ public:
     void Rearrange(XFillFloatTransparenceItem* pGradientItem);
     void InitStatus(XFillFloatTransparenceItem* pGradientItem);
     void ExecuteValueModify( sal_uInt8 nStartCol, sal_uInt8 nEndCol );
-    void SetControlState_Impl(XGradientStyle eXGS);
+    void SetControlState_Impl(css::awt::GradientStyle eXGS);
 
 private:
     FixedText           maFtTrgrCenterX;
diff --git a/svx/source/svdraw/gradtrns.cxx b/svx/source/svdraw/gradtrns.cxx
index d010eec5e639..72981d02ae96 100644
--- a/svx/source/svdraw/gradtrns.cxx
+++ b/svx/source/svdraw/gradtrns.cxx
@@ -53,7 +53,7 @@ void GradTransformer::GradToVec(GradTransGradient& rG, GradTransVector& rV, cons
 
     switch(rG.aGradient.GetGradientStyle())
     {
-        case XGRAD_LINEAR :
+        case css::awt::GradientStyle_LINEAR :
         {
             aStartPos = basegfx::B2DPoint(aCenter.getX(), aRange.getMinY());
             aEndPos = basegfx::B2DPoint(aCenter.getX(), aRange.getMaximum().getY());
@@ -76,7 +76,7 @@ void GradTransformer::GradToVec(GradTransGradient& rG, GradTransVector& rV, cons
             }
             break;
         }
-        case XGRAD_AXIAL :
+        case css::awt::GradientStyle_AXIAL :
         {
             aStartPos = aCenter;
             aEndPos = basegfx::B2DPoint(aCenter.getX(), aRange.getMaximum().getY());
@@ -99,8 +99,8 @@ void GradTransformer::GradToVec(GradTransGradient& rG, GradTransVector& rV, cons
             }
             break;
         }
-        case XGRAD_RADIAL :
-        case XGRAD_SQUARE :
+        case css::awt::GradientStyle_RADIAL :
+        case css::awt::GradientStyle_SQUARE :
         {
             aStartPos = basegfx::B2DPoint(aRange.getMinX(), aRange.getMaximum().getY());
             aEndPos = basegfx::B2DPoint(aRange.getMinX(), aRange.getMinY());
@@ -134,8 +134,8 @@ void GradTransformer::GradToVec(GradTransGradient& rG, GradTransVector& rV, cons
 
             break;
         }
-        case XGRAD_ELLIPTICAL :
-        case XGRAD_RECT :
+        case css::awt::GradientStyle_ELLIPTICAL :
+        case css::awt::GradientStyle_RECT :
         {
             aStartPos = basegfx::B2DPoint(aRange.getMinX(), aCenter.getY());
             aEndPos = basegfx::B2DPoint(aRange.getMinX(), aRange.getMinY());
@@ -169,6 +169,8 @@ void GradTransformer::GradToVec(GradTransGradient& rG, GradTransVector& rV, cons
 
             break;
         }
+        default:
+            break;
     }
 
     // set values for vector positions now
@@ -205,7 +207,7 @@ void GradTransformer::VecToGrad(GradTransVector& rV, GradTransGradient& rG, Grad
 
     switch(rG.aGradient.GetGradientStyle())
     {
-        case XGRAD_LINEAR :
+        case css::awt::GradientStyle_LINEAR :
         {
             if(!bMoveSingle || (bMoveSingle && !bMoveFirst))
             {
@@ -274,7 +276,7 @@ void GradTransformer::VecToGrad(GradTransVector& rV, GradTransGradient& rG, Grad
 
             break;
         }
-        case XGRAD_AXIAL :
+        case css::awt::GradientStyle_AXIAL :
         {
             if(!bMoveSingle || (bMoveSingle && !bMoveFirst))
             {
@@ -330,8 +332,8 @@ void GradTransformer::VecToGrad(GradTransVector& rV, GradTransGradient& rG, Grad
 
             break;
         }
-        case XGRAD_RADIAL :
-        case XGRAD_SQUARE :
+        case css::awt::GradientStyle_RADIAL :
+        case css::awt::GradientStyle_SQUARE :
         {
             if(!bMoveSingle || (bMoveSingle && !bMoveFirst))
             {
@@ -426,8 +428,8 @@ void GradTransformer::VecToGrad(GradTransVector& rV, GradTransGradient& rG, Grad
 
             break;
         }
-        case XGRAD_ELLIPTICAL :
-        case XGRAD_RECT :
+        case css::awt::GradientStyle_ELLIPTICAL :
+        case css::awt::GradientStyle_RECT :
         {
             if(!bMoveSingle || (bMoveSingle && !bMoveFirst))
             {
@@ -522,6 +524,8 @@ void GradTransformer::VecToGrad(GradTransVector& rV, GradTransGradient& rG, Grad
 
             break;
         }
+        default:
+            break;
     }
 }
 
diff --git a/svx/source/svdraw/svdfmtf.cxx b/svx/source/svdraw/svdfmtf.cxx
index f92df8c92e11..391364bdb045 100644
--- a/svx/source/svdraw/svdfmtf.cxx
+++ b/svx/source/svdraw/svdfmtf.cxx
@@ -1233,7 +1233,7 @@ void ImpSdrGDIMetaFileImport::DoAction( MetaCommentAction& rAct, GDIMetaFile& rM
                     SfxItemSet aGradAttr(mpModel->GetItemPool(), pPath->GetMergedItemSet().GetRanges());
                     XGradient aXGradient;
 
-                    aXGradient.SetGradientStyle((XGradientStyle)rGrad.GetStyle());
+                    aXGradient.SetGradientStyle((css::awt::GradientStyle)rGrad.GetStyle());
                     aXGradient.SetStartColor(rGrad.GetStartColor());
                     aXGradient.SetEndColor(rGrad.GetEndColor());
                     aXGradient.SetAngle((sal_uInt16)rGrad.GetAngle());
@@ -1365,24 +1365,26 @@ void ImpSdrGDIMetaFileImport::DoAction(MetaMaskScalePartAction& rAct)
 
 namespace
 {
-    XGradientStyle getXGradientStyleFromGradientStyle(const GradientStyle& rGradientStyle)
+    css::awt::GradientStyle getXGradientStyleFromGradientStyle(const GradientStyle& rGradientStyle)
     {
-        XGradientStyle aXGradientStyle(XGRAD_LINEAR);
+        css::awt::GradientStyle aXGradientStyle(css::awt::GradientStyle_LINEAR);
 
         switch(rGradientStyle)
         {
-            case GradientStyle_LINEAR: aXGradientStyle = XGRAD_LINEAR; break;
-            case GradientStyle_AXIAL: aXGradientStyle = XGRAD_AXIAL; break;
-            case GradientStyle_RADIAL: aXGradientStyle = XGRAD_RADIAL; break;
-            case GradientStyle_ELLIPTICAL: aXGradientStyle = XGRAD_ELLIPTICAL; break;
-            case GradientStyle_SQUARE: aXGradientStyle = XGRAD_SQUARE; break;
-            case GradientStyle_RECT: aXGradientStyle = XGRAD_RECT; break;
+            case GradientStyle_LINEAR: aXGradientStyle = css::awt::GradientStyle_LINEAR; break;
+            case GradientStyle_AXIAL: aXGradientStyle = css::awt::GradientStyle_AXIAL; break;
+            case GradientStyle_RADIAL: aXGradientStyle = css::awt::GradientStyle_RADIAL; break;
+            case GradientStyle_ELLIPTICAL: aXGradientStyle = css::awt::GradientStyle_ELLIPTICAL; break;
+            case GradientStyle_SQUARE: aXGradientStyle = css::awt::GradientStyle_SQUARE; break;
+            case GradientStyle_RECT: aXGradientStyle = css::awt::GradientStyle_RECT; break;
 
             // Needed due to GradientStyle_FORCE_EQUAL_SIZE; this again is needed
             // to force the enum defines in VCL to a defined size for the compilers,
             // so despite it is never used it cannot be removed (would break the
             // API implementation probably).
             case GradientStyle_FORCE_EQUAL_SIZE: break;
+            default:
+                break;
         }
 
         return aXGradientStyle;
@@ -1406,7 +1408,7 @@ void ImpSdrGDIMetaFileImport::DoAction(MetaGradientAction& rAct)
                 ceil(aRange.getMaxY())));
         // #i125211# Use the ranges from the SdrObject to create a new empty SfxItemSet
         SfxItemSet aGradientAttr(mpModel->GetItemPool(), pRect->GetMergedItemSet().GetRanges());
-        const XGradientStyle aXGradientStyle(getXGradientStyleFromGradientStyle(rGradient.GetStyle()));
+        const css::awt::GradientStyle aXGradientStyle(getXGradientStyleFromGradientStyle(rGradient.GetStyle()));
         const XFillGradientItem aXFillGradientItem(
             XGradient(
                 rGradient.GetStartColor(),
@@ -1476,7 +1478,7 @@ void ImpSdrGDIMetaFileImport::DoAction(MetaGradientExAction& rAct)
             SdrPathObj* pPath = new SdrPathObj(OBJ_POLY, aSource);
             // #i125211# Use the ranges from the SdrObject to create a new empty SfxItemSet
             SfxItemSet aGradientAttr(mpModel->GetItemPool(), pPath->GetMergedItemSet().GetRanges());
-            const XGradientStyle aXGradientStyle(getXGradientStyleFromGradientStyle(rGradient.GetStyle()));
+            const css::awt::GradientStyle aXGradientStyle(getXGradientStyleFromGradientStyle(rGradient.GetStyle()));
             const XFillGradientItem aXFillGradientItem(
                 XGradient(
                     rGradient.GetStartColor(),
diff --git a/svx/source/unodraw/XPropertyTable.cxx b/svx/source/unodraw/XPropertyTable.cxx
index b6df02f8d21f..60df2af3014c 100644
--- a/svx/source/unodraw/XPropertyTable.cxx
+++ b/svx/source/unodraw/XPropertyTable.cxx
@@ -592,7 +592,7 @@ XPropertyEntry* SvxUnoXGradientTable::getEntry( const OUString& rName, const uno
 
     XGradient aXGradient;
 
-    aXGradient.SetGradientStyle( (XGradientStyle) aGradient.Style );
+    aXGradient.SetGradientStyle( (css::awt::GradientStyle) aGradient.Style );
     aXGradient.SetStartColor( aGradient.StartColor );
     aXGradient.SetEndColor( aGradient.EndColor );
     aXGradient.SetAngle( aGradient.Angle );
diff --git a/svx/source/xoutdev/xattr.cxx b/svx/source/xoutdev/xattr.cxx
index 803178dee42f..87356be82617 100644
--- a/svx/source/xoutdev/xattr.cxx
+++ b/svx/source/xoutdev/xattr.cxx
@@ -2288,7 +2288,7 @@ bool XSecondaryFillColorItem::GetPresentation
 }
 
 XGradient::XGradient() :
-    eStyle( XGRAD_LINEAR ),
+    eStyle( css::awt::GradientStyle_LINEAR ),
     aStartColor( Color( COL_BLACK ) ),
     aEndColor( Color( COL_WHITE ) ),
     nAngle( 0 ),
@@ -2302,7 +2302,7 @@ XGradient::XGradient() :
 }
 
 XGradient::XGradient(const Color& rStart, const Color& rEnd,
-                     XGradientStyle eTheStyle, long nTheAngle, sal_uInt16 nXOfs,
+                     css::awt::GradientStyle eTheStyle, long nTheAngle, sal_uInt16 nXOfs,
                      sal_uInt16 nYOfs, sal_uInt16 nTheBorder,
                      sal_uInt16 nStartIntens, sal_uInt16 nEndIntens,
                      sal_uInt16 nSteps) :
@@ -2368,7 +2368,7 @@ XFillGradientItem::XFillGradientItem(SvStream& rIn, sal_uInt16 nVer) :
         sal_Int16  nITemp;
         sal_Int32  nLTemp;
 
-        rIn.ReadInt16( nITemp ); aGradient.SetGradientStyle((XGradientStyle)nITemp);
+        rIn.ReadInt16( nITemp ); aGradient.SetGradientStyle((css::awt::GradientStyle)nITemp);
         rIn.ReadUInt16( nRed );
         rIn.ReadUInt16( nGreen );
         rIn.ReadUInt16( nBlue );
@@ -2583,7 +2583,7 @@ bool XFillGradientItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uI
                 {
                     XGradient aXGradient;
 
-                    aXGradient.SetGradientStyle( (XGradientStyle) aGradient2.Style );
+                    aXGradient.SetGradientStyle( (css::awt::GradientStyle) aGradient2.Style );
                     aXGradient.SetStartColor( aGradient2.StartColor );
                     aXGradient.SetEndColor( aGradient2.EndColor );
                     aXGradient.SetAngle( aGradient2.Angle );
@@ -2620,7 +2620,7 @@ bool XFillGradientItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uI
 
             XGradient aXGradient;
 
-            aXGradient.SetGradientStyle( (XGradientStyle) aGradient2.Style );
+            aXGradient.SetGradientStyle( (css::awt::GradientStyle) aGradient2.Style );
             aXGradient.SetStartColor( aGradient2.StartColor );
             aXGradient.SetEndColor( aGradient2.EndColor );
             aXGradient.SetAngle( aGradient2.Angle );
@@ -2670,7 +2670,7 @@ bool XFillGradientItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uI
             switch ( nMemberId )
             {
                 case MID_GRADIENT_STYLE:
-                    aXGradient.SetGradientStyle( (XGradientStyle)nVal ); break;
+                    aXGradient.SetGradientStyle( (css::awt::GradientStyle)nVal ); break;
                 case MID_GRADIENT_ANGLE:
                     aXGradient.SetAngle( nVal ); break;
                 case MID_GRADIENT_BORDER:
diff --git a/svx/source/xoutdev/xtabgrdt.cxx b/svx/source/xoutdev/xtabgrdt.cxx
index 6e88708f7c29..f25a215fd29f 100644
--- a/svx/source/xoutdev/xtabgrdt.cxx
+++ b/svx/source/xoutdev/xtabgrdt.cxx
@@ -72,17 +72,17 @@ bool XGradientList::Create()
     rtl::OUStringBuffer aStr(SVX_RESSTR(RID_SVXSTR_GRADIENT));
     aStr.append(" 1");
     sal_Int32 nLen = aStr.getLength() - 1;
-    Insert(new XGradientEntry(XGradient(RGB_Color(COL_BLACK  ),RGB_Color(COL_WHITE  ),XGRAD_LINEAR    ,    0,10,10, 0,100,100),aStr.toString()));
+    Insert(new XGradientEntry(XGradient(RGB_Color(COL_BLACK  ),RGB_Color(COL_WHITE  ),css::awt::GradientStyle_LINEAR    ,    0,10,10, 0,100,100),aStr.toString()));
     aStr[nLen] = '2';
-    Insert(new XGradientEntry(XGradient(RGB_Color(COL_BLUE   ),RGB_Color(COL_RED    ),XGRAD_AXIAL     ,  300,20,20,10,100,100),aStr.toString()));
+    Insert(new XGradientEntry(XGradient(RGB_Color(COL_BLUE   ),RGB_Color(COL_RED    ),css::awt::GradientStyle_AXIAL     ,  300,20,20,10,100,100),aStr.toString()));
     aStr[nLen] = '3';
-    Insert(new XGradientEntry(XGradient(RGB_Color(COL_RED    ),RGB_Color(COL_YELLOW ),XGRAD_RADIAL    ,  600,30,30,20,100,100),aStr.toString()));
+    Insert(new XGradientEntry(XGradient(RGB_Color(COL_RED    ),RGB_Color(COL_YELLOW ),css::awt::GradientStyle_RADIAL    ,  600,30,30,20,100,100),aStr.toString()));
     aStr[nLen] = '4';
-    Insert(new XGradientEntry(XGradient(RGB_Color(COL_YELLOW ),RGB_Color(COL_GREEN  ),XGRAD_ELLIPTICAL,  900,40,40,30,100,100),aStr.toString()));
+    Insert(new XGradientEntry(XGradient(RGB_Color(COL_YELLOW ),RGB_Color(COL_GREEN  ),css::awt::GradientStyle_ELLIPTICAL,  900,40,40,30,100,100),aStr.toString()));
     aStr[nLen] = '5';
-    Insert(new XGradientEntry(XGradient(RGB_Color(COL_GREEN  ),RGB_Color(COL_MAGENTA),XGRAD_SQUARE    , 1200,50,50,40,100,100),aStr.toString()));
+    Insert(new XGradientEntry(XGradient(RGB_Color(COL_GREEN  ),RGB_Color(COL_MAGENTA),css::awt::GradientStyle_SQUARE    , 1200,50,50,40,100,100),aStr.toString()));
     aStr[nLen] = '6';
-    Insert(new XGradientEntry(XGradient(RGB_Color(COL_MAGENTA),RGB_Color(COL_YELLOW ),XGRAD_RECT      , 1900,60,60,50,100,100),aStr.toString()));
+    Insert(new XGradientEntry(XGradient(RGB_Color(COL_MAGENTA),RGB_Color(COL_YELLOW ),css::awt::GradientStyle_RECT      , 1900,60,60,50,100,100),aStr.toString()));
 
     return true;
 }
@@ -126,34 +126,34 @@ Bitmap XGradientList::CreateBitmapForUI( long nIndex )
 
         switch(rGradient.GetGradientStyle())
         {
-            case XGRAD_LINEAR :
+            case css::awt::GradientStyle_LINEAR :
             {
                 aGradientStyle = drawinglayer::attribute::GRADIENTSTYLE_LINEAR;
                 break;
             }
-            case XGRAD_AXIAL :
+            case css::awt::GradientStyle_AXIAL :
             {
                 aGradientStyle = drawinglayer::attribute::GRADIENTSTYLE_AXIAL;
                 break;
             }
-            case XGRAD_RADIAL :
+            case css::awt::GradientStyle_RADIAL :
             {
                 aGradientStyle = drawinglayer::attribute::GRADIENTSTYLE_RADIAL;
                 break;
             }
-            case XGRAD_ELLIPTICAL :
+            case css::awt::GradientStyle_ELLIPTICAL :
             {
                 aGradientStyle = drawinglayer::attribute::GRADIENTSTYLE_ELLIPTICAL;
                 break;
             }
-            case XGRAD_SQUARE :
+            case css::awt::GradientStyle_SQUARE :
             {
                 aGradientStyle = drawinglayer::attribute::GRADIENTSTYLE_SQUARE;
                 break;
             }
             default :
             {
-                aGradientStyle = drawinglayer::attribute::GRADIENTSTYLE_RECT; // XGRAD_RECT
+                aGradientStyle = drawinglayer::attribute::GRADIENTSTYLE_RECT; // css::awt::GradientStyle_RECT
                 break;
             }
         }