draft

Author: andiwand

CMakeLists.txt

@@ -99,7 +99,6 @@ set(ODR_SOURCE_FILES
         "src/odr/internal/cfb/cfb_util.cpp"
 
         "src/odr/internal/common/document.cpp"
-        "src/odr/internal/common/document_element.cpp"
         "src/odr/internal/common/file.cpp"
         "src/odr/internal/common/filesystem.cpp"
         "src/odr/internal/common/image_file.cpp"
@@ -133,29 +132,30 @@ set(ODR_SOURCE_FILES
 
         "src/odr/internal/odf/odf_crypto.cpp"
         "src/odr/internal/odf/odf_document.cpp"
+        "src/odr/internal/odf/odf_element_registry.cpp"
         "src/odr/internal/odf/odf_file.cpp"
         "src/odr/internal/odf/odf_manifest.cpp"
         "src/odr/internal/odf/odf_meta.cpp"
-        "src/odr/internal/odf/odf_parser.cpp"
-        "src/odr/internal/odf/odf_style.cpp"
+        #"src/odr/internal/odf/odf_parser.cpp"
+        #"src/odr/internal/odf/odf_style.cpp"
 
         "src/odr/internal/oldms/oldms_file.cpp"
 
-        "src/odr/internal/ooxml/presentation/ooxml_presentation_document.cpp"
-        "src/odr/internal/ooxml/presentation/ooxml_presentation_element.cpp"
-        "src/odr/internal/ooxml/presentation/ooxml_presentation_parser.cpp"
-        "src/odr/internal/ooxml/spreadsheet/ooxml_spreadsheet_document.cpp"
-        "src/odr/internal/ooxml/spreadsheet/ooxml_spreadsheet_element.cpp"
-        "src/odr/internal/ooxml/spreadsheet/ooxml_spreadsheet_parser.cpp"
-        "src/odr/internal/ooxml/spreadsheet/ooxml_spreadsheet_style.cpp"
-        "src/odr/internal/ooxml/text/ooxml_text_document.cpp"
-        "src/odr/internal/ooxml/text/ooxml_text_element.cpp"
-        "src/odr/internal/ooxml/text/ooxml_text_parser.cpp"
-        "src/odr/internal/ooxml/text/ooxml_text_style.cpp"
-        "src/odr/internal/ooxml/ooxml_crypto.cpp"
-        "src/odr/internal/ooxml/ooxml_file.cpp"
-        "src/odr/internal/ooxml/ooxml_meta.cpp"
-        "src/odr/internal/ooxml/ooxml_util.cpp"
+        #"src/odr/internal/ooxml/presentation/ooxml_presentation_document.cpp"
+        #"src/odr/internal/ooxml/presentation/ooxml_presentation_element.cpp"
+        #"src/odr/internal/ooxml/presentation/ooxml_presentation_parser.cpp"
+        #"src/odr/internal/ooxml/spreadsheet/ooxml_spreadsheet_document.cpp"
+        #"src/odr/internal/ooxml/spreadsheet/ooxml_spreadsheet_element.cpp"
+        #"src/odr/internal/ooxml/spreadsheet/ooxml_spreadsheet_parser.cpp"
+        #"src/odr/internal/ooxml/spreadsheet/ooxml_spreadsheet_style.cpp"
+        #"src/odr/internal/ooxml/text/ooxml_text_document.cpp"
+        #"src/odr/internal/ooxml/text/ooxml_text_element.cpp"
+        #"src/odr/internal/ooxml/text/ooxml_text_parser.cpp"
+        #"src/odr/internal/ooxml/text/ooxml_text_style.cpp"
+        #"src/odr/internal/ooxml/ooxml_crypto.cpp"
+        #"src/odr/internal/ooxml/ooxml_file.cpp"
+        #"src/odr/internal/ooxml/ooxml_meta.cpp"
+        #"src/odr/internal/ooxml/ooxml_util.cpp"
 
         "src/odr/internal/pdf/pdf_cmap.cpp"
         "src/odr/internal/pdf/pdf_cmap_parser.cpp"

src/odr/document.cpp

@@ -39,7 +39,7 @@ DocumentType Document::document_type() const noexcept {
 }
 
 Element Document::root_element() const {
-  return {m_impl.get(), m_impl->root_element()};
+  return {m_impl->element_adapter(), m_impl->root_element()};
 }
 
 Filesystem Document::as_filesystem() const {

src/odr/document_element_identifier.hpp

@@ -2,6 +2,7 @@
 
 #include <compare>
 #include <cstdint>
+#include <utility>
 
 namespace odr {
 

src/odr/internal/abstract/document.hpp

@@ -48,8 +48,7 @@ class Document {
   /// \return cursor to the root element of the document.
   [[nodiscard]] virtual ExtendedElementIdentifier root_element() const = 0;
 
-  [[nodiscard]] virtual const ElementAdapter *
-  element_adapter(ExtendedElementIdentifier element_id) const = 0;
+  [[nodiscard]] virtual const ElementAdapter *element_adapter() const = 0;
 };
 
 } // namespace odr::internal::abstract

src/odr/internal/common/document.cpp

@@ -1,6 +1,7 @@
 #include <odr/internal/common/document.hpp>
 
 #include <odr/document_element_identifier.hpp>
+#include <odr/internal/abstract/document_element.hpp>
 #include <odr/internal/abstract/filesystem.hpp>
 
 namespace odr::internal {
@@ -10,6 +11,8 @@ Document::Document(const FileType file_type, const DocumentType document_type,
     : m_file_type{file_type}, m_document_type{document_type},
       m_files{std::move(files)} {}
 
+Document::~Document() = default;
+
 FileType Document::file_type() const noexcept { return m_file_type; }
 
 DocumentType Document::document_type() const noexcept {
@@ -25,9 +28,8 @@ ExtendedElementIdentifier Document::root_element() const {
   return m_root_element;
 }
 
-const abstract::ElementAdapter *
-Document::element_adapter(ExtendedElementIdentifier) const {
-  return m_element_adapter;
+const abstract::ElementAdapter *Document::element_adapter() const {
+  return m_element_adapter.get();
 }
 
 } // namespace odr::internal

src/odr/internal/common/document.hpp

@@ -15,6 +15,7 @@ class Document : public abstract::Document {
 public:
   Document(FileType file_type, DocumentType document_type,
            std::shared_ptr<abstract::ReadableFilesystem> files);
+  ~Document() override;
 
   [[nodiscard]] FileType file_type() const noexcept final;
   [[nodiscard]] DocumentType document_type() const noexcept final;
@@ -25,7 +26,7 @@ class Document : public abstract::Document {
   [[nodiscard]] ExtendedElementIdentifier root_element() const override;
 
   [[nodiscard]] const abstract::ElementAdapter *
-  element_adapter(ExtendedElementIdentifier element_id) const override;
+  element_adapter() const override;
 
 protected:
   FileType m_file_type;
@@ -34,7 +35,7 @@ class Document : public abstract::Document {
   std::shared_ptr<abstract::ReadableFilesystem> m_files;
 
   ExtendedElementIdentifier m_root_element;
-  abstract::ElementAdapter *m_element_adapter{nullptr};
+  std::unique_ptr<abstract::ElementAdapter> m_element_adapter;
 };
 
 } // namespace odr::internal