[Libreoffice-commits] .: Branch 'libreoffice-3-4' - patches/dev300

[Tor Lillqvist]

 patches/dev300/apply                                              |    1 
 patches/dev300/oox-drawingml-fix-apply-shape-reference-crash.diff |   19 ----------
 2 files changed, 20 deletions(-)

New commits:
commit cf34f8dd63fdf1bbeec6d5ff45f6350e86261fd3
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Fri Apr 15 11:03:30 2011 +0300

    oox-drawingml-fix-apply-shape-reference-crash.diff is not needed any more

diff --git a/patches/dev300/apply b/patches/dev300/apply
index f4cea10..647ee95 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -1567,7 +1567,6 @@ SectionOwner => cbosdo
 #border-types-more.diff, fate#309127
 
 [ OOXML ]
-oox-drawingml-fix-apply-shape-reference-crash.diff, n#593611, rodo
 # FIXME 2011-04-07: thorsten is working on making this apply.
 # When that is ready and this is uncommented, please uncomment
 # oox-xlsx-import-fix-connector-shape.diff, too
diff --git a/patches/dev300/oox-drawingml-fix-apply-shape-reference-crash.diff b/patches/dev300/oox-drawingml-fix-apply-shape-reference-crash.diff
deleted file mode 100644
index e2ce020..0000000
--- a/patches/dev300/oox-drawingml-fix-apply-shape-reference-crash.diff
+++ /dev/null
@@ -1,19 +0,0 @@
----
- oox/source/drawingml/shape.cxx |    1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-diff --git oox/source/drawingml/shape.cxx oox/source/drawingml/shape.cxx
-index 765a559..bd251d1 100644
---- oox/source/drawingml/shape.cxx
-+++ oox/source/drawingml/shape.cxx
-@@ -172,6 +172,7 @@ void Shape::addShape(
- 
- void Shape::applyShapeReference( const Shape& rReferencedShape )
- {
-+    if( rReferencedShape.mpTextBody.get() )
-     mpTextBody = TextBodyPtr( new TextBody( *rReferencedShape.mpTextBody.get() ) );
-     maShapeProperties = rReferencedShape.maShapeProperties;
-     mpLinePropertiesPtr = LinePropertiesPtr( new LineProperties( *rReferencedShape.mpLinePropertiesPtr.get() ) );
--- 
-1.7.0.1
-