(1.0.1.196): ASCOfficeOdfFile

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

ASCOfficeOdfFile/ASCOfficeOdfFile/version.h

@@ -2,6 +2,6 @@
 //1
 //0
 //1
-//195
-#define INTVER 1,0,1,195
-#define STRVER "1,0,1,195\0"
+//196
+#define INTVER 1,0,1,196
+#define STRVER "1,0,1,196\0"

ASCOfficeOdfFile/src/odf/draw_frame_docx.cpp

@@ -801,6 +801,13 @@ 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);	
+
+	if ((drawing.fill.bitmap) && (drawing.fill.bitmap->rId.length() < 1))
+	{
+		std::wstring href = drawing.fill.bitmap->xlink_href_;
+		drawing.fill.bitmap->rId = Context.add_mediaitem(href, oox::mediaitems::typeImage,drawing.fill.bitmap->isInternal,href);
+	}
+
 ////////////////////////////////////////////////////
 	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)));