Get rid of GRADIENT_* defines, they conflict with Windows GDI types.

Change-Id: Ia0bc37f81b7213b20fc5093beb46d7a05b1ac931

11 files changed, 24 insertions, 50 deletions

diff --git a/vcl/inc/vcl/gradient.hxx b/vcl/inc/vcl/gradient.hxx
index 382b245e984a..150b79458913 100644
--- a/vcl/inc/vcl/gradient.hxx
+++ b/vcl/inc/vcl/gradient.hxx
@@ -35,18 +35,6 @@
 
 #include <vcl/vclenum.hxx>
 
-// ------------------
-// - Gradient-Types -
-// ------------------
-
-/*
-#ifndef ENUM_GRADIENTSTYLE_DECLARED
-#define ENUM_GRADIENTSTYLE_DECLARED
-enum GradientStyle { GRADIENT_LINEAR, GRADIENT_AXIAL, GRADIENT_RADIAL,
-                     GRADIENT_ELLIPTICAL, GRADIENT_SQUARE, GRADIENT_RECT };
-#endif
-*/
-
 // ----------------
 // - Impl_Gradient -
 // ----------------
diff --git a/vcl/inc/vcl/vclenum.hxx b/vcl/inc/vcl/vclenum.hxx
index dbc18302ce41..95510e8414f0 100644
--- a/vcl/inc/vcl/vclenum.hxx
+++ b/vcl/inc/vcl/vclenum.hxx
@@ -67,31 +67,17 @@ enum ExtDateFieldFormat { XTDATEF_SYSTEM_SHORT, XTDATEF_SYSTEM_SHORT_YY, XTDATEF
 
 // ------------------------------------------------------------
 
-// to avoid conflicts with enum's declared otherwise
-#define GRADIENT_LINEAR             GradientStyle_LINEAR
-#define GRADIENT_AXIAL              GradientStyle_AXIAL
-#define GRADIENT_RADIAL             GradientStyle_RADIAL
-#define GRADIENT_ELLIPTICAL         GradientStyle_ELLIPTICAL
-#define GRADIENT_SQUARE             GradientStyle_SQUARE
-#define GRADIENT_RECT               GradientStyle_RECT
-#define GRADIENT_FORCE_EQUAL_SIZE   GradientStyle_FORCE_EQUAL_SIZE
-
-#ifndef ENUM_GRADIENTSTYLE_DECLARED
-#define ENUM_GRADIENTSTYLE_DECLARED
-
 enum GradientStyle
 {
-    GRADIENT_LINEAR = 0,
-    GRADIENT_AXIAL = 1,
-    GRADIENT_RADIAL = 2,
-    GRADIENT_ELLIPTICAL = 3,
-    GRADIENT_SQUARE = 4,
-    GRADIENT_RECT = 5,
+    GradientStyle_LINEAR = 0,
+    GradientStyle_AXIAL = 1,
+    GradientStyle_RADIAL = 2,
+    GradientStyle_ELLIPTICAL = 3,
+    GradientStyle_SQUARE = 4,
+    GradientStyle_RECT = 5,
     GradientStyle_FORCE_EQUAL_SIZE = SAL_MAX_ENUM
 };
 
-#endif
-
 // ------------------------------------------------------------
 
 // to avoid conflicts with enum's declared otherwise
diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx
index f30ce5c282d6..02457d1791e5 100644
--- a/vcl/source/app/settings.cxx
+++ b/vcl/source/app/settings.cxx
@@ -428,7 +428,7 @@ void ImplStyleData::SetStandardStyles()
     mbHideDisabledMenuItems     = sal_False;
     mnAcceleratorsInContextMenus    = sal_True;
 
-    Gradient aGrad( GRADIENT_LINEAR, DEFAULT_WORKSPACE_GRADIENT_START_COLOR, DEFAULT_WORKSPACE_GRADIENT_END_COLOR );
+    Gradient aGrad( GradientStyle_LINEAR, DEFAULT_WORKSPACE_GRADIENT_START_COLOR, DEFAULT_WORKSPACE_GRADIENT_END_COLOR );
     maWorkspaceGradient = Wallpaper( aGrad );
 }
 
diff --git a/vcl/source/gdi/gradient.cxx b/vcl/source/gdi/gradient.cxx
index af648a19d53f..61c005dfa8e1 100644
--- a/vcl/source/gdi/gradient.cxx
+++ b/vcl/source/gdi/gradient.cxx
@@ -42,7 +42,7 @@ Impl_Gradient::Impl_Gradient() :
     maEndColor( COL_WHITE )
 {
     mnRefCount          = 1;
-    meStyle             = GRADIENT_LINEAR;
+    meStyle             = GradientStyle_LINEAR;
     mnAngle             = 0;
     mnBorder            = 0;
     mnOfsX              = 50;
@@ -238,7 +238,7 @@ void Gradient::GetBoundRect( const Rectangle& rRect, Rectangle& rBoundRect, Poin
     Rectangle aRect( rRect );
     sal_uInt16 nAngle = GetAngle() % 3600;
 
-    if( GetStyle() == GRADIENT_LINEAR || GetStyle() == GRADIENT_AXIAL )
+    if( GetStyle() == GradientStyle_LINEAR || GetStyle() == GradientStyle_AXIAL )
     {
         aRect.Left()--;
         aRect.Top()--;
@@ -264,7 +264,7 @@ void Gradient::GetBoundRect( const Rectangle& rRect, Rectangle& rBoundRect, Poin
     }
     else
     {
-        if( GetStyle() == GRADIENT_SQUARE || GetStyle() == GRADIENT_RECT )
+        if( GetStyle() == GradientStyle_SQUARE || GetStyle() == GradientStyle_RECT )
         {
             const double    fAngle = nAngle * F_PI1800;
             const double    fWidth = aRect.GetWidth();
@@ -283,19 +283,19 @@ void Gradient::GetBoundRect( const Rectangle& rRect, Rectangle& rBoundRect, Poin
 
         Size aSize( aRect.GetSize() );
 
-        if( GetStyle() == GRADIENT_RADIAL )
+        if( GetStyle() == GradientStyle_RADIAL )
         {
             // Radien-Berechnung fuer Kreis
             aSize.Width() = (long)(0.5 + sqrt((double)aSize.Width()*(double)aSize.Width() + (double)aSize.Height()*(double)aSize.Height()));
             aSize.Height() = aSize.Width();
         }
-        else if( GetStyle() == GRADIENT_ELLIPTICAL )
+        else if( GetStyle() == GradientStyle_ELLIPTICAL )
         {
             // Radien-Berechnung fuer Ellipse
             aSize.Width() = (long)( 0.5 + (double) aSize.Width()  * 1.4142 );
             aSize.Height() = (long)( 0.5 + (double) aSize.Height() * 1.4142 );
         }
-        else if( GetStyle() == GRADIENT_SQUARE )
+        else if( GetStyle() == GradientStyle_SQUARE )
         {
             if ( aSize.Width() > aSize.Height() )
                 aSize.Height() = aSize.Width();
diff --git a/vcl/source/gdi/outdev4.cxx b/vcl/source/gdi/outdev4.cxx
index 735a85e6bdac..7b5c81955b26 100644
--- a/vcl/source/gdi/outdev4.cxx
+++ b/vcl/source/gdi/outdev4.cxx
@@ -185,7 +185,7 @@ void OutputDevice::ImplDrawLinearGradient( const Rectangle& rRect,
     long        nBorder = (long)rGradient.GetBorder() * aRect.GetHeight() / 100;
 
     // Rand berechnen und Rechteck neu setzen fuer linearen Farbverlauf
-    bool bLinear = (rGradient.GetStyle() == GRADIENT_LINEAR);
+    bool bLinear = (rGradient.GetStyle() == GradientStyle_LINEAR);
     if ( bLinear )
     {
         aRect.Top() += nBorder;
@@ -529,7 +529,7 @@ void OutputDevice::ImplDrawComplexGradient( const Rectangle& rRect,
         if( ( aRect.GetWidth() < 2 ) || ( aRect.GetHeight() < 2 ) )
             break;
 
-        if( rGradient.GetStyle() == GRADIENT_RADIAL || rGradient.GetStyle() == GRADIENT_ELLIPTICAL )
+        if( rGradient.GetStyle() == GradientStyle_RADIAL || rGradient.GetStyle() == GradientStyle_ELLIPTICAL )
             aPoly = Polygon( aRect.Center(), aRect.GetWidth() >> 1, aRect.GetHeight() >> 1 );
         else
             aPoly = Polygon( aRect );
@@ -727,7 +727,7 @@ void OutputDevice::DrawGradient( const Rectangle& rRect,
             if ( !aGradient.GetSteps() )
                 aGradient.SetSteps( GRADIENT_DEFAULT_STEPCOUNT );
 
-            if( aGradient.GetStyle() == GRADIENT_LINEAR || aGradient.GetStyle() == GRADIENT_AXIAL )
+            if( aGradient.GetStyle() == GradientStyle_LINEAR || aGradient.GetStyle() == GradientStyle_AXIAL )
                 ImplDrawLinearGradient( aRect, aGradient, sal_False, NULL );
             else
                 ImplDrawComplexGradient( aRect, aGradient, sal_False, NULL );
@@ -892,7 +892,7 @@ void OutputDevice::DrawGradient( const PolyPolygon& rPolyPoly,
                         if ( !aGradient.GetSteps() )
                             aGradient.SetSteps( GRADIENT_DEFAULT_STEPCOUNT );
 
-                        if( aGradient.GetStyle() == GRADIENT_LINEAR || aGradient.GetStyle() == GRADIENT_AXIAL )
+                        if( aGradient.GetStyle() == GradientStyle_LINEAR || aGradient.GetStyle() == GradientStyle_AXIAL )
                             ImplDrawLinearGradient( aRect, aGradient, sal_False, &aClipPolyPoly );
                         else
                             ImplDrawComplexGradient( aRect, aGradient, sal_False, &aClipPolyPoly );
@@ -1001,7 +1001,7 @@ void OutputDevice::AddGradientActions( const Rectangle& rRect, const Gradient& r
         if ( !aGradient.GetSteps() )
             aGradient.SetSteps( GRADIENT_DEFAULT_STEPCOUNT );
 
-        if( aGradient.GetStyle() == GRADIENT_LINEAR || aGradient.GetStyle() == GRADIENT_AXIAL )
+        if( aGradient.GetStyle() == GradientStyle_LINEAR || aGradient.GetStyle() == GradientStyle_AXIAL )
             ImplDrawLinearGradient( aRect, aGradient, sal_True, NULL );
         else
             ImplDrawComplexGradient( aRect, aGradient, sal_True, NULL );
diff --git a/vcl/source/gdi/wall.cxx b/vcl/source/gdi/wall.cxx
index 98c7629789a3..51a70cc5a500 100644
--- a/vcl/source/gdi/wall.cxx
+++ b/vcl/source/gdi/wall.cxx
@@ -437,7 +437,7 @@ Gradient Wallpaper::ImplGetApplicationGradient() const
 {
     Gradient g;
     g.SetAngle( 900 );
-    g.SetStyle( GRADIENT_LINEAR );
+    g.SetStyle( GradientStyle_LINEAR );
     g.SetStartColor( Application::GetSettings().GetStyleSettings().GetFaceColor() );
     // no 'extreme' gradient when high contrast
     if( Application::GetSettings().GetStyleSettings().GetHighContrastMode() )
diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx
index 7c1751c72f03..935d5a9ec9ac 100644
--- a/vcl/source/window/menu.cxx
+++ b/vcl/source/window/menu.cxx
@@ -2954,7 +2954,7 @@ void Menu::ImplPaint( Window* pWin, sal_uInt16 nBorder, long nStartY, MenuItemDa
         Rectangle aRect( Point( 0, 0 ), Point( aLogoSz.Width()-1, aOutSz.Height() ) );
         if ( pWin->GetColorCount() >= 256 )
         {
-            Gradient aGrad( GRADIENT_LINEAR, pLogo->aStartColor, pLogo->aEndColor );
+            Gradient aGrad( GradientStyle_LINEAR, pLogo->aStartColor, pLogo->aEndColor );
             aGrad.SetAngle( 1800 );
             aGrad.SetBorder( 15 );
             pWin->DrawGradient( aRect, aGrad );
diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx
index c144f3c62316..993c107d221e 100644
--- a/vcl/source/window/toolbox.cxx
+++ b/vcl/source/window/toolbox.cxx
@@ -408,7 +408,7 @@ void ToolBox::ImplDrawGradientBackground( ToolBox* pThis, ImplDockingWindowWrapp
 
     Gradient g;
     g.SetAngle( pThis->mbHorz ? 0 : 900 );
-    g.SetStyle( GRADIENT_LINEAR );
+    g.SetStyle( GradientStyle_LINEAR );
 
     g.SetStartColor( startCol );
     g.SetEndColor( endCol );
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index d9aff3d04556..8835788908fc 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -484,7 +484,7 @@ void Window::ImplUpdateGlobalSettings( AllSettings& rSettings, sal_Bool bCallHdl
         aStyleSettings.SetWorkspaceGradient( Wallpaper( Color( COL_BLACK ) ) );
     else
     {
-        Gradient aGrad( GRADIENT_LINEAR, DEFAULT_WORKSPACE_GRADIENT_START_COLOR, DEFAULT_WORKSPACE_GRADIENT_END_COLOR );
+        Gradient aGrad( GradientStyle_LINEAR, DEFAULT_WORKSPACE_GRADIENT_START_COLOR, DEFAULT_WORKSPACE_GRADIENT_END_COLOR );
         aStyleSettings.SetWorkspaceGradient( Wallpaper( aGrad ) );
     }
 
diff --git a/vcl/workben/outdevgrind.cxx b/vcl/workben/outdevgrind.cxx
index 96b657236a14..323feee5d94f 100644
--- a/vcl/workben/outdevgrind.cxx
+++ b/vcl/workben/outdevgrind.cxx
@@ -145,7 +145,7 @@ void setupMethodStubs( functor_vector_type& res )
     const BitmapEx    aBitmapExAlphaAlien( aBitmapAlien, aBitmapAlien );
 
     const Image       aImage( aBitmapEx );
-    const Gradient    aGradient(GRADIENT_ELLIPTICAL,aBlackColor,aWhiteColor);
+    const Gradient    aGradient(GradientStyle_ELLIPTICAL,aBlackColor,aWhiteColor);
     const Hatch       aHatch(HatchStyle_TRIPLE,aBlackColor,4,450);
     const Wallpaper   aWallpaper( aWhiteColor );
 
diff --git a/vcl/workben/svptest.cxx b/vcl/workben/svptest.cxx
index 545c2aedf6ee..2c1dd59a8174 100644
--- a/vcl/workben/svptest.cxx
+++ b/vcl/workben/svptest.cxx
@@ -308,7 +308,7 @@ void MyWin::Paint( const Rectangle& rRect )
     Color aLightGreen( 0, 0xff, 0 );
     Color aDarkGreen( 0, 0x40, 0 );
 
-    Gradient aGradient( GRADIENT_LINEAR, aBlack, aWhite );
+    Gradient aGradient( GradientStyle_LINEAR, aBlack, aWhite );
     aGradient.SetAngle( 900 );
     DrawGradient( Rectangle( Point( 1000, 4500 ),
                              Size( aPaperSize.Width() - 2000,