diff options
| author | Radek Doulik <rodo@novell.com> | 2013-01-29 10:42:46 +0100 |
|---|---|---|
| committer | Radek Doulik <rodo@novell.com> | 2013-04-03 18:55:34 +0200 |
| commit | 8c7100d05aa90c8567e22f83f3cec8b5ac4c9ca3 (patch) | |
| tree | f3a33d3127347fc32746abca7dab6a51955b3abb /oox | |
| parent | ccab75a6b86072a28f943f14cef55b5f5fca3400 (diff) | |
use ole obj preview image
Change-Id: I7e88ca553fcb8449a337af36554dd1996bc6dd7d
Diffstat (limited to 'oox')
| -rw-r--r-- | oox/source/drawingml/fillproperties.cxx | 3 | ||||
| -rw-r--r-- | oox/source/drawingml/graphicshapecontext.cxx | 3 | ||||
| -rw-r--r-- | oox/source/drawingml/shape.cxx | 2 |
3 files changed, 7 insertions, 1 deletions
diff --git a/oox/source/drawingml/fillproperties.cxx b/oox/source/drawingml/fillproperties.cxx index a400cce8c65e..5caeb5504d60 100644 --- a/oox/source/drawingml/fillproperties.cxx +++ b/oox/source/drawingml/fillproperties.cxx @@ -396,6 +396,9 @@ void GraphicProperties::pushToPropMap( PropertyMap& rPropMap, const GraphicHelpe } } + rPropMap[ PROP_Graphic ] <<= xGraphic; + + // do we still need to set GraphicURL as well? (TODO) OUString aGraphicUrl = rGraphicHelper.createGraphicObject( xGraphic ); if( !aGraphicUrl.isEmpty() ) rPropMap[ PROP_GraphicURL ] <<= aGraphicUrl; diff --git a/oox/source/drawingml/graphicshapecontext.cxx b/oox/source/drawingml/graphicshapecontext.cxx index 1b13420f866b..377b8c58a50d 100644 --- a/oox/source/drawingml/graphicshapecontext.cxx +++ b/oox/source/drawingml/graphicshapecontext.cxx @@ -214,6 +214,9 @@ Reference< XFastContextHandler > OleObjectGraphicDataContext::createFastChildCon OSL_ENSURE( mrOleObjectInfo.mbLinked, "OleObjectGraphicDataContext::createFastChildContext - unexpected child element" ); mrOleObjectInfo.mbAutoUpdate = aAttribs.getBool( XML_updateAutomatic, false ); break; + case PPT_TOKEN( pic ): + xRet.set( new GraphicShapeContext( *this, mpMasterShapePtr, mpShapePtr ) ); + break; } return xRet; } diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx index 9e0b232f8a0d..8a4cdcacd19b 100644 --- a/oox/source/drawingml/shape.cxx +++ b/oox/source/drawingml/shape.cxx @@ -540,7 +540,7 @@ Reference< XShape > Shape::createAndInsert( // applying properties aShapeProps.assignUsed( getShapeProperties() ); aShapeProps.assignUsed( maDefaultShapeProperties ); - if ( bIsEmbMedia || aServiceName == "com.sun.star.drawing.GraphicObjectShape" ) + if ( bIsEmbMedia || aServiceName == "com.sun.star.drawing.GraphicObjectShape" || aServiceName == "com.sun.star.drawing.OLE2Shape" ) mpGraphicPropertiesPtr->pushToPropMap( aShapeProps, rGraphicHelper ); if ( mpTablePropertiesPtr.get() && aServiceName == "com.sun.star.drawing.TableShape" ) mpTablePropertiesPtr->pushToPropSet( rFilterBase, xSet, mpMasterTextListStyle ); |