[gnumeric] handle 'ext' in 'blip's during xlsx import



commit d374f41ce96a9ea3f69e7ec7c3ef188f51d5f3e0
Author: Andreas J Guelzow <aguelzow pyrshep ca>
Date:   Sun Jun 16 16:49:20 2013 -0600

    handle 'ext' in 'blip's during xlsx import
    
    2013-06-16  Andreas J. Guelzow <aguelzow pyrshep ca>
    
        * xlsx-read-drawing.c: connect "ext" handler
        * xlsx-read.c: declare xlsx_ext_begin early

 plugins/excel/ChangeLog           |    7 ++++++-
 plugins/excel/xlsx-read-drawing.c |    2 ++
 plugins/excel/xlsx-read.c         |    2 ++
 3 files changed, 10 insertions(+), 1 deletions(-)
---
diff --git a/plugins/excel/ChangeLog b/plugins/excel/ChangeLog
index d008ac1..0e07bb2 100644
--- a/plugins/excel/ChangeLog
+++ b/plugins/excel/ChangeLog
@@ -1,4 +1,9 @@
-2013-06-15  Andreas J. Guelzow <aguelzow pyrshep ca>
+2013-06-16  Andreas J. Guelzow <aguelzow pyrshep ca>
+
+       * xlsx-read-drawing.c: connect "ext" handler
+       * xlsx-read.c: declare xlsx_ext_begin early
+
+2013-06-16  Andreas J. Guelzow <aguelzow pyrshep ca>
 
        * xlsx-read.c (xlsx_read_external_book): also try an alternative url
        (xlsx_read_external_sheetname): check whether we have a book before
diff --git a/plugins/excel/xlsx-read-drawing.c b/plugins/excel/xlsx-read-drawing.c
index 2d7719c..b69824f 100644
--- a/plugins/excel/xlsx-read-drawing.c
+++ b/plugins/excel/xlsx-read-drawing.c
@@ -2375,6 +2375,8 @@ GSF_XML_IN_NODE_FULL (START, DRAWING, XL_NS_SS_DRAW, "wsDr", GSF_XML_NO_CONTENT,
     GSF_XML_IN_NODE (TWO_CELL, PICTURE, XL_NS_SS_DRAW, "pic", GSF_XML_NO_CONTENT, &xlsx_drawing_picture, 
NULL),
       GSF_XML_IN_NODE (PICTURE, PIC_FILL_BLIP, XL_NS_SS_DRAW, "blipFill", GSF_XML_NO_CONTENT, NULL, NULL),
         GSF_XML_IN_NODE (PIC_FILL_BLIP, BLIP, XL_NS_DRAW, "blip", GSF_XML_NO_CONTENT, &xlsx_blip_start, 
NULL),
+        GSF_XML_IN_NODE (BLIP, EXTLST, XL_NS_DRAW, "extLst", GSF_XML_NO_CONTENT, NULL, NULL),
+          GSF_XML_IN_NODE (EXTLST, EXTITEM, XL_NS_DRAW, "ext", GSF_XML_NO_CONTENT, &xlsx_ext_begin, NULL),
         GSF_XML_IN_NODE (PIC_FILL_BLIP, BLIP_STRETCH, XL_NS_DRAW, "stretch", GSF_XML_NO_CONTENT, NULL, NULL),
           GSF_XML_IN_NODE (BLIP_STRETCH, BLIP_FILL_RECT, XL_NS_DRAW, "fillRect", GSF_XML_NO_CONTENT, NULL, 
NULL),
         GSF_XML_IN_NODE (PIC_FILL_BLIP, BLIP_SRC_RECT, XL_NS_DRAW, "srcRect", GSF_XML_NO_CONTENT, NULL, 
NULL),
diff --git a/plugins/excel/xlsx-read.c b/plugins/excel/xlsx-read.c
index 97f0e6b..1f26e7c 100644
--- a/plugins/excel/xlsx-read.c
+++ b/plugins/excel/xlsx-read.c
@@ -1093,6 +1093,8 @@ xlsx_parse_sqref (GsfXMLIn *xin, xmlChar const *refs)
 
 /***********************************************************************/
 
+static void xlsx_ext_begin (GsfXMLIn *xin, xmlChar const **attrs);
+
 #include "xlsx-read-drawing.c"
 
 /***********************************************************************/


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]