1 files changed, 14 insertions, 14 deletions

diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx
index 8bbfc820fca1..cab64f11c166 100644
--- a/oox/source/drawingml/shape.cxx
+++ b/oox/source/drawingml/shape.cxx
@@ -76,7 +76,7 @@ OUString CreateShapeCallback::onCreateXShape( const OUString& rServiceName, cons
     return rServiceName;
 }
 
-void CreateShapeCallback::onXShapeCreated( const Reference< XShape >& ) const
+void CreateShapeCallback::onXShapeCreated( const Reference< XShape >&, const Reference< XShapes >& ) const
 {
 }
 
@@ -135,7 +135,7 @@ const ShapeStyleRef* Shape::getShapeStyleRef( sal_Int32 nRefType ) const
 
 void Shape::addShape(
         const ::oox::core::XmlFilterBase& rFilterBase,
-        const ThemePtr& rxTheme,
+        const Theme* pTheme,
         const Reference< XShapes >& rxShapes,
         const awt::Rectangle* pShapeRect,
         ShapeIdMap* pShapeMap )
@@ -145,7 +145,7 @@ void Shape::addShape(
         rtl::OUString sServiceName( msServiceName );
         if( sServiceName.getLength() )
         {
-            Reference< XShape > xShape( createAndInsert( rFilterBase, sServiceName, rxTheme, rxShapes, pShapeRect, sal_False ) );
+            Reference< XShape > xShape( createAndInsert( rFilterBase, sServiceName, pTheme, rxShapes, pShapeRect, sal_False ) );
 
             if( pShapeMap && msId.getLength() )
             {
@@ -155,7 +155,7 @@ void Shape::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&  )
@@ -184,7 +184,7 @@ void Shape::applyShapeReference( const Shape& rReferencedShape )
 void Shape::addChildren(
         const ::oox::core::XmlFilterBase& rFilterBase,
         Shape& rMaster,
-        const ThemePtr& rxTheme,
+        const Theme* pTheme,
         const Reference< XShapes >& rxShapes,
         const awt::Rectangle& rClientRect,
         ShapeIdMap* pShapeMap )
@@ -235,14 +235,14 @@ void Shape::addChildren(
                 pShapeRect = &aShapeRect;
             }
         }
-        (*aIter++)->addShape( rFilterBase, rxTheme, rxShapes, pShapeRect, pShapeMap );
+        (*aIter++)->addShape( rFilterBase, pTheme, rxShapes, pShapeRect, pShapeMap );
     }
 }
 
 Reference< XShape > Shape::createAndInsert(
         const ::oox::core::XmlFilterBase& rFilterBase,
         const rtl::OUString& rServiceName,
-        const ThemePtr& rxTheme,
+        const Theme* pTheme,
         const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& rxShapes,
         const awt::Rectangle* pShapeRect,
         sal_Bool bClearText )
@@ -383,23 +383,23 @@ Reference< XShape > Shape::createAndInsert(
         aFillProperties.moFillType = XML_noFill;
         sal_Int32 nFillPhClr = -1;
 
-        if( rxTheme.get() )
+        if( pTheme )
         {
             if( const ShapeStyleRef* pLineRef = getShapeStyleRef( XML_lnRef ) )
             {
-                if( const LineProperties* pLineProps = rxTheme->getLineStyle( pLineRef->mnThemedIdx ) )
+                if( const LineProperties* pLineProps = pTheme->getLineStyle( pLineRef->mnThemedIdx ) )
                     aLineProperties.assignUsed( *pLineProps );
                 nLinePhClr = pLineRef->maPhClr.getColor( rFilterBase );
             }
             if( const ShapeStyleRef* pFillRef = getShapeStyleRef( XML_fillRef ) )
             {
-                if( const FillProperties* pFillProps = rxTheme->getFillStyle( pFillRef->mnThemedIdx ) )
+                if( const FillProperties* pFillProps = pTheme->getFillStyle( pFillRef->mnThemedIdx ) )
                     aFillProperties.assignUsed( *pFillProps );
                 nFillPhClr = pFillRef->maPhClr.getColor( rFilterBase );
             }
 //            if( const ShapeStyleRef* pEffectRef = getShapeStyleRef( XML_fillRef ) )
 //            {
-//                if( const EffectProperties* pEffectProps = rxTheme->getEffectStyle( pEffectRef->mnThemedIdx ) )
+//                if( const EffectProperties* pEffectProps = pTheme->getEffectStyle( pEffectRef->mnThemedIdx ) )
 //                    aEffectProperties.assignUsed( *pEffectProps );
 //                nEffectPhClr = pEffectRef->maPhClr.getColor( rFilterBase );
 //            }
@@ -451,8 +451,8 @@ Reference< XShape > Shape::createAndInsert(
                 TextCharacterProperties aCharStyleProperties;
                 if( const ShapeStyleRef* pFontRef = getShapeStyleRef( XML_fontRef ) )
                 {
-                    if( rxTheme.get() )
-                        if( const TextCharacterProperties* pCharProps = rxTheme->getFontStyle( pFontRef->mnThemedIdx ) )
+                    if( pTheme )
+                        if( const TextCharacterProperties* pCharProps = pTheme->getFontStyle( pFontRef->mnThemedIdx ) )
                             aCharStyleProperties.assignUsed( *pCharProps );
                     aCharStyleProperties.maCharColor.assignIfUsed( pFontRef->maPhClr );
                 }
@@ -465,7 +465,7 @@ Reference< XShape > Shape::createAndInsert(
 
     // use a callback for further processing on the XShape (e.g. charts)
     if( mxShape.is() && mxCreateCallback.get() )
-        mxCreateCallback->onXShapeCreated( mxShape );
+        mxCreateCallback->onXShapeCreated( mxShape, rxShapes );
 
     return mxShape;
 }