fdo#85486 - Clean up unnecessary enumerations from xenum.hxx

Removed XGradientStyle

Reviewed on:
https://gerrit.libreoffice.org/13320

Change-Id: Iff662c05105c3a939104f658f2d0be7d8cb57995

2 files changed, 18 insertions, 18 deletions

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;
             }
         }