pengjunjie/core
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/core.git synced 2026-04-07 13:55:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/feature/localraster' into develop

Browse Source 
# Conflicts:
#	EpubFile/test/main.cpp
This commit is contained in:
Oleg Korshul
2021-05-28 09:54:28 +03:00
parent a03f7f47bd 7671dcdac6
commit f95e5a4487
23 changed files with 1129 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
HtmlFile2/htmlfile2.cpp
View File

@ -1526,17 +1526,17 @@ private:
oXml->WriteString(L"<w:pPr><w:pStyle w:val=\"");
std::vector<std::pair<size_t, NSCSS::CNode>> temporary;
size_t i = 0;
while(i != sSelectors.size())
{
size_t i = 0;
while(i != sSelectors.size())
{
if(rStyle.find(L' ' + sSelectors[i].m_sName + L' ') != std::wstring::npos)
{
temporary.push_back(std::make_pair(i, sSelectors[i]));
sSelectors.erase(sSelectors.begin() + i);
}
else
i++;
}
{
temporary.push_back(std::make_pair(i, sSelectors[i]));
sSelectors.erase(sSelectors.begin() + i);
}
else
i++;
}
NSCSS::CCompiledStyle oStyleSetting = m_oStylesCalculator.GetCompiledStyle(sSelectors, true);
NSCSS::CCompiledStyle oStyle = m_oStylesCalculator.GetCompiledStyle(sSelectors);
@ -1549,7 +1549,7 @@ private:
m_oXmlStyle.Clear();
for(int i = temporary.size() - 1; i >= 0; i--)
sSelectors.insert(sSelectors.begin() + temporary[i].first, temporary[i].second);
sSelectors.insert(sSelectors.begin() + temporary[i].first, temporary[i].second);
// Если в таблице
bool bInTable = false;