[Libreoffice-commits] .: Branch 'distro/suse/suse-3.6' - oox/source

[Libreoffice Gerrit user]

 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 5ebcda21d568589574a39c3edcc85f340809cfe4
Author: Radek Doulik <rodo at 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 dde28b5..b43f2ab 100644
--- a/oox/source/drawingml/fillproperties.cxx
+++ b/oox/source/drawingml/fillproperties.cxx
@@ -405,6 +405,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 8af4e80..678bff0 100644
--- a/oox/source/drawingml/graphicshapecontext.cxx
+++ b/oox/source/drawingml/graphicshapecontext.cxx
@@ -223,6 +223,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 156bc09..fbe1553 100644
--- a/oox/source/drawingml/shape.cxx
+++ b/oox/source/drawingml/shape.cxx
@@ -542,7 +542,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 );