Kaydet (Commit) ba511f80 authored tarafından Jan Holesovsky's avatar Jan Holesovsky

Related bnc#819614: Set the position and name immediately.

Change-Id: I4c1046040f52e261004df95125b53e42dc8fca4b
üst 59373b75
...@@ -47,6 +47,9 @@ ExtDrawingFragmentHandler::onCreateContext( ::sal_Int32 aElement, ...@@ -47,6 +47,9 @@ ExtDrawingFragmentHandler::onCreateContext( ::sal_Int32 aElement,
break; break;
case DSP_TOKEN( spTree ): case DSP_TOKEN( spTree ):
mpShapePtr = oox::drawingml::ShapePtr( new PPTShape( meShapeLocation, "com.sun.star.drawing.GroupShape" ) ); mpShapePtr = oox::drawingml::ShapePtr( new PPTShape( meShapeLocation, "com.sun.star.drawing.GroupShape" ) );
mpShapePtr->setPosition( mpOrgShapePtr->getPosition() );
mpShapePtr->setName( mpOrgShapePtr->getName() );
return new PPTShapeGroupContext( return new PPTShapeGroupContext(
*this, mpSlidePersistPtr, meShapeLocation, mpGroupShapePtr, *this, mpSlidePersistPtr, meShapeLocation, mpGroupShapePtr,
mpShapePtr ); mpShapePtr );
...@@ -56,14 +59,6 @@ ExtDrawingFragmentHandler::onCreateContext( ::sal_Int32 aElement, ...@@ -56,14 +59,6 @@ ExtDrawingFragmentHandler::onCreateContext( ::sal_Int32 aElement,
return this; 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() );
}
}
} } } }
......
...@@ -30,7 +30,6 @@ public: ...@@ -30,7 +30,6 @@ public:
oox::drawingml::ShapePtr pShapePtr ) throw(); oox::drawingml::ShapePtr pShapePtr ) throw();
virtual ~ExtDrawingFragmentHandler() 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; virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const AttributeList& rAttribs ) SAL_OVERRIDE;
private: private:
......
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