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

[Radek Doulík]

 patches/dev300/apply                                              |    1 
 patches/dev300/oox-drawingml-fix-apply-shape-reference-crash.diff |   13 ++++++++++
 2 files changed, 14 insertions(+)

New commits:
commit e2e1e02c0980e40c9f119c51ffecdeed566f072a
Author: Radek Doulik <rodo at novell.com>
Date:   Fri May 7 13:26:55 2010 +0200

    fixes crash in document attached to n#593611
    
    * patches/dev300/apply:
    * patches/dev300/oox-drawingml-fix-apply-shape-reference-crash.diff:

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 3aa2152..48a7480 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -3901,6 +3901,7 @@ oox-import-helper-property-map-dump.diff, rodo
 oox-pptx-import-fix-text-body-vert-2.diff, n#479829, rodo
 oox-import-helper-debug-dump.diff, rodo
 oox-pptx-import-fix-placeholder-text-style-1.diff, n#592906, rodo
+oox-drawingml-fix-apply-shape-reference-crash.diff, n#593611, rodo
 
 [ NovellOnlyWin32 ]
 
diff --git a/patches/dev300/oox-drawingml-fix-apply-shape-reference-crash.diff b/patches/dev300/oox-drawingml-fix-apply-shape-reference-crash.diff
new file mode 100644
index 0000000..2fd7bd8
--- /dev/null
+++ b/patches/dev300/oox-drawingml-fix-apply-shape-reference-crash.diff
@@ -0,0 +1,13 @@
+diff -rup oox-orig-1/source/drawingml/shape.cxx oox/source/drawingml/shape.cxx
+--- oox-orig-1/source/drawingml/shape.cxx	2010-05-07 12:18:01.000000000 +0200
++++ oox/source/drawingml/shape.cxx	2010-05-07 12:18:20.000000000 +0200
+@@ -197,7 +197,8 @@ void Shape::addShape(
+ 
+ void Shape::applyShapeReference( const Shape& rReferencedShape )
+ {
+-    mpTextBody = TextBodyPtr( new TextBody( *rReferencedShape.mpTextBody.get() ) );
++    if( rReferencedShape.mpTextBody.get() )
++	mpTextBody = TextBodyPtr( new TextBody( *rReferencedShape.mpTextBody.get() ) );
+     maShapeProperties = rReferencedShape.maShapeProperties;
+     mpLinePropertiesPtr = LinePropertiesPtr( new LineProperties( *rReferencedShape.mpLinePropertiesPtr.get() ) );
+     mpFillPropertiesPtr = FillPropertiesPtr( new FillProperties( *rReferencedShape.mpFillPropertiesPtr.get() ) );