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 merge bug

Browse Source
This commit is contained in:
Oleg.Korshul
2023-07-12 22:46:06 +05:00
parent 6191c1798b
commit c0d6375bb4
1 changed files with 7 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
DjVuFile/DjVuFileImplementation.cpp
View File

@ -910,33 +910,21 @@ void CDjVuFileImplementation::TextToRenderer(IRenderer* pRenderer, XmlUtils::CXm
{
// Выставим шрифт пустой (чтобы растягивать по всему ректу)
pRenderer->put_FontName(L"DjvuEmptyFont");
<<<<<<< HEAD
//std::wstring csText = oTextNode.GetXml();
std::vector<XmlUtils::CXmlNode> oLinesNodes;
=======
//std::wstring csText = oTextNode.GetXml();
XmlUtils::CXmlNodes oLinesNodes;
>>>>>>> hotfix/v7.4.1
std::vector<XmlUtils::CXmlNode> oLinesNodes = oTextNode.GetNodes(L"LINE");
oTextNode.GetNodes(L"LINE", oLinesNodes);
for (size_t nLineIndex = 0; nLineIndex < oLinesNodes.size(); ++nLineIndex)
for (size_t nLineIndex = 0; nLineIndex < oLinesNodes.size(); ++nLineIndex)
{
XmlUtils::CXmlNode & oLineNode = oLinesNodes[nLineIndex];
XmlUtils::CXmlNode& oLineNode = oLinesNodes[nLineIndex];
std::vector<XmlUtils::CXmlNode> oWordsNodes;
oLineNode.GetNodes(L"WORD", oWordsNodes);
for (size_t nWordIndex = 0; nWordIndex < oWordsNodes.size(); ++nWordIndex)
std::vector<XmlUtils::CXmlNode> oWordsNodes = oLineNode.GetNodes(L"WORD");
for (size_t nWordIndex = 0; nWordIndex < oWordsNodes.size(); ++nWordIndex)
{
<<<<<<< HEAD
XmlUtils::CXmlNode & oWordNode = oWordsNodes[nWordIndex];
XmlUtils::CXmlNode& oWordNode = oWordsNodes[nWordIndex];
std::wstring csWord = oWordNode.GetText();
std::wstring csCoords = oWordNode.GetAttribute(L"coords");
=======
XmlUtils::CXmlNode oWordNode;
oWordsNodes.GetAt(nWordIndex, oWordNode);
std::wstring csWord = oWordNode.GetText();
std::wstring csCoords = oWordNode.GetAttribute(L"coords");
>>>>>>> hotfix/v7.4.1
double arrCoords[4];
ParseCoords(csCoords, arrCoords, dKoef);
DrawPageText(pRenderer, arrCoords, csWord);