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 placeholder index attribute

Browse Source
This commit is contained in:
Kamil Kerimov
2024-06-14 15:58:56 +05:00
parent adfbf6ea3f
commit a72b42bd6d
3 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -230,8 +230,8 @@ void pptx_serialize_shape(std::wostream & strm, _pptx_drawing & val)
{
CP_XML_NODE(L"p:ph")
{
CP_XML_ATTR(L"type", val.place_holder_type_);
if (val.place_holder_idx_ > 0) CP_XML_ATTR(L"idx", val.place_holder_idx_);
CP_XML_ATTR(L"type", val.place_holder_type_);
CP_XML_ATTR(L"idx", (uint32_t)val.place_holder_idx_);
if (val.place_holder_type_ == L"dt") { CP_XML_ATTR(L"sz", L"half"); }
if (val.place_holder_type_ == L"ftr") { CP_XML_ATTR(L"sz", L"quarter"); }

1
OdfFile/Reader/Converter/pptx_text_context.cpp
View File

@ -487,7 +487,6 @@ std::wstring pptx_text_context::Impl::dump_paragraph(/*bool last*/)
int sz = last_run_font_size_->get_value_unit(odf_types::length::pt) * 100;
CP_XML_ATTR(L"sz", sz);
}
last_run_font_size_ = boost::none;

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

@ -485,7 +485,7 @@ void paragraph_format_properties::pptx_convert(oox::pptx_conversion_context & Co
std::wstring w_before = pptx_process_margin(margin_top, length::pt, 100.0);
CP_XML_NODE(L"a:spcPts")
{
CP_XML_ATTR(L"val",w_before);
CP_XML_ATTR(L"val", w_before);
}
}
else