#118

Author: DESKTOP-U434MT0\hiro

src/structs/drawing/graphic.rs

@@ -29,7 +29,7 @@ impl Graphic {
         &mut self,
         reader: &mut Reader<R>,
         _e: &BytesStart,
-        drawing_relationships: &RawRelationships,
+        drawing_relationships: Option<&RawRelationships>,
     ) {
         let mut buf = Vec::new();
 

src/structs/drawing/graphic_data.rs

@@ -31,7 +31,7 @@ impl GraphicData {
         &mut self,
         reader: &mut Reader<R>,
         _e: &BytesStart,
-        drawing_relationships: &RawRelationships,
+        drawing_relationships: Option<&RawRelationships>,
     ) {
         let mut buf = Vec::new();
 
@@ -40,7 +40,7 @@ impl GraphicData {
                 Ok(Event::Empty(ref e)) => match e.name().into_inner() {
                     b"c:chart" => {
                         let chart_id = get_attribute(e, b"r:id").unwrap();
-                        let relationship = drawing_relationships.get_relationship_by_rid(&chart_id);
+                        let relationship = drawing_relationships.unwrap().get_relationship_by_rid(&chart_id);
                         let _ = chart::read(relationship.get_raw_file(), &mut self.chart_space);
                     }
                     _ => (),

src/structs/drawing/spreadsheet/graphic_frame.rs

@@ -77,7 +77,7 @@ impl GraphicFrame {
         &mut self,
         reader: &mut Reader<R>,
         e: &BytesStart,
-        drawing_relationships: &RawRelationships,
+        drawing_relationships: Option<&RawRelationships>,
     ) {
         match get_attribute(e, b"macro") {
             Some(v) => {

src/structs/drawing/spreadsheet/two_cell_anchor.rs

@@ -204,7 +204,7 @@ impl TwoCellAnchor {
                     }
                     b"xdr:graphicFrame" => {
                         let mut obj = GraphicFrame::default();
-                        obj.set_attributes(reader, e, drawing_relationships.unwrap());
+                        obj.set_attributes(reader, e, drawing_relationships);
                         self.set_graphic_frame(obj);
                     }
                     b"xdr:sp" => {

src/structs/vml/image_data.rs

@@ -35,11 +35,11 @@ impl ImageData {
         &mut self,
         _reader: &mut Reader<R>,
         e: &BytesStart,
-        drawing_relationships: &RawRelationships,
+        drawing_relationships: Option<&RawRelationships>,
     ) {
         match get_attribute(e, b"o:relid") {
             Some(relid) => {
-                let relationship = drawing_relationships.get_relationship_by_rid(&relid);
+                let relationship = drawing_relationships.unwrap().get_relationship_by_rid(&relid);
                 self.image_name
                     .set_value_string(relationship.get_raw_file().get_file_name());
             }

src/structs/vml/shape.rs

@@ -280,7 +280,7 @@ impl Shape {
                     }
                     b"v:imagedata" => {
                         let mut obj = ImageData::default();
-                        obj.set_attributes(reader, e, drawing_relationships.unwrap());
+                        obj.set_attributes(reader, e, drawing_relationships);
                         self.set_image_data(obj);
                     }
                     _ => (),