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

Fix bug 78774

Browse Source
This commit is contained in:
Daria Ermakova
2026-02-06 18:48:55 +03:00
parent 655bc0698f
commit f6bf73dfab
3 changed files with 28 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
MsBinaryFile/DocFile/DocumentMapping.cpp
View File

@ -1939,7 +1939,8 @@ namespace DocFileFormat
//{
// m_pXmlWriter->WriteAttribute( L"w:customMarkFollows", L"1");
//}
m_pXmlWriter->WriteAttribute( L"w:id", FormatUtils::IntToWideString(_footnoteNr++ ) );
_footnoteNr++;
m_pXmlWriter->WriteAttribute( L"w:id", FormatUtils::IntToWideString(_footnoteNr ) );
m_pXmlWriter->WriteNodeEnd( L"", true );
}
}

33
MsBinaryFile/DocFile/FootnotesMapping.cpp
View File

@ -43,11 +43,10 @@ namespace DocFileFormat
{
m_document = static_cast<WordDocument*>( visited );
if ( m_document && ( m_document->FIB->m_RgLw97.ccpFtn > 0 ) )
{
m_context->_docx->RegisterFootnotes();
int id = 0;
int id = 1;
int index = 0;
m_pXmlWriter->WriteNodeBegin( L"w:footnotes", TRUE );
@ -71,21 +70,21 @@ namespace DocFileFormat
m_pXmlWriter->WriteAttribute( L"mc:Ignorable", L"w14 wp14" );
m_pXmlWriter->WriteNodeEnd( L"", TRUE, FALSE );
//m_pXmlWriter->WriteNodeBegin( L"w:footnote", TRUE );
//m_pXmlWriter->WriteAttribute( L"w:type", L"separator");
//m_pXmlWriter->WriteAttribute( L"w:id", L"-1");
//m_pXmlWriter->WriteNodeEnd( L"", TRUE, FALSE );
m_pXmlWriter->WriteNodeBegin( L"w:footnote", TRUE );
m_pXmlWriter->WriteAttribute( L"w:type", L"separator");
m_pXmlWriter->WriteAttribute( L"w:id", L"-1");
m_pXmlWriter->WriteNodeEnd( L"", TRUE, FALSE );
//m_pXmlWriter->WriteString(L"<w:p><w:pPr><w:spacing w:lineRule=\"auto\" w:line=\"240\" w:after=\"0\"/></w:pPr><w:r></w:r><w:r><w:separator/></w:r></w:p>");
//m_pXmlWriter->WriteNodeEnd( L"w:footnote");
m_pXmlWriter->WriteString(L"<w:p><w:pPr><w:pBdr/><w:spacing/><w:ind/><w:rPr/></w:pPr><w:r><w:separator/></w:r><w:r/></w:p>");
m_pXmlWriter->WriteNodeEnd( L"w:footnote");
//m_pXmlWriter->WriteNodeBegin( L"w:footnote", TRUE );
//m_pXmlWriter->WriteAttribute( L"w:type", L"continuationSeparator");
//m_pXmlWriter->WriteAttribute( L"w:id", L"0");
//m_pXmlWriter->WriteNodeEnd( L"", TRUE, FALSE );
m_pXmlWriter->WriteNodeBegin( L"w:footnote", TRUE );
m_pXmlWriter->WriteAttribute( L"w:type", L"continuationSeparator");
m_pXmlWriter->WriteAttribute( L"w:id", L"0");
m_pXmlWriter->WriteNodeEnd( L"", TRUE, FALSE );
//m_pXmlWriter->WriteString(L"<w:p><w:pPr><w:spacing w:lineRule=\"auto\" w:line=\"240\" w:after=\"0\"/></w:pPr><w:r></w:r><w:r><w:continuationSeparator/></w:r></w:p>");
//m_pXmlWriter->WriteNodeEnd( L"w:footnote");
m_pXmlWriter->WriteString(L"<w:p><w:pPr><w:pBdr/><w:spacing/><w:ind/><w:rPr/></w:pPr><w:r><w:continuationSeparator/></w:r><w:r/></w:p>");
m_pXmlWriter->WriteNodeEnd( L"w:footnote");
int cp = m_document->FIB->m_RgLw97.ccpText;
@ -95,7 +94,7 @@ namespace DocFileFormat
m_pXmlWriter->WriteAttribute( L"w:id", FormatUtils::IntToWideString( id ));
m_pXmlWriter->WriteNodeEnd( L"", TRUE, FALSE );
while ( ( cp - m_document->FIB->m_RgLw97.ccpText ) < (*m_document->IndividualFootnotesPlex)[id + 1] )
while ( ( cp - m_document->FIB->m_RgLw97.ccpText ) < (*m_document->IndividualFootnotesPlex)[index + 1] )
{
int cpStart = cp;
@ -122,12 +121,12 @@ namespace DocFileFormat
}
m_pXmlWriter->WriteNodeEnd( L"w:footnote");
index++;
id++;
}
m_pXmlWriter->WriteNodeEnd( L"w:footnotes");
m_context->_docx->FootnotesXML = std::wstring(m_pXmlWriter->GetXmlString());
}
}
}

10
MsBinaryFile/DocFile/SettingsMapping.cpp
View File

@ -257,6 +257,16 @@ namespace DocFileFormat
appendValueAttribute( &footnotePr, L"w:pos", FormatUtils::MapValueToWideString( dop->Fpc, &FootnotePositionMap[0][0], 4, 12 ) );
}
XMLTools::XMLElement footnoteMinusOne( L"w:footnote" );
XMLTools::XMLAttribute idAttrMinusOne( L"w:id", L"-1" );
footnoteMinusOne.AppendAttribute( idAttrMinusOne );
footnotePr.AppendChild( footnoteMinusOne );
XMLTools::XMLElement footnoteZero( L"w:footnote" );
XMLTools::XMLAttribute idAttrZero( L"w:id", L"0" );
footnoteZero.AppendAttribute( idAttrZero );
footnotePr.AppendChild( footnoteZero );
if ( footnotePr.GetAttributeCount() > 0 )
{
m_oXmlWriter.WriteString( footnotePr.GetXMLString() );