Skip to content

rework document tree #452

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 5 commits into
base: main
Choose a base branch
from
Draft

rework document tree #452

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f80f519
draft
andiwand Oct 4, 2025
432e8f5
draft
andiwand Oct 5, 2025
c7bef0c
draft
andiwand Oct 5, 2025
7e45387
draft
andiwand Oct 5, 2025
43f2880
draft more
andiwand Oct 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 16 additions & 18 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -133,31 +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.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_spreadsheet.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"
Expand Down
2 changes: 1 addition & 1 deletion src/odr/document.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Loading
Loading