mirror of
https://github.com/ONLYOFFICE/core.git
synced 2026-02-10 18:05:41 +08:00
Fix bug with break columns
clear all comments into code
(cherry picked from commit 3f7edeec4f)
This commit is contained in:
committed by
ElenaSubbotina
parent
182a3cea90
commit
73f40edc7e
@ -1613,7 +1613,6 @@ bool docx_conversion_context::process_page_properties(std::wostream & strm)
|
||||
{
|
||||
if ( is_next_dump_page_properties() || get_section_context().get_last().is_dump_ )
|
||||
{
|
||||
_CP_LOG << L"I`m inside!\n";
|
||||
std::wstring pageProperties = get_page_properties();
|
||||
odf_reader::page_layout_instance * page_layout_instance_ = root()->odf_context().pageLayoutContainer().page_layout_by_name(pageProperties);
|
||||
|
||||
|
||||
@ -364,9 +364,8 @@ void paragraph::docx_convert(oox::docx_conversion_context & Context, _CP_OPT(std
|
||||
|
||||
if (!Context.process_headers_footers_ && (next_section_ || next_end_section_)) // remove in text::section - GreekSynopsis.odt
|
||||
{
|
||||
if( !flag_for_emplicit_end ) // Если параграф не последний (т.е flag_for_emplicit_end = false )
|
||||
if( !flag_for_emplicit_end )
|
||||
{
|
||||
// То возможно в нем явно указан разрыв, потому мы устанавливаем флаг is_dump = true
|
||||
Context.get_section_context().get_last().is_dump_ = true;
|
||||
is_empty = false;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user