v5.2.4

x2t version up - 2.4.556

ASCOfficeDocFile/DocDocxConverter/DocumentMapping.cpp

@@ -1071,7 +1071,9 @@ namespace DocFileFormat
 			int cpPic			= searchNextTextMark(m_document->Text, cpFieldStart, TextMark::Picture);
 			int cpFieldEnd		= searchNextTextMark( m_document->Text, cpFieldStart, TextMark::FieldEndMark );
 
-			if (cpFieldStart < cpPic && cpPic < cpFieldEnd)
+			bool bStartField = _fieldLevels.empty() ? false : (_fieldLevels.back().bBegin && !_fieldLevels.back().bSeparate);
+
+			if (cpFieldStart < cpPic && cpPic < cpFieldEnd && !bStartField)
 			{
 				writeField(text, cpFieldStart, cpFieldEnd);
 				text.clear();

ASCOfficeDocFile/DocDocxConverter/MainDocumentMapping.cpp

@@ -31,6 +31,7 @@
  */
 
 #include "MainDocumentMapping.h"
+#include "OfficeDrawing/FillStyleBooleanProperties.h"
 
 namespace DocFileFormat
 {
@@ -83,16 +84,27 @@ namespace DocFileFormat
 
 		if ((m_document->GetOfficeArt()) && (m_document->GetOfficeArt()->GetShapeBackgound()))
 		{
+			bool bFilled = true;
 			m_document->DocProperties->bDisplayBackgroundShape = true;
 			ShapeContainer* pShape = m_document->GetOfficeArt()->GetShapeBackgound();
 
-			m_pXmlWriter->WriteNodeBegin ( L"w:background", TRUE);
-				m_pXmlWriter->WriteAttribute	( L"w:color", L"FFFFFF");
-			m_pXmlWriter->WriteNodeEnd( L"",  TRUE, FALSE );
-			
-			VMLShapeMapping oVmlWriter (m_context, m_pXmlWriter, NULL, NULL,  _caller);
-				pShape->Convert(&oVmlWriter);
-			m_pXmlWriter->WriteNodeEnd (L"w:background");
+			OptionEntryPtr boolFill = pShape->ExtractOption(fillStyleBooleanProperties);
+
+			FillStyleBooleanProperties booleans(boolFill ? boolFill->op : 0);
+			if (booleans.fUsefFilled && !booleans.fFilled)
+			{
+				bFilled = false;
+			}
+			if (bFilled)
+			{
+				m_pXmlWriter->WriteNodeBegin ( L"w:background", TRUE);
+					m_pXmlWriter->WriteAttribute ( L"w:color", L"FFFFFF");
+				m_pXmlWriter->WriteNodeEnd( L"",  TRUE, FALSE );
+				
+				VMLShapeMapping oVmlWriter (m_context, m_pXmlWriter, NULL, NULL,  _caller);
+					pShape->Convert(&oVmlWriter);
+				m_pXmlWriter->WriteNodeEnd (L"w:background");
+			}
 		}
 
 		m_pXmlWriter->WriteNodeBegin( L"w:body", FALSE );

ASCOfficeDocFile/DocDocxConverter/OfficeDrawing/ShapeContainer.h

@@ -101,6 +101,24 @@ namespace DocFileFormat
 			return new ShapeContainer( _reader, bodySize, typeCode, version, instance );
 		}
 
+		OptionEntryPtr ExtractOption(const PropertyId & prop) const
+		{
+			OptionEntryPtr ret;
+			for ( size_t i = 0; i < this->Children.size(); ++i )
+			{
+				ShapeOptions* opt = dynamic_cast<ShapeOptions*>( this->Children[i] );
+
+				if ( opt == NULL ) continue;
+
+				std::map<PropertyId, OptionEntryPtr>::iterator pFind = opt->OptionsByID.find(prop);
+				if (pFind != opt->OptionsByID.end())
+				{
+					ret = pFind->second;
+				}
+			}
+			return ret;
+		}
+
 		std::vector<OptionEntryPtr> ExtractOptions() const
 		{
 			std::vector<OptionEntryPtr> ret;

ASCOfficeOdfFile/formulasconvert/formulasconvert_odf.cpp

@@ -235,7 +235,7 @@ namespace formulasconvert {
 	{
 		convert_with_TableName = withTableName;
 
-		boost::wregex complexRef(L"\\[(?:\$)?([^\\.]+?){0,1}\\.(\\${0,1}[\\w^0-9]*\\${0,1}\\d*)(?::(\\${0,1}[^\\.]+?){0,1}\\.(\\${0,1}[\\w^0-9]*\\${0,1}\\d*)){0,1}\\]");
+		boost::wregex complexRef(L"\\[(?:\\$)?([^\\.]+?){0,1}\\.(\\${0,1}[\\w^0-9]*\\${0,1}\\d*)(?::(\\${0,1}[^\\.]+?){0,1}\\.(\\${0,1}[\\w^0-9]*\\${0,1}\\d*)){0,1}\\]");
 		/*
 									 [     $   Sheet2          . A1								 : ( $   Sheet2)? . B5                    ]
 		*/
@@ -494,7 +494,7 @@ namespace formulasconvert {
 
 		bool isFormula = check_formula(workstr);
 
-		boost::regex_replace(
+		workstr = boost::regex_replace(
 			workstr,
 			boost::wregex(L"('.*?')|(\".*?\")"),
 			&convert_scobci, boost::match_default | boost::format_all);

ASCOfficeOdfFile/src/docx/oox_drawing.cpp

@@ -108,6 +108,8 @@ static const std::wstring _ooxShapeType[]=
 	L"custGeom",//uses sub-sub type,
 	L"polygon", 
 	L"roundRect", 
+	L"bentConnector3",
+	L"curvedConnector3"
 };
 
 
@@ -418,7 +420,7 @@ void _oox_drawing::serialize_shape(std::wostream & strm)
 			shapeGeomPreset = L"rect";
 		}
 	}
-	else if (sub_type < 10 && sub_type >= 0)
+	else if (sub_type <= 12 && sub_type >= 0)
 	{
 		shapeGeomPreset = _ooxShapeType[sub_type]; //odf -> oox
 	} 

ASCOfficeOdfFile/src/docx/pptx_drawing.cpp

@@ -212,7 +212,7 @@ void pptx_serialize_shape(std::wostream & strm, _pptx_drawing & val)
                 }
 				CP_XML_NODE(L"p:cNvSpPr")//non visual properies (собственно тока 1 там)
 				{
-					if (val.sub_type==1 || val.sub_type==2)CP_XML_ATTR(L"txBox", 1);
+					if (val.sub_type == 1 || val.sub_type == 2)CP_XML_ATTR(L"txBox", 1);
 					CP_XML_NODE(L"a:spLocks")
 					{
 						CP_XML_ATTR(L"noGrp", 1);

ASCOfficeOdfFile/src/docx/xlsx_output_xml.cpp

@@ -211,13 +211,6 @@ void xlsx_xml_worksheet::write_to(std::wostream & strm)
 			
 			CP_XML_STREAM() << impl_->drawing_.str();
 			
-			if (!impl_->tableParts_.str().empty())
-            {
-                CP_XML_NODE(L"tableParts")
-                {
-					CP_XML_STREAM() << impl_->tableParts_.str();
-				}
-			}
 			if (!impl_->commentsId_.empty())
 			{
 				CP_XML_NODE(L"legacyDrawing")
@@ -239,6 +232,13 @@ void xlsx_xml_worksheet::write_to(std::wostream & strm)
 					CP_XML_STREAM() << impl_->controls_.str();
                 }
             }
+			if (!impl_->tableParts_.str().empty())
+            {
+                CP_XML_NODE(L"tableParts")
+                {
+					CP_XML_STREAM() << impl_->tableParts_.str();
+				}
+			}
 			CP_XML_STREAM() << impl_->picture_background_.str();
 
 			//CP_XML_NODE(L"headerFooter){}

ASCOfficeOdfFile/src/docx/xlsx_table_state.h

@@ -59,17 +59,24 @@ typedef _CP_PTR(xlsx_data_range_values) xlsx_data_range_values_ptr;
 class xlsx_data_range_values
 {
 public:
-	xlsx_data_range_values(size_t row, size_t col1, size_t col2) : row_header(row), start_column(col1), end_column(col2) {}
+	xlsx_data_range_values(size_t row, size_t col1, size_t col2) : withHeader(false), filter(false), row_header(row), start_column(col1), end_column(col2) 
+	{
+		for (size_t i = start_column; i <= end_column; i++)
+			values.push_back(L"");
+	}
 	
 	size_t row_header;
 	size_t start_column;
 	size_t end_column;
 
+	bool withHeader;
+	bool filter;
+
 	std::vector<std::wstring> values;
 
 	void set_value(size_t col, size_t row, const std::wstring& value)
 	{
-		while (col - start_column + 1 > values.size())
+		while (col - start_column + 1 >= values.size())
 			values.push_back(L"");
 
 		values[col - start_column] = value;

ASCOfficeOdfFile/src/docx/xlsx_tablecontext.cpp

@@ -119,12 +119,14 @@ void xlsx_table_context::set_database_header (bool val)
 	if (xlsx_data_ranges_.empty()) return;
 
 	xlsx_data_ranges_.back()->withHeader = val;
+	xlsx_data_ranges_values_.back()->withHeader = val;
 }
 void xlsx_table_context::set_database_filter (bool val)
 {
 	if (xlsx_data_ranges_.empty()) return;
 
 	xlsx_data_ranges_.back()->filter = val;
+	xlsx_data_ranges_values_.back()->filter = val;
 }
 void xlsx_table_context::end_database_range()
 {
@@ -145,7 +147,8 @@ int xlsx_table_context::in_database_range()
 
 	for (size_t i = 0; i < xlsx_data_ranges_values_.size(); i++)
 	{
-		if (xlsx_data_ranges_values_[i]->in_range(col, row))
+		if ((xlsx_data_ranges_values_[i]->withHeader || xlsx_data_ranges_values_[i]->filter)
+			&& xlsx_data_ranges_values_[i]->in_range(col, row))
 		{
 			return (int)i;
 		}
@@ -317,6 +320,12 @@ void xlsx_table_context::serialize_tableParts(std::wostream & _Wostream, rels &
 				CP_XML_ATTR(L"name", xlsx_data_ranges_[it->second]->table_name);
 				CP_XML_ATTR(L"displayName", xlsx_data_ranges_[it->second]->table_name);
 				CP_XML_ATTR(L"ref", xlsx_data_ranges_[it->second]->ref);
+				
+				if (xlsx_data_ranges_[it->second]->withHeader == false && 
+					xlsx_data_ranges_[it->second]->filter == false)
+					CP_XML_ATTR(L"headerRowCount", 0);
+
+				CP_XML_ATTR(L"totalsRowCount", 0);
 				CP_XML_ATTR(L"totalsRowShown", 0);
 
 				xlsx_data_ranges_[it->second]->serialize_autofilter(CP_XML_STREAM());
@@ -331,8 +340,13 @@ void xlsx_table_context::serialize_tableParts(std::wostream & _Wostream, rels &
 					{
 						CP_XML_NODE(L"tableColumn")
 						{
+							std::wstring column_name = xlsx_data_ranges_values_[it->second]->values[id];
+							if (column_name.empty())
+							{
+								column_name = L"Column_" + std::to_wstring(id + 1); 
+							}
 							CP_XML_ATTR(L"id", id + 1);
-							CP_XML_ATTR(L"name", xlsx_data_ranges_values_[it->second]->values[id]);
+							CP_XML_ATTR(L"name", column_name);
 						}
 					}
 				}

ASCOfficeOdfFile/src/odf/draw_frame_docx.cpp

@@ -1038,7 +1038,9 @@ void draw_shape::docx_convert(oox::docx_conversion_context & Context)
 	drawing.sub_type	= sub_type_;
 	drawing.additional	= additional_;//сюда могут добавиться свойства ...
 
-	if (drawing.sub_type !=5 )//line
+	if (drawing.sub_type != 5 && 
+		drawing.sub_type != 11 && 
+		drawing.sub_type != 12 )//line, connectors
 	{
 		drawing.additional.push_back(_property(L"text-content", Context.get_drawing_context().get_text_stream_shape()));
 	}

ASCOfficeOdfFile/src/odf/draw_shapes.cpp

@@ -649,17 +649,15 @@ void draw_connector::add_attributes( const xml::attributes_wc_ptr & Attributes )
     draw_line_attlist_.add_attributes(Attributes);
 	draw_shape::add_attributes(Attributes);
 
-	sub_type_ = 5; //коннектор - линия, если ломаная (ниже определяется) - то путь
+	sub_type_ = 10; //коннектор - линия, если ломаная (ниже определяется) - то путь
 	
 }
 void draw_connector::reset_svg_path()
 {
-	if (!draw_connector_attlist_.svg_d_)
-	{
-		bad_shape_ = true;
-	}
-	else
+	if (draw_connector_attlist_.svg_d_)
 	{
+		sub_type_ = 8;
+
 		std::vector<::svg_path::_polyline> o_Polyline_pt;
 		std::vector<::svg_path::_polyline> o_Polyline_cm;
 	
@@ -707,7 +705,7 @@ void dr3d_scene::add_attributes( const xml::attributes_wc_ptr & Attributes )
 {
 	draw_shape::add_attributes(Attributes);
 
-	sub_type_ = 10; 
+	sub_type_ = 12; 
 	
 }
 //-------------------------------------------------------------------------------------------

ASCOfficeOdfFile/src/odf/draw_shapes_docx.cpp

@@ -215,10 +215,18 @@ void draw_path::docx_convert(oox::docx_conversion_context & Context)
 void draw_connector::docx_convert(oox::docx_conversion_context & Context)
 {
 	//if (Context.get_drawing_context().get_current_level() >0 )return;
-
+	if (draw_connector_attlist_.draw_type_)
+	{
+		if (*draw_connector_attlist_.draw_type_ == L"curve")
+		{
+			sub_type_ = 11;
+		}
+	}
+	reset_svg_attributes();	
 	common_docx_convert(Context);
 	//...
 	reset_svg_path();
+
 	draw_shape::docx_convert(Context);
 }
 void draw_polygon::docx_convert(oox::docx_conversion_context & Context)

ASCOfficeOdfFile/src/odf/draw_shapes_pptx.cpp

@@ -298,6 +298,13 @@ void draw_connector::reset_svg_attributes()
 }
 void draw_connector::pptx_convert(oox::pptx_conversion_context & Context)
 {
+	if (draw_connector_attlist_.draw_type_)
+	{
+		if (*draw_connector_attlist_.draw_type_ == L"curve")
+		{
+			sub_type_ = 11;
+		}
+	}
 	reset_svg_attributes();
 	reset_svg_path();
 ///////////////////////////////////////////////////////////////////////

ASCOfficeOdfFile/src/odf/draw_shapes_xlsx.cpp

@@ -211,6 +211,15 @@ void draw_path::xlsx_convert(oox::xlsx_conversion_context & Context)
 
 void draw_connector::xlsx_convert(oox::xlsx_conversion_context & Context)
 {
+	if (draw_connector_attlist_.draw_type_)
+	{
+		if (*draw_connector_attlist_.draw_type_ == L"curve")
+		{
+			sub_type_ = 11;
+		}
+	}
+	reset_svg_attributes();	
+
 	reset_svg_path();
 ///////////////////////////////////////////////////////////////////////
 	Context.get_drawing_context().start_shape(6);

ASCOfficeOdfFileW/source/OdfFormat/Shapes/odf_shape_mapping.h

@@ -58,23 +58,23 @@ static const _sh_typ Shape_Types_Mapping[] = // index === OOX::Drawing::EShapeTy
 	{	L"mso-spt197"					,  7},			//	shapetypeActionButtonReturn,
 	{	L"mso-spt199"					,  7},			//	shapetypeActionButtonSound,
 	{	L""								,  7},			//	shapetypeArc,
-	{	L"mso-spt91"					,  7},			//	shapetypeBentArrow,
-	{	L"mso-spt33"					,  7},			//	shapetypeBentConnector2,
-	{	L"mso-spt34"					,  7},			//	shapetypeBentConnector3,
-	{	L"mso-spt35"					,  7},			//	shapetypeBentConnector4,
-	{	L"mso-spt36"					,  7},			//	shapetypeBentConnector5,
+	{	L""								,  7},			//	shapetypeBentArrow,
+	{	L""								,  9},			//	shapetypeBentConnector2,
+	{	L""								,  9},			//	shapetypeBentConnector3,
+	{	L""								,  9},			//	shapetypeBentConnector4,
+	{	L""								,  9},			//	shapetypeBentConnector5,
 	{	L""								,  7},			//	shapetypeBentUpArrow,
-	{	L"quad-bevel"					,  7},			//	shapetypeBevel,
+	{	L""								,  7},			//	shapetypeBevel,
 	{	L""								,  7},			//	shapetypeBlockArc,
 	{	L""								,  7},			//	shapetypeBorderCallout1,
 	{	L""								,  7},			//	shapetypeBorderCallout2,
 	{	L""								,  7},			//	shapetypeBorderCallout3,
-	{	L"brace-pair"					,  7},			//	shapetypeBracePair,
+	{	L""								,  7},			//	shapetypeBracePair,
 	{	L""								,  7},			//	shapetypeBracketPair,
 	{	L""								,  7},			//	shapetypeCallout1,
 	{	L""								,  7},			//	shapetypeCallout2,
 	{	L""								,  7},			//	shapetypeCallout3,
-	{	L"can"							,  7},			//	shapetypeCan,
+	{	L""								,  7},			//	shapetypeCan,
 	{	L""								,  7},			//	shapetypeChartPlus,
 	{	L""								,  7},			//	shapetypeChartStar,
 	{	L""								,  7},			//	shapetypeChartX,
@@ -86,14 +86,14 @@ static const _sh_typ Shape_Types_Mapping[] = // index === OOX::Drawing::EShapeTy
 	{	L""								,  7},			//	shapetypeCorner,
 	{	L""								,  7},			//	shapetypeCornerTabs,
 	{	L""								,  7},			//	shapetypeCube,
-	{	L"mso-spt37"					,  7},			//	shapetypeCurvedConnector2,
-	{	L"mso-spt38"					,  7},			//	shapetypeCurvedConnector3,
-	{	L"mso-spt39"					,  7},			//	shapetypeCurvedConnector4,
-	{	L"mso-spt40"					,  7},			//	shapetypeCurvedConnector5,
+	{	L""								,  10},			//	shapetypeCurvedConnector2,
+	{	L""								,  10},			//	shapetypeCurvedConnector3,
+	{	L""								,  10},			//	shapetypeCurvedConnector4,
+	{	L""								,  10},			//	shapetypeCurvedConnector5,
 	{	L""								,  7},			//	shapetypeCurvedDownArrow,
 	{	L""								,  7},			//	shapetypeCurvedLeftArrow,
 	{	L""								,  7},			//	shapetypeCurvedRightArrow,
-	{	L"mso-spt104"					,  7},			//	shapetypeCurvedUpArrow,
+	{	L""								,  7},			//	shapetypeCurvedUpArrow,
 	{	L""								,  7},			//	shapetypeDecagon,
 	{	L""								,  7},			//	shapetypeDiagStripe,
 	{	L""								,  7},			//	shapetypeDiamond,
@@ -134,13 +134,13 @@ static const _sh_typ Shape_Types_Mapping[] = // index === OOX::Drawing::EShapeTy
 	{	L"flowchart-sort"				,  7},			//	shapetypeFlowChartSort,
 	{	L"flowchart-summing-junction"	,  7},			//	shapetypeFlowChartSummingJunction,
 	{	L"flowchart-terminator"			,  7},			//	shapetypeFlowChartTerminator,
-	{	L"paper"						,  7},			//	shapetypeFoldedCorner,
+	{	L""								,  7},			//	shapetypeFoldedCorner,
 	{	L""								,  7},			//	shapetypeFrame,
 	{	L""								,  7},			//	shapetypeFunnel,
 	{	L""								,  7},			//	shapetypeGear6,
 	{	L""								,  7},			//	shapetypeGear9,
 	{	L""								,  7},			//	shapetypeHalfFrame,
-	{	L"heart"						,  7},			//	shapetypeHeart,
+	{	L""								,  7},			//	shapetypeHeart,
 	{	L""								,  7},			//	shapetypeHeptagon,
 	{	L""								,  7},			//	shapetypeHexagon,
 	{	L""								,  7},			//	shapetypeHomePlate,
@@ -149,8 +149,8 @@ static const _sh_typ Shape_Types_Mapping[] = // index === OOX::Drawing::EShapeTy
 	{	L""								,  7},			//	shapetypeIrregularSeal2,
 	{	L""								,  7},			//	shapetypeLeftArrow,
 	{	L""								,  7},			//	shapetypeLeftArrowCallout,
-	{	L"left-brace"					,  7},			//	shapetypeLeftBrace,
-	{	L"left-bracket"					,  7},			//	shapetypeLeftBracket,
+	{	L""								,  7},			//	shapetypeLeftBrace,
+	{	L""								,  7},			//	shapetypeLeftBracket,
 	{	L""								,  7},			//	shapetypeLeftCircularArrow,
 	{	L""								,  7},			//	shapetypeLeftRightArrow,
 	{	L"left-right-arrow-callout"		,  7},			//	shapetypeLeftRightArrowCallout,
@@ -158,7 +158,7 @@ static const _sh_typ Shape_Types_Mapping[] = // index === OOX::Drawing::EShapeTy
 	{	L""								,  7},			//	shapetypeLeftRightRibbon,
 	{	L""								,  7},			//	shapetypeLeftRightUpArrow,
 	{	L""								,  7},			//	shapetypeLeftUpArrow,
-	{	L"lightning"					,  7},			//	shapetypeLightningBolt,
+	{	L""								,  7},			//	shapetypeLightningBolt,
 	{	L""								,  5},			//	shapetypeLine,
 	{	L""								,  7},			//	shapetypeLineInv,
 	{	L""								,  7},			//	shapetypeMathDivide,
@@ -167,7 +167,7 @@ static const _sh_typ Shape_Types_Mapping[] = // index === OOX::Drawing::EShapeTy
 	{	L""								,  7},			//	shapetypeMathMultiply,
 	{	L""								,  7},			//	shapetypeMathNotEqual,
 	{	L""								,  7},			//	shapetypeMathPlus,
-	{	L"moon"							,  7},			//	shapetypeMoon,
+	{	L""								,  7},			//	shapetypeMoon,
 	{	L""								,  7},			//	shapetypeNonIsoscelesTrapezoid,
 	{	L"forbidden"					,  7},			//	shapetypeNoSmoking,
 	{	L""								,  7},			//	shapetypeNotchedRightArrow,
@@ -180,14 +180,14 @@ static const _sh_typ Shape_Types_Mapping[] = // index === OOX::Drawing::EShapeTy
 	{	L""								,  7},			//	shapetypePlaqueTabs,
 	{	L""								,  7},			//	shapetypePlus,
 	{	L"quad-arrow"					,  7},			//	shapetypeQuadArrow,
-	{	L"quad-arrow-callout"			,  7},			//	shapetypeQuadArrowCallout,
+	{	L""								,  7},			//	shapetypeQuadArrowCallout,
 	{	L"rectangle"					,  2},			//	shapetypeRect,
 	{	L""								,  7},			//	shapetypeRibbon,
 	{	L""								,  7},			//	shapetypeRibbon2,
 	{	L""								,  7},			//	shapetypeRightArrow,
 	{	L""								,  7},			//	shapetypeRightArrowCallout,
-	{	L"right-brace"					,  7},			//	shapetypeRightBrace,
-	{	L"right-bracket"				,  7},			//	shapetypeRightBracket,
+	{	L""								,  7},			//	shapetypeRightBrace,
+	{	L""								,  7},			//	shapetypeRightBracket,
 	{	L""								,  7},			//	shapetypeRound1Rect,
 	{	L""								,  7},			//	shapetypeRound2DiagRect,
 	{	L""								,  7},			//	shapetypeRound2SameRect,
@@ -209,7 +209,7 @@ static const _sh_typ Shape_Types_Mapping[] = // index === OOX::Drawing::EShapeTy
 	{	L""								,  7},			//	shapetypeStar6,
 	{	L""								,  7},			//	shapetypeStar7,
 	{	L"star8"						,  7},			//	shapetypeStar8,
-	{	L""								,  7},			//	shapetypeStraightConnector1,
+	{	L""								,  5},			//	shapetypeStraightConnector1,
 	{	L"striped-right-arrow"			,  7},			//	shapetypeStripedRightArrow,
 	{	L""								,  7},			//	shapetypeSun,
 	{	L""								,  7},			//	shapetypeSwooshArrow,

ASCOfficeOdfFileW/source/OdfFormat/Shapes/oox_shapeArrows.h

@@ -608,230 +608,157 @@ public:
 	{
 		odf_type_name	= L"ooxml-circularArrow";
 
-		enhanced_path	= L"M ?f60 ?f61 G ?f10 ?f12 ?f197 ?f198 L ?f172 ?f173 ?f54 ?f55 ?f174 ?f175 ?f159 ?f160 G ?f13 ?f14 ?f199 ?f200 Z N";
-		text_areas		= L"?f193 ?f195 ?f194 ?f196";
-		modifiers		= L"12500 515062 20457681 17744048 18489";
-		view_box		= L"0 0 0 0";
+		enhanced_path	= L"M 534468 1430865 A ?f91 ?f92 ?f93 ?f94 534468 1430865 ?f88 ?f90  W ?f95 ?f96 ?f97 ?f98 534468 1430865 ?f88 ?f90 L 853493 790375 695381 939240 547047 613089 643004 668602 A ?f138 ?f139 ?f140 ?f141 643004 668602 ?f135 ?f137  W ?f142 ?f143 ?f144 ?f145 643004 668602 ?f135 ?f137 Z N";
+		text_areas		= L"?f48 ?f50 ?f49 ?f51";
+		view_box		= L"0 0 880110 1583055";
+		glue_points		= L"?f40 ?f41 ?f42 ?f43 ?f44 ?f45 ?f46 ?f47";
 		
-		add(L"f0", L"if(0-$4 ,0,if(25000-$4 ,$4 ,25000))");
-		add(L"f1", L"?f0 *2/1");
-		add(L"f2", L"if(0-$0 ,0,if(?f1 -$0 ,$0 ,?f1 ))");
-		add(L"f3", L"if(1-$2 ,1,if(21599999-$2 ,$2 ,21599999))");
-		add(L"f4", L"if(0-$3 ,0,if(21599999-$3 ,$3 ,21599999))");
-		add(L"f5", L"min(logwidth,logheight)");
-		add(L"f6", L"?f5 *?f2 /100000");
-		add(L"f7", L"?f5 *?f0 /100000");
-		add(L"f8", L"?f6 *1/2");
-		add(L"f9", L"logwidth/2");
-		add(L"f10", L"?f9 +?f8 -?f7 ");
-		add(L"f11", L"logheight/2");
-		add(L"f12", L"?f11 +?f8 -?f7 ");
-		add(L"f13", L"?f10 +0-?f6 ");
-		add(L"f14", L"?f12 +0-?f6 ");
-		add(L"f15", L"?f13 +?f8 -0");
-		add(L"f16", L"?f14 +?f8 -0");
-		add(L"f17", L"?f15 *sin(pi*(?f3 )/10800000)");
-		add(L"f18", L"?f16 *cos(pi*(?f3 )/10800000)");
-		add(L"f19", L"?f15 *(cos(atan2(?f17 ,?f18 )))");
-		add(L"f20", L"?f16 *(sin(atan2(?f17 ,?f18 )))");
-		add(L"f21", L"logwidth/2");
-		add(L"f22", L"?f21 +?f19 -0");
-		add(L"f23", L"logheight/2");
-		add(L"f24", L"?f23 +?f20 -0");
-		add(L"f25", L"min(?f13 ,?f14 )");
-		add(L"f26", L"?f19 *?f19 /1");
-		add(L"f27", L"?f20 *?f20 /1");
-		add(L"f28", L"?f25 *?f25 /1");
-		add(L"f29", L"?f26 +0-?f28 ");
-		add(L"f30", L"?f27 +0-?f28 ");
-		add(L"f31", L"?f29 *?f30 /?f26 ");
-		add(L"f32", L"?f31 *1/?f27 ");
-		add(L"f33", L"1+0-?f32 ");
-		add(L"f34", L"sqrt(?f33 )");
-		add(L"f35", L"?f29 *1/?f19 ");
-		add(L"f36", L"?f35 *1/?f20 ");
-		add(L"f37", L"(1+?f34 )/?f36 ");
-		add(L"f38", L"(10800000*atan2(?f37 ,1))/pi");
-		add(L"f39", L"?f38 +21600000-0");
-		add(L"f40", L"if(?f38 ,?f38 ,?f39 )");
-		add(L"f41", L"?f40 +0-?f3 ");
-		add(L"f42", L"?f41 +21600000-0");
-		add(L"f43", L"if(?f41 ,?f41 ,?f42 )");
-		add(L"f44", L"?f43 +0-10800000");
-		add(L"f45", L"?f43 +0-21600000");
-		add(L"f46", L"if(?f44 ,?f45 ,?f43 )");
-		add(L"f47", L"abs(?f46 )");
-		add(L"f48", L"if(0-$1 ,0,if(?f47 -$1 ,$1 ,?f47 ))");
-		add(L"f49", L"?f3 +?f48 -0");
-		add(L"f50", L"?f15 *sin(pi*(?f49 )/10800000)");
-		add(L"f51", L"?f16 *cos(pi*(?f49 )/10800000)");
-		add(L"f52", L"?f15 *(cos(atan2(?f50 ,?f51 )))");
-		add(L"f53", L"?f16 *(sin(atan2(?f50 ,?f51 )))");
-		add(L"f54", L"?f21 +?f52 -0");
-		add(L"f55", L"?f23 +?f53 -0");
-		add(L"f56", L"?f10 *sin(pi*(?f4 )/10800000)");
-		add(L"f57", L"?f12 *cos(pi*(?f4 )/10800000)");
-		add(L"f58", L"?f10 *(cos(atan2(?f56 ,?f57 )))");
-		add(L"f59", L"?f12 *(sin(atan2(?f56 ,?f57 )))");
-		add(L"f60", L"?f21 +?f58 -0");
-		add(L"f61", L"?f23 +?f59 -0");
-		add(L"f62", L"?f7 *cos(pi*(?f49 )/10800000)");
-		add(L"f63", L"?f7 *sin(pi*(?f49 )/10800000)");
-		add(L"f64", L"?f22 +?f62 -0");
-		add(L"f65", L"?f24 +?f63 -0");
-		add(L"f66", L"?f7 *cos(pi*(?f49 )/10800000)");
-		add(L"f67", L"?f7 *sin(pi*(?f49 )/10800000)");
-		add(L"f68", L"?f22 +0-?f66 ");
-		add(L"f69", L"?f24 +0-?f67 ");
-		add(L"f70", L"?f68 +0-?f21 ");
-		add(L"f71", L"?f69 +0-?f23 ");
-		add(L"f72", L"?f64 +0-?f21 ");
-		add(L"f73", L"?f65 +0-?f23 ");
-		add(L"f74", L"min(?f10 ,?f12 )");
-		add(L"f75", L"?f70 *?f74 /?f10 ");
-		add(L"f76", L"?f71 *?f74 /?f12 ");
-		add(L"f77", L"?f72 *?f74 /?f10 ");
-		add(L"f78", L"?f73 *?f74 /?f12 ");
-		add(L"f79", L"?f77 +0-?f75 ");
-		add(L"f80", L"?f78 +0-?f76 ");
-		add(L"f81", L"sqrt(?f79 *?f79 +?f80 *?f80 +0*0)");
-		add(L"f82", L"?f75 *?f78 /1");
-		add(L"f83", L"?f77 *?f76 /1");
-		add(L"f84", L"?f82 +0-?f83 ");
-		add(L"f85", L"?f74 *?f74 /1");
-		add(L"f86", L"?f81 *?f81 /1");
-		add(L"f87", L"?f85 *?f86 /1");
-		add(L"f88", L"?f84 *?f84 /1");
-		add(L"f89", L"?f87 +0-?f88 ");
-		add(L"f90", L"max(?f89 ,0)");
-		add(L"f91", L"sqrt(?f90 )");
-		add(L"f92", L"?f80 *-1/1");
-		add(L"f93", L"if(?f92 ,-1,1)");
-		add(L"f94", L"?f93 *?f79 /1");
-		add(L"f95", L"?f94 *?f91 /1");
-		add(L"f96", L"?f84 *?f80 /1");
-		add(L"f97", L"(?f96 +?f95 )/?f86 ");
-		add(L"f98", L"?f96 +0-?f95 ");
-		add(L"f99", L"?f98 *1/?f86 ");
-		add(L"f100", L"abs(?f80 )");
-		add(L"f101", L"?f100 *?f91 /1");
-		add(L"f102", L"?f84 *?f79 /-1");
-		add(L"f103", L"(?f102 +?f101 )/?f86 ");
-		add(L"f104", L"?f102 +0-?f101 ");
-		add(L"f105", L"?f104 *1/?f86 ");
-		add(L"f106", L"?f77 +0-?f97 ");
-		add(L"f107", L"?f77 +0-?f99 ");
-		add(L"f108", L"?f78 +0-?f103 ");
-		add(L"f109", L"?f78 +0-?f105 ");
-		add(L"f110", L"sqrt(?f106 *?f106 +?f108 *?f108 +0*0)");
-		add(L"f111", L"sqrt(?f107 *?f107 +?f109 *?f109 +0*0)");
-		add(L"f112", L"?f111 +0-?f110 ");
-		add(L"f113", L"if(?f112 ,?f97 ,?f99 )");
-		add(L"f114", L"if(?f112 ,?f103 ,?f105 )");
-		add(L"f115", L"?f113 *?f10 /?f74 ");
-		add(L"f116", L"?f114 *?f12 /?f74 ");
-		add(L"f117", L"?f21 +?f115 -0");
-		add(L"f118", L"?f23 +?f116 -0");
-		add(L"f119", L"?f70 *?f25 /?f13 ");
-		add(L"f120", L"?f71 *?f25 /?f14 ");
-		add(L"f121", L"?f72 *?f25 /?f13 ");
-		add(L"f122", L"?f73 *?f25 /?f14 ");
-		add(L"f123", L"?f121 +0-?f119 ");
-		add(L"f124", L"?f122 +0-?f120 ");
-		add(L"f125", L"sqrt(?f123 *?f123 +?f124 *?f124 +0*0)");
-		add(L"f126", L"?f119 *?f122 /1");
-		add(L"f127", L"?f121 *?f120 /1");
-		add(L"f128", L"?f126 +0-?f127 ");
-		add(L"f129", L"?f25 *?f25 /1");
-		add(L"f130", L"?f125 *?f125 /1");
-		add(L"f131", L"?f129 *?f130 /1");
-		add(L"f132", L"?f128 *?f128 /1");
-		add(L"f133", L"?f131 +0-?f132 ");
-		add(L"f134", L"max(?f133 ,0)");
-		add(L"f135", L"sqrt(?f134 )");
-		add(L"f136", L"?f93 *?f123 /1");
-		add(L"f137", L"?f136 *?f135 /1");
-		add(L"f138", L"?f128 *?f124 /1");
-		add(L"f139", L"(?f138 +?f137 )/?f130 ");
-		add(L"f140", L"?f138 +0-?f137 ");
-		add(L"f141", L"?f140 *1/?f130 ");
-		add(L"f142", L"abs(?f124 )");
-		add(L"f143", L"?f142 *?f135 /1");
-		add(L"f144", L"?f128 *?f123 /-1");
-		add(L"f145", L"(?f144 +?f143 )/?f130 ");
-		add(L"f146", L"?f144 +0-?f143 ");
-		add(L"f147", L"?f146 *1/?f130 ");
-		add(L"f148", L"?f119 +0-?f139 ");
-		add(L"f149", L"?f119 +0-?f141 ");
-		add(L"f150", L"?f120 +0-?f145 ");
-		add(L"f151", L"?f120 +0-?f147 ");
-		add(L"f152", L"sqrt(?f148 *?f148 +?f150 *?f150 +0*0)");
-		add(L"f153", L"sqrt(?f149 *?f149 +?f151 *?f151 +0*0)");
-		add(L"f154", L"?f153 +0-?f152 ");
-		add(L"f155", L"if(?f154 ,?f139 ,?f141 )");
-		add(L"f156", L"if(?f154 ,?f145 ,?f147 )");
-		add(L"f157", L"?f155 *?f13 /?f25 ");
-		add(L"f158", L"?f156 *?f14 /?f25 ");
-		add(L"f159", L"?f21 +?f157 -0");
-		add(L"f160", L"?f23 +?f158 -0");
-		add(L"f161", L"(10800000*atan2(?f158 ,?f157 ))/pi");
-		add(L"f162", L"?f161 +21600000-0");
-		add(L"f163", L"if(?f161 ,?f161 ,?f162 )");
-		add(L"f164", L"?f4 +0-?f163 ");
-		add(L"f165", L"?f164 +0-21600000");
-		add(L"f166", L"if(?f164 ,?f165 ,?f164 )");
-		add(L"f167", L"?f117 +0-?f159 ");
-		add(L"f168", L"?f118 +0-?f160 ");
-		add(L"f169", L"sqrt(?f167 *?f167 +?f168 *?f168 +0*0)");
-		add(L"f170", L"?f169 *1/2");
-		add(L"f171", L"?f170 +0-?f7 ");
-		add(L"f172", L"if(?f171 ,?f117 ,?f64 )");
-		add(L"f173", L"if(?f171 ,?f118 ,?f65 )");
-		add(L"f174", L"if(?f171 ,?f159 ,?f68 )");
-		add(L"f175", L"if(?f171 ,?f160 ,?f69 )");
-		add(L"f176", L"(10800000*atan2(?f116 ,?f115 ))/pi");
-		add(L"f177", L"?f176 +21600000-0");
-		add(L"f178", L"if(?f176 ,?f176 ,?f177 )");
-		add(L"f179", L"?f178 +0-?f4 ");
-		add(L"f180", L"?f179 +21600000-0");
-		add(L"f181", L"if(?f179 ,?f179 ,?f180 )");
-		add(L"f182", L"?f15 *sin(pi*(?f4 )/10800000)");
-		add(L"f183", L"?f16 *cos(pi*(?f4 )/10800000)");
-		add(L"f184", L"?f15 *(cos(atan2(?f182 ,?f183 )))");
-		add(L"f185", L"?f16 *(sin(atan2(?f182 ,?f183 )))");
-		add(L"f186", L"?f21 +?f184 -0");
-		add(L"f187", L"?f23 +?f185 -0");
-		add(L"f188", L"?f4 +0-5400000");
-		add(L"f189", L"?f49 +5400000-0");
-		add(L"f190", L"?f49 +10800000-0");
-		add(L"f191", L"?f10 *cos(pi*(2700000)/10800000)");
-		add(L"f192", L"?f12 *sin(pi*(2700000)/10800000)");
-		add(L"f193", L"?f21 +0-?f191 ");
-		add(L"f194", L"?f21 +?f191 -0");
-		add(L"f195", L"?f23 +0-?f192 ");
-		add(L"f196", L"?f23 +?f192 -0");
-		add(L"f197", L"(?f4 )/60000.0");
-		add(L"f198", L"(?f181 )/60000.0");
-		add(L"f199", L"(?f163 )/60000.0");
-		add(L"f200", L"(?f166 )/60000.0");
-/////////////////////////////////////////////////////////
-		_handle h;
-
-		h.position = L"?f54 ?f55";
-		handles.push_back(h);
-
- 		h.position = L"?f60 ?f61";
-		handles.push_back(h);
-
- 		h.position = L"?f117 ?f118";
-		h.r_minimum = L"0";
-		h.r_maximum = L"?f1";
-		handles.push_back(h);
-
- 		h.position = L"?f68 ?f69";
-		h.r_minimum = L"0";
-		h.r_maximum = L"25000";
-		handles.push_back(h);
+		add(L"f0", L"10800000");
+		add(L"f1", L"5400000");
+		add(L"f2", L"left");
+		add(L"f3", L"right");
+		add(L"f4", L"top");
+		add(L"f5", L"bottom");
+		add(L"f6", L"?f5 - ?f4");
+		add(L"f7", L"?f3 - ?f2");
+		add(L"f8", L"5419351 / 1725033");
+		add(L"f9", L"180");
+		add(L"f10", L"?f7 / 880110");
+		add(L"f11", L"?f6 / 1583055");
+		add(L"f12", L"695381 - 440055");
+		add(L"f13", L"939240 - 791527");
+		add(L"f14", L"sqrt(?f12 * ?f12 + ?f13 * ?f13 + 0 * 0)");
+		add(L"f15", L"atan2(?f12, ?f13)");
+		add(L"f16", L"?f15 + ?f1");
+		add(L"f17", L"?f16 * ?f9 / ?f0");
+		add(L"f18", L"0 - ?f17");
+		add(L"f19", L"534468 - 440055");
+		add(L"f20", L"1430865 - 791527");
+		add(L"f21", L"sqrt(?f19 * ?f19 + ?f20 * ?f20 + 0 * 0)");
+		add(L"f22", L"atan2(?f19, ?f20)");
+		add(L"f23", L"?f22 + ?f1");
+		add(L"f24", L"?f23 * ?f9 / ?f0");
+		add(L"f25", L"0 - ?f24");
+		add(L"f26", L"756945 - 440055");
+		add(L"f27", L"734520 - 791527");
+		add(L"f28", L"sqrt(?f26 * ?f26 + ?f27 * ?f27 + 0 * 0)");
+		add(L"f29", L"atan2(?f26, ?f27)");
+		add(L"f30", L"?f29 + ?f1");
+		add(L"f31", L"?f30 * ?f9 / ?f0");
+		add(L"f32", L"0 - ?f31");
+		add(L"f33", L"547047 - 440055");
+		add(L"f34", L"613089 - 791527");
+		add(L"f35", L"sqrt(?f33 * ?f33 + ?f34 * ?f34 + 0 * 0)");
+		add(L"f36", L"atan2(?f33, ?f34)");
+		add(L"f37", L"?f36 + ?f1");
+		add(L"f38", L"?f37 * ?f9 / ?f0");
+		add(L"f39", L"0 - ?f38");
+		add(L"f40", L"525840 / ?f10");
+		add(L"f41", L"1372440 / ?f11");
+		add(L"f42", L"853493 / ?f10");
+		add(L"f43", L"790375 / ?f11");
+		add(L"f44", L"695381 / ?f10");
+		add(L"f45", L"939240 / ?f11");
+		add(L"f46", L"547047 / ?f10");
+		add(L"f47", L"613089 / ?f11");
+		add(L"f48", L"215163 / ?f10");
+		add(L"f49", L"664947 / ?f10");
+		add(L"f50", L"318107 / ?f11");
+		add(L"f51", L"1264948 / ?f11");
+		add(L"f52", L"21550000 - 16092125");
+		add(L"f53", L"if(?f52, 16092125, 21550000)");
+		add(L"f54", L"-21550000 - ?f53");
+		add(L"f55", L"if(?f54, -21550000, ?f53)");
+		add(L"f56", L"4895979 + ?f55");
+		add(L"f57", L"4895979 + ?f1");
+		add(L"f58", L"?f57 * ?f8 / ?f0");
+		add(L"f59", L"0 - ?f58");
+		add(L"f60", L"cos(?f59)");
+		add(L"f61", L"0 - ?f60");
+		add(L"f62", L"?f61 * 318045");
+		add(L"f63", L"sin(?f59)");
+		add(L"f64", L"0 - ?f63");
+		add(L"f65", L"?f64 * 669518");
+		add(L"f66", L"sqrt(?f62 * ?f62 + ?f65 * ?f65 + 0 * 0)");
+		add(L"f67", L"318045 * 669518 / ?f66");
+		add(L"f68", L"?f64 * ?f67");
+		add(L"f69", L"534468 - ?f68");
+		add(L"f70", L"?f61 * ?f67");
+		add(L"f71", L"1430865 - ?f70");
+		add(L"f72", L"?f69 - 318045");
+		add(L"f73", L"?f71 - 669518");
+		add(L"f74", L"?f69 + 318045");
+		add(L"f75", L"?f71 + 669518");
+		add(L"f76", L"?f56 + ?f1");
+		add(L"f77", L"?f76 * ?f8 / ?f0");
+		add(L"f78", L"0 - ?f77");
+		add(L"f79", L"cos(?f78)");
+		add(L"f80", L"0 - ?f79");
+		add(L"f81", L"?f80 * 318045");
+		add(L"f82", L"sin(?f78)");
+		add(L"f83", L"0 - ?f82");
+		add(L"f84", L"?f83 * 669518");
+		add(L"f85", L"sqrt(?f81 * ?f81 + ?f84 * ?f84 + 0 * 0)");
+		add(L"f86", L"318045 * 669518 / ?f85");
+		add(L"f87", L"?f83 * ?f86");
+		add(L"f88", L"?f69 + ?f87");
+		add(L"f89", L"?f80 * ?f86");
+		add(L"f90", L"?f71 + ?f89");
+		add(L"f91", L"if(?f55, 534468, ?f72)");
+		add(L"f92", L"if(?f55, 1430865, ?f73)");
+		add(L"f93", L"if(?f55, 534468, ?f74)");
+		add(L"f94", L"if(?f55, 1430865, ?f75)");
+		add(L"f95", L"if(?f55, ?f72, ?f88)");
+		add(L"f96", L"if(?f55, ?f73, ?f90)");
+		add(L"f97", L"if(?f55, ?f74, ?f88)");
+		add(L"f98", L"if(?f55, ?f75, ?f90)");
+		add(L"f99", L"21550000 - -14831828");
+		add(L"f100", L"if(?f99, -14831828, 21550000)");
+		add(L"f101", L"-21550000 - ?f100");
+		add(L"f102", L"if(?f101, -21550000, ?f100)");
+		add(L"f103", L"19727807 + ?f102");
+		add(L"f104", L"19727807 + ?f1");
+		add(L"f105", L"?f104 * ?f8 / ?f0");
+		add(L"f106", L"0 - ?f105");
+		add(L"f107", L"cos(?f106)");
+		add(L"f108", L"0 - ?f107");
+		add(L"f109", L"?f108 * 208032");
+		add(L"f110", L"sin(?f106)");
+		add(L"f111", L"0 - ?f110");
+		add(L"f112", L"?f111 * 559504");
+		add(L"f113", L"sqrt(?f109 * ?f109 + ?f112 * ?f112 + 0 * 0)");
+		add(L"f114", L"208032 * 559504 / ?f113");
+		add(L"f115", L"?f111 * ?f114");
+		add(L"f116", L"643004 - ?f115");
+		add(L"f117", L"?f108 * ?f114");
+		add(L"f118", L"668602 - ?f117");
+		add(L"f119", L"?f116 - 208032");
+		add(L"f120", L"?f118 - 559504");
+		add(L"f121", L"?f116 + 208032");
+		add(L"f122", L"?f118 + 559504");
+		add(L"f123", L"?f103 + ?f1");
+		add(L"f124", L"?f123 * ?f8 / ?f0");
+		add(L"f125", L"0 - ?f124");
+		add(L"f126", L"cos(?f125)");
+		add(L"f127", L"0 - ?f126");
+		add(L"f128", L"?f127 * 208032");
+		add(L"f129", L"sin(?f125)");
+		add(L"f130", L"0 - ?f129");
+		add(L"f131", L"?f130 * 559504");
+		add(L"f132", L"sqrt(?f128 * ?f128 + ?f131 * ?f131 + 0 * 0)");
+		add(L"f133", L"208032 * 559504 / ?f132");
+		add(L"f134", L"?f130 * ?f133");
+		add(L"f135", L"?f116 + ?f134");
+		add(L"f136", L"?f127 * ?f133");
+		add(L"f137", L"?f118 + ?f136");
+		add(L"f138", L"if(?f102, 643004, ?f119)");
+		add(L"f139", L"if(?f102, 668602, ?f120)");
+		add(L"f140", L"if(?f102, 643004, ?f121)");
+		add(L"f141", L"if(?f102, 668602, ?f122)");
+		add(L"f142", L"if(?f102, ?f119, ?f135)");
+		add(L"f143", L"if(?f102, ?f120, ?f137)");
+		add(L"f144", L"if(?f102, ?f121, ?f135)");
+		add(L"f145", L"if(?f102, ?f122, ?f137)");
 	}
 };
 class oox_shape_SwooshArrow : public oox_shape
@@ -990,4 +917,5 @@ public:
 		handles.push_back(h2);
 	}
 };
+
 }

ASCOfficeOdfFileW/source/OdfFormat/Shapes/oox_shapeCallouts.h

@@ -42,6 +42,7 @@
 //+ shapetypeWedgeRoundRectCallout
 //+ shapetypeCloudCallout
 //+ shapetypeWedgeEllipseCallout
+//+ shapetypeQuadArrowCallout
 
 namespace cpdoccore 
 {
@@ -560,4 +561,53 @@ public:
 		handles.push_back(h1);
 	}
 };
+class oox_shape_QuadArrowCallout : public oox_shape
+{
+public:
+	oox_shape_QuadArrowCallout()
+	{
+		odf_type_name	=L"ooxml-quadArrowCallout";
+
+		enhanced_path	= L"M ?f0 ?f6 L ?f17 ?f30 ?f17 ?f32 ?f21 ?f32 ?f21 ?f28 ?f25 ?f28 ?f25 ?f17 ?f23 ?f17 ?f9 ?f2 ?f24 ?f17 ?f26 ?f17 ?f26 ?f28 ?f22 ?f28 ?f22 ?f32 ?f20 ?f32 ?f20 ?f30 ?f1 ?f6 ?f20 ?f31 ?f20 ?f33 ?f22 ?f33 ?f22 ?f29 ?f26 ?f29 ?f26 ?f27 ?f24 ?f27 ?f9 ?f3 ?f23 ?f27 ?f25 ?f27 ?f25 ?f29 ?f21 ?f29 ?f21 ?f33 ?f17 ?f33 ?f17 ?f31 Z N";
+		text_areas		= L"?f21 ?f28 ?f22 ?f29";
+		view_box		= L"0 0 21600 21600";
+		modifiers		= L"18515 18515 18515 48123";
+		
+		add(L"f0", L"left");
+		add(L"f1", L"right");
+		add(L"f2", L"top");
+		add(L"f3", L"bottom");
+		add(L"f4", L"?f3 - ?f2");
+		add(L"f5", L"?f4 / 2");
+		add(L"f6", L"?f2 + ?f5");
+		add(L"f7", L"?f1 - ?f0");
+		add(L"f8", L"?f7 / 2");
+		add(L"f9", L"?f0 + ?f8");
+		add(L"f10", L"min(?f7, ?f4)");
+		add(L"f11", L"$1");
+		add(L"f12", L"$0");
+		add(L"f13", L"$2");
+		add(L"f14", L"$3");
+		add(L"f15", L"?f10 * ?f11 / 100000");
+		add(L"f16", L"?f10 * ?f12 / 200000");
+		add(L"f17", L"?f10 * ?f13 / 100000");
+		add(L"f18", L"?f7 * ?f14 / 200000");
+		add(L"f19", L"?f4 * ?f14 / 200000");
+		add(L"f20", L"?f1 - ?f17");
+		add(L"f21", L"?f9 - ?f18");
+		add(L"f22", L"?f9 + ?f18");
+		add(L"f23", L"?f9 - ?f15");
+		add(L"f24", L"?f9 + ?f15");
+		add(L"f25", L"?f9 - ?f16");
+		add(L"f26", L"?f9 + ?f16");
+		add(L"f27", L"?f3 - ?f17");
+		add(L"f28", L"?f6 - ?f19");
+		add(L"f29", L"?f6 + ?f19");
+		add(L"f30", L"?f6 - ?f15");
+		add(L"f31", L"?f6 + ?f15");
+		add(L"f32", L"?f6 - ?f16");
+		add(L"f33", L"?f6 + ?f16");
+/////////////////////////////////////////////////////////
+	}
+};
 }

ASCOfficeOdfFileW/source/OdfFormat/Shapes/oox_shapePrimitives.h

@@ -31,6 +31,7 @@
  */
 //+	shapetypeArc,
 //+	shapetypeBevel,
+//+	shapetypeCan,
 //+	shapetypeChevron,
 //+	shapetypeChord,
 //+	shapetypeCorner,
@@ -1317,20 +1318,27 @@ public:
 	{
 		odf_type_name	=L"ooxml-bevel";
 
-		enhanced_path	= L"M ?f2 ?f2 L ?f3 ?f2 ?f3 ?f4 ?f2 ?f4 Z S N M 0 0 L ?f5 0 ?f3 ?f2 ?f2 ?f2 Z K S N M 0 ?f8 L ?f2 ?f4 ?f3 ?f4 ?f5 ?f8 Z I S N M 0 0 L ?f2 ?f2 ?f2 ?f4 0 ?f8 Z J S N M ?f5 0 L ?f5 ?f8 ?f3 ?f4 ?f3 ?f2 Z H S N M 0 0 L ?f5 0 ?f5 ?f8 0 ?f8 Z M ?f2 ?f2 L ?f3 ?f2 ?f3 ?f4 ?f2 ?f4 Z M 0 0 L ?f2 ?f2 M 0 ?f8 L ?f2 ?f4 M ?f5 0 L ?f3 ?f2 M ?f5 ?f8 L ?f3 ?f4 F N";
+		enhanced_path	= L"S M ?f12 ?f12 L ?f13 ?f12 ?f13 ?f14 ?f12 ?f14 Z N S M ?f0 ?f2 L ?f1 ?f2 ?f13 ?f12 ?f12 ?f12 Z N S M ?f0 ?f3 L ?f12 ?f14 ?f13 ?f14 ?f1 ?f3 Z N S M ?f0 ?f2 L ?f12 ?f12 ?f12 ?f14 ?f0 ?f3 Z N S M ?f1 ?f2 L ?f1 ?f3 ?f13 ?f14 ?f13 ?f12 Z N F M ?f0 ?f2 L ?f1 ?f2 ?f1 ?f3 ?f0 ?f3 Z M ?f12 ?f12 L ?f13 ?f12 ?f13 ?f14 ?f12 ?f14 Z M ?f0 ?f2 L ?f12 ?f12 M ?f0 ?f3 L ?f12 ?f14 M ?f1 ?f2 L ?f13 ?f12 M ?f1 ?f3 L ?f13 ?f14 N";
 		text_areas		= L"?f2 ?f2 ?f3 ?f4";
-		view_box		= L"0 0 0 0";
+		view_box		= L"0 0 21600 21600";
 		modifiers		= L"12500";
+		glue_points		= L"?f13 ?f6 ?f9 ?f14 ?f12 ?f6 ?f9 ?f12";
 		
-		add(L"f0", L"if(0-$0 ,0,if(50000-$0 ,$0 ,50000))");
-		add(L"f1", L"min(logwidth,logheight)");
-		add(L"f2", L"?f1 *?f0 /100000");
-		add(L"f3", L"logwidth+0-?f2 ");
-		add(L"f4", L"logheight+0-?f2 ");
-		add(L"f5", L"logwidth");
-		add(L"f6", L"logheight/2");
-		add(L"f7", L"logwidth/2");
-		add(L"f8", L"logheight");
+		add(L"f0", L"left");
+		add(L"f1", L"right");
+		add(L"f2", L"top");
+		add(L"f3", L"bottom");
+		add(L"f4", L"?f3 - ?f2");
+		add(L"f5", L"?f4 / 2");
+		add(L"f6", L"?f2 + ?f5");
+		add(L"f7", L"?f1 - ?f0");
+		add(L"f8", L"?f7 / 2");
+		add(L"f9", L"?f0 + ?f8");
+		add(L"f10", L"min(?f7, ?f4)");
+		add(L"f11", L"$0");
+		add(L"f12", L"?f10 * ?f11 / 100000");
+		add(L"f13", L"?f1 - ?f12");
+		add(L"f14", L"?f3 - ?f12");
 
 /////////////////////////////////////////////////////////
 		_handle h;
@@ -1542,56 +1550,6 @@ public:
 		handles.push_back(h);
 	}
 };
-class oox_shape_bracketPair : public oox_shape
-{
-public:
-	oox_shape_bracketPair()
-	{
-		odf_type_name	=L"ooxml-bracketPair";
-
-		//enhanced_path	= L"M 0 ?f2 L ?f3 0 L ?f11 ?f4 L ?f2 ?f10 Z S N M ?f2 ?f10 L 0 ?f2 M ?f3 0 L ?f11 ?f4 F N";
-		enhanced_path	= L"M 0 ?f2 G ?f2 ?f2 ?f12 ?f13 L ?f3 0 G ?f2 ?f2 ?f14 ?f15 L ?f11 ?f4 G ?f2 ?f2 ?f16 ?f17 L ?f2 ?f10 G ?f2 ?f2 ?f18 ?f19 Z S N M ?f2 ?f10 G ?f2 ?f2 ?f20 ?f21 L 0 ?f2 G ?f2 ?f2 ?f22 ?f23 M ?f3 0 G ?f2 ?f2 ?f24 ?f25 L ?f11 ?f4 G ?f2 ?f2 ?f26 ?f27 F N";
-		text_areas		= L"?f5 ?f5 ?f6 ?f7";
-		view_box		= L"0 0 0 0";
-		modifiers		= L"23051";
-		
-		add(L"f0", L"if(0-$0 ,0,if(50000-$0 ,$0 ,50000))"); 
-		add(L"f1", L"min(logwidth,logheight)"); 
-		add(L"f2", L"?f1 *?f0 /100000"); 
-		add(L"f3", L"logwidth+0-?f2 "); 
-		add(L"f4", L"logheight+0-?f2 "); 
-		add(L"f5", L"?f2 *29289/100000"); 
-		add(L"f6", L"logwidth+0-?f5 "); 
-		add(L"f7", L"logheight+0-?f5 "); 
-		add(L"f8", L"logwidth/2"); 
-		add(L"f9", L"logheight/2"); 
-		add(L"f10", L"logheight"); 
-		add(L"f11", L"logwidth"); 
-		add(L"f12", L"(10800000)/60000.0"); 
-		add(L"f13", L"(5400000)/60000.0"); 
-		add(L"f14", L"(16200000)/60000.0"); 
-		add(L"f15", L"(5400000)/60000.0"); 
-		add(L"f16", L"(0)/60000.0"); 
-		add(L"f17", L"(5400000)/60000.0"); 
-		add(L"f18", L"(5400000)/60000.0"); 
-		add(L"f19", L"(5400000)/60000.0"); 
-		add(L"f20", L"(5400000)/60000.0"); 
-		add(L"f21", L"(5400000)/60000.0"); 
-		add(L"f22", L"(10800000)/60000.0"); 
-		add(L"f23", L"(5400000)/60000.0"); 
-		add(L"f24", L"(16200000)/60000.0"); 
-		add(L"f25", L"(5400000)/60000.0"); 
-		add(L"f26", L"(0)/60000.0"); 
-		add(L"f27", L"(5400000)/60000.0");
-/////////////////////////////////////////////////////////
-		_handle h1;
-
-		h1.position = L"0 ?f2";
-		h1.y_minimum = L"0";
-		h1.y_maximum = L"50000";
-		handles.push_back(h1);
-	}
-};
 class oox_shape_Frame : public oox_shape
 {
 public:
@@ -1899,7 +1857,6 @@ public:
 /////////////////////////////////////////////////////////
 	}
 };
-
 class oox_shape_Cube : public oox_shape
 {
 public:
@@ -1931,4 +1888,185 @@ public:
 /////////////////////////////////////////////////////////
 	}
 };
+class oox_shape_Can : public oox_shape
+{
+public:
+	oox_shape_Can()
+	{
+		odf_type_name	=L"ooxml-can";
+
+		modifiers		= L"25000";
+		enhanced_path	= L"S M ?f2 ?f13 A ?f55 ?f56 ?f57 ?f58 ?f2 ?f13 ?f52 ?f54  W ?f59 ?f60 ?f61 ?f62 ?f2 ?f13 ?f52 ?f54 L ?f3 ?f15 A ?f102 ?f103 ?f104 ?f105 ?f3 ?f15 ?f99 ?f101  W ?f106 ?f107 ?f108 ?f109 ?f3 ?f15 ?f99 ?f101 Z N S M ?f2 ?f13 A ?f130 ?f131 ?f132 ?f133 ?f2 ?f13 ?f127 ?f129  W ?f134 ?f135 ?f136 ?f137 ?f2 ?f13 ?f127 ?f129 Z N F M ?f3 ?f13 A ?f157 ?f158 ?f159 ?f160 ?f3 ?f13 ?f154 ?f156  W ?f161 ?f162 ?f163 ?f164 ?f3 ?f13 ?f154 ?f156 L ?f3 ?f15 A ?f102 ?f103 ?f104 ?f105 ?f3 ?f15 ?f99 ?f101  W ?f106 ?f107 ?f108 ?f109 ?f3 ?f15 ?f99 ?f101 L ?f2 ?f13 N";
+		text_areas		= L"?f0 ?f8 ?f12 ?f3";
+		view_box		= L"0 0 21600 21600";
+		glue_points		= L"?f9 ?f14";
+		
+		add(L"f0", L"10800000");
+		add(L"f1", L"5400000");
+		add(L"f2", L"left");
+		add(L"f3", L"right");
+		add(L"f4", L"top");
+		add(L"f5", L"bottom");
+		add(L"f6", L"?f5 - ?f4");
+		add(L"f7", L"?f3 - ?f2");
+		add(L"f8", L"?f7 / 2");
+		add(L"f9", L"?f2 + ?f8");
+		add(L"f10", L"min(?f7, ?f6)");
+		add(L"f11", L"5419351 / 1725033");
+		add(L"f12", L"$0");
+		add(L"f13", L"?f10 * ?f12 / 200000");
+		add(L"f14", L"?f13 + ?f13");
+		add(L"f15", L"?f5 - ?f13");
+		add(L"f16", L"21550000 - -10800000");
+		add(L"f17", L"if(?f16, -10800000, 21550000)");
+		add(L"f18", L"-21550000 - ?f17");
+		add(L"f19", L"if(?f18, -21550000, ?f17)");
+		add(L"f20", L"?f0 + ?f19");
+		add(L"f21", L"?f0 + ?f1");
+		add(L"f22", L"?f21 * ?f11 / ?f0");
+		add(L"f23", L"0 - ?f22");
+		add(L"f24", L"cos(?f23)");
+		add(L"f25", L"0 - ?f24");
+		add(L"f26", L"?f25 * ?f8");
+		add(L"f27", L"sin(?f23)");
+		add(L"f28", L"0 - ?f27");
+		add(L"f29", L"?f28 * ?f13");
+		add(L"f30", L"sqrt(?f26 * ?f26 + ?f29 * ?f29 + 0 * 0)");
+		add(L"f31", L"?f8 * ?f13 / ?f30");
+		add(L"f32", L"?f28 * ?f31");
+		add(L"f33", L"?f2 - ?f32");
+		add(L"f34", L"?f25 * ?f31");
+		add(L"f35", L"?f13 - ?f34");
+		add(L"f36", L"?f33 - ?f8");
+		add(L"f37", L"?f35 - ?f13");
+		add(L"f38", L"?f33 + ?f8");
+		add(L"f39", L"?f35 + ?f13");
+		add(L"f40", L"?f20 + ?f1");
+		add(L"f41", L"?f40 * ?f11 / ?f0");
+		add(L"f42", L"0 - ?f41");
+		add(L"f43", L"cos(?f42)");
+		add(L"f44", L"0 - ?f43");
+		add(L"f45", L"?f44 * ?f8");
+		add(L"f46", L"sin(?f42)");
+		add(L"f47", L"0 - ?f46");
+		add(L"f48", L"?f47 * ?f13");
+		add(L"f49", L"sqrt(?f45 * ?f45 + ?f48 * ?f48 + 0 * 0)");
+		add(L"f50", L"?f8 * ?f13 / ?f49");
+		add(L"f51", L"?f47 * ?f50");
+		add(L"f52", L"?f33 + ?f51");
+		add(L"f53", L"?f44 * ?f50");
+		add(L"f54", L"?f35 + ?f53");
+		add(L"f55", L"if(?f19, ?f2, ?f36)");
+		add(L"f56", L"if(?f19, ?f13, ?f37)");
+		add(L"f57", L"if(?f19, ?f2, ?f38)");
+		add(L"f58", L"if(?f19, ?f13, ?f39)");
+		add(L"f59", L"if(?f19, ?f36, ?f52)");
+		add(L"f60", L"if(?f19, ?f37, ?f54)");
+		add(L"f61", L"if(?f19, ?f38, ?f52)");
+		add(L"f62", L"if(?f19, ?f39, ?f54)");
+		add(L"f63", L"21550000 - ?f0");
+		add(L"f64", L"if(?f63, ?f0, 21550000)");
+		add(L"f65", L"-21550000 - ?f64");
+		add(L"f66", L"if(?f65, -21550000, ?f64)");
+		add(L"f67", L"0 + ?f66");
+		add(L"f68", L"0 + ?f1");
+		add(L"f69", L"?f68 * ?f11 / ?f0");
+		add(L"f70", L"0 - ?f69");
+		add(L"f71", L"cos(?f70)");
+		add(L"f72", L"0 - ?f71");
+		add(L"f73", L"?f72 * ?f8");
+		add(L"f74", L"sin(?f70)");
+		add(L"f75", L"0 - ?f74");
+		add(L"f76", L"?f75 * ?f13");
+		add(L"f77", L"sqrt(?f73 * ?f73 + ?f76 * ?f76 + 0 * 0)");
+		add(L"f78", L"?f8 * ?f13 / ?f77");
+		add(L"f79", L"?f75 * ?f78");
+		add(L"f80", L"?f3 - ?f79");
+		add(L"f81", L"?f72 * ?f78");
+		add(L"f82", L"?f15 - ?f81");
+		add(L"f83", L"?f80 - ?f8");
+		add(L"f84", L"?f82 - ?f13");
+		add(L"f85", L"?f80 + ?f8");
+		add(L"f86", L"?f82 + ?f13");
+		add(L"f87", L"?f67 + ?f1");
+		add(L"f88", L"?f87 * ?f11 / ?f0");
+		add(L"f89", L"0 - ?f88");
+		add(L"f90", L"cos(?f89)");
+		add(L"f91", L"0 - ?f90");
+		add(L"f92", L"?f91 * ?f8");
+		add(L"f93", L"sin(?f89)");
+		add(L"f94", L"0 - ?f93");
+		add(L"f95", L"?f94 * ?f13");
+		add(L"f96", L"sqrt(?f92 * ?f92 + ?f95 * ?f95 + 0 * 0)");
+		add(L"f97", L"?f8 * ?f13 / ?f96");
+		add(L"f98", L"?f94 * ?f97");
+		add(L"f99", L"?f80 + ?f98");
+		add(L"f100", L"?f91 * ?f97");
+		add(L"f101", L"?f82 + ?f100");
+		add(L"f102", L"if(?f66, ?f3, ?f83)");
+		add(L"f103", L"if(?f66, ?f15, ?f84)");
+		add(L"f104", L"if(?f66, ?f3, ?f85)");
+		add(L"f105", L"if(?f66, ?f15, ?f86)");
+		add(L"f106", L"if(?f66, ?f83, ?f99)");
+		add(L"f107", L"if(?f66, ?f84, ?f101)");
+		add(L"f108", L"if(?f66, ?f85, ?f99)");
+		add(L"f109", L"if(?f66, ?f86, ?f101)");
+		add(L"f110", L"21550000 - 21600000");
+		add(L"f111", L"if(?f110, 21600000, 21550000)");
+		add(L"f112", L"-21550000 - ?f111");
+		add(L"f113", L"if(?f112, -21550000, ?f111)");
+		add(L"f114", L"?f0 + ?f113");
+		add(L"f115", L"?f114 + ?f1");
+		add(L"f116", L"?f115 * ?f11 / ?f0");
+		add(L"f117", L"0 - ?f116");
+		add(L"f118", L"cos(?f117)");
+		add(L"f119", L"0 - ?f118");
+		add(L"f120", L"?f119 * ?f8");
+		add(L"f121", L"sin(?f117)");
+		add(L"f122", L"0 - ?f121");
+		add(L"f123", L"?f122 * ?f13");
+		add(L"f124", L"sqrt(?f120 * ?f120 + ?f123 * ?f123 + 0 * 0)");
+		add(L"f125", L"?f8 * ?f13 / ?f124");
+		add(L"f126", L"?f122 * ?f125");
+		add(L"f127", L"?f33 + ?f126");
+		add(L"f128", L"?f119 * ?f125");
+		add(L"f129", L"?f35 + ?f128");
+		add(L"f130", L"if(?f113, ?f2, ?f36)");
+		add(L"f131", L"if(?f113, ?f13, ?f37)");
+		add(L"f132", L"if(?f113, ?f2, ?f38)");
+		add(L"f133", L"if(?f113, ?f13, ?f39)");
+		add(L"f134", L"if(?f113, ?f36, ?f127)");
+		add(L"f135", L"if(?f113, ?f37, ?f129)");
+		add(L"f136", L"if(?f113, ?f38, ?f127)");
+		add(L"f137", L"if(?f113, ?f39, ?f129)");
+		add(L"f138", L"0 + ?f113");
+		add(L"f139", L"?f13 - ?f81");
+		add(L"f140", L"?f139 - ?f13");
+		add(L"f141", L"?f139 + ?f13");
+		add(L"f142", L"?f138 + ?f1");
+		add(L"f143", L"?f142 * ?f11 / ?f0");
+		add(L"f144", L"0 - ?f143");
+		add(L"f145", L"cos(?f144)");
+		add(L"f146", L"0 - ?f145");
+		add(L"f147", L"?f146 * ?f8");
+		add(L"f148", L"sin(?f144)");
+		add(L"f149", L"0 - ?f148");
+		add(L"f150", L"?f149 * ?f13");
+		add(L"f151", L"sqrt(?f147 * ?f147 + ?f150 * ?f150 + 0 * 0)");
+		add(L"f152", L"?f8 * ?f13 / ?f151");
+		add(L"f153", L"?f149 * ?f152");
+		add(L"f154", L"?f80 + ?f153");
+		add(L"f155", L"?f146 * ?f152");
+		add(L"f156", L"?f139 + ?f155");
+		add(L"f157", L"if(?f113, ?f3, ?f83)");
+		add(L"f158", L"if(?f113, ?f13, ?f140)");
+		add(L"f159", L"if(?f113, ?f3, ?f85)");
+		add(L"f160", L"if(?f113, ?f13, ?f141)");
+		add(L"f161", L"if(?f113, ?f83, ?f154)");
+		add(L"f162", L"if(?f113, ?f140, ?f156)");
+		add(L"f163", L"if(?f113, ?f85, ?f154)");
+		add(L"f164", L"if(?f113, ?f141, ?f156)");
+/////////////////////////////////////////////////////////
+	}
+};
 }

ASCOfficeOdfFileW/source/OdfFormat/odf_drawing_context.cpp

@@ -708,8 +708,14 @@ office_element_ptr odf_drawing_context::Impl::create_draw_element(int type)
 		create_element(L"draw", L"polygon", element, odf_context_);
 		break;
 	case 9:
+	case 10:
+	{
 		create_element(L"draw", L"connector", element, odf_context_);
-		break;
+		draw_connector* connector = dynamic_cast<draw_connector*>(element.get());
+
+		if (type == 10)	connector->draw_connector_attlist_.draw_type_ = L"curve";
+		else			connector->draw_connector_attlist_.draw_type_ = L"standard";
+	}break;
 	case 5000:
 		create_element(L"draw", L"g", element, odf_context_);
 		break;
@@ -1160,6 +1166,11 @@ bool odf_drawing_context::isLineShape()
 	case 49:	//SimpleTypes::shapetypeCurvedConnector4:
 	case 50:	//SimpleTypes::shapetypeCurvedConnector5:
 	case 31:	//SimpleTypes::shapetypeBracketPair
+	case 30:	//SimpleTypes::shapetypeBracePair
+	case 148:	//SimpleTypes::shapetypeRightBracket
+	case 111:	//SimpleTypes::shapetypeLeftBracket
+	case 147:	//SimpleTypes::shapetypeRightBrace
+	case 110:	//SimpleTypes::shapetypeLeftBrace
 	case 18:	//SimpleTypes::shapetypeArc
 		return true;
 	case 1000:

ASCOfficeOdfFileW/source/OdfFormat/oox_shape_defines.cpp

@@ -83,12 +83,17 @@ oox_shape_ptr oox_shape::create(int ooxPrstGeomType)
 	case SimpleTypes::shapetypeStar12:				return boost::make_shared<oox_shape_star12>();
 	case SimpleTypes::shapetypeStar16:				return boost::make_shared<oox_shape_star16>();
 	case SimpleTypes::shapetypeStar32:				return boost::make_shared<oox_shape_star32>();
+	
 	case SimpleTypes::shapetypeSun:					return boost::make_shared<oox_shape_sun>();
+	case SimpleTypes::shapetypeMoon:				return boost::make_shared<oox_shape_moon>();
+	case SimpleTypes::shapetypeLightningBolt:		return boost::make_shared<oox_shape_lightningBolt>();
+	case SimpleTypes::shapetypeHeart:				return boost::make_shared<oox_shape_heart>();
 	
 	case SimpleTypes::shapetypeCircularArrow:		return boost::make_shared<oox_shape_CircularArrow>();
 	case SimpleTypes::shapetypeCurvedLeftArrow:		return boost::make_shared<oox_shape_CurvedLeftArrow>();
 	case SimpleTypes::shapetypeCurvedRightArrow:	return boost::make_shared<oox_shape_CurvedRightArrow>();
 	case SimpleTypes::shapetypeCurvedDownArrow:		return boost::make_shared<oox_shape_CurvedDownArrow>();
+	case SimpleTypes::shapetypeCurvedUpArrow:		return boost::make_shared<oox_shape_CurvedUpArrow>();
 	case SimpleTypes::shapetypeLeftCircularArrow:	return boost::make_shared<oox_shape_LeftCircularArrow>();
 	case SimpleTypes::shapetypeSwooshArrow:			return boost::make_shared<oox_shape_SwooshArrow>();
 	case SimpleTypes::shapetypeLeftArrow:			return boost::make_shared<oox_shape_LeftArrow>();
@@ -99,6 +104,7 @@ oox_shape_ptr oox_shape::create(int ooxPrstGeomType)
 	case SimpleTypes::shapetypeDownArrow:			return boost::make_shared<oox_shape_DownArrow>();
 	case SimpleTypes::shapetypeUpArrow:				return boost::make_shared<oox_shape_UpArrow>();
 	case SimpleTypes::shapetypeNotchedRightArrow:	return boost::make_shared<oox_shape_NotchedRightArrow>();
+	case SimpleTypes::shapetypeQuadArrowCallout:	return boost::make_shared<oox_shape_QuadArrowCallout>();
 
 	case SimpleTypes::shapetypeFunnel:				return boost::make_shared<oox_shape_Funnel>();
 	case SimpleTypes::shapetypeGear6:				return boost::make_shared<oox_shape_Gear6>();
@@ -124,7 +130,8 @@ oox_shape_ptr oox_shape::create(int ooxPrstGeomType)
 	case SimpleTypes::shapetypeDonut:				return boost::make_shared<oox_shape_Donut>();	
 	case SimpleTypes::shapetypeLeftRightRibbon:		return boost::make_shared<oox_shape_LeftRightRibbon>();	
 	case SimpleTypes::shapetypeWave:				return boost::make_shared<oox_shape_Wave>();	
-	case SimpleTypes::shapetypeBracketPair:			return boost::make_shared<oox_shape_bracketPair>();
+	case SimpleTypes::shapetypeFoldedCorner:		return boost::make_shared<oox_shape_FoldedCorner>();
+	case SimpleTypes::shapetypeCan:					return boost::make_shared<oox_shape_Can>();
 
 	case SimpleTypes::shapetypeFlowChartExtract:	return boost::make_shared<oox_shape_FlowChartExtract>();	
 
@@ -171,6 +178,13 @@ oox_shape_ptr oox_shape::create(int ooxPrstGeomType)
 	case SimpleTypes::shapetypeRibbon2:				return boost::make_shared<oox_shape_Ribbon2>();
 	case SimpleTypes::shapetypeEllipseRibbon:		return boost::make_shared<oox_shape_EllipseRibbon>();
 	case SimpleTypes::shapetypeEllipseRibbon2:		return boost::make_shared<oox_shape_EllipseRibbon2>();
+
+	case SimpleTypes::shapetypeRightBrace:			return boost::make_shared<oox_shape_RightBrace>();
+	case SimpleTypes::shapetypeLeftBrace:			return boost::make_shared<oox_shape_LeftBrace>();
+	case SimpleTypes::shapetypeRightBracket:		return boost::make_shared<oox_shape_RightBracket>();
+	case SimpleTypes::shapetypeLeftBracket:			return boost::make_shared<oox_shape_LeftBracket>();
+	case SimpleTypes::shapetypeBracePair:			return boost::make_shared<oox_shape_BracePair>();
+	case SimpleTypes::shapetypeBracketPair:			return boost::make_shared<oox_shape_BracketPair>();
 	//case (2001 + SimpleTypes::textshapetypeTextArchDown): 
 	//case (2001 + SimpleTypes::textshapetypeTextArchDownPour): 
 	//case (2001 + SimpleTypes::textshapetypeTextArchUp): 

ASCOfficePPTXFile/ASCOfficeDrawingConverter.cpp

@@ -666,7 +666,14 @@ namespace PPTX
 
 			std::wstring strValue = strParams.substr(nPosOld, nPosition - nPosOld);
 
-			m_mapSettings.insert(std::pair<std::wstring, std::wstring>(strName, strValue));
+			if (m_mapSettings.find(strName) == m_mapSettings.end())
+			{
+				m_mapSettings.insert(std::make_pair(strName, strValue));
+			}
+			else
+			{
+				m_mapSettings[strName] += L"," + strValue;
+			}
 		}
 	}
 
@@ -733,8 +740,14 @@ namespace PPTX
 			if (pData[nPosOld] == WCHAR('.'))
                 strValue = (L"0" + strValue);
 
-			//добавляем через [], а не insert, потому что ключи могут дублироваться(а в предыдущей реализации использовалось последнее значение)
-			m_mapSettings[strName] = strValue;
+			if (m_mapSettings.find(strName) == m_mapSettings.end())
+			{
+				m_mapSettings.insert(std::make_pair(strName, strValue));
+			}
+			else
+			{
+				m_mapSettings[strName] += L"," + strValue;
+			}
 		}
 	}
 
@@ -2833,7 +2846,8 @@ void CDrawingConverter::doc_LoadShape(PPTX::Logic::SpTreeElem *elem, XmlUtils::C
 					pSpPr->xfrm->flipH = true;
                 else if (pFind->second == L"y")
 					pSpPr->xfrm->flipV = true;
-                else if ((pFind->second == L"xy") || (pFind->second == L"yx") || (pFind->second == L"x y") || (pFind->second == L"y x"))
+				else if ((pFind->second == L"xy") || (pFind->second == L"yx") || (pFind->second == L"x y") || (pFind->second == L"y x")
+					 || (pFind->second == L"y,x") || (pFind->second == L"x,y"))
 				{
 					pSpPr->xfrm->flipH = true;
 					pSpPr->xfrm->flipV = true;
@@ -2867,7 +2881,8 @@ void CDrawingConverter::doc_LoadShape(PPTX::Logic::SpTreeElem *elem, XmlUtils::C
 					pSpPr->xfrm->flipH = true;
                 else if (pFind->second == L"y")
 					pSpPr->xfrm->flipV = true;
-                else if ((pFind->second == L"xy") || (pFind->second == L"yx") || (pFind->second == L"x y") || (pFind->second == L"y x"))
+				else if ((pFind->second == L"xy") || (pFind->second == L"yx") || (pFind->second == L"x y") || (pFind->second == L"y x")
+					 || (pFind->second == L"y,x") || (pFind->second == L"x,y"))
 				{
 					pSpPr->xfrm->flipH = true;
 					pSpPr->xfrm->flipV = true;
@@ -3031,7 +3046,8 @@ void CDrawingConverter::doc_LoadGroup(PPTX::Logic::SpTreeElem *result, XmlUtils:
 				pTree->grpSpPr.xfrm->flipH = true;
             else if (pFind->second == L"y")
 				pTree->grpSpPr.xfrm->flipV = true;
-            else if ((pFind->second == L"xy") || (pFind->second == L"yx") || (pFind->second == L"x y") || (pFind->second == L"y x"))
+            else if ((pFind->second == L"xy") || (pFind->second == L"yx") || (pFind->second == L"x y") || (pFind->second == L"y x")
+				 || (pFind->second == L"y,x") || (pFind->second == L"x,y"))
 			{
 				pTree->grpSpPr.xfrm->flipH = true;
 				pTree->grpSpPr.xfrm->flipV = true;
@@ -3071,7 +3087,8 @@ void CDrawingConverter::doc_LoadGroup(PPTX::Logic::SpTreeElem *result, XmlUtils:
 				pTree->grpSpPr.xfrm->flipH = true;
             else if (pFind->second == L"y")
 				pTree->grpSpPr.xfrm->flipV = true;
-            else if ((pFind->second == L"xy") || (pFind->second == L"yx") || (pFind->second == L"x y") || (pFind->second == L"y x"))
+            else if ((pFind->second == L"xy") || (pFind->second == L"yx") || (pFind->second == L"x y") || (pFind->second == L"y x")
+				 || (pFind->second == L"y,x") || (pFind->second == L"x,y"))
 			{
 				pTree->grpSpPr.xfrm->flipH = true;
 				pTree->grpSpPr.xfrm->flipV = true;
@@ -4752,6 +4769,14 @@ HRESULT CDrawingConverter::SaveObject(LONG lStart, LONG lLength, const std::wstr
 		if(oPic.oleObject.IsInit())
 		{
 			bOle = oPic.oleObject->isValid();
+			if (oPic.oleObject->m_oDxaOrig.IsInit() == false)
+			{
+				oPic.oleObject->m_oDxaOrig = 0;
+			}
+			if (oPic.oleObject->m_oDyaOrig.IsInit() == false)
+			{
+				oPic.oleObject->m_oDyaOrig = 0;
+			}
 		}
 	}
 	bool bSignatureLine = false;

ASCOfficePPTXFile/PPTXFormat/Logic/Pic.cpp

@@ -323,7 +323,8 @@ namespace PPTX
 						{
 							m_OleObjectFile = new OOX::OleObject(NULL, true, pReader->m_nDocumentType == XMLWRITER_DOC_TYPE_DOCX);
 							
-							std::wstring strOlePath = pReader->GetString(_embed_data_size);
+							BYTE type = pReader->GetUChar();
+							std::wstring strOlePath = pReader->GetString2();
 							m_OleObjectFile->set_filename(strOlePath, false); //temp !!! for ImageManager original file name
 						}
 						else if (embedded_type == 4)

Common/3dParty/cef/fetch.sh

@@ -37,7 +37,14 @@ mkdir "build"
 fi
 cef_binary=cef_binary
 cef_arch=$cef_binary.7z
-cef_url=http://d2ettrnqo7v976.cloudfront.net/cef/3163/$platform$arch/$cef_arch
+cef_version="3163"
+
+if [[ "$platform" == *"linux"* ]]
+then
+cef_version="3202"
+fi
+
+cef_url=http://d2ettrnqo7v976.cloudfront.net/cef/$cef_version/$platform$arch/$cef_arch
 
 if [[ "$platform" == *"linux"* ]]
 then

Common/OfficeFileFormatChecker2.cpp

@@ -262,7 +262,7 @@ std::wstring COfficeFileFormatChecker::getDocumentID (const std::wstring & _file
 	}
 	else
 	{
-		if ( false == isOpenOfficeFormatFile(fileName, sDocumentID))
+		if ( false == isOpenOfficeFormatFile(fileName, documentID))
 		{
 			NSFile::CFileBinary file;
 			if (!file.OpenFile(fileName))
@@ -275,12 +275,13 @@ std::wstring COfficeFileFormatChecker::getDocumentID (const std::wstring & _file
 			file.ReadFile(buffer, MIN_SIZE_BUFFER, dwReadBytes);
 			file.CloseFile();
 
-			if (isPdfFormatFile(buffer, (int)dwReadBytes, sDocumentID) )
+			if (isPdfFormatFile(buffer, (int)dwReadBytes, documentID) )
 			{
 				nFileType = AVS_OFFICESTUDIO_FILE_CROSSPLATFORM_PDF;
 			}
 		}
 	}
+	sDocumentID = documentID;
 
 	return documentID;
 }

Common/version.txt

@@ -1 +1 @@
-2.4.555.0
+2.4.556.0

DesktopEditor/raster/Metafile/MetaFile.cpp

@@ -177,47 +177,49 @@ namespace MetaFile
 	{
 		return m_lType;
 	}
-	void CMetaFile::GetBounds(double* pdX, double* pdY, double* pdW, double* pdH)
-	{
-		if (c_lMetaWmf == m_lType)
-		{
-            const TRectD& oRect = m_oWmfFile.GetBounds();
-			*pdX = oRect.dLeft;
-			*pdY = oRect.dTop;
-			*pdW = oRect.dRight - oRect.dLeft;
-			*pdH = oRect.dBottom - oRect.dTop;
-		}
-		else if (c_lMetaEmf == m_lType)
-		{
-			TEmfRectL* pRect = m_oEmfFile.GetBounds();
-			*pdX = pRect->lLeft;
-			*pdY = pRect->lTop;
-			*pdW = pRect->lRight - pRect->lLeft;
-			*pdH = pRect->lBottom - pRect->lTop;
-		}
-		else if (c_lMetaSvm == m_lType)
-		{
-			TRect* pRect = m_oSvmFile.GetBounds();
-			*pdX = pRect->nLeft;
-			*pdY = pRect->nTop;
-			*pdW = pRect->nRight - pRect->nLeft;
-			*pdH = pRect->nBottom - pRect->nTop;
+        void CMetaFile::GetBounds(double* pdX, double* pdY, double* pdW, double* pdH)
+        {
+            if (c_lMetaWmf == m_lType)
+            {
+                const TRectD& oRect = m_oWmfFile.GetBounds();
+                *pdX = oRect.dLeft;
+                *pdY = oRect.dTop;
+                *pdW = oRect.dRight - oRect.dLeft;
+                *pdH = oRect.dBottom - oRect.dTop;
+            }
+            else if (c_lMetaEmf == m_lType)
+            {
+                TEmfRectL* pRect = m_oEmfFile.GetBounds();
+                *pdX = pRect->lLeft;
+                *pdY = pRect->lTop;
+                *pdW = pRect->lRight - pRect->lLeft;
+                *pdH = pRect->lBottom - pRect->lTop;
+            }
+            else if (c_lMetaSvm == m_lType)
+            {
+                TRect* pRect = m_oSvmFile.GetBounds();
+                *pdX = pRect->nLeft;
+                *pdY = pRect->nTop;
+                *pdW = pRect->nRight - pRect->nLeft;
+                *pdH = pRect->nBottom - pRect->nTop;
 
-			if (*pdW > 10000 || *pdH > 10000)
-			{
-				*pdW /= 10;
-				*pdH /= 10;
-			}
-		}
-		else
-		{
-			*pdX = 0;
-			*pdY = 0;
-			*pdW = 0;
-			*pdH = 0;
-		}
-	};
-	void CMetaFile::ConvertToRaster(const wchar_t* wsOutFilePath, unsigned int unFileType, int nWidth, int nHeight)
+                if (*pdW > 10000 || *pdH > 10000)
+                {
+                    *pdW /= 10;
+                    *pdH /= 10;
+                }
+            }
+            else
+            {
+                *pdX = 0;
+                *pdY = 0;
+                *pdW = 0;
+                *pdH = 0;
+            }
+            if (*pdW < 0) *pdW = -*pdW;
+            if (*pdH < 0) *pdH = -*pdH;
+        };
+        void CMetaFile::ConvertToRaster(const wchar_t* wsOutFilePath, unsigned int unFileType, int nWidth, int nHeight)
 	{
 		CFontManager *pFontManager = (CFontManager*)m_pAppFonts->GenerateFontManager();
 		CFontsCache* pFontCache = new CFontsCache();

HtmlFile/HtmlFile.cpp

@@ -398,9 +398,9 @@ int CHtmlFile::Convert(const std::vector<std::wstring>& arFiles, const std::wstr
 
             const char* nenv[4];
             nenv[0] = sLibraryDir.c_str();
-            nenv[1] = "LD_PRELOAD=./libcef.so";
-            nenv[2] = "DISPLAY=:0";
-            nenv[3] = NULL;
+            nenv[1] = "DISPLAY=:0";
+            nenv[2] = NULL;
+			nenv[3] = NULL;
 
             execve(sProgramm.c_str(),
                    (char * const *)nargs,
@@ -419,9 +419,8 @@ int CHtmlFile::Convert(const std::vector<std::wstring>& arFiles, const std::wstr
 
             const char* nenv[4];
             nenv[0] = sLibraryDir.c_str();
-            nenv[1] = "LD_PRELOAD=./libcef.so";
-            nenv[2] = NULL;//"DISPLAY=:99";
-            nenv[3] = NULL;
+            nenv[1] = NULL;//"DISPLAY=:99";
+            nenv[2] = NULL;
 
             execve("/usr/bin/xvfb-run", (char * const *)nargs, (char * const *)nenv);
             exit(EXIT_SUCCESS);

HtmlFile/test/test.pro

@@ -16,6 +16,11 @@ CONFIG -= debug_and_release debug_and_release_target
 DEFINES += HTMLFILE_USE_DYNAMIC_LIBRARY
 DEFINES += UNICODECONVERTER_USE_DYNAMIC_LIBRARY
 
+CORE_ROOT_DIR = $$PWD/../..
+PWD_ROOT_DIR = $$PWD
+include($$CORE_ROOT_DIR/Common/base.pri)
+include($$CORE_ROOT_DIR/Common/3dParty/icu/icu.pri)
+
 CONFIG(debug, debug|release) {
     DESTDIR = $$PWD/Debug
 } else {
@@ -25,41 +30,10 @@ CONFIG(debug, debug|release) {
 CONFIG += c++11
 TEMPLATE = app
 
-############### destination path ###############
-DESTINATION_SDK_PATH = $$PWD/../../build/lib
-
-# WINDOWS
-win32:contains(QMAKE_TARGET.arch, x86_64):{
-CONFIG(debug, debug|release) {
-    DESTINATION_SDK_PATH = $$DESTINATION_SDK_PATH/win_64/DEBUG
-} else {
-    DESTINATION_SDK_PATH = $$DESTINATION_SDK_PATH/win_64
-}
-}
-win32:!contains(QMAKE_TARGET.arch, x86_64):{
-CONFIG(debug, debug|release) {
-    DESTINATION_SDK_PATH = $$DESTINATION_SDK_PATH/win_32/DEBUG
-} else {
-    DESTINATION_SDK_PATH = $$DESTINATION_SDK_PATH/win_32
-}
-}
-
-linux-g++:contains(QMAKE_HOST.arch, x86_64):{
-    DESTINATION_SDK_PATH = $$DESTINATION_SDK_PATH/linux_64
-}
-linux-g++:!contains(QMAKE_HOST.arch, x86_64):{
-    DESTINATION_SDK_PATH = $$DESTINATION_SDK_PATH/linux_32
-}
-
-LIBS += -L$$DESTINATION_SDK_PATH -lHtmlFile
-LIBS += -L$$DESTINATION_SDK_PATH -lUnicodeConverter
-LIBS += -L$$DESTINATION_SDK_PATH -lgraphics
+LIBS += -L$$CORE_BUILDS_LIBRARIES_PATH -lUnicodeConverter -lkernel -lgraphics -lHtmlFile
 
 linux-g++ | linux-g++-64 | linux-g++-32 {
     QMAKE_LFLAGS += -Wl,--rpath=./
-
-    LIBS        += $$PWD/../../build/bin/icu/linux_64/libicuuc.so.55
-    LIBS        += $$PWD/../../build/bin/icu/linux_64/libicudata.so.55
     message(linux)
 }
 
@@ -67,9 +41,6 @@ win32 {
 LIBS += -ladvapi32 \
         -luser32 \
         -lshell32
-
-LIBS        += -L$$PWD/../../build/bin/icu/win_64/ -licudt
-LIBS        += -L$$PWD/../../build/bin/icu/win_64/ -licuuc
 }
 
 SOURCES += main.cpp