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 50799

Browse Source 
The bug has already been fixed on develop. Making a duplication in release
This commit is contained in:
Kulikova Svetlana
2021-08-12 10:37:19 +03:00
parent c888b809b3
commit 90a3231c75
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Fb2File/Fb2File.cpp
View File

@ -1589,7 +1589,7 @@ HRESULT CFb2File::Open(const std::wstring& sPath, const std::wstring& sDirectory
return S_OK;
}
void readLi(NSStringUtils::CStringBuilder& oXml, XmlUtils::CXmlLiteReader& oIndexHtml, std::vector<std::wstring>& arrBinary, bool bUl, bool bWasTable);
void readLi(NSStringUtils::CStringBuilder& oXml, XmlUtils::CXmlLiteReader& oIndexHtml, std::vector<std::wstring>& arrBinary, bool bUl, bool bWasP, bool bWasTable);
void readStream(NSStringUtils::CStringBuilder& oXml, XmlUtils::CXmlLiteReader& oIndexHtml, std::vector<std::wstring>& arrBinary, bool bWasP, bool bWasTable)
{
int nDeath = oIndexHtml.GetDepth();
@ -1760,9 +1760,9 @@ void readStream(NSStringUtils::CStringBuilder& oXml, XmlUtils::CXmlLiteReader& o
oXml.WriteString(L"</a>");
}
else if (sName == L"ul")
readLi(oXml, oIndexHtml, arrBinary, true, bWasTable);
readLi(oXml, oIndexHtml, arrBinary, true, bWasP, bWasTable);
else if (sName == L"ol")
readLi(oXml, oIndexHtml, arrBinary, false, bWasTable);
readLi(oXml, oIndexHtml, arrBinary, false, bWasP, bWasTable);
else if (sName == L"img")
{
std::wstring sBinary;
@ -1823,7 +1823,7 @@ std::wstring ToLowerRoman(int number)
return L"";
}
void readLi(NSStringUtils::CStringBuilder& oXml, XmlUtils::CXmlLiteReader& oIndexHtml, std::vector<std::wstring>& arrBinary, bool bUl, bool bWasTable)
void readLi(NSStringUtils::CStringBuilder& oXml, XmlUtils::CXmlLiteReader& oIndexHtml, std::vector<std::wstring>& arrBinary, bool bUl, bool bWasP, bool bWasTable)
{
int nNum = 1;
while (oIndexHtml.MoveToNextAttribute())
@ -1837,7 +1837,8 @@ void readLi(NSStringUtils::CStringBuilder& oXml, XmlUtils::CXmlLiteReader& oInde
{
if (oIndexHtml.GetName() == L"li")
{
oXml.WriteString(L"<p>");
if (!bWasP)
oXml.WriteString(L"<p>");
if (bUl)
oXml.AddCharSafe(183);
else
@ -1875,7 +1876,8 @@ void readLi(NSStringUtils::CStringBuilder& oXml, XmlUtils::CXmlLiteReader& oInde
}
oXml.WriteString(L" ");
readStream(oXml, oIndexHtml, arrBinary, true, bWasTable);
oXml.WriteString(L"</p>");
if (!bWasP)
oXml.WriteString(L"</p>");
}
} while (oIndexHtml.ReadNextSiblingNode2(nDeath));
}