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 #74982

Browse Source
This commit is contained in:
Green
2025-06-10 12:51:28 +03:00
parent 0d79f941b9
commit 4e59cac4cd
1 changed files with 11 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
HtmlFile2/htmlfile2.cpp
View File

@ -264,6 +264,7 @@ struct CTextSettings
bool bAddSpaces; // Добавлять пробелы перед текстом?
bool bMergeText; // Объединять подяр идущий текст в 1?
int nLi; // Уровень списка
bool bNumberingLi; // Является ли список нумерованным
std::wstring sPStyle;
@ -277,11 +278,12 @@ struct CTextSettings
NSCSS::CCompiledStyle oAdditionalStyle;
CTextSettings()
: bBdo(false), bPre(false), bQ(false), bAddSpaces(true), bMergeText(false), nLi(-1), eTextMode(Normal)
: bBdo(false), bPre(false), bQ(false), bAddSpaces(true), bMergeText(false), nLi(-1), bNumberingLi(false), eTextMode(Normal)
{}
CTextSettings(const CTextSettings& oTS) :
bBdo(oTS.bBdo), bPre(oTS.bPre), bQ(oTS.bQ), bAddSpaces(oTS.bAddSpaces), bMergeText(oTS.bMergeText), nLi(oTS.nLi), sPStyle(oTS.sPStyle), eTextMode(oTS.eTextMode)
bBdo(oTS.bBdo), bPre(oTS.bPre), bQ(oTS.bQ), bAddSpaces(oTS.bAddSpaces), bMergeText(oTS.bMergeText),
nLi(oTS.nLi),bNumberingLi(oTS.bNumberingLi), sPStyle(oTS.sPStyle), eTextMode(oTS.eTextMode)
{}
void AddPStyle(const std::wstring& wsStyle)
@ -3932,6 +3934,8 @@ private:
CTextSettings oTSLiP(oTS);
oTSLiP.bNumberingLi = !bType;
std::wstring wsValue;
const std::wstring wsParentName{(!sSelectors.empty()) ? sSelectors.back().m_wsName : L""};
@ -3954,27 +3958,11 @@ private:
oTSLiP.oAdditionalStyle.m_oText.SetColor(L"#808080", NEXT_LEVEL);
else if (L"selected" == wsArgumentName)
oTSLiP.oAdditionalStyle.m_oText.SetDecoration(L"underline", NEXT_LEVEL);
// oTSLiP.AddRStyle(L"<w:u w:val=\"single\"/>");
}
m_oLightReader.MoveToElement();
if (std::wstring::npos != oTS.sPStyle.find(L"<w:numPr>"))
{
wrP(oXml, sSelectors, oTS);
CloseP(oXml, sSelectors);
oTSLiP.sPStyle.clear();
}
oTSLiP.nLi++;
const std::wstring wsOldPStyle{oTSLiP.sPStyle};
oTSLiP.sPStyle += L"<w:numPr><w:ilvl w:val=\"" + std::to_wstring(oTSLiP.nLi) + L"\"/><w:numId w:val=\"" +
(bType ? L"1" : std::to_wstring(m_nNumberingId + 1)) + L"\"/></w:numPr>";
wrP(oXml, sSelectors, oTSLiP);
oTSLiP.sPStyle = wsOldPStyle;
if (!wsValue.empty())
{
OpenR(oXml);
@ -4381,7 +4369,7 @@ private:
if (sPStyle.empty() && !ElementInTable(sSelectors))
sPStyle = L"normal-web";
if (sPStyle.empty() && oTS.sPStyle.empty())
if (sPStyle.empty() && oTS.sPStyle.empty() && 0 > oTS.nLi)
return L"";
m_oXmlStyle.WriteLitePStyle(oTS.oAdditionalStyle);
@ -4397,6 +4385,10 @@ private:
oXml->WriteString(L"\"/>");
}
if (oTS.nLi >= 0)
oXml->WriteString(L"<w:numPr><w:ilvl w:val=\"" + std::to_wstring(oTS.nLi) + L"\"/><w:numId w:val=\"" +
(!oTS.bNumberingLi ? L"1" : std::to_wstring(m_nNumberingId + 1)) + L"\"/></w:numPr>");
oXml->WriteString(oTS.sPStyle + sPSettings);
oXml->WriteNodeEnd(L"w:pPr");
m_oState.m_bWasPStyle = true;