fix ods

opendocument-app · Dec 10, 2023 · 23e552d · 23e552d
1 parent 37e1698
commit 23e552d
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 10 deletions.
diff --git a/src/odr/internal/odf/odf_spreadsheet.cpp b/src/odr/internal/odf/odf_spreadsheet.cpp
@@ -108,17 +108,24 @@ pugi::xml_node Sheet::row_(std::uint32_t row) const {
   return {};
 }
 
+pugi::xml_node Sheet::cell_(std::uint32_t column, std::uint32_t row) const {
+  if (auto row_it = util::map::lookup_greater_than(m_rows, row);
+      row_it != std::end(m_rows)) {
+    const auto &cells = row_it->second.cells;
+    if (auto cell_it = util::map::lookup_greater_than(cells, column);
+        cell_it != std::end(cells)) {
+      return cell_it->second;
+    }
+  }
+  return {};
+}
+
 common::ResolvedStyle Sheet::cell_style_(const abstract::Document *document,
                                          std::uint32_t column,
                                          std::uint32_t row) const {
-  auto it = m_cells.find({column, row});
-  if (it == std::end(m_cells)) {
-    return common::ResolvedStyle();
-  }
-
   const char *style_name = nullptr;
 
-  auto cell_node = it->second->m_node;
+  auto cell_node = cell_(column, row);
   if (auto attr = cell_node.attribute("table:style-name")) {
     style_name = attr.value();
   }

diff --git a/src/odr/internal/odf/odf_spreadsheet.hpp b/src/odr/internal/odf/odf_spreadsheet.hpp
@@ -66,6 +66,7 @@ class Sheet final : public Element, public abstract::Sheet {
 
   pugi::xml_node column_(std::uint32_t) const;
   pugi::xml_node row_(std::uint32_t) const;
+  pugi::xml_node cell_(std::uint32_t column, std::uint32_t row) const;
 
   common::ResolvedStyle cell_style_(const abstract::Document *,
                                     std::uint32_t column,

diff --git a/src/odr/internal/ooxml/spreadsheet/ooxml_spreadsheet_element.cpp b/src/odr/internal/ooxml/spreadsheet/ooxml_spreadsheet_element.cpp
@@ -101,18 +101,18 @@ TableStyle Sheet::style(const abstract::Document *) const {
 }
 
 TableColumnStyle Sheet::column_style(const abstract::Document *,
-                                     std::uint32_t column) const {
+                                     std::uint32_t /*column*/) const {
   return TableColumnStyle(); // TODO
 }
 
 TableRowStyle Sheet::row_style(const abstract::Document *,
-                               std::uint32_t row) const {
+                               std::uint32_t /*row*/) const {
   return TableRowStyle(); // TODO
 }
 
 TableCellStyle Sheet::cell_style(const abstract::Document *,
-                                 std::uint32_t column,
-                                 std::uint32_t row) const {
+                                 std::uint32_t /*column*/,
+                                 std::uint32_t /*row*/) const {
   return TableCellStyle(); // TODO
 }