Attachment 77010 Details for Bug 61789 – prototype patch ...

prototype patch ...

export-transformed.diff (text/plain), 2.90 KB, created by Michael Meeks on 2013-03-25 17:12:58 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michael Meeks

Created: 2013-03-25 17:12:58 UTC

Size: 2.90 KB

patch

obsolete

>diff --git a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
>index f9d583d..a437416 100644
>--- a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
>+++ b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
>@@ -444,6 +445,15 @@ namespace drawinglayer
>                     // pre-fill fLineWidth
>                     fLineWidth = pLineAttribute->getWidth();
> 
>+                    // #i113922# the LineWidth is duplicated in the MetaPolylineAction,
>+                    // and also inside the SvtGraphicStroke and needs transforming into
>+                    // the same space as its co-ordinates here cf. fdo#61789
>+                    // This is a partial fix. When a object transformation is used which
>+                    // e.g. contains a scaleX != scaleY, an unproportional scaling will happen.
>+                    const basegfx::B2DVector aDiscreteUnit(maCurrentTransformation *
>+                                                           basegfx::B2DVector(pLineAttribute->getWidth(), 0.0));
>+                    fLineWidth = aDiscreteUnit.getLength();
>+
>                     // pre-fill fMiterLength
>                     fMiterLength = fLineWidth;
> 
>@@ -1233,11 +1243,7 @@ namespace drawinglayer
>                             mpOutputDevice->SetFillColor();
>                             aHairLinePolyPolygon.transform(maCurrentTransformation);
> 
>-                            // #i113922# LineWidth needs to be transformed, too
>-                            const basegfx::B2DVector aDiscreteUnit(maCurrentTransformation * basegfx::B2DVector(rLine.getWidth(), 0.0));
>-                            const double fDiscreteLineWidth(aDiscreteUnit.getLength());
>-
>-                            LineInfo aLineInfo(LINE_SOLID, basegfx::fround(fDiscreteLineWidth));
>+                            LineInfo aLineInfo(LINE_SOLID, basegfx::fround(rLine.getWidth()));
>                             aLineInfo.SetLineJoin(rLine.getLineJoin());
>                             aLineInfo.SetLineCap(rLine.getLineCap());
> 
>diff --git a/drawinglayer/source/processor2d/vclprocessor2d.cxx b/drawinglayer/source/processor2d/vclprocessor2d.cxx
>index 8423069..92d843c 100644
>--- a/drawinglayer/source/processor2d/vclprocessor2d.cxx
>+++ b/drawinglayer/source/processor2d/vclprocessor2d.cxx
>@@ -1350,7 +1350,7 @@ namespace drawinglayer
>                     {
>                         // #i101491# If the polygon complexity uses more than a given amount, do
>                         // use OuputDevice::DrawPolyLine directly; this will avoid buffering all
>-                        // decompositions in primtives (memory) and fallback to old line painting
>+                        // decompositions in primitives (memory) and fallback to old line painting
>                         // for very complex polygons, too
>                         for(sal_uInt32 a(0); a < nCount; a++)
>                         {

Actions: View

Attachments on bug 61789: 75893 | 76527 | 77010 | 77022