.....

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

ASCOfficeOdfFile/src/docx/oox_drawing.cpp

@@ -259,6 +259,12 @@ void oox_serialize_shape(std::wostream & strm, _oox_drawing & val)
 		_CP_OPT(int) iVal;
 		odf_reader::GetProperty(val.additional, L"odf-custom-draw-index",iVal);
 		if (iVal)shapeType = _OO_OOX_custom_shapes[*iVal].oox;	
+
+		if (shapeType == L"textBox")
+		{
+			val.sub_type = 1;
+			shapeType = L"rect";
+		}
 	}
 	else if (val.sub_type<9 && val.sub_type>=0)
 	{

ASCOfficeOdfFile/src/docx/oox_drawing_fills.cpp

@@ -115,7 +115,16 @@ void oox_serialize_bitmap_fill(std::wostream & strm, const _oox_fill & val)
 					CP_XML_ATTR(L"b", static_cast<size_t>(val.bitmap->cropRect[3]*1000));
 				}
 			}
-			if (val.bitmap->bStretch)
+			if (val.bitmap->bTile)
+			{
+				CP_XML_NODE(L"a:tile")
+				{
+					//tx="0" ty="0" sx="100000" sy="100000"
+					CP_XML_ATTR(L"flip","none");
+					CP_XML_ATTR(L"algn",L"ctr");
+				}
+			}
+			else if (val.bitmap->bStretch)
 			{			
 				CP_XML_NODE(L"a:stretch")
 				{
@@ -125,16 +134,7 @@ void oox_serialize_bitmap_fill(std::wostream & strm, const _oox_fill & val)
 					}
 
 				}
-			}
-			if (val.bitmap->bTile)
-			{
-				CP_XML_NODE(L"a:tile")
-				{
-					//tx="0" ty="0" sx="100000" sy="100000"
-					CP_XML_ATTR(L"flip","none");
-					CP_XML_ATTR(L"algn",L"ctr");
-				}
-			}		
+			}	
 
 		}
 

ASCOfficeOdfFile/src/docx/pptx_text_context.cpp

@@ -143,16 +143,16 @@ void pptx_text_context::Impl::start_paragraph(const std::wstring & styleName)
 {
     if (paragraphs_cout_++ > 0)
     {	
-		if (paragraph_style_name_ != styleName)
-		{
-			dump_paragraph();
-		}
-		else if (in_list_ == false || in_comment == true)
+		if (in_list_ == false || in_comment == true)
 		{
 		//      
 		//text_ << L"&#10;";
 			text_ << L"\n"; 
 		}
+		else/* (paragraph_style_name_ != styleName)*/
+		{
+			dump_paragraph();
+		}
 	}else
 	{
 		text_.str(std::wstring());
@@ -181,8 +181,8 @@ void pptx_text_context::Impl::start_span(const std::wstring & styleName)//
 
 void pptx_text_context::Impl::end_span() 
 {
-    dump_run();
-    span_style_name_ = L"";
+    //dump_run();
+    //span_style_name_ = L"";
 	
 	in_span = false;
 }
@@ -505,22 +505,26 @@ void pptx_text_context::Impl::dump_run()
 	if (process_layouts_) return; 
 	
 	const std::wstring content = xml::utils::replace_text_to_xml(text_.str());
-	if (content.length() <1 &&  span_style_name_.length()<1) return ;     
+	//if (content.length() <1 &&  span_style_name_.length()<1) return ;      ...        ...
 
-	CP_XML_WRITER(run_)
-    {
-		CP_XML_NODE(L"a:r")
+	if (content .length() > 0)
+	{
+		
+		CP_XML_WRITER(run_)
 		{
-			write_rPr(CP_XML_STREAM());   
-
-			CP_XML_NODE(L"a:t")
+			CP_XML_NODE(L"a:r")
 			{
-				//CP_XML_ATTR(L"xml:space", L"preserve"); 
-				CP_XML_STREAM() << content;
-			}
-         }
-        text_.str(std::wstring());			
-    }
+				write_rPr(CP_XML_STREAM());   
+
+				CP_XML_NODE(L"a:t")
+				{
+					//CP_XML_ATTR(L"xml:space", L"preserve"); 
+					CP_XML_STREAM() << content;
+				}
+			 }
+			text_.str(std::wstring());			
+		}
+	}
 	hyperlink_hId =L"";
 }