diff options
| author | Daniel Rentz <dr@openoffice.org> | 2009-07-13 08:56:32 +0000 |
|---|---|---|
| committer | Daniel Rentz <dr@openoffice.org> | 2009-07-13 08:56:32 +0000 |
| commit | a386089b5304685c37f9cacf107a374b0083c326 (patch) | |
| tree | 21a6ad9eb2594aac7739a12d895c8cc588a8b411 /oox/source/ppt/pptshape.cxx | |
| parent | f2f5cbfdd200561ca465eadb3526bfdaba3ef58f (diff) | |
#i12587# import shapes in charts from MSOOXML
Diffstat (limited to 'oox/source/ppt/pptshape.cxx')
| -rw-r--r-- | oox/source/ppt/pptshape.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/oox/source/ppt/pptshape.cxx b/oox/source/ppt/pptshape.cxx index c168b8085894..e4b144e6e55d 100644 --- a/oox/source/ppt/pptshape.cxx +++ b/oox/source/ppt/pptshape.cxx @@ -67,7 +67,7 @@ PPTShape::~PPTShape() void PPTShape::addShape( const oox::core::XmlFilterBase& rFilterBase, const SlidePersist& rSlidePersist, - const oox::drawingml::ThemePtr& rxTheme, + const oox::drawingml::Theme* pTheme, const Reference< XShapes >& rxShapes, const awt::Rectangle* pShapeRect, ::oox::drawingml::ShapeIdMap* pShapeMap ) @@ -157,7 +157,7 @@ void PPTShape::addShape( aMasterTextListStyle = rSlidePersist.getMasterPersist().get() ? rSlidePersist.getMasterPersist()->getOtherTextStyle() : rSlidePersist.getOtherTextStyle(); setMasterTextListStyle( aMasterTextListStyle ); - Reference< XShape > xShape( createAndInsert( rFilterBase, sServiceName, rxTheme, rxShapes, pShapeRect ) ); + Reference< XShape > xShape( createAndInsert( rFilterBase, sServiceName, pTheme, rxShapes, pShapeRect ) ); if( pShapeMap && msId.getLength() ) { @@ -167,7 +167,7 @@ void PPTShape::addShape( // if this is a group shape, we have to add also each child shape Reference< XShapes > xShapes( xShape, UNO_QUERY ); if ( xShapes.is() ) - addChildren( rFilterBase, *this, rxTheme, xShapes, pShapeRect ? *pShapeRect : awt::Rectangle( maPosition.X, maPosition.Y, maSize.Width, maSize.Height ), pShapeMap ); + addChildren( rFilterBase, *this, pTheme, xShapes, pShapeRect ? *pShapeRect : awt::Rectangle( maPosition.X, maPosition.Y, maSize.Width, maSize.Height ), pShapeMap ); } } catch( const Exception& ) |