1 files changed, 7 insertions, 7 deletions

diff --git a/src/odf/odfLoader.ml b/src/odf/odfLoader.ml
index 9420fdd..93a6c62 100755
--- a/src/odf/odfLoader.ml
+++ b/src/odf/odfLoader.ml
@@ -16,18 +16,18 @@ end
 

 let load_content cache content = begin function

   | "float" -> Expression.Basic (

-      ScTypes.number (

+      ScTypes.Type.number (

         DataType.Num.of_float (float_of_string content)

       ))

   | "date"  -> Expression.Basic (

-      ScTypes.date (

+      ScTypes.Type.date (

         DataType.Num.of_float (float_of_string content)

       ))

   | _ ->

     (* If the same text is present many times, use the same string instead of creating a new one *)

     memoization cache content (fun content ->

       Expression.Basic (

-            ScTypes.string (

+            ScTypes.Type.string (

               UTF8.from_utf8string content)))

 end

 

@@ -83,7 +83,7 @@ let build_p (attributes:Xmlm.attribute list) = begin function
 end

 

 

-let build_row (sheet:Sheet.Raw.t ref) (row_num:int ref) (attributes:Xmlm.attribute list) (childs:tree list) = begin

+let build_row (sheet:Sheet.Raw.t ref) (row_num:int ref) catalog (attributes:Xmlm.attribute list) (childs:tree list) = begin

 

   let repetition =

     try int_of_string @@ List.assoc (NS.table, "number-rows-repeated") attributes

@@ -94,7 +94,7 @@ let build_row (sheet:Sheet.Raw.t ref) (row_num:int ref) (attributes:Xmlm.attribu
     List.iter (function

     | Cell cell ->

       for i = 1 to cell.repetition do

-        sheet := snd @@ Sheet.Raw.add (!cell_num, !row_num) cell.expression !sheet;

+        sheet := snd @@ Sheet.Raw.add (!cell_num, !row_num) cell.expression catalog !sheet;

         cell_num := !cell_num + cell.cell_width

       done;

     | _ -> ()

@@ -106,7 +106,7 @@ end
 

 let data str = Data str

 

-let load source = begin

+let load catalog source = begin

 

   (* Mutable datas *)

   let sheet = ref Sheet.Raw.empty in

@@ -115,7 +115,7 @@ let load source = begin
   let table = Base.String_dict.of_alist_exn [

     ((NS.text ^ "p"), build_p);

     ((NS.table ^ "table-cell"), build_cell cache);

-    ((NS.table ^ "table-row"), build_row sheet (ref 1))

+    ((NS.table ^ "table-row"), build_row sheet (ref 1) catalog)

   ] in

 

   let el (((ns, name), attributes):Xmlm.tag) childs = begin