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

Browse Source
This commit is contained in:
ElenaSubbotina
2025-06-24 18:56:47 +03:00
parent e48fab418d
commit 54a903d2e7
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
OdfFile/Reader/Converter/xlsx_table_state.cpp
View File

@ -356,7 +356,8 @@ std::wstring xlsx_table_state::default_column_cell_style() const
void xlsx_table_state::end_row()
{
table_row_style_ = L"";
in_cell = false;
table_row_style_ = L"";
}
std::wstring xlsx_table_state::current_row_style() const

6
OdfFile/Reader/Format/table_xlsx.cpp
View File

@ -1033,7 +1033,11 @@ void table_table_cell::xlsx_convert(oox::xlsx_conversion_context & Context)
xlsx_value_type = oox::XlsxCellType::s;//в случае текста, если он есть берем кэшированное значение
}
//---------------------------------------------------------------------------------------------------------
if (skip_next_cell) break;
if (skip_next_cell)
{
Context.end_table_cell();
break;
}
// пустые ячейки пропускаем.
if ( is_data_visible || ((cellStyle || defaultColumnCellStyle) && is_style_visible))