binfilter/bf_svx/source/svdraw/svx_svdobj.cxx | 2 +- binfilter/bf_svx/source/xoutdev/svx_xline.cxx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
New commits: commit 74c2636f88b46f5d17de76fd128e842386aa3217 Author: Stephan Bergmann <sberg...@redhat.com> Date: Tue Jun 12 17:22:24 2012 +0200 Adapt to 6d78c490b0923c22d125286ebdae2e41edd28f6c ... "Get rid of GRADIENT_* defines, they conflict with Windows GDI types." Change-Id: Id05d47005e56ba5fd24b1b1ce17b069e011a4003 diff --git a/binfilter/bf_svx/source/svdraw/svx_svdobj.cxx b/binfilter/bf_svx/source/svdraw/svx_svdobj.cxx index 48bf941..01128ea 100644 --- a/binfilter/bf_svx/source/svdraw/svx_svdobj.cxx +++ b/binfilter/bf_svx/source/svdraw/svx_svdobj.cxx @@ -1640,7 +1640,7 @@ SAL_WNODEPRECATED_DECLARATIONS_POP /*?*/ // to be shown line has transparence, output via MetaFile /*?*/ UINT8 nScaledTrans((UINT8)((nTransparence * 255)/100)); /*?*/ Color aTransColor(nScaledTrans, nScaledTrans, nScaledTrans); -/*?*/ Gradient aGradient(GRADIENT_LINEAR, aTransColor, aTransColor); +/*?*/ Gradient aGradient(GradientStyle_LINEAR, aTransColor, aTransColor); /*?*/ GDIMetaFile aMetaFile; /*?*/ VirtualDevice aVDev; /*?*/ Volume3D aVolume; diff --git a/binfilter/bf_svx/source/xoutdev/svx_xline.cxx b/binfilter/bf_svx/source/xoutdev/svx_xline.cxx index 6bc5306..e096a0d 100644 --- a/binfilter/bf_svx/source/xoutdev/svx_xline.cxx +++ b/binfilter/bf_svx/source/xoutdev/svx_xline.cxx @@ -460,7 +460,7 @@ namespace binfilter { /*?*/ MapMode aMap( pOldOut->GetMapMode() ); /*?*/ const BYTE cTrans = nLineTransparence * 255 / 100; /*?*/ const Color aTrans( cTrans, cTrans, cTrans ); -/*?*/ Gradient aTransGradient( GRADIENT_LINEAR, aTrans, aTrans ); +/*?*/ Gradient aTransGradient( GradientStyle_LINEAR, aTrans, aTrans ); /*?*/ /*?*/ pOut = &aVDev; /*?*/ aVDev.EnableOutput( FALSE ); _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits