(1.0.1.199): ASCOfficeOdfFile

поправлена множественная вложеность в шейпы

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

ASCOfficeOdfFile/ASCOfficeOdfFile/version.h

@@ -2,6 +2,6 @@
 //1
 //0
 //1
-//198
-#define INTVER 1,0,1,198
-#define STRVER "1,0,1,198\0"
+//199
+#define INTVER 1,0,1,199
+#define STRVER "1,0,1,199\0"

ASCOfficeOdfFile/src/docx/docx_package.cpp

@@ -22,6 +22,7 @@ docx_content_types_file::docx_content_types_file()
     content_type_.add_default(L"jpeg",    L"image/jpeg");
     content_type_.add_default(L"png",     L"image/png");
     content_type_.add_default(L"wmf",     L"image/x-wmf");
+	content_type_.add_default(L"emf",     L"image/x-emf");
 
     content_type_.add_override(L"/_rels/.rels",                  L"application/vnd.openxmlformats-package.relationships+xml");
     content_type_.add_override(L"/word/_rels/document.xml.rels", L"application/vnd.openxmlformats-package.relationships+xml");

ASCOfficeOdfFile/src/odf/draw_shapes_docx.cpp

@@ -47,8 +47,10 @@ void draw_shape::common_docx_convert(oox::docx_conversion_context & Context)
 	std::wstringstream temp_stream(Context.get_drawing_context().get_text_stream_shape());
 	Context.set_stream_man( boost::shared_ptr<oox::streams_man>( new oox::streams_man(temp_stream) ));
 
-	bool pState = Context.get_paragraph_state();
+	bool pParaState = Context.get_paragraph_state();
+	bool pRunState = Context.get_run_state();
 	Context.set_paragraph_state(false);		
+	Context.set_run_state(false);		
 
 	BOOST_FOREACH(const office_element_ptr & elm, content_)
     {
@@ -56,7 +58,9 @@ void draw_shape::common_docx_convert(oox::docx_conversion_context & Context)
         elm->docx_convert(Context);
     }
 
-	Context.set_paragraph_state(pState);	
+	Context.set_paragraph_state(pParaState);	
+	Context.set_run_state(pRunState);	
+
 	Context.get_drawing_context().get_text_stream_shape() = temp_stream.str();
 	Context.set_stream_man(prev);
 }