1 files changed, 0 insertions, 61 deletions
diff --git a/patches/dev300/pptx-fix-connector-crash.diff b/patches/dev300/pptx-fix-connector-crash.diff
deleted file mode 100644
index 480ce07cc..000000000
--- a/patches/dev300/pptx-fix-connector-crash.diff
+++ /dev/null
@@ -1,61 +0,0 @@
----
- oox/source/export/drawingml.cxx |   18 ++++++++++--------
- oox/source/export/shapes.cxx    |    6 ++++++
- 2 files changed, 16 insertions(+), 8 deletions(-)
-
-diff --git oox/source/export/drawingml.cxx oox/source/export/drawingml.cxx
-index 8789b80..1e4a9a0 100644
---- oox/source/export/drawingml.cxx
-+++ oox/source/export/drawingml.cxx
-@@ -1328,14 +1328,16 @@ void DrawingML::WritePolyPolygon( const PolyPolygon& rPolyPolygon )
- 
- void DrawingML::WriteConnectorConnections( EscherConnectorListEntry& rConnectorEntry, sal_Int32 nStartID, sal_Int32 nEndID )
- {
--    mpFS->singleElementNS( XML_a, XML_stCxn,
--                           XML_id, I32S( nStartID ),
--                           XML_idx, I64S( rConnectorEntry.GetConnectorRule( TRUE ) ),
--                           FSEND );
--    mpFS->singleElementNS( XML_a, XML_endCxn,
--                           XML_id, I32S( nEndID ),
--                           XML_idx, I64S( rConnectorEntry.GetConnectorRule( FALSE ) ),
--                           FSEND );
-+    if( nStartID != -1 )
-+        mpFS->singleElementNS( XML_a, XML_stCxn,
-+                               XML_id, I32S( nStartID ),
-+                               XML_idx, I64S( rConnectorEntry.GetConnectorRule( TRUE ) ),
-+                               FSEND );
-+    if( nEndID != -1 )
-+        mpFS->singleElementNS( XML_a, XML_endCxn,
-+                               XML_id, I32S( nEndID ),
-+                               XML_idx, I64S( rConnectorEntry.GetConnectorRule( FALSE ) ),
-+                               FSEND );
- }
- 
- // from sw/source/filter/ww8/wrtw8num.cxx for default bullets to export to MS intact
-diff --git oox/source/export/shapes.cxx oox/source/export/shapes.cxx
-index 1c351a5..3306967 100644
---- oox/source/export/shapes.cxx
-+++ oox/source/export/shapes.cxx
-@@ -981,6 +981,9 @@ sal_Int32 ShapeExport::GetNewShapeID( const Reference< XShape > rXShape )
- 
- sal_Int32 ShapeExport::GetNewShapeID( const Reference< XShape > rXShape, XmlFilterBase* pFB )
- {
-+    if( !rXShape.is() )
-+        return -1;
-+
-     sal_Int32 nID = pFB->GetUniqueId();
- 
-     saShapeMap[ rXShape ] = nID;
-@@ -990,6 +993,9 @@ sal_Int32 ShapeExport::GetNewShapeID( const Reference< XShape > rXShape, XmlFilt
- 
- sal_Int32 ShapeExport::GetShapeID( const Reference< XShape > rXShape )
- {
-+    if( !rXShape.is() )
-+        return -1;
-+
-     ShapeHashMap::const_iterator aIter = saShapeMap.find( rXShape );
- 
-     if( aIter == saShapeMap.end() )
--- 
-1.7.0.1
-