mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Fixed Bug [35079]"

Browse Source 
The commit completely breaks slide transitions (and probably other
things as well).

This reverts commit 234738874f29ed23cd2aafb470511b5acf411e3c.
This commit is contained in:
David Tardon 2012-08-17 10:01:50 +02:00
parent ad031fd4bd
commit 19d13fd16e
1 changed files with 14 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
drawinglayer/source/primitive2d/baseprimitive2d.cxx
View File

@ -27,7 +27,6 @@
************************************************************************/
#include <drawinglayer/primitive2d/baseprimitive2d.hxx>
#include <drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx>
#include <drawinglayer/geometry/viewinformation2d.hxx>
#include <basegfx/tools/canvastools.hxx>
@ -122,27 +121,25 @@ namespace drawinglayer
basegfx::B2DRange getB2DRangeFromPrimitive2DReference(const Primitive2DReference& rCandidate, const geometry::ViewInformation2D& aViewInformation)
{
basegfx::B2DRange aRetval;
if(rCandidate.is())
{
//Ignores hidden primitives that may be malpositioned
if ((dynamic_cast< BasePrimitive2D*>(rCandidate.get()))->getPrimitive2DID() != PRIMITIVE2D_ID_HIDDENGEOMETRYPRIMITIVE2D)
{
// try to get C++ implementation base
const BasePrimitive2D* pCandidate(dynamic_cast< BasePrimitive2D* >(rCandidate.get()));
// 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)));
}
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;
}