diff --git a/OdfFile/Reader/Converter/pptx_drawing.cpp b/OdfFile/Reader/Converter/pptx_drawing.cpp index 1c91de4048..ae7845e048 100644 --- a/OdfFile/Reader/Converter/pptx_drawing.cpp +++ b/OdfFile/Reader/Converter/pptx_drawing.cpp @@ -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"); } diff --git a/OdfFile/Reader/Converter/pptx_text_context.cpp b/OdfFile/Reader/Converter/pptx_text_context.cpp index 74d26af809..6ecb4af569 100644 --- a/OdfFile/Reader/Converter/pptx_text_context.cpp +++ b/OdfFile/Reader/Converter/pptx_text_context.cpp @@ -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; diff --git a/OdfFile/Reader/Format/style_paragraph_properties_pptx.cpp b/OdfFile/Reader/Format/style_paragraph_properties_pptx.cpp index 8e40c41489..a33566e298 100644 --- a/OdfFile/Reader/Format/style_paragraph_properties_pptx.cpp +++ b/OdfFile/Reader/Format/style_paragraph_properties_pptx.cpp @@ -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