summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2012-06-12 17:22:24 +0200
committerNorbert Thiebaud <nthiebaud@gmail.com>2012-06-17 18:17:17 -0500
commit0e83873df15b5bc38902635aad4a94cd4d9fd9a2 (patch)
tree6c01bfe3c2ee0a07278e6007c21b971cd8378f51
parentBranch libreoffice-3-6 (diff)
downloadbinfilter-0e83873df15b5bc38902635aad4a94cd4d9fd9a2.tar.gz
binfilter-0e83873df15b5bc38902635aad4a94cd4d9fd9a2.zip
Adapt to 6d78c490b0923c22d125286ebdae2e41edd28f6c
... "Get rid of GRADIENT_* defines, they conflict with Windows GDI types." Change-Id: Id05d47005e56ba5fd24b1b1ce17b069e011a4003
-rw-r--r--binfilter/bf_svx/source/svdraw/svx_svdobj.cxx2
-rw-r--r--binfilter/bf_svx/source/xoutdev/svx_xline.cxx2
2 files changed, 2 insertions, 2 deletions
diff --git a/binfilter/bf_svx/source/svdraw/svx_svdobj.cxx b/binfilter/bf_svx/source/svdraw/svx_svdobj.cxx
index 48bf941eb..01128eabe 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 6bc530634..e096a0da6 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 );