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 'fix/bug55175' (#451) from fix/bug55175 into release/v9.1.0

Browse Source 
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/core/pulls/451
This commit is contained in:
Elena Subbotina
2025-09-24 13:49:24 +00:00
parent cd2f1a2b2a 670c788625
commit e2faddf21f
3 changed files with 29 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
OdfFile/Writer/Format/odf_text_context.cpp
View File

@ -772,7 +772,7 @@ bool odf_text_context::set_type_break(int type, int clear)//todooo clear ???
{
need_break_ = boost::none;
}
else if (type == 0)//brtypeColumn
else if (type == 0)//brtypeColumn
{
need_break_ = fo_break(fo_break::Column);
need_restart = true;
@ -780,7 +780,7 @@ bool odf_text_context::set_type_break(int type, int clear)//todooo clear ???
else if (type == 1)//brtypePage
{
office_element_ptr elm;
create_element(L"text", L"soft-page-break", elm, odf_context_);
create_element(L"text", L"soft-page-break", elm, odf_context_);
start_element(elm);
end_element();
@ -794,8 +794,9 @@ bool odf_text_context::set_type_break(int type, int clear)//todooo clear ???
create_element(L"text", L"line-break", elm, odf_context_);
if (current_level_.size() > 0)
current_level_.back().elm->add_child_element(elm);
current_level_.back().elm->add_child_element(elm);
}
return need_restart;
}

2
OdfFile/Writer/Format/odf_text_context.h
View File

@ -164,6 +164,7 @@ public:
int prevNumID = -1;
}list_state_;
bool single_paragraph_;
odf_conversion_context *odf_context_;
private:
bool keep_next_paragraph_;
@ -173,7 +174,6 @@ private:
text_format_properties *text_properties_; //хранилка-опознавалка что свойства приписаны другому, не текстовому, объекту
odf_style_context_ptr styles_context_;
odf_conversion_context *odf_context_;
std::wstring parent_span_style_;
std::wstring parent_paragraph_style_;