(1.2.0.105): ASCOfficeOdfFileW

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

ASCOfficeOdfFileW/source/OdfFormat/draw_shapes.cpp

@@ -158,10 +158,22 @@ void draw_custom_shape::serialize(std::wostream & _Wostream)
         {
 			draw_shape::serialize_attlist(CP_GET_XML_NODE());
 
+			if (draw_enhanced_geometry_)draw_enhanced_geometry_->serialize(CP_XML_STREAM());
 			draw_shape::serialize(CP_XML_STREAM());
 		}
 	}
 }
+void draw_custom_shape::add_child_element( office_element_ptr & child_element)
+{
+	switch(child_element->get_type())
+	{
+		case typeDrawEnhancedGeometry:
+			draw_enhanced_geometry_ = child_element;
+			break;
+		default:
+			draw_base::add_child_element(child_element);
+	}
+}
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 /// draw-path-attlist
 void draw_path_attlist::serialize(CP_ATTR_NODE)
@@ -358,6 +370,8 @@ void draw_enhanced_geometry_attlist::serialize(CP_ATTR_NODE)
     CP_XML_ATTR_OPT(L"draw:modifiers", draw_modifiers_);
     CP_XML_ATTR_OPT(L"draw:enhanced-path", draw_enhanced_path_);	
 	CP_XML_ATTR_OPT(L"draw:glue-points", draw_glue_points_);
+	CP_XML_ATTR_OPT(L"draw:mirror-vertical", draw_mirror_vertical_);
+	CP_XML_ATTR_OPT(L"draw:mirror-horizontal", draw_mirror_horizontal_);
 }
 // draw:enhanced_geometry
 const wchar_t * draw_enhanced_geometry::ns = L"draw";

ASCOfficeOdfFileW/source/OdfFormat/draw_shapes.h

@@ -196,6 +196,9 @@ public:
 	static const xml::NodeType xml_type = xml::typeElement;
 
     virtual void serialize(std::wostream & _Wostream);
+    virtual void add_child_element( office_element_ptr & child_element);
+
+	office_element_ptr draw_enhanced_geometry_;
 };
 
 CP_REGISTER_OFFICE_ELEMENT2(draw_custom_shape);
@@ -288,6 +291,9 @@ public:
 	_CP_OPT(std::wstring) draw_text_areas_;
 	_CP_OPT(std::wstring) draw_glue_points_;
 	
+	_CP_OPT(Bool)		draw_mirror_vertical_;
+	_CP_OPT(Bool)		draw_mirror_horizontal_;
+	
 	void serialize(CP_ATTR_NODE);   
 };
 /////////////////////////////////////////////////////////////////////////
@@ -298,7 +304,7 @@ public:
     static const wchar_t * ns;
     static const wchar_t * name;
 	
-	static const ElementType type = typeDrawCustomShape;
+	static const ElementType type = typeDrawEnhancedGeometry;
 	static const xml::NodeType xml_type = xml::typeElement;
 	
 	virtual void create_child_element(const ::std::wstring & Ns, const ::std::wstring & Name);

ASCOfficeOdfFileW/source/OdfFormat/office_elements_type.h

@@ -204,6 +204,7 @@ enum ElementType
 	typeDrawCustomShape,
 	typeDrawHandle,
 	typeDrawEquation,
+	typeDrawEnhancedGeometry,
 
 	typeDrawPage,    
 	typePresentationFooterDecl,

ASCOfficeOdfFileW/version.h

@@ -2,6 +2,6 @@
 //1
 //2
 //0
-//104
-#define INTVER 1,2,0,104
-#define STRVER "1,2,0,104\0"
+//105
+#define INTVER 1,2,0,105
+#define STRVER "1,2,0,105\0"