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 bug #65600

Browse Source
This commit is contained in:
Kamil Kerimov
2024-01-18 01:12:15 +05:00
parent ba9d6b430a
commit d593418616
3 changed files with 57 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
OdfFile/Writer/Converter/PptxConverter.cpp
View File

@ -349,6 +349,9 @@ std::wstring PptxConverter::convert(PPTX::Logic::TablePartStyle* style, const st
odp_context->drawing_context()->start_line_properties();
convert(style->tcStyle->tcBdr.GetPointer(), style_state->get_paragraph_properties());
odp_context->drawing_context()->end_line_properties();
convert(style_state->get_graphic_properties(), style_state->get_table_cell_properties());
convert(style_state->get_paragraph_properties(), style_state->get_table_cell_properties());
}
convert(style->tcTxStyle.GetPointer(), style_state->get_text_properties());
@ -1176,6 +1179,43 @@ void PptxConverter::convert(PPTX::Logic::Audio* oox_audio)
odp_context->current_slide().end_anim_audio();
}
void PptxConverter::convert(odf_writer::graphic_format_properties* graphic_props, odf_writer::style_table_cell_properties* table_cell_props)
{
if (!graphic_props)
return;
if (!table_cell_props)
return;
using namespace odf_types;
if(graphic_props->common_draw_fill_attlist_.draw_fill_color_)
table_cell_props->content_.common_background_color_attlist_.fo_background_color_ = background_color(*graphic_props->common_draw_fill_attlist_.draw_fill_color_);
odf_types::color color_ = graphic_props->svg_stroke_color_.get_value_or(odf_types::color(L"#FFFFFF"));
// odf_types::draw_fill draw_fill_ = graphic_props->common_draw_fill_attlist_.draw_fill_.get_value_or(draw_fill(draw_fill::solid));
odf_types::length length_ = graphic_props->svg_stroke_width_.get_value_or(length(1, length::pt)).get_length();
table_cell_props->content_.common_border_attlist_.fo_border_bottom_ = odf_types::border_style(color_, border_style::solid, length_);
}
void PptxConverter::convert(odf_writer::paragraph_format_properties* paragraph_props, odf_writer::style_table_cell_properties* table_cell_props)
{
if (!paragraph_props)
return;
if (!table_cell_props)
return;
if (paragraph_props->common_border_attlist_.fo_border_)
{
table_cell_props->content_.common_border_attlist_.fo_border_left_ = *paragraph_props->common_border_attlist_.fo_border_;
table_cell_props->content_.common_border_attlist_.fo_border_top_ = *paragraph_props->common_border_attlist_.fo_border_;
table_cell_props->content_.common_border_attlist_.fo_border_right_ = *paragraph_props->common_border_attlist_.fo_border_;
table_cell_props->content_.common_border_attlist_.fo_border_bottom_ = *paragraph_props->common_border_attlist_.fo_border_;
}
else
table_cell_props->content_.common_border_attlist_ = paragraph_props->common_border_attlist_;
}
void PptxConverter::convert_common()
{
if (presentation->sldSz.IsInit())

6
OdfFile/Writer/Converter/PptxConverter.h
View File

@ -117,6 +117,10 @@ namespace cpdoccore
class odf_conversion_context;
class odt_conversion_context;
class odp_conversion_context;
class graphic_format_properties;
class style_table_cell_properties;
class paragraph_format_properties;
}
}
@ -212,6 +216,8 @@ private:
void convert(const PPTX::Limit::TLNodeType& oox_note_type);
void convert(const PPTX::Limit::TLPresetClass& oox_preset_class);
void convert(const PPTX::Limit::TLPresetClass& oox_preset_class, int preset_id);
void convert(odf_writer::graphic_format_properties* graphic_props, odf_writer::style_table_cell_properties* table_cell_props);
void convert(odf_writer::paragraph_format_properties* paragraph_props, odf_writer::style_table_cell_properties* table_cell_props);
PPTX::Document *pptx_document;
PPTX::Presentation *presentation;

22
OdfFile/Writer/Format/styles.cpp
View File

@ -254,17 +254,17 @@ void style_content::create_child_element( const std::wstring & Ns, const std::ws
}
void style_content::serialize(std::wostream & strm)
{
if (style_text_properties_) style_text_properties_->serialize(strm);
if (style_paragraph_properties_)style_paragraph_properties_->serialize(strm);
if (style_section_properties_) style_section_properties_->serialize(strm);
if (style_ruby_properties_) style_ruby_properties_->serialize(strm);
if (style_table_properties_) style_table_properties_->serialize(strm);
if (style_table_column_properties_)style_table_column_properties_->serialize(strm);
if (style_table_row_properties_)style_table_row_properties_->serialize(strm);
if (style_chart_properties_) style_chart_properties_->serialize(strm);
if (style_graphic_properties_) style_graphic_properties_->serialize(strm);
if (style_table_cell_properties_)style_table_cell_properties_->serialize(strm);
if (style_drawing_page_properties_)style_drawing_page_properties_->serialize(strm);
if (style_table_cell_properties_) style_table_cell_properties_->serialize(strm);
if (style_graphic_properties_) style_graphic_properties_->serialize(strm);
if (style_paragraph_properties_) style_paragraph_properties_->serialize(strm);
if (style_section_properties_) style_section_properties_->serialize(strm);
if (style_ruby_properties_) style_ruby_properties_->serialize(strm);
if (style_table_properties_) style_table_properties_->serialize(strm);
if (style_table_column_properties_) style_table_column_properties_->serialize(strm);
if (style_table_row_properties_) style_table_row_properties_->serialize(strm);
if (style_chart_properties_) style_chart_properties_->serialize(strm);
if (style_drawing_page_properties_) style_drawing_page_properties_->serialize(strm);
if (style_text_properties_) style_text_properties_->serialize(strm);
}
// style:default-style