(1.0.1.177): ASCOfficeOdfFile

22839 - поправлен текст в некоторых объектах

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

ASCOfficeODFFile/ASCOfficeOdfFile/version.h

@@ -2,6 +2,6 @@
 //1
 //0
 //1
-//176
-#define INTVER 1,0,1,176
-#define STRVER "1,0,1,176\0"
+//177
+#define INTVER 1,0,1,177
+#define STRVER "1,0,1,177\0"

ASCOfficeODFFile/src/odf/draw_shapes_pptx.cpp

@@ -113,12 +113,12 @@ void draw_shape::common_pptx_convert(oox::pptx_conversion_context & Context)
 	Compute_GraphicFill(properties.common_draw_fill_attlist_, Context.root()->odf_context().drawStyles() ,fill);	
 	Context.get_slide_context().set_fill(fill);
 ////////////////////////////////////////////////////////////////////////////////////
-	//////Context.get_text_context().start_drawing_content();
+	Context.get_text_context().start_object();
 	BOOST_FOREACH(office_element_ptr const & elm, content_)
     {
         elm->pptx_convert(Context);
     }
-	std::wstring text_content_;////// = Context.get_text_context().end_drawing_content();
+	std::wstring text_content_ = Context.get_text_context().end_object();
 
 	if (text_content_.length()>0)
 	{