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

Browse Source 
fix bug #79610
This commit is contained in:
Timofey Derevyankin
2026-02-06 17:33:50 +03:00
parent 2024302fbe
commit f7555af6b3
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -513,12 +513,16 @@ void docx_serialize_wps(std::wostream & strm, _docx_drawing & val)
{
CP_XML_NODE(L"wp:extent")
{
if (val.cx > 0 || val.cy > 0)
if (val.cx > 0 && val.cy > 0)
{
CP_XML_ATTR(L"cx", val.cx);
CP_XML_ATTR(L"cy", val.cy);
}
else
{
CP_XML_ATTR(L"cx", 180000);
CP_XML_ATTR(L"cy", 180000);
}
}
serialize_null_extent(CP_XML_STREAM());
}

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

@ -437,7 +437,7 @@ void paragraph::docx_convert(oox::docx_conversion_context & Context, _CP_OPT(std
}
else
{
content_[i]->docx_convert(Context);
content_[i]->docx_convert(Context);
if (Context.get_drop_cap_context().state() > 0)
Context.get_drop_cap_context().state(0);//disable