diff options
| author | Jan Holesovsky <kendy@collabora.com> | 2013-09-16 16:46:46 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@collabora.com> | 2013-09-16 17:04:20 +0200 |
| commit | ba511f8002a2da521f06c3a6a0c60aa6de79d170 (patch) | |
| tree | a10ff8c914bb4a4982c57e4c7528b3fa12141fb2 /oox | |
| parent | 59373b753902f69cd44d183568b084429322e7ab (diff) | |
Related bnc#819614: Set the position and name immediately.
Change-Id: I4c1046040f52e261004df95125b53e42dc8fca4b
Diffstat (limited to 'oox')
| -rw-r--r-- | oox/source/ppt/extdrawingfragmenthandler.cxx | 11 | ||||
| -rw-r--r-- | oox/source/ppt/extdrawingfragmenthandler.hxx | 1 |
2 files changed, 3 insertions, 9 deletions
diff --git a/oox/source/ppt/extdrawingfragmenthandler.cxx b/oox/source/ppt/extdrawingfragmenthandler.cxx index 9fbf0a55f29f..d2b892fc40d2 100644 --- a/oox/source/ppt/extdrawingfragmenthandler.cxx +++ b/oox/source/ppt/extdrawingfragmenthandler.cxx @@ -47,6 +47,9 @@ ExtDrawingFragmentHandler::onCreateContext( ::sal_Int32 aElement, break; case DSP_TOKEN( spTree ): mpShapePtr = oox::drawingml::ShapePtr( new PPTShape( meShapeLocation, "com.sun.star.drawing.GroupShape" ) ); + mpShapePtr->setPosition( mpOrgShapePtr->getPosition() ); + mpShapePtr->setName( mpOrgShapePtr->getName() ); + return new PPTShapeGroupContext( *this, mpSlidePersistPtr, meShapeLocation, mpGroupShapePtr, mpShapePtr ); @@ -56,14 +59,6 @@ ExtDrawingFragmentHandler::onCreateContext( ::sal_Int32 aElement, return this; } -void SAL_CALL ExtDrawingFragmentHandler::endDocument() throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException) -{ - if( mpShapePtr ) - { - mpShapePtr->setPosition( mpOrgShapePtr->getPosition() ); - mpShapePtr->setName( mpOrgShapePtr->getName() ); - } -} } } diff --git a/oox/source/ppt/extdrawingfragmenthandler.hxx b/oox/source/ppt/extdrawingfragmenthandler.hxx index 0b186eb93abc..8de27efe7a82 100644 --- a/oox/source/ppt/extdrawingfragmenthandler.hxx +++ b/oox/source/ppt/extdrawingfragmenthandler.hxx @@ -30,7 +30,6 @@ public: oox::drawingml::ShapePtr pShapePtr ) throw(); virtual ~ExtDrawingFragmentHandler() throw(); - virtual void SAL_CALL endDocument() throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const AttributeList& rAttribs ) SAL_OVERRIDE; private: |