summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSarper Akdemir <q.sarperakdemir@gmail.com>2020-08-16 00:03:43 +0300
committerSarper Akdemir <q.sarperakdemir@gmail.com>2020-08-17 10:18:49 +0300
commite4a31bcabad9b717307cdf6c3cea295f5b32f55b (patch)
treefe4411a5a4fea085af9660c494a9ffbeaa17f9f7
parentwip add bounciness velocity and density options to physics animations (diff)
downloadcore-private/quwex/gsoc-box2d-experimental.tar.gz
core-private/quwex/gsoc-box2d-experimental.zip
fix group shape crash for physics animations private/quwex/gsoc-box2d-experimental
Change-Id: Icc4f69246b9fab69d2a1d96743a7b85a95d65dc7
-rw-r--r--slideshow/source/engine/box2dtools.cxx29
-rw-r--r--slideshow/source/engine/shapes/shapeimporter.cxx1
-rw-r--r--slideshow/source/inc/shape.hxx3
3 files changed, 29 insertions, 4 deletions
diff --git a/slideshow/source/engine/box2dtools.cxx b/slideshow/source/engine/box2dtools.cxx
index d1ef96f154ca..2c6c144a1ec9 100644
--- a/slideshow/source/engine/box2dtools.cxx
+++ b/slideshow/source/engine/box2dtools.cxx
@@ -18,6 +18,9 @@
#include <svx/svdobj.hxx>
#include <svx/svdoashp.hxx>
+#include <svx/svdogrp.hxx>
+
+#include <svx/unoapi.hxx>
#define BOX2D_SLIDE_SIZE_IN_METERS 100.00f
#define DEFAULT_BOUNCINESS 0.1
@@ -401,12 +404,36 @@ void box2DWorld::initateAllShapesAsStaticBodies(
mbShapesInitialized = true;
auto aXShapeToShapeMap = pShapeManager->getXShapeToShapeMap();
- // iterate over shapes in the current slide
+ std::unordered_map<css::uno::Reference<css::drawing::XShape>, bool> aXShapeBelongsToAGroup;
+
+ // iterate over the shapes in the current slide and flag them if they belong to a group
for (auto aIt = aXShapeToShapeMap.begin(); aIt != aXShapeToShapeMap.end(); aIt++)
{
slideshow::internal::ShapeSharedPtr pShape = aIt->second;
if (pShape->isForeground())
{
+ SdrObject* pTemp = SdrObject::getSdrObjectFromXShape(pShape->getXShape());
+ if (pTemp && pTemp->IsGroupObject())
+ {
+ SdrObjList* aObjList = pTemp->GetSubList();
+ const size_t nObjCount(aObjList->GetObjCount());
+
+ for (size_t nObjIndex = 0; nObjIndex < nObjCount; ++nObjIndex)
+ {
+ SdrObject* pGroupMember(aObjList->GetObj(nObjIndex));
+ aXShapeBelongsToAGroup.insert(
+ std::make_pair(GetXShapeForSdrObject(pGroupMember), true));
+ }
+ }
+ }
+ }
+
+ // iterate over shapes in the current slide
+ for (auto aIt = aXShapeToShapeMap.begin(); aIt != aXShapeToShapeMap.end(); aIt++)
+ {
+ slideshow::internal::ShapeSharedPtr pShape = aIt->second;
+ if (pShape->isForeground() && !aXShapeBelongsToAGroup[pShape->getXShape()])
+ {
Box2DBodySharedPtr pBox2DBody = createStaticBody(pShape);
mpXShapeToBodyMap.insert(std::make_pair(pShape->getXShape(), pBox2DBody));
diff --git a/slideshow/source/engine/shapes/shapeimporter.cxx b/slideshow/source/engine/shapes/shapeimporter.cxx
index 8f2abded678d..b1b1b3417269 100644
--- a/slideshow/source/engine/shapes/shapeimporter.cxx
+++ b/slideshow/source/engine/shapes/shapeimporter.cxx
@@ -495,7 +495,6 @@ ShapeSharedPtr ShapeImporter::importShape() // throw (ShapeLoadFailedException)
}
if( bIsGroupShape && pRet )
{
- pRet->setIsForeground(false);
// push new group on the stack: group traversal
maShapesStack.push( XShapesEntry( pRet ) );
}
diff --git a/slideshow/source/inc/shape.hxx b/slideshow/source/inc/shape.hxx
index 1638e87c08a7..0e6533fca6fe 100644
--- a/slideshow/source/inc/shape.hxx
+++ b/slideshow/source/inc/shape.hxx
@@ -269,8 +269,7 @@ namespace slideshow
private:
/** Flag to check whether the shape belongs to the foreground.
- For instance, it is false if the shape belongs to the master slide or
- a group shape.
+ For instance, it is false if the shape belongs to the master slide.
*/
bool mbIsForeground;
};