Skip to content

Commit 7b82044

Browse files
committed
more fixes
1 parent c48b90e commit 7b82044

3 files changed

Lines changed: 8 additions & 8 deletions

File tree

src/odr/internal/ooxml/presentation/ooxml_presentation_document.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@ Document::Document(std::shared_ptr<abstract::ReadableFilesystem> filesystem)
1515
DocumentType::presentation,
1616
std::move(filesystem)) {
1717
m_document_xml =
18-
util::xml::parse(*m_filesystem, common::Path("ppt/presentation.xml"));
18+
util::xml::parse(*m_filesystem, common::Path("/ppt/presentation.xml"));
1919

2020
for (const auto &relationships : parse_relationships(
21-
*m_filesystem, common::Path("ppt/presentation.xml"))) {
21+
*m_filesystem, common::Path("/ppt/presentation.xml"))) {
2222
m_slides_xml[relationships.first] = util::xml::parse(
2323
*m_filesystem,
24-
common::Path("ppt").join(common::Path(relationships.second)));
24+
common::Path("/ppt").join(common::Path(relationships.second)));
2525
}
2626

2727
m_root_element = parse_tree(*this, m_document_xml.document_element());

src/odr/internal/ooxml/spreadsheet/ooxml_spreadsheet_document.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ Document::Document(std::shared_ptr<abstract::ReadableFilesystem> filesystem)
1414
: common::TemplateDocument<Element>(FileType::office_open_xml_workbook,
1515
DocumentType::spreadsheet,
1616
std::move(filesystem)) {
17-
auto workbook_path = common::Path("xl/workbook.xml");
17+
auto workbook_path = common::Path("/xl/workbook.xml");
1818
auto [workbook_xml, workbook_relations] = parse_xml_(workbook_path);
19-
auto [styles_xml, _] = parse_xml_(common::Path("xl/styles.xml"));
19+
auto [styles_xml, _] = parse_xml_(common::Path("/xl/styles.xml"));
2020

2121
for (pugi::xml_node sheet_node :
2222
workbook_xml.document_element().child("sheets").children("sheet")) {
@@ -32,9 +32,9 @@ Document::Document(std::shared_ptr<abstract::ReadableFilesystem> filesystem)
3232
}
3333
}
3434

35-
if (m_filesystem->exists(common::Path("xl/sharedStrings.xml"))) {
35+
if (m_filesystem->exists(common::Path("/xl/sharedStrings.xml"))) {
3636
auto [shared_strings_xml, _] =
37-
parse_xml_(common::Path("xl/sharedStrings.xml"));
37+
parse_xml_(common::Path("/xl/sharedStrings.xml"));
3838

3939
for (auto shared_string : shared_strings_xml.document_element()) {
4040
m_shared_strings.push_back(shared_string);

src/odr/internal/ooxml/text/ooxml_text_element.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -295,7 +295,7 @@ std::string Image::href(const abstract::Document *document) const {
295295
.attribute("r:embed")) {
296296
auto relations = document_relations_(document);
297297
if (auto rel = relations.find(ref.value()); rel != std::end(relations)) {
298-
return common::Path("word").join(common::Path(rel->second)).string();
298+
return common::Path("/word").join(common::Path(rel->second)).string();
299299
}
300300
}
301301
return ""; // TODO

0 commit comments

Comments
 (0)