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

fix/bug79616

Browse Source 
for bug #79616
This commit is contained in:
Timofey Derevyankin
2026-02-03 13:31:14 +03:00
parent 6af52920a2
commit 58b221f4fa
3 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2072,7 +2072,7 @@ int docx_conversion_context::process_paragraph_style(_CP_OPT(std::wstring) style
else
{
const std::wstring id = styles_map_.get( styleInst->name(), styleInst->type() );
output_stream() << L"<w:pPr>";
output_stream() << L"<w:pPr>";
output_stream() << L"<w:pStyle w:val=\"" << id << L"\" />";
@ -2305,7 +2305,7 @@ void docx_conversion_context::process_page_break_after(const odf_reader::style_i
if (inst->content() && inst->content()->get_style_paragraph_properties())
{
_CP_OPT(odf_types::fo_break) fo_break_val = inst->content()->get_style_paragraph_properties()->content_.fo_break_after_;
if (fo_break_val)
if (fo_break_val)
{
set_page_break_after(fo_break_val->get_type());
break;

6
OdfFile/Reader/Converter/oox_drawing.cpp
View File

@ -672,8 +672,12 @@ void _oox_drawing::serialize_bodyPr(std::wostream & strm, const std::wstring & n
_CP_OPT(int) iWrap;
odf_reader::GetProperty(prop, L"text-wrap", iWrap);
if (((iWrap) && (*iWrap == 0)) || ((is_math_formula) && (*is_math_formula)))
if (((iWrap) && (*iWrap == 0))) // для текста устанавливаем значение square. Так у нас визуальное соотвествие при конвертации
CP_XML_ATTR(L"wrap", L"square");
else if((is_math_formula) && (*is_math_formula))
{
CP_XML_ATTR(L"wrap", L"none");
}
}
}

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

@ -366,7 +366,7 @@ void line_break::docx_convert(oox::docx_conversion_context & Context)
{
bool in_drawing = false;
if (Context.get_drawing_context().get_current_shape() || Context.get_drawing_context().get_current_frame())
if (Context.get_drawing_context().get_current_shape() || Context.get_drawing_context().get_current_frame())
{
in_drawing = true;