diff options
Diffstat (limited to 'patches/dev300/oox-pptx-import-fix-groups-2.diff')
| -rw-r--r-- | patches/dev300/oox-pptx-import-fix-groups-2.diff | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/patches/dev300/oox-pptx-import-fix-groups-2.diff b/patches/dev300/oox-pptx-import-fix-groups-2.diff index 010ec6d90..2021decea 100644 --- a/patches/dev300/oox-pptx-import-fix-groups-2.diff +++ b/patches/dev300/oox-pptx-import-fix-groups-2.diff @@ -34,7 +34,7 @@ diff -rup ../ooo330-m2-orig/oox/source/drawingml/shape.cxx oox/source/drawingml/ , mpFillPropertiesPtr( pSourceShape->mpFillPropertiesPtr ) @@ -237,45 +239,34 @@ void Shape::addChildren( Shape& rMaster, - const Theme* pTheme, + const ThemePtr& rxTheme, const Reference< XShapes >& rxShapes, - const awt::Rectangle& rClientRect, + const awt::Rectangle&, @@ -94,6 +94,6 @@ diff -rup ../ooo330-m2-orig/oox/source/drawingml/shape.cxx oox/source/drawingml/ + + pShapeRect = &aShapeRect; + - (*aIter++)->addShape( rFilterBase, pTheme, rxShapes, pShapeRect, pShapeMap ); + (*aIter++)->addShape( rFilterBase, rxTheme, rxShapes, pShapeRect, pShapeMap ); } } |