XlsFormat

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

ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/FixedPoint.h

@@ -14,8 +14,6 @@ public:
     FixedPoint(const int raw_data);
 	XLS::BiffStructurePtr clone();
 
-	//virtual void toXML(BiffStructurePtr & parent, const std::wstring & attrib_name);
-	//virtual const bool fromXML(BiffStructurePtr & parent, const std::wstring & attrib_name);
 	virtual void load(XLS::CFRecord& record);
 	virtual void store(XLS::CFRecord& record);
 

ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/ODRAW/OfficeArtFOPTE.cpp

@@ -367,20 +367,20 @@ void FillStyleBooleanProperties::load(XLS::CFRecord& record)
 {
 	OfficeArtFOPTE::load(record);
 
-	fNoFillHitTest = GETBIT(op, 0);
-	fillUseRect = GETBIT(op, 1);
-	fillShape = GETBIT(op, 2);
-	fHitTestFill = GETBIT(op, 3);
-	fFilled = GETBIT(op, 4);
-	fUseShapeAnchor = GETBIT(op, 5);
-	fRecolorFillAsPicture = GETBIT(op, 6);
-	fUsefNoFillHitTest = GETBIT(op, 16);
-	fUsefillUseRect = GETBIT(op, 17);
-	fUsefillShape = GETBIT(op, 18);
-	fUsefHitTestFill = GETBIT(op, 19);
-	fUsefFilled = GETBIT(op, 20);
-	fUsefUseShapeAnchor = GETBIT(op, 21);
-	fUsefRecolorFillAsPicture = GETBIT(op, 22);
+	fNoFillHitTest				= GETBIT(op, 0);
+	fillUseRect					= GETBIT(op, 1);
+	fillShape					= GETBIT(op, 2);
+	fHitTestFill				= GETBIT(op, 3);
+	fFilled						= GETBIT(op, 4);
+	fUseShapeAnchor				= GETBIT(op, 5);
+	fRecolorFillAsPicture		= GETBIT(op, 6);
+	fUsefNoFillHitTest			= GETBIT(op, 16);
+	fUsefillUseRect				= GETBIT(op, 17);
+	fUsefillShape				= GETBIT(op, 18);
+	fUsefHitTestFill			= GETBIT(op, 19);
+	fUsefFilled					= GETBIT(op, 20);
+	fUsefUseShapeAnchor			= GETBIT(op, 21);
+	fUsefRecolorFillAsPicture	= GETBIT(op, 22);
 }
 
 void fillBlip::ReadComplexData(XLS::CFRecord& record)

ASCOfficeXlsFile2/source/XlsXlsxConverter/ShapeType.h

@@ -212,6 +212,17 @@ namespace oox
 	};
 
 
+	std::wstring static Spt2ShapeType_mini( MSOSPT type) 
+	{
+		switch(type)
+		{
+        case msosptTextBox:						return L"rect";
+        case msosptRectangle : 					return L"rect";
+        case msosptEllipse : 					return L"ellipse";
+        case msosptLine : 						return L"line";
+		}
+        return L"";
+	}
 	std::wstring static Spt2ShapeType( MSOSPT type) 
 	{
 		switch(type)
@@ -290,8 +301,8 @@ namespace oox
         case msosptUpArrowCallout : 			return L"upArrowCallout";
         case msosptDownArrowCallout : 			return L"downArrowCallout";
         case msosptLeftRightArrowCallout : 		return L"leftRightArrowCallout";
-        case msosptUpDownArrowCallout : 		return L"UpDownArrowCallout";
-        case msosptQuadArrowCallout : 			return L"QuadArrowCallout";
+        case msosptUpDownArrowCallout : 		return L"upDownArrowCallout";
+        case msosptQuadArrowCallout : 			return L"quadArrowCallout";
         case msosptBevel : 						return L"bevel";
         case msosptLeftBracket : 				return L"leftBracket";
         case msosptRightBracket : 				return L"rightBracket";
@@ -308,7 +319,7 @@ namespace oox
         case msosptVerticalScroll : 			return L"verticalScroll";
         case msosptHorizontalScroll : 			return L"horizontalScroll";
         case msosptCircularArrow : 				return L"circularArrow";
-        //case msosptNotchedCircularArrow :		return L"notchedCircularArrow";
+        case msosptNotchedCircularArrow :		return L"flowChartDelay";		//return L"notchedCircularArrow";
         case msosptUturnArrow : 				return L"uturnArrow";
         case msosptCurvedRightArrow : 			return L"curvedRightArrow";
         case msosptCurvedLeftArrow : 			return L"curvedLeftArrow";
@@ -337,7 +348,7 @@ namespace oox
         case msosptFlowChartSort : 				return L"flowChartSort";
         case msosptFlowChartExtract : 			return L"flowChartExtract";
         case msosptFlowChartMerge : 			return L"flowChartMerge";
-        //case msosptFlowChartOfflineStorage : 	return L"chartOfflineStorage";
+        case msosptFlowChartOfflineStorage : 	return L"flowChartOfflineStorage";
         case msosptFlowChartOnlineStorage : 	return L"flowChartOnlineStorage";
         case msosptFlowChartMagneticTape :		return L"flowChartMagneticTape";
         case msosptFlowChartMagneticDisk :		return L"flowChartMagneticDisk";

ASCOfficeXlsFile2/source/XlsXlsxConverter/xlsx_drawing_context.cpp

@@ -444,7 +444,18 @@ void xlsx_drawing_context::serialize_text(std::wostream & stream)
 	{
 		CP_XML_NODE(L"xdr:txBody")
 		{  
-			CP_XML_NODE(L"a:bodyPr");
+			CP_XML_NODE(L"a:bodyPr")
+			{
+				if (drawing_state.back().bWordArt)
+				{
+					std::wstring prstTxWarp = Spt2WordArtShapeType(drawing_state.back().shape_id);				
+					CP_XML_NODE(L"a:prstTxWarp")
+					{
+						CP_XML_ATTR(L"prst", prstTxWarp);
+						CP_XML_NODE(L"a:avLst");//
+					}
+				}
+			}
 			CP_XML_NODE(L"a:lstStyle");		
 			
 			CP_XML_NODE(L"a:p")