diff options
| author | Jan Holesovsky <kendy@collabora.com> | 2013-09-16 16:30:45 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@collabora.com> | 2013-09-16 17:04:03 +0200 |
| commit | 59373b753902f69cd44d183568b084429322e7ab (patch) | |
| tree | d4da45a309e6f0bb3be83714ae92e4db41fe91f3 /oox | |
| parent | fc54915c461dc753866627bd52ea60b12b71a012 (diff) | |
Related bnc#819614: The diagram is a group.
It is not really desired to import diagrams broken into individual objects;
makes trouble with the hieararchy, and also the user wants to see it as a
group - can be ungrouped for modifications easily.
Change-Id: I0533a69af9e377804bf0e06b2ce873fd0c9bde02
Diffstat (limited to 'oox')
| -rw-r--r-- | oox/source/drawingml/shape.cxx | 7 | ||||
| -rw-r--r-- | oox/source/ppt/extdrawingfragmenthandler.cxx | 4 |
2 files changed, 2 insertions, 9 deletions
diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx index d8d127a48ea4..44a43ff4c531 100644 --- a/oox/source/drawingml/shape.cxx +++ b/oox/source/drawingml/shape.cxx @@ -665,13 +665,6 @@ TextBodyPtr Shape::getTextBody() return mpTextBody; } -void Shape::moveAllToPosition( const awt::Point &rPoint ) -{ - setPosition( awt::Point( rPoint.X + maPosition.X, rPoint.Y + maPosition.Y ) ); - for( ::std::vector<ShapePtr>::const_iterator aIt = maChildren.begin(), aEnd = maChildren.end();aIt != aEnd; ++aIt ) - (*aIt)->moveAllToPosition( rPoint ); -} - void Shape::setMasterTextListStyle( const TextListStylePtr& pMasterTextListStyle ) { SAL_INFO("oox.drawingml", OSL_THIS_FUNC << "set master text list style to shape id: " << msId); diff --git a/oox/source/ppt/extdrawingfragmenthandler.cxx b/oox/source/ppt/extdrawingfragmenthandler.cxx index e6d4b2f5ce97..9fbf0a55f29f 100644 --- a/oox/source/ppt/extdrawingfragmenthandler.cxx +++ b/oox/source/ppt/extdrawingfragmenthandler.cxx @@ -48,7 +48,7 @@ ExtDrawingFragmentHandler::onCreateContext( ::sal_Int32 aElement, case DSP_TOKEN( spTree ): mpShapePtr = oox::drawingml::ShapePtr( new PPTShape( meShapeLocation, "com.sun.star.drawing.GroupShape" ) ); return new PPTShapeGroupContext( - *this, mpSlidePersistPtr, meShapeLocation, mpSlidePersistPtr->getShapes(), + *this, mpSlidePersistPtr, meShapeLocation, mpGroupShapePtr, mpShapePtr ); default: break; @@ -60,7 +60,7 @@ void SAL_CALL ExtDrawingFragmentHandler::endDocument() throw (::com::sun::star:: { if( mpShapePtr ) { - mpShapePtr->moveAllToPosition( mpOrgShapePtr->getPosition() ); + mpShapePtr->setPosition( mpOrgShapePtr->getPosition() ); mpShapePtr->setName( mpOrgShapePtr->getName() ); } } |