[ooo-build-commit] .: patches/dev300

[Radek Doulík]

 patches/dev300/oox-import-fix-ole2-shapes.diff |   13 +++++++++++++
 1 file changed, 13 insertions(+)

New commits:
commit bc5866a7fb3b4b10349cbd351e7d8f300cd51048
Author: Radek Doulik <rodo at novell.com>
Date:   Thu Jun 17 13:41:31 2010 +0200

    added the actual diff I forgot to add in my last commit
    
    * patches/dev300/oox-import-fix-ole2-shapes.diff:

diff --git a/patches/dev300/oox-import-fix-ole2-shapes.diff b/patches/dev300/oox-import-fix-ole2-shapes.diff
new file mode 100644
index 0000000..f98cc0e
--- /dev/null
+++ b/patches/dev300/oox-import-fix-ole2-shapes.diff
@@ -0,0 +1,13 @@
+diff -rup oox/source/ppt-orig/pptshape.cxx oox/source/ppt/pptshape.cxx
+--- oox/source/ppt-orig/pptshape.cxx	2010-06-16 15:04:08.000000000 +0200
++++ oox/source/ppt/pptshape.cxx	2010-06-16 15:04:33.000000000 +0200
+@@ -84,7 +84,8 @@ void PPTShape::addShape(
+             Reference< lang::XMultiServiceFactory > xServiceFact( rFilterBase.getModel(), UNO_QUERY_THROW );
+             sal_Bool bClearText = sal_False;
+ 
+-            if ( sServiceName != OUString::createFromAscii( "com.sun.star.drawing.GraphicObjectShape" ) )
++            if ( sServiceName != OUString::createFromAscii( "com.sun.star.drawing.GraphicObjectShape" ) &&
++                 sServiceName != OUString::createFromAscii( "com.sun.star.drawing.OLE2Shape" ) )
+             {
+                 switch( mnSubType )
+                 {