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

for bug #74487

Browse Source
This commit is contained in:
ElenaSubbotina
2025-05-29 15:03:44 +03:00
parent 32cfb4f71b
commit cc9cb8ca05
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OdfFile/Reader/Converter/docx_conversion_context.cpp
View File

@ -2435,7 +2435,7 @@ bool docx_conversion_context::set_master_page_name(const std::wstring & MasterPa
{
if (current_master_page_name_ == MasterPageName) return false;
current_master_page_name_ = MasterPageName;
current_master_page_name_ = MasterPageName;
return true;
}

8
OdfFile/Reader/Converter/docx_drawing.cpp
View File

@ -296,8 +296,8 @@ void docx_serialize_image_child(std::wostream & strm, _docx_drawing & val)
CP_XML_ATTR(L"id", val.id + 1);
CP_XML_ATTR(L"name", val.name);
CP_XML_ATTR_OPT(L"title", title);
CP_XML_ATTR_OPT(L"descr", descr);
CP_XML_ATTR_OPT_ENCODE_STRING(L"title", title);
CP_XML_ATTR_OPT_ENCODE_STRING(L"descr", descr);
//oox_serialize_action(CP_XML_STREAM(), val.action);
}
@ -413,8 +413,8 @@ void docx_serialize_common(std::wostream & strm, _docx_drawing & val)
CP_XML_ATTR(L"name", val.name);
CP_XML_ATTR(L"id", 0xf000 + val.id + 1);
CP_XML_ATTR_OPT(L"title", title);
CP_XML_ATTR_OPT(L"descr", descr);
CP_XML_ATTR_OPT_ENCODE_STRING(L"title", title);
CP_XML_ATTR_OPT_ENCODE_STRING(L"descr", descr);
oox_serialize_action(CP_XML_STREAM(), val.action);
}

2
OdfFile/Reader/Format/text_elements.cpp
View File

@ -357,7 +357,7 @@ void paragraph::docx_convert(oox::docx_conversion_context & Context, _CP_OPT(std
}
else next_masterPageName = boost::none;
}
if (next_section_ || next_end_section_) // remove in text::section - GreekSynopsis.odt
if (!Context.process_headers_footers_ && (next_section_ || next_end_section_)) // remove in text::section - GreekSynopsis.odt
{
Context.get_section_context().get_last().is_dump_ = true;
is_empty = false;