[Libreoffice-commits] .: Branch 'feature/pptx-export-ooxml11' - patches/dev300

[Tor Lillqvist]

 patches/dev300/apply                                               |    4 ---
 patches/dev300/xlsx-shared-oox-drawingml-fix-shapes-map-crash.diff |   13 ----------
 2 files changed, 17 deletions(-)

New commits:
commit 95a1770cf281ef6c7335ea3c69d2a41246ca7a11
Author: Tor Lillqvist <tml at iki.fi>
Date:   Mon Nov 8 14:14:20 2010 +0200

    xlsx-shared-oox-drawingml-fix-shapes-map-crash.diff is in git here

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 0381e0c..4e1736f 100755
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -2012,10 +2012,6 @@ svx-fix-fit-to-frame-crash.diff, n#508621, rodo
 # expand path placeholders early in template dialog
 normalize-template-paths-fix.diff, n#512146, thorsten
 
-[ OOXMLExportDevel ]
-# equivalent of ooxml-drawing-fix-shapes-map-crash-xlsx-part for shared filter
-xlsx-shared-oox-drawingml-fix-shapes-map-crash.diff, rodo
-
 [ Experimental ]
 experimental_ooapi.diff, flr
 
diff --git a/patches/dev300/xlsx-shared-oox-drawingml-fix-shapes-map-crash.diff b/patches/dev300/xlsx-shared-oox-drawingml-fix-shapes-map-crash.diff
deleted file mode 100644
index 671bba7..0000000
--- a/patches/dev300/xlsx-shared-oox-drawingml-fix-shapes-map-crash.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -rup sc-orig/source/filter/xcl97/xcl97rec.cxx sc/source/filter/xcl97/xcl97rec.cxx
---- sc-orig/source/filter/xcl97/xcl97rec.cxx	2009-07-14 17:32:13.000000000 +0200
-+++ sc/source/filter/xcl97/xcl97rec.cxx	2009-07-14 17:35:50.000000000 +0200
-@@ -1162,7 +1162,7 @@ void XclObjAny::SaveXml( XclExpXmlStream
- 
-     sax_fastparser::FSHelperPtr pDrawing = rStrm.GetCurrentStream();
- 
--    ShapeExport aDML( XML_xdr, pDrawing, &rStrm, DrawingML::DOCUMENT_XLSX );
-+    ShapeExport aDML( XML_xdr, pDrawing, NULL, &rStrm, DrawingML::DOCUMENT_XLSX );
- 
-     pDrawing->startElement( FSNS( XML_xdr, XML_twoCellAnchor ), // OOXTODO: oneCellAnchor, absoluteAnchor
-             XML_editAs, GetEditAs( *this ),
-