fix ods empty spanned cells

Author: andiwand

src/odr/document_path.cpp

@@ -3,6 +3,7 @@
 #include <odr/document_element.hpp>
 
 #include <algorithm>
+#include <iostream>
 #include <stdexcept>
 
 namespace odr {
@@ -131,12 +132,12 @@ DocumentPath DocumentPath::extract(const Element element) {
 DocumentPath DocumentPath::extract(const Element element, const Element root) {
   std::vector<Component> reverse;
 
-  for (auto current = element; current != root;) {
+  for (Element current = element; current != root;) {
     if (!current.parent()) {
       break;
     }
 
-    if (const SheetCell sheet_cell = element.as_sheet_cell(); sheet_cell) {
+    if (const SheetCell sheet_cell = current.as_sheet_cell(); sheet_cell) {
       const auto [parent, cell] = Cell::extract(sheet_cell);
       reverse.emplace_back(cell);
       current = static_cast<Element>(parent);

src/odr/internal/odf/odf_document.cpp

@@ -573,13 +573,16 @@ class ElementAdapter final : public abstract::ElementAdapter,
   }
   [[nodiscard]] ElementIdentifier
   sheet_first_shape(const ElementIdentifier element_id) const override {
-    (void)element_id;
-    return {}; // TODO
+    if (const ElementRegistry::Sheet *sheet_registry =
+            m_registry->sheet_element(element_id);
+        sheet_registry != nullptr) {
+      return sheet_registry->first_shape_id;
+    }
+    return null_element_id;
   }
   [[nodiscard]] TableStyle
   sheet_style(const ElementIdentifier element_id) const override {
-    (void)element_id;
-    return {}; // TODO
+    return get_partial_style(element_id).table_style;
   }
   [[nodiscard]] TableColumnStyle
   sheet_column_style(const ElementIdentifier element_id,
@@ -633,8 +636,12 @@ class ElementAdapter final : public abstract::ElementAdapter,
 
   [[nodiscard]] TablePosition
   sheet_cell_position(const ElementIdentifier element_id) const override {
-    (void)element_id;
-    return {0, 0};
+    if (const ElementRegistry::SheetCell *sheet_cell =
+            m_registry->sheet_cell_element(element_id);
+        sheet_cell != nullptr) {
+      return sheet_cell->position;
+    }
+    return {};
   }
   [[nodiscard]] bool
   sheet_cell_is_covered(const ElementIdentifier element_id) const override {
@@ -924,7 +931,7 @@ class ElementAdapter final : public abstract::ElementAdapter,
   [[nodiscard]] std::optional<std::string>
   frame_z_index(const ElementIdentifier element_id) const override {
     const pugi::xml_node node = get_node(element_id);
-    if (const pugi::xml_attribute attribute = node.attribute("svg:z-index")) {
+    if (const pugi::xml_attribute attribute = node.attribute("draw:z-index")) {
       return attribute.value();
     }
     return std::nullopt;

src/odr/internal/odf/odf_parser.cpp

@@ -164,9 +164,17 @@ parse_sheet(ElementRegistry &registry, const pugi::xml_node node) {
     bool row_empty = true;
     for (const pugi::xml_node cell_node :
          row_node.children("table:table-cell")) {
-      bool cell_empty = false;
-      if (!cell_node.first_child()) {
-        cell_empty = true;
+      const std::uint32_t colspan =
+          cell_node.attribute("table:number-columns-spanned").as_uint(1);
+      const std::uint32_t rowspan =
+          cell_node.attribute("table:number-rows-spanned").as_uint(1);
+
+      bool cell_empty = true;
+      if (cell_node.first_child()) {
+        cell_empty = false;
+      }
+      if (colspan > 1 || rowspan > 1) {
+        cell_empty = false;
       }
 
       if (!cell_empty) {
@@ -213,9 +221,12 @@ parse_sheet(ElementRegistry &registry, const pugi::xml_node node) {
             cell_node.attribute("table:number-rows-spanned").as_uint(1);
         const bool is_repeated = columns_repeated > 1 || rows_repeated > 1;
 
-        bool cell_empty = false;
-        if (!cell_node.first_child()) {
-          cell_empty = true;
+        bool cell_empty = true;
+        if (cell_node.first_child()) {
+          cell_empty = false;
+        }
+        if (colspan > 1 || rowspan > 1) {
+          cell_empty = false;
         }
 
         if (cell_empty) {

test/scripts/compare_output_server.sh

@@ -17,5 +17,5 @@ docker run -ti \
   -v $(pwd):/repo \
   -p 8000:8000 \
   --platform linux/amd64 \
-  ghcr.io/opendocument-app/odr_core_test:1.0.15 \
-  compare-html-server /repo/$REF /repo/$OBS --compare --driver $DRIVER --port 8000
+  ghcr.io/opendocument-app/odr_core_test:1.0.18 \
+  compare-html-server /repo/$REF /repo/$OBS --compare --driver $DRIVER --port 8000 -vv