(1.0.1.166): ASCOfficeOdfFile

21047 - исправлены и расширены заливки объектов в odt

git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@53621 954022d7-b5bf-4e40-9824-e11837661b57

ASCOfficeODFFile/ASCOfficeOdfFile/version.h

@@ -2,6 +2,6 @@
 //1
 //0
 //1
-//164
-#define INTVER 1,0,1,164
-#define STRVER "1,0,1,164\0"
+//166
+#define INTVER 1,0,1,166
+#define STRVER "1,0,1,166\0"

ASCOfficeODFFile/src/docx/oox_drawing_fills.h

@@ -87,6 +87,7 @@ namespace oox {
 //////////////////////////////////////////////////////////////////////////////
 	struct _oox_fill
 	{
+		_oox_fill() : type(-1){}
 		oox_gradient_fill_ptr	gradient;
 		oox_hatch_fill_ptr		hatch;
 		oox_bitmap_fill_ptr		bitmap;
@@ -101,7 +102,7 @@ namespace oox {
 
 		void clear()
 		{
-			type=0;
+			type=-1;
 			opacity = boost::none;
 
 			gradient.reset();

ASCOfficeODFFile/src/odf/draw_common.cpp

@@ -315,7 +315,7 @@ void Compute_GradientFill(draw_gradient * image_style,oox::oox_gradient_fill_ptr
 
 void Compute_GraphicFill(const common_draw_fill_attlist & props, styles_lite_container &styles, oox::_oox_fill & fill)
 {
-	fill.type = 0; 
+	if (fill.type<1)fill.type = 0; 
 
 	if (props.draw_opacity_) fill.opacity = props.draw_opacity_->get_value();
 	if (props.draw_opacity_name_)

ASCOfficeODFFile/src/odf/draw_frame_docx.cpp

@@ -788,6 +788,8 @@ void common_draw_docx_convert(oox::docx_conversion_context & Context, const unio
 //////////////////////////////////////////////
 	graphicProperties.apply_to(drawing.additional);
 //////////////////////////////////////////
+	Compute_GraphicFill(graphicProperties.common_draw_fill_attlist_, Context.root()->odf_context().drawStyles() ,drawing.fill);	
+////////////////////////////////////////////////////
 	drawing.additional.push_back(odf::_property(L"border_width_left",	Compute_BorderWidth(graphicProperties, sideLeft)));
 	drawing.additional.push_back(odf::_property(L"border_width_top",	Compute_BorderWidth(graphicProperties, sideTop)));
 	drawing.additional.push_back(odf::_property(L"border_width_right",	Compute_BorderWidth(graphicProperties, sideRight)));
@@ -947,6 +949,7 @@ void draw_image::docx_convert(oox::docx_conversion_context & Context)
 /////////////////////////////////////////////////////////////////////////////////////////////////////
 	oox::_docx_drawing drawing = oox::_docx_drawing();
 	drawing.fill.bitmap = oox::oox_bitmap_fill::create();
+	drawing.fill.type = 2;
 	drawing.type = oox::mediaitems::typeImage;
 
 	drawing.fill.bitmap->isInternal = false;