Skip to content

Commit

Permalink
Merge pull request 'Fix bug #72871' (#230) from fix/bug72871 into hot…
Browse files Browse the repository at this point in the history
  • Loading branch information
ElenaSubbotina committed Feb 14, 2025
2 parents ddd7628 + 1f86b02 commit 84416ef
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 5 deletions.
8 changes: 4 additions & 4 deletions OdfFile/Reader/Format/note.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -79,10 +79,10 @@ void note_citation::add_space(const std::wstring & Text)
}
void note_citation::docx_convert(oox::docx_conversion_context & Context)
{
for (size_t i = 0; i < content_.size(); i++)
{
content_[i]->docx_convert(Context);
}
//for (size_t i = 0; i < content_.size(); i++)
// {
// content_[i]->docx_convert(Context);
// }
}

// text:note-body
Expand Down
8 changes: 7 additions & 1 deletion OdfFile/Reader/Format/paragraph_elements.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -999,11 +999,17 @@ void note::docx_convert(oox::docx_conversion_context & Context)

if (text_note_class_.get_type() == noteclass::Footnote)
{
Context.output_stream() << "<w:footnoteReference w:id=\"" << Context.get_notes_context().next_id() << "\"/>";
Context.output_stream() << L"<w:rPr>";
Context.output_stream() << L"<w:vertAlign w:val=\"superscript\"/>";
Context.output_stream() << L"</w:rPr>";

Context.output_stream() << "<w:footnoteReference w:id=\"" << Context.get_notes_context().next_id() << "\"/>";
Context.add_new_run();
}
else
{
Context.output_stream() << "<w:endnoteReference w:id=\"" << Context.get_notes_context().next_id() << "\"/>";
Context.add_new_run();
}

if (text_note_citation_)
Expand Down

0 comments on commit 84416ef

Please sign in to comment.