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 pull request 'hotfix/v9.0.4' (#391) from hotfix/v9.0.4 into develop

Browse Source 
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/core/pulls/391
This commit is contained in:
Oleg Korshul
2025-07-12 06:44:47 +00:00
parent 6f7a414888 407993cd40
commit 63da89d846
64 changed files with 552 additions and 398 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
OdfFile/Writer/Format/odt_conversion_context.cpp
View File

@ -79,11 +79,10 @@ odt_conversion_context::odt_conversion_context(package::odf_document * outputDoc
comment_context_(this), notes_context_(this), main_text_context_(NULL), table_context_(this), controls_context_(this)
{
is_hyperlink_ = false;
is_header_ = false;
is_footer_ = false;
is_hyperlink_ = false;
is_header_ = false;
is_footer_ = false;
is_background_ = false;
is_paragraph_in_current_section_ = false;
text_changes_state_.main_text_context = NULL; //header, footer, drawing, main, ..

6
OdfFile/Writer/Format/table.cpp
View File

@ -473,9 +473,13 @@ void table_columns_no_group::serialize(std::wostream & _Wostream)
table_columns_1_.serialize(_Wostream);
if (table_table_header_columns_)
{
table_table_header_columns_->serialize(_Wostream);
}
else
CP_XML_NODE(L"table:table-header-columns");
{
//CP_XML_NODE(L"table:table-header-columns");
}
table_columns_2_.serialize(_Wostream);
}