fix bug #66656

ONLYOFFICE · Feb 29, 2024 · 0476ded · 0476ded
1 parent b71ed59
commit 0476ded
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 3 deletions.
diff --git a/OdfFile/Reader/Format/documentcontext.cpp b/OdfFile/Reader/Format/documentcontext.cpp
@@ -36,7 +36,7 @@
 namespace cpdoccore { 
 namespace odf_reader {
 
-document_context::document_context() : last_paragraph(NULL)
+document_context::document_context() : last_paragraph(NULL), is_old_version(false)
 {            
 }
 

diff --git a/OdfFile/Reader/Format/documentcontext.h b/OdfFile/Reader/Format/documentcontext.h
@@ -49,6 +49,7 @@ class document_context
 	office_element* get_last_element();
 
 	std::wstring office_class_; //openoffice xml 1.0
+	bool is_old_version;  //openoffice xml 1.0
 
 	std::vector<office_element*> levels;
 	office_element* last_paragraph;

diff --git a/OdfFile/Reader/Format/styles.cpp b/OdfFile/Reader/Format/styles.cpp
@@ -279,6 +279,8 @@ void style_content::add_child_element( xml::sax * Reader, const std::wstring & N
 	}
 	else if CP_CHECK_NAME(L"style", L"properties")
 	{
+		Context->is_old_version = true;
+
 		office_element_ptr element;
 		CP_CREATE_ELEMENT_SIMPLE(element);
 
@@ -1775,16 +1777,41 @@ void style_master_page::pptx_convert(oox::pptx_conversion_context & Context)
 	if (attlist_.draw_style_name_)
 	{
 		std::wstring style_name = attlist_.draw_style_name_.get();
-		style_instance * style_inst = Context.root()->odf_context().styleContainer().style_by_name(style_name, style_family::DrawingPage, true);
 
+		graphic_format_properties* default_properties = NULL;
+
+		if (getContext()->is_old_version)
+		{
+			style_instance* style_inst_def = Context.root()->odf_context().styleContainer().style_by_name(L"standard", style_family::Graphic, true);
+			if ((style_inst_def) && (style_inst_def->content()))
+			{
+				default_properties = style_inst_def->content()->get_graphic_properties();
+			}
+		}
+		else
+		{
+			style_instance* style_inst_def = Context.root()->odf_context().styleContainer().style_default_by_type(odf_types::style_family::Graphic);
+			if ((style_inst_def) && (style_inst_def->content()))
+			{
+				default_properties = style_inst_def->content()->get_graphic_properties();
+			}
+		}
+		style_instance * style_inst = Context.root()->odf_context().styleContainer().style_by_name(style_name, style_family::DrawingPage, true);
 		if ((style_inst) && (style_inst->content()))
 		{
 			style_drawing_page_properties * properties = style_inst->content()->get_style_drawing_page_properties();
 
 			if (properties)
 			{				
+				odf_types::common_draw_fill_attlist calc_props;
+				if (default_properties)
+				{
+					calc_props.apply_from(default_properties->common_draw_fill_attlist_);
+				}
+				calc_props.apply_from(properties->content().common_draw_fill_attlist_);
+
 				oox::_oox_fill fill;
-				Compute_GraphicFill(properties->content().common_draw_fill_attlist_, office_element_ptr(), Context.root(), fill);
+				Compute_GraphicFill(calc_props, office_element_ptr(), Context.root(), fill);
 				Context.get_slide_context().add_background(fill);
 			}
 		}