From 6d78c490b0923c22d125286ebdae2e41edd28f6c Mon Sep 17 00:00:00 2001 From: Jan Holesovsky Date: Mon, 11 Jun 2012 16:41:34 +0200 Subject: Get rid of GRADIENT_* defines, they conflict with Windows GDI types. Change-Id: Ia0bc37f81b7213b20fc5093beb46d7a05b1ac931 --- sd/source/ui/annotations/annotationwindow.cxx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'sd/source') diff --git a/sd/source/ui/annotations/annotationwindow.cxx b/sd/source/ui/annotations/annotationwindow.cxx index 34950f9f299f..6d8a311edc71 100644 --- a/sd/source/ui/annotations/annotationwindow.cxx +++ b/sd/source/ui/annotations/annotationwindow.cxx @@ -137,7 +137,7 @@ void AnnotationTextWindow::Paint( const Rectangle& rRect) if ( !bHighContrast ) { DrawGradient(Rectangle(Point(0,0),PixelToLogic(GetSizePixel())), - Gradient(GRADIENT_LINEAR,mpAnnotationWindow->maColorLight,mpAnnotationWindow->maColor)); + Gradient(GradientStyle_LINEAR,mpAnnotationWindow->maColorLight,mpAnnotationWindow->maColor)); } if( mpOutlinerView ) @@ -693,9 +693,9 @@ void AnnotationWindow::Paint( const Rectangle& rRect) //draw button Gradient aGradient; if (mbMouseOverButton) - aGradient = Gradient(GRADIENT_LINEAR,ColorFromAlphaColor(80,maColorDark,maColor),ColorFromAlphaColor(15,maColorDark,maColor)); + aGradient = Gradient(GradientStyle_LINEAR,ColorFromAlphaColor(80,maColorDark,maColor),ColorFromAlphaColor(15,maColorDark,maColor)); else - aGradient = Gradient(GRADIENT_LINEAR,ColorFromAlphaColor(15,maColorDark,maColor),ColorFromAlphaColor(80,maColorDark,maColor)); + aGradient = Gradient(GradientStyle_LINEAR,ColorFromAlphaColor(15,maColorDark,maColor),ColorFromAlphaColor(80,maColorDark,maColor)); DrawGradient(maRectMetaButton,aGradient); //draw rect around button SetFillColor(); -- cgit