oox/inc/oox/drawingml/shape.hxx |5 -
oox/source/drawingml/chart/chartdrawingfragment.cxx |2 +-
oox/source/drawingml/shape.cxx | 15 +++
oox/source/ppt/dgmimport.cxx|2 +-
oox/source/ppt/pptshape.cxx |2 +-
oox/source/ppt/slidepersist.cxx |2 +-
oox/source/shape/ShapeContextHandler.cxx|6 +++---
sc/source/filter/oox/drawingfragment.cxx|2 +-
8 files changed, 23 insertions(+), 13 deletions(-)
New commits:
commit 4e730db5b3d02047f8b6100e803a94880d5a711e
Author: Noel Power noel.po...@suse.com
Date: Tue Mar 12 20:37:15 2013 +
bnc#798309 inherit group style from parent
Change-Id: I8acba22750b8b06b9c20607884629899ad180425
Reviewed-on: https://gerrit.libreoffice.org/2702
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org
diff --git a/oox/inc/oox/drawingml/shape.hxx b/oox/inc/oox/drawingml/shape.hxx
index 09ea502..b1b423d 100644
--- a/oox/inc/oox/drawingml/shape.hxx
+++ b/oox/inc/oox/drawingml/shape.hxx
@@ -156,6 +156,7 @@ public:
const Theme* pTheme,
const ::com::sun::star::uno::Reference
::com::sun::star::drawing::XShapes rxShapes,
basegfx::B2DHomMatrix aTransformation,
+FillProperties rShapeOrParentShapeFillProps,
const ::com::sun::star::awt::Rectangle* pShapeRect
= 0,
ShapeIdMap* pShapeMap = 0 );
@@ -190,7 +191,9 @@ protected:
const ::com::sun::star::awt::Rectangle* pShapeRect,
sal_Bool bClearText,
sal_Bool bDoNotInsertEmptyTextBody,
-basegfx::B2DHomMatrix aTransformation );
+basegfx::B2DHomMatrix aTransformation,
+FillProperties rShapeOrParentShapeFillProps
+ );
voidaddChildren(
::oox::core::XmlFilterBase rFilterBase,
diff --git a/oox/source/drawingml/chart/chartdrawingfragment.cxx
b/oox/source/drawingml/chart/chartdrawingfragment.cxx
index 4d0109b..6d0540f 100644
--- a/oox/source/drawingml/chart/chartdrawingfragment.cxx
+++ b/oox/source/drawingml/chart/chartdrawingfragment.cxx
@@ -226,7 +226,7 @@ void ChartDrawingFragment::onEndElement()
getLimitedValue sal_Int32, sal_Int64 (
aShapeRectEmu.Width, 0, SAL_MAX_INT32 ),
getLimitedValue sal_Int32, sal_Int64 (
aShapeRectEmu.Height, 0, SAL_MAX_INT32 ) );
basegfx::B2DHomMatrix aMatrix;
-mxShape-addShape( getFilter(), getFilter().getCurrentTheme(),
mxDrawPage, aMatrix, aShapeRectEmu32 );
+mxShape-addShape( getFilter(), getFilter().getCurrentTheme(),
mxDrawPage, aMatrix, mxShape-getFillProperties(), aShapeRectEmu32 );
}
}
mxShape.reset();
diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx
index 66a1ee1..a5fead9 100644
--- a/oox/source/drawingml/shape.cxx
+++ b/oox/source/drawingml/shape.cxx
@@ -201,6 +201,7 @@ void Shape::addShape(
const Theme* pTheme,
const Reference XShapes rxShapes,
basegfx::B2DHomMatrix aTransformation,
+FillProperties rShapeOrParentShapeFillProps,
const awt::Rectangle* pShapeRect,
ShapeIdMap* pShapeMap )
{
@@ -212,7 +213,7 @@ void Shape::addShape(
if( !sServiceName.isEmpty() )
{
basegfx::B2DHomMatrix aMatrix( aTransformation );
-Reference XShape xShape( createAndInsert( rFilterBase,
sServiceName, pTheme, rxShapes, pShapeRect, sal_False, sal_False, aMatrix ) );
+Reference XShape xShape( createAndInsert( rFilterBase,
sServiceName, pTheme, rxShapes, pShapeRect, sal_False, sal_False, aMatrix,
rShapeOrParentShapeFillProps ) );
if( pShapeMap !msId.isEmpty() )
{
@@ -316,7 +317,7 @@ void Shape::addChildren(
std::vector ShapePtr ::iterator aIter( rMaster.maChildren.begin() );
while( aIter != rMaster.maChildren.end() ) {
(*aIter)-setMasterTextListStyle( mpMasterTextListStyle );
-(*aIter++)-addShape( rFilterBase, pTheme, rxShapes,
aChildTransformation, NULL, pShapeMap );
+(*aIter++)-addShape( rFilterBase, pTheme, rxShapes,
aChildTransformation, getFillProperties(), NULL, pShapeMap );
}
}
@@ -328,7 +329,8 @@ Reference XShape Shape::createAndInsert(
const awt::Rectangle* /* pShapeRect */,
sal_Bool bClearText,
sal_Bool bDoNotInsertEmptyTextBody,
-basegfx::B2DHomMatrix aParentTransformation )
+basegfx::B2DHomMatrix aParentTransformation,
+FillProperties
