Kaydet (Commit) 23473887 authored tarafından Lennard's avatar Lennard Kaydeden (comit) Cédric Bosdonnat

Fixed Bug [35079]

Drawing: Fixed Custom Shape Frame-Selection Bounding box bug

Change-Id: Ia14feba446358cb195922477e0aa9576e9be2ae6
Signed-off-by: 's avatarLennard <Wasserthal@nefkom.net>
üst 5321134c
......@@ -27,6 +27,7 @@
************************************************************************/
#include <drawinglayer/primitive2d/baseprimitive2d.hxx>
#include <drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx>
#include <drawinglayer/geometry/viewinformation2d.hxx>
#include <basegfx/tools/canvastools.hxx>
......@@ -121,25 +122,27 @@ namespace drawinglayer
basegfx::B2DRange getB2DRangeFromPrimitive2DReference(const Primitive2DReference& rCandidate, const geometry::ViewInformation2D& aViewInformation)
{
basegfx::B2DRange aRetval;
if(rCandidate.is())
{
// try to get C++ implementation base
const BasePrimitive2D* pCandidate(dynamic_cast< BasePrimitive2D* >(rCandidate.get()));
if(pCandidate)
{
// use it if possible
aRetval.expand(pCandidate->getB2DRange(aViewInformation));
}
else
//Ignores hidden primitives that may be malpositioned
if ((dynamic_cast< BasePrimitive2D*>(rCandidate.get()))->getPrimitive2DID() != PRIMITIVE2D_ID_HIDDENGEOMETRYPRIMITIVE2D)
{
// use UNO API call instead
const uno::Sequence< beans::PropertyValue >& rViewParameters(aViewInformation.getViewInformationSequence());
aRetval.expand(basegfx::unotools::b2DRectangleFromRealRectangle2D(rCandidate->getRange(rViewParameters)));
// try to get C++ implementation base
const BasePrimitive2D* pCandidate(dynamic_cast< BasePrimitive2D* >(rCandidate.get()));
if(pCandidate)
{
// use it if possible
aRetval.expand(pCandidate->getB2DRange(aViewInformation));
}
else
{
// use UNO API call instead
const uno::Sequence< beans::PropertyValue >& rViewParameters(aViewInformation.getViewInformationSequence());
aRetval.expand(basegfx::unotools::b2DRectangleFromRealRectangle2D(rCandidate->getRange(rViewParameters)));
}
}
}
return aRetval;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment