......

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

ASCOfficeOdfFile/src/odf/style_paragraph_properties_docx.cpp

@@ -210,7 +210,7 @@ void paragraph_format_properties::docx_convert(oox::docx_conversion_context & Co
 			std::wstring w_shadow;
 	        
 			if (style_shadow_)
-				w_shadow = style_shadow_->length()>0 ! ? L"1" : L"0"; //   -  
+				w_shadow = style_shadow_->get_type() != shadow_type::None ? L"1" : L"0";
 
 			std::wstring w_top, w_left, w_right, w_bottom, w_between;
 	        

ASCOfficeOdfFileW/source/OdfFormat/odf_drawing_context.h

@@ -45,7 +45,7 @@ public:
 	void set_horizontal_pos(double offset_pt);
 
 	void set_wrap_style(style_wrap::type  style);
-
+	void set_overlap (bool val);
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////////////
 	office_element_ptr & get_current_style_element() ;

ASCOfficeOdfFileW/source/OdfFormat/odt_conversion_context.h

@@ -94,6 +94,8 @@ public:
 		void end_table_row();
 	void end_table();
 
+	bool is_empty_section(){return current_root_elements_.size() > 0 ? false : true; }
+
 private:
 	office_text*				root_text_;
 	office_element_ptr			root_document_;

ASCOfficeOdfFileW/source/Oox2OdfConverter/Converter.cpp

@@ -200,10 +200,10 @@ void OoxConverter::convert(OOX::Drawing::CGroupShapeProperties *   oox_group_spP
 		}
 
 		//???
-		//if (oox_group_spPr->m_oXfrm->m_oFlipH.GetValue() == SimpleTypes::onoffTrue)
-		//	odf_context()->drawing_context()->set_group_flip_H(true);
-		//if (oox_group_spPr->m_oXfrm->m_oFlipV.GetValue() == SimpleTypes::onoffTrue)
-		//	odf_context()->drawing_context()->set_group_flip_V(true);
+		if (oox_group_spPr->m_oXfrm->m_oFlipH.GetValue() == SimpleTypes::onoffTrue)
+			odf_context()->drawing_context()->set_group_flip_H(true);
+		if (oox_group_spPr->m_oXfrm->m_oFlipV.GetValue() == SimpleTypes::onoffTrue)
+			odf_context()->drawing_context()->set_group_flip_V(true);
 		if (oox_group_spPr->m_oXfrm->m_oRot.GetValue() > 0)
 			odf_context()->drawing_context()->set_group_rotate(oox_group_spPr->m_oXfrm->m_oRot.GetValue());
 	}

ASCOfficeOdfFileW/source/Oox2OdfConverter/DocxConverter.cpp

@@ -273,7 +273,7 @@ void DocxConverter::convert(OOX::Logic::CParagraph *oox_paragraph)
 
 	bool bStartNewParagraph = !m_bKeepNextParagraph;
 	
-	if (oox_paragraph->m_oParagraphProperty) 
+	if (oox_paragraph->m_oParagraphProperty || odt_context->is_empty_section()) 
 	{
 		styled = true;
 		odf::style_paragraph_properties	*paragraph_properties = NULL;
@@ -1373,6 +1373,10 @@ void DocxConverter::convert(OOX::Drawing::CAnchor *oox_anchor)
 	{
 		odt_context->drawing_context()->set_wrap_style(odf::style_wrap::Parallel);
 	}
+	if (oox_anchor->m_oAllowOverlap.IsInit())
+	{
+		odt_context->drawing_context()->set_overlap(oox_anchor->m_oAllowOverlap->ToBool());
+	}
 	convert(oox_anchor->m_oGraphic.GetPointer());
 }
 void DocxConverter::convert(OOX::Drawing::CInline *oox_inline)
@@ -1555,6 +1559,12 @@ void DocxConverter::convert(OOX::Logic::CShape	 *oox_shape)
 			if (oox_shape->m_oCNvSpPr->m_otxBox.GetValue() == 1)
 				type = 2000; //textBox
 		}
+
+		if (type == SimpleTypes::shapetypeRect && oox_shape->m_oTxBody.IsInit() && oox_shape->m_oTxBodyProperties.IsInit() /*&&
+			oox_shape->m_oTxBodyProperties->m_eAutoFitType == OOX::Drawing::textautofitShape*/)
+		{
+			type = 2000;//     ,      , ...
+		}
 		if (type < 0)return;
 	/////////////////////////////////////////////////////////////////////////////////
 		if (type == 2000)	odt_context->drawing_context()->start_text_box(); 

ASCOfficeOdfFileW/version.h

@@ -2,6 +2,6 @@
 //1
 //2
 //0
-//99
-#define INTVER 1,2,0,99
-#define STRVER "1,2,0,99\0"
+//100
+#define INTVER 1,2,0,100
+#define STRVER "1,2,0,100\0"