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/bug55175

Browse Source 
fix bug when text stick together
This commit is contained in:
Timofey Derevyankin
2025-09-24 16:19:24 +03:00
parent 7d40c402bc
commit 670c788625
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

@ -765,7 +765,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;
@ -773,7 +773,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();
@ -787,8 +787,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

@ -160,6 +160,7 @@ public:
int prevNumID = -1;
}list_state_;
bool single_paragraph_;
odf_conversion_context *odf_context_;
private:
bool keep_next_paragraph_;
@ -169,7 +170,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_;