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

Fix calcucaltion bug

Browse Source
This commit is contained in:
Alexey Nagaev
2026-01-15 13:30:27 +03:00
parent b3a7e20b35
commit e49c4bc7fe
1 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
DocxRenderer/src/logic/Page.cpp
View File

@ -1547,6 +1547,18 @@ namespace NSDocxRenderer
v_type == eVerticalCrossingType::vctNoCrossingCurrentBelowNext;
};
auto calc_selected = [this] (cont_ptr_t cont) {
if (m_bUseDefaultFont)
{
cont->m_oSelectedSizes.dHeight = cont->m_dHeight;
cont->m_oSelectedSizes.dWidth = cont->m_dWidth;
}
else
{
cont->CalcSelected();
}
};
// линии из которых сделаем шейпы
for (size_t index = 0; index < m_arTextLines.size(); ++index)
{
@ -1571,10 +1583,10 @@ namespace NSDocxRenderer
curr_line->CalcFirstWordWidth();
for (auto& cont : prev_line->m_arConts)
cont->CalcSelected();
calc_selected(cont);
for (auto& cont : curr_line->m_arConts)
cont->CalcSelected();
calc_selected(cont);
m_arShapes.push_back(CreateSingleLineShape(prev_line));
m_arShapes.push_back(CreateSingleLineShape(curr_line));