You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by al...@apache.org on 2013/06/12 18:56:19 UTC
svn commit: r1492283 - /openoffice/trunk/main/svx/source/svdraw/svdhdl.cxx
Author: alg
Date: Wed Jun 12 16:56:18 2013
New Revision: 1492283
URL: http://svn.apache.org/r1492283
Log:
i74211 added frame to better see graphic
Modified:
openoffice/trunk/main/svx/source/svdraw/svdhdl.cxx
Modified: openoffice/trunk/main/svx/source/svdraw/svdhdl.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/svx/source/svdraw/svdhdl.cxx?rev=1492283&r1=1492282&r2=1492283&view=diff
==============================================================================
--- openoffice/trunk/main/svx/source/svdraw/svdhdl.cxx (original)
+++ openoffice/trunk/main/svx/source/svdraw/svdhdl.cxx Wed Jun 12 16:56:18 2013
@@ -69,6 +69,7 @@
#include <drawinglayer/primitive2d/graphicprimitive2d.hxx>
#include <drawinglayer/primitive2d/maskprimitive2d.hxx>
#include <drawinglayer/primitive2d/unifiedtransparenceprimitive2d.hxx>
+#include <drawinglayer/primitive2d/polygonprimitive2d.hxx>
////////////////////////////////////////////////////////////////////////////////////////////////////
// #i15222#
@@ -2559,9 +2560,10 @@ void SdrCropViewHdl::CreateB2dIAObject()
aCropped.transform(aBackToUnit);
// prepare crop PolyPolygon
- basegfx::B2DPolyPolygon aCropPolyPolygon(
+ basegfx::B2DPolygon aGraphicOutlinePolygon(
basegfx::tools::createPolygonFromRect(
aCropped));
+ basegfx::B2DPolyPolygon aCropPolyPolygon(aGraphicOutlinePolygon);
// current range is unit range
basegfx::B2DRange aOverlap(0.0, 0.0, 1.0, 1.0);
@@ -2577,6 +2579,7 @@ void SdrCropViewHdl::CreateB2dIAObject()
// transform to object coordinates to prepare for clip
aCropPolyPolygon.transform(maObjectTransform);
+ aGraphicOutlinePolygon.transform(maObjectTransform);
// create cropped transformation
basegfx::B2DHomMatrix aCroppedTransform;
@@ -2596,11 +2599,24 @@ void SdrCropViewHdl::CreateB2dIAObject()
aCroppedTransform,
maGraphic));
+ // prepare outline polygon for whole graphic
+ const SvtOptionsDrawinglayer aSvtOptionsDrawinglayer;
+ const basegfx::BColor aHilightColor(aSvtOptionsDrawinglayer.getHilightColor().getBColor());
+ const drawinglayer::primitive2d::Primitive2DReference aGraphicOutline(
+ new drawinglayer::primitive2d::PolygonHairlinePrimitive2D(
+ aGraphicOutlinePolygon,
+ aHilightColor));
+
+ // combine these
+ drawinglayer::primitive2d::Primitive2DSequence aCombination(2);
+ aCombination[0] = aGraphic;
+ aCombination[1] = aGraphicOutline;
+
// embed to MaskPrimitive2D
const drawinglayer::primitive2d::Primitive2DReference aMaskedGraphic(
new drawinglayer::primitive2d::MaskPrimitive2D(
aCropPolyPolygon,
- drawinglayer::primitive2d::Primitive2DSequence(&aGraphic, 1)));
+ aCombination));
// embed to UnifiedTransparencePrimitive2D
const drawinglayer::primitive2d::Primitive2DReference aTransparenceMaskedGraphic(