pengjunjie/core
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/core.git synced 2026-02-10 18:05:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

Added endnotes conversion in hwp format and fixed bugs

Browse Source
This commit is contained in:
Green
2025-01-05 23:44:46 +03:00
parent a7d5fe3994
commit de821b73c8
5 changed files with 51 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
HwpFile/HwpDoc/Conversion/FootnoteConverter.cpp
View File

@ -8,13 +8,17 @@
namespace HWP
{
CFootnoteConverter::CFootnoteConverter()
: m_unCountFootnotes(0)
: m_unCountFootnotes(0), m_unCountEndnotes(0)
{}
void CFootnoteConverter::Clear()
{
m_unCountFootnotes = 0;
m_unCountEndnotes = 0;
m_arNotWrittenIds.clear();
m_oFootnoteXml.Clear();
m_oEndnoteXml.Clear();
}
bool CFootnoteConverter::NeedWritten() const
@ -22,12 +26,12 @@ bool CFootnoteConverter::NeedWritten() const
return !m_arNotWrittenIds.empty();
}
std::vector<unsigned short> CFootnoteConverter::GetNotWrittenIds(bool bNeedClear)
std::vector<std::pair<std::wstring, unsigned short> > CFootnoteConverter::GetNotWrittenIds(bool bNeedClear)
{
if (!bNeedClear)
return m_arNotWrittenIds;
std::vector<unsigned short> arNotWrittenIds{m_arNotWrittenIds};
std::vector<std::pair<std::wstring, unsigned short>> arNotWrittenIds{m_arNotWrittenIds};
m_arNotWrittenIds.clear();
return arNotWrittenIds;
@ -38,16 +42,26 @@ void CFootnoteConverter::CreateFootnote(const CCtrlNote* pNote)
if (nullptr == pNote)
return;
m_oFootnoteXml.WriteString(L"<w:footnote w:id=\"" + std::to_wstring(++m_unCountFootnotes) + L"\">");
m_arNotWrittenIds.push_back(m_unCountFootnotes);
NSStringUtils::CStringBuilder *pXMLBuilder = &m_oFootnoteXml;
std::wstring wsPrefix = L"foot";
if (L" ne" == pNote->GetID())
{
wsPrefix = L"end";
pXMLBuilder = &m_oEndnoteXml;
}
pXMLBuilder->WriteString(L"<w:" + wsPrefix + L"note w:id=\"" + std::to_wstring(++m_unCountFootnotes) + L"\">");
m_arNotWrittenIds.push_back(std::make_pair(wsPrefix, m_unCountFootnotes));
for (const CHWPPargraph* pParagraph : pNote->GetParagraphs())
{
m_oFootnoteXml.WriteString(L"<w:p>");
pXMLBuilder->WriteString(L"<w:p>");
for (const CCtrl* pCtrl : pParagraph->GetCtrls())
{
if (nullptr != dynamic_cast<const CCtrlAutoNumber*>(pCtrl))
m_oFootnoteXml.WriteString(L"<w:r><w:footnoteRef/></w:r>");
pXMLBuilder->WriteString(L"<w:r><w:" + wsPrefix + L"noteRef/></w:r>");
else if (nullptr != dynamic_cast<const CParaText*>(pCtrl))
{
std::wstring wsText = ((const CParaText*)pCtrl)->GetText();
@ -55,26 +69,30 @@ void CFootnoteConverter::CreateFootnote(const CCtrlNote* pNote)
if (wsText.empty())
wsText = L" ";
m_oFootnoteXml.WriteString(L"<w:r><w:t xml:space=\"preserve\">");
m_oFootnoteXml.WriteEncodeXmlString(wsText);
m_oFootnoteXml.WriteString(L"</w:t></w:r>");
pXMLBuilder->WriteString(L"<w:r><w:t xml:space=\"preserve\">");
pXMLBuilder->WriteEncodeXmlString(wsText);
pXMLBuilder->WriteString(L"</w:t></w:r>");
}
}
m_oFootnoteXml.WriteString(L"</w:p>");
pXMLBuilder->WriteString(L"</w:p>");
}
m_oFootnoteXml.WriteString(L"</w:footnote>");
pXMLBuilder->WriteString(L"</w:" + wsPrefix + L"note>");
}
bool CFootnoteConverter::SaveToFile(const std::wstring& wsDirectory)
{
if (0 == m_oFootnoteXml.GetCurSize())
if (0 == m_oFootnoteXml.GetCurSize() && 0 == m_oEndnoteXml.GetCurSize())
return false;
NSFile::CFileBinary oFootnoteWriter;
if (!oFootnoteWriter.CreateFileW(wsDirectory + L"footnotes.xml"))
return false;
NSFile::CFileBinary oEndNotesWriter;
if (!oEndNotesWriter.CreateFile(wsDirectory + L"endnotes.xml"))
return false;
oFootnoteWriter.WriteStringUTF8(L"<w:footnotes xmlns:wpc=\"http://schemas.microsoft.com/office/word/2010/wordprocessingCanvas\" xmlns:cx=\"http://schemas.microsoft.com/office/drawing/2014/chartex\" xmlns:cx1=\"http://schemas.microsoft.com/office/drawing/2015/9/8/chartex\" xmlns:cx2=\"http://schemas.microsoft.com/office/drawing/2015/10/21/chartex\" xmlns:cx3=\"http://schemas.microsoft.com/office/drawing/2016/5/9/chartex\" xmlns:cx4=\"http://schemas.microsoft.com/office/drawing/2016/5/10/chartex\" xmlns:cx5=\"http://schemas.microsoft.com/office/drawing/2016/5/11/chartex\" xmlns:cx6=\"http://schemas.microsoft.com/office/drawing/2016/5/12/chartex\" xmlns:cx7=\"http://schemas.microsoft.com/office/drawing/2016/5/13/chartex\" xmlns:cx8=\"http://schemas.microsoft.com/office/drawing/2016/5/14/chartex\" xmlns:mc=\"http://schemas.openxmlformats.org/markup-compatibility/2006\" xmlns:aink=\"http://schemas.microsoft.com/office/drawing/2016/ink\" xmlns:am3d=\"http://schemas.microsoft.com/office/drawing/2017/model3d\" xmlns:o=\"urn:schemas-microsoft-com:office:office\" xmlns:oel=\"http://schemas.microsoft.com/office/2019/extlst\" xmlns:r=\"http://schemas.openxmlformats.org/officeDocument/2006/relationships\" xmlns:m=\"http://schemas.openxmlformats.org/officeDocument/2006/math\" xmlns:v=\"urn:schemas-microsoft-com:vml\" xmlns:wp14=\"http://schemas.microsoft.com/office/word/2010/wordprocessingDrawing\" xmlns:wp=\"http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing\" xmlns:w10=\"urn:schemas-microsoft-com:office:word\" xmlns:w=\"http://schemas.openxmlformats.org/wordprocessingml/2006/main\" xmlns:w14=\"http://schemas.microsoft.com/office/word/2010/wordml\" xmlns:w15=\"http://schemas.microsoft.com/office/word/2012/wordml\" xmlns:w16cex=\"http://schemas.microsoft.com/office/word/2018/wordml/cex\" xmlns:w16cid=\"http://schemas.microsoft.com/office/word/2016/wordml/cid\" xmlns:w16=\"http://schemas.microsoft.com/office/word/2018/wordml\" xmlns:w16du=\"http://schemas.microsoft.com/office/word/2023/wordml/word16du\" xmlns:w16sdtdh=\"http://schemas.microsoft.com/office/word/2020/wordml/sdtdatahash\" xmlns:w16sdtfl=\"http://schemas.microsoft.com/office/word/2024/wordml/sdtformatlock\" xmlns:w16se=\"http://schemas.microsoft.com/office/word/2015/wordml/symex\" xmlns:wpg=\"http://schemas.microsoft.com/office/word/2010/wordprocessingGroup\" xmlns:wpi=\"http://schemas.microsoft.com/office/word/2010/wordprocessingInk\" xmlns:wne=\"http://schemas.microsoft.com/office/word/2006/wordml\" xmlns:wps=\"http://schemas.microsoft.com/office/word/2010/wordprocessingShape\" mc:Ignorable=\"w14 w15 w16se w16cid w16 w16cex w16sdtdh w16sdtfl w16du wp14\">");
oFootnoteWriter.WriteStringUTF8(L"<w:footnote w:type=\"separator\" w:id=\"-1\"> <w:p><w:pPr><w:spacing w:after=\"0\" w:line=\"240\" w:lineRule=\"auto\"/></w:pPr><w:r><w:separator/></w:r></w:p></w:footnote>");
oFootnoteWriter.WriteStringUTF8(L"<w:footnote w:type=\"continuationSeparator\" w:id=\"0\"><w:p><w:pPr><w:spacing w:after=\"0\" w:line=\"240\" w:lineRule=\"auto\"/></w:pPr><w:r><w:continuationSeparator/></w:r></w:p></w:footnote>");
@ -83,12 +101,9 @@ bool CFootnoteConverter::SaveToFile(const std::wstring& wsDirectory)
oFootnoteWriter.CloseFile();
NSFile::CFileBinary oEndNotesWriter;
if (!oEndNotesWriter.CreateFile(wsDirectory + L"endnotes.xml"))
return false;
oEndNotesWriter.WriteStringUTF8(L"<w:endnotes xmlns:wpc=\"http://schemas.microsoft.com/office/word/2010/wordprocessingCanvas\" xmlns:cx=\"http://schemas.microsoft.com/office/drawing/2014/chartex\" xmlns:cx1=\"http://schemas.microsoft.com/office/drawing/2015/9/8/chartex\" xmlns:cx2=\"http://schemas.microsoft.com/office/drawing/2015/10/21/chartex\" xmlns:cx3=\"http://schemas.microsoft.com/office/drawing/2016/5/9/chartex\" xmlns:cx4=\"http://schemas.microsoft.com/office/drawing/2016/5/10/chartex\" xmlns:cx5=\"http://schemas.microsoft.com/office/drawing/2016/5/11/chartex\" xmlns:cx6=\"http://schemas.microsoft.com/office/drawing/2016/5/12/chartex\" xmlns:cx7=\"http://schemas.microsoft.com/office/drawing/2016/5/13/chartex\" xmlns:cx8=\"http://schemas.microsoft.com/office/drawing/2016/5/14/chartex\" xmlns:mc=\"http://schemas.openxmlformats.org/markup-compatibility/2006\" xmlns:aink=\"http://schemas.microsoft.com/office/drawing/2016/ink\" xmlns:am3d=\"http://schemas.microsoft.com/office/drawing/2017/model3d\" xmlns:o=\"urn:schemas-microsoft-com:office:office\" xmlns:oel=\"http://schemas.microsoft.com/office/2019/extlst\" xmlns:r=\"http://schemas.openxmlformats.org/officeDocument/2006/relationships\" xmlns:m=\"http://schemas.openxmlformats.org/officeDocument/2006/math\" xmlns:v=\"urn:schemas-microsoft-com:vml\" xmlns:wp14=\"http://schemas.microsoft.com/office/word/2010/wordprocessingDrawing\" xmlns:wp=\"http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing\" xmlns:w10=\"urn:schemas-microsoft-com:office:word\" xmlns:w=\"http://schemas.openxmlformats.org/wordprocessingml/2006/main\" xmlns:w14=\"http://schemas.microsoft.com/office/word/2010/wordml\" xmlns:w15=\"http://schemas.microsoft.com/office/word/2012/wordml\" xmlns:w16cex=\"http://schemas.microsoft.com/office/word/2018/wordml/cex\" xmlns:w16cid=\"http://schemas.microsoft.com/office/word/2016/wordml/cid\" xmlns:w16=\"http://schemas.microsoft.com/office/word/2018/wordml\" xmlns:w16du=\"http://schemas.microsoft.com/office/word/2023/wordml/word16du\" xmlns:w16sdtdh=\"http://schemas.microsoft.com/office/word/2020/wordml/sdtdatahash\" xmlns:w16sdtfl=\"http://schemas.microsoft.com/office/word/2024/wordml/sdtformatlock\" xmlns:w16se=\"http://schemas.microsoft.com/office/word/2015/wordml/symex\" xmlns:wpg=\"http://schemas.microsoft.com/office/word/2010/wordprocessingGroup\" xmlns:wpi=\"http://schemas.microsoft.com/office/word/2010/wordprocessingInk\" xmlns:wne=\"http://schemas.microsoft.com/office/word/2006/wordml\" xmlns:wps=\"http://schemas.microsoft.com/office/word/2010/wordprocessingShape\" mc:Ignorable=\"w14 w15 w16se w16cid w16 w16cex w16sdtdh w16sdtfl w16du wp14\">");
oEndNotesWriter.WriteStringUTF8(L"<w:endnote w:type=\"separator\" w:id=\"-1\"><w:p><w:r><w:separator/></w:r></w:p></w:endnote><w:endnote w:type=\"continuationSeparator\" w:id=\"0\"><w:p><w:r><w:continuationSeparator/></w:r></w:p></w:endnote>");
oEndNotesWriter.WriteStringUTF8(m_oEndnoteXml.GetData());
oEndNotesWriter.WriteStringUTF8(L"</w:endnotes>");
oEndNotesWriter.CloseFile();