element identifier

opendocument-app · Nov 28, 2023 · 4812d0e · 4812d0e
1 parent d5e9883
commit 4812d0e
Show file tree

Hide file tree

Showing 16 changed files with 1,117 additions and 792 deletions.
diff --git a/src/odr/document_element.cpp b/src/odr/document_element.cpp
diff --git a/src/odr/document_element.hpp b/src/odr/document_element.hpp
@@ -72,6 +72,10 @@ class Circle;
 class CustomShape;
 class Image;
 
+using ElementIdentifier = std::uint64_t;
+using ColumnIndex = std::uint32_t;
+using RowIndex = std::uint32_t;
+
 enum class ElementType {
   none,
 
@@ -168,6 +172,7 @@ class Element {
 protected:
   const internal::abstract::Document *m_document{nullptr};
   internal::abstract::Element *m_element{nullptr};
+  ElementIdentifier m_elementId{0};
 };
 
 class ElementIterator {
@@ -193,6 +198,7 @@ class ElementIterator {
 private:
   const internal::abstract::Document *m_document{nullptr};
   internal::abstract::Element *m_element{nullptr};
+  ElementIdentifier m_elementId{0};
 };
 
 template <typename T> class TypedElement : public Element {
@@ -252,9 +258,9 @@ class Sheet final : public TypedElement<internal::abstract::Sheet> {
   [[nodiscard]] TableDimensions
   content(std::optional<TableDimensions> range) const;
 
-  [[nodiscard]] TableColumn column(std::uint32_t column) const;
-  [[nodiscard]] TableRow row(std::uint32_t row) const;
-  [[nodiscard]] TableCell cell(std::uint32_t column, std::uint32_t row) const;
+  [[nodiscard]] TableColumn column(ColumnIndex column) const;
+  [[nodiscard]] TableRow row(RowIndex row) const;
+  [[nodiscard]] TableCell cell(ColumnIndex column, RowIndex row) const;
 
   [[nodiscard]] ElementRange shapes() const;
 

diff --git a/src/odr/internal/abstract/document.hpp b/src/odr/internal/abstract/document.hpp
@@ -1,8 +1,6 @@
 #ifndef ODR_INTERNAL_ABSTRACT_DOCUMENT_H
 #define ODR_INTERNAL_ABSTRACT_DOCUMENT_H
 
-#include <odr/document.hpp>
-
 #include <memory>
 
 namespace odr {