oox/source/drawingml/fillproperties.cxx | 3 +++
oox/source/drawingml/graphicshapecontext.cxx | 3 +++
oox/source/drawingml/shape.cxx | 2 +-
3 files changed, 7 insertions(+), 1 deletion(-)
New commits:
commit 972609a87f1269a86fd1290a1e34eb9683e6426a
Author: Radek Doulik <r...@novell.com>
Date: Tue Jan 29 10:42:46 2013 +0100
use ole obj preview image
Change-Id: I7e88ca553fcb8449a337af36554dd1996bc6dd7d
diff --git a/oox/source/drawingml/fillproperties.cxx
b/oox/source/drawingml/fillproperties.cxx
index 327b19b..4e9a02a 100644
--- a/oox/source/drawingml/fillproperties.cxx
+++ b/oox/source/drawingml/fillproperties.cxx
@@ -395,6 +395,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 96f47b0..2b46302 100644
--- a/oox/source/drawingml/graphicshapecontext.cxx
+++ b/oox/source/drawingml/graphicshapecontext.cxx
@@ -213,6 +213,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 2ea289c..45cc868 100644
--- a/oox/source/drawingml/shape.cxx
+++ b/oox/source/drawingml/shape.cxx
@@ -531,7 +531,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 );
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
