diff options
| author | Armin Weiss <aw@openoffice.org> | 2007-12-20 12:13:15 +0000 |
|---|---|---|
| committer | Armin Weiss <aw@openoffice.org> | 2007-12-20 12:13:15 +0000 |
| commit | 83d6b11ccb76d1e0fe4651bf222876a4676bbfa1 (patch) | |
| tree | 61394ae74b5a5925a3ed8d0cbbf57ae8ecab0441 /drawinglayer | |
| parent | 43f54a02f8aff4f4f9a0ad4be3c1edb3c5e9eb31 (diff) | |
#i39532# sequence of PDF VClRenderer changed to be nice to the PDFWriter
Diffstat (limited to 'drawinglayer')
| -rw-r--r-- | drawinglayer/inc/drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx | 7 | ||||
| -rw-r--r-- | drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx | 16 |
2 files changed, 15 insertions, 8 deletions
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx index 36bb7fa849a6..ec4544dd99c2 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx @@ -4,9 +4,9 @@ * * $RCSfile: drawinglayer_primitivetypes2d.hxx,v $ * - * $Revision: 1.8 $ + * $Revision: 1.9 $ * - * last change: $Author: aw $ $Date: 2007-11-07 14:27:16 $ + * last change: $Author: aw $ $Date: 2007-12-20 13:13:14 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -42,6 +42,8 @@ #define PRIMITIVE2D_ID_RANGE_DRAWINGLAYER (0 << 16) #define PRIMITIVE2D_ID_RANGE_SVX (1 << 16) #define PRIMITIVE2D_ID_RANGE_SD (2 << 16) +#define PRIMITIVE2D_ID_RANGE_SW (3 << 16) +#define PRIMITIVE2D_ID_RANGE_SC (4 << 16) ////////////////////////////////////////////////////////////////////////////// // local primitives @@ -93,6 +95,7 @@ #define PRIMITIVE2D_ID_TEXTEFFECTPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 44) #define PRIMITIVE2D_ID_TEXTHIERARCHYBULLETPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 45) #define PRIMITIVE2D_ID_POLYPOLYGONHAIRLINEPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 46) +#define PRIMITIVE2D_ID_EXECUTEPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 47) ////////////////////////////////////////////////////////////////////////////// diff --git a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx index 0ae5f47832e2..89cfec9c1147 100644 --- a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx +++ b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx @@ -4,9 +4,9 @@ * * $RCSfile: vclmetafileprocessor2d.cxx,v $ * - * $Revision: 1.14 $ + * $Revision: 1.15 $ * - * last change: $Author: aw $ $Date: 2007-12-12 13:23:40 $ + * last change: $Author: aw $ $Date: 2007-12-20 13:13:15 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -1363,10 +1363,12 @@ namespace drawinglayer Graphic()); } - // call VCL directly; encapsulate with SvtGraphicFill - impStartSvtGraphicFill(pSvtGraphicFill); + // set line and fill color mpOutputDevice->SetFillColor(Color(aPolygonColor)); mpOutputDevice->SetLineColor(); + + // call VCL directly; encapsulate with SvtGraphicFill + impStartSvtGraphicFill(pSvtGraphicFill); mpOutputDevice->DrawPolyPolygon(aLocalPolyPolygon); impEndSvtGraphicFill(pSvtGraphicFill); @@ -1490,11 +1492,13 @@ namespace drawinglayer Graphic()); } - // call VCL directly; encapsulate with SvtGraphicFill - impStartSvtGraphicFill(pSvtGraphicFill); + // set line and fill color const sal_uInt16 nTransPercentVcl((sal_uInt16)basegfx::fround(rUniAlphaCandidate.getAlpha() * 100.0)); mpOutputDevice->SetFillColor(Color(aPolygonColor)); mpOutputDevice->SetLineColor(); + + // call VCL directly; encapsulate with SvtGraphicFill + impStartSvtGraphicFill(pSvtGraphicFill); mpOutputDevice->DrawTransparent( PolyPolygon(aLocalPolyPolygon), nTransPercentVcl); |