diff options
| author | Noel Power <noel.power@suse.com> | 2013-03-12 20:37:15 +0000 |
|---|---|---|
| committer | Noel Power <noel.power@suse.com> | 2013-03-13 09:54:03 +0000 |
| commit | 1dbd088e4fb9597b0e2f5e4c4db6ecf047d85da3 (patch) | |
| tree | 736a3c966e379f34674df53f9e04afaeb0c5ece2 /oox/source/ppt | |
| parent | 856756ec77ac64d1caee6c1b80c3641d4e487b2d (diff) | |
bnc#798309 inherit group style from parent
Change-Id: Ie4f1d244f1c9b4935305742d12cabaee3e38647c
Diffstat (limited to 'oox/source/ppt')
| -rw-r--r-- | oox/source/ppt/dgmimport.cxx | 2 | ||||
| -rw-r--r-- | oox/source/ppt/pptshape.cxx | 2 | ||||
| -rw-r--r-- | oox/source/ppt/slidepersist.cxx | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/oox/source/ppt/dgmimport.cxx b/oox/source/ppt/dgmimport.cxx index 0918f82eaa90..10d16141cc70 100644 --- a/oox/source/ppt/dgmimport.cxx +++ b/oox/source/ppt/dgmimport.cxx @@ -78,7 +78,7 @@ bool QuickDiagrammingImport::importDocument() throw() pShape->addShape( *this, pTheme.get(), xParentShape, - aMatrix ); + aMatrix, pShape->getFillProperties() ); return true; } diff --git a/oox/source/ppt/pptshape.cxx b/oox/source/ppt/pptshape.cxx index 6bf64984db7b..a91ecbb2ae6f 100644 --- a/oox/source/ppt/pptshape.cxx +++ b/oox/source/ppt/pptshape.cxx @@ -328,7 +328,7 @@ void PPTShape::addShape( } else setMasterTextListStyle( aMasterTextListStyle ); - Reference< XShape > xShape( createAndInsert( rFilterBase, sServiceName, pTheme, rxShapes, pShapeRect, bClearText, mpPlaceholder.get() != NULL, aTransformation ) ); + Reference< XShape > xShape( createAndInsert( rFilterBase, sServiceName, pTheme, rxShapes, pShapeRect, bClearText, mpPlaceholder.get() != NULL, aTransformation, getFillProperties() ) ); if ( !rSlidePersist.isMasterPage() && rSlidePersist.getPage().is() && ( (sal_Int32)mnSubType == XML_title ) ) { try diff --git a/oox/source/ppt/slidepersist.cxx b/oox/source/ppt/slidepersist.cxx index 277096c37e66..92be16e10da5 100644 --- a/oox/source/ppt/slidepersist.cxx +++ b/oox/source/ppt/slidepersist.cxx @@ -136,7 +136,7 @@ void SlidePersist::createXShapes( XmlFilterBase& rFilterBase ) if ( pPPTShape ) pPPTShape->addShape( rFilterBase, *this, getTheme().get(), xShapes, aTransformation, 0, &getShapeMap() ); else - (*aChildIter)->addShape( rFilterBase, getTheme().get(), xShapes, aTransformation, 0, &getShapeMap() ); + (*aChildIter)->addShape( rFilterBase, getTheme().get(), xShapes, aTransformation, maShapesPtr->getFillProperties(), 0, &getShapeMap() ); aChildIter++; } } |