XlsFormat - fix pivots

XlsFormat - fix custom shape with connectors

ASCOfficePPTXFile/PPTXFormat/Logic/GraphicFrame.cpp

@@ -250,12 +250,26 @@ namespace PPTX
 					}
 					else if (L"oleObj" == strName)
 					{
-						olePic = oNode.ReadNode(L"p:pic");
+						olePic = oNode.ReadNode(L"p:pic"); //нормальный вариант объекта
 						if (olePic.IsInit())
 						{
 							olePic->fromXMLOle(oNode);
 							result = true;
 						}
+						else
+						{
+							olePic.Init();  //старый вариант описания объекта через spid в VmlDrawing
+							olePic->spPr.xfrm;
+
+							Logic::PrstGeom* geom = new Logic::PrstGeom();
+							geom->prst = L"rect";
+							olePic->spPr.Geometry.m_geometry.reset(geom);							
+			
+							olePic->fromXMLOle(oNode);
+							result = true;
+						}
+						if (olePic->spPr.xfrm.IsInit() == false)
+							olePic->spPr.xfrm = xfrm;
 					}
 					else if (L"AlternateContent" == strName)
 					{

ASCOfficePPTXFile/PPTXFormat/Logic/Pic.cpp

@@ -619,6 +619,45 @@ namespace PPTX
 			if(oleObject.IsInit())
 			{
 				pWriter->StartRecord(SPTREE_TYPE_OLE);
+				
+				if (oleObject->m_sShapeId.IsInit() && (!blipFill.blip->embed.IsInit() && blipFill.blip->oleFilepathImage.empty())  &&
+						parentFileIs<PPTX::Slide>() && parentFileAs<PPTX::Slide>().Vml.IsInit())
+				{
+					OOX::CVmlDrawing *pVml = parentFileAs<PPTX::Slide>().Vml.operator->();
+					
+					std::map<std::wstring, OOX::CVmlDrawing::_vml_shape>::iterator pPair = pVml->m_mapShapes.find(*oleObject->m_sShapeId);
+					if (pVml->m_mapShapes.end() != pPair)
+					{
+						pPair->second.bUsed = true;
+						OOX::Vml::CShape* pShape = dynamic_cast<OOX::Vml::CShape*>(pPair->second.pElement);
+						for(size_t j = 0; (pShape) && (j < pShape->m_arrItems.size()); ++j)
+						{
+							OOX::WritingElement* pChildElemShape = pShape->m_arrItems[j];
+							if(OOX::et_v_imagedata == pChildElemShape->getType())
+							{
+								OOX::Vml::CImageData* pImageData = static_cast<OOX::Vml::CImageData*>(pChildElemShape);									
+													
+								std::wstring sIdImageFileCache;
+
+								if (pImageData->m_oRelId.IsInit())		sIdImageFileCache = pImageData->m_oRelId->GetValue();
+								else if (pImageData->m_rId.IsInit())	sIdImageFileCache = pImageData->m_rId->GetValue();
+																	
+								if (!sIdImageFileCache.empty())
+								{
+									//ищем физический файл ( rId относительно vml_drawing)									
+									smart_ptr<OOX::File> pFile = pVml->Find(sIdImageFileCache);
+									
+									if (pFile.IsInit() && (	OOX::FileTypes::Image == pFile->type()))
+									{
+										OOX::Image*	pImageFileCache = static_cast<OOX::Image*>(pFile.operator->());
+										
+										blipFill.blip->oleFilepathImage = pImageFileCache->filename().GetPath();
+									}
+								}
+							}
+						}
+					}
+				}
 			}
 			else if (nvPicPr.nvPr.media.is_init())
 			{
@@ -630,10 +669,17 @@ namespace PPTX
 					blipFill.blip->mediaFilepath = mediaFile->filename().GetPath();
 				}
 
-				if (nvPicPr.nvPr.media.as<MediaFile>().name == L"audioFile")
+				if (nvPicPr.nvPr.media.is<MediaFile>())
+				{
+					if (nvPicPr.nvPr.media.as<MediaFile>().name == L"audioFile")
+						pWriter->StartRecord(SPTREE_TYPE_AUDIO);
+					else if (nvPicPr.nvPr.media.as<MediaFile>().name == L"videoFile")
+						pWriter->StartRecord(SPTREE_TYPE_VIDEO);
+				}
+				else if (nvPicPr.nvPr.media.is<WavAudioFile>() || nvPicPr.nvPr.media.is<AudioCD>())
+				{
 					pWriter->StartRecord(SPTREE_TYPE_AUDIO);
-				else if (nvPicPr.nvPr.media.as<MediaFile>().name == L"videoFile")
-					pWriter->StartRecord(SPTREE_TYPE_VIDEO);
+				}
 				else
 					pWriter->StartRecord(SPTREE_TYPE_PIC);
 			}
@@ -1338,6 +1384,7 @@ namespace PPTX
 					blipFill.blip.Init();
 				blipFill.blip->oleRid = oleObject->m_oId->get();
 			}
+			node.ReadAttributeBase(L"spid",	oleObject->m_sShapeId);
 		}
 	} // namespace Logic
 } // namespace PPTX

ASCOfficePPTXFile/PPTXFormat/Logic/Pic.h

@@ -259,7 +259,7 @@ namespace PPTX
 			void toXmlWriterVML(NSBinPptxRW::CXmlWriter* pWriter, smart_ptr<PPTX::Theme>& oTheme, smart_ptr<PPTX::Logic::ClrMap>& oClrMap, bool in_group = false);
 //----------------------------------------------------------------------
 			NvPicPr					nvPicPr;
-			BlipFill				blipFill;
+			mutable BlipFill		blipFill;
 			SpPr					spPr;
 			nullable<ShapeStyle>	style;
 		//internal

ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/SXLI.cpp

@@ -72,14 +72,21 @@ void SXLI::readFields(CFRecord& record)
 		item.fGrand				= GETBIT(flags, 11);
 		item.fMultiDataOnAxis	= GETBIT(flags, 12);
 
-		//if (!item.fGrand && item.itmType != 0x000E)
+		if (item.fGrand)
+			item.isxviMac = 1;
+
+		if (item.cSic > item.isxviMac)
+			item.cSic = item.isxviMac;
+
+		if (item.fSbt && item.itmType < 0x000D)
+			item.isxviMac++;
+
+		for (short i = 0; i < item.isxviMac; i++)
 		{
-			for (short i = 0; i < item.isxviMac; i++)
-			{
-				short val; record >> val;
-				item.rgisxvi.push_back(val);
-			}
+			short val; record >> val;
+			item.rgisxvi.push_back(val);
 		}
+
 		m_arItems.push_back(item);
 	}
 }

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

@@ -750,7 +750,7 @@ class pConnectionSitesDir : public OfficeArtFOPTE
 	
 	virtual void ReadComplexData(XLS::CFRecord& record);
 
-	IMsoArray<ODRAW::FixedPoint> complex;
+	IMsoArray<OSHARED::FixedPoint> complex;
 };
 
 class pInscribe : public OfficeArtFOPTE 

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

@@ -57,7 +57,7 @@ public:
 			unsigned char Byte4;
 			unsigned short type;
 			unsigned short fExprO;
-		};
+		}bytes;
 		double value;
 	} data;
 };

ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/DREF.cpp

@@ -92,6 +92,42 @@ int DREF::serialize(std::wostream & strm)
 			}
 			else if(bin)
 			{
+				switch(bin->nBuiltin)
+				{
+
+					case 0x0004:/*Database*/
+					case 0x000d:/*_FilterDatabase*/
+					{
+						CP_XML_ATTR(L"type", L"external");
+						//connectionId in connections(root)
+					}break;
+					case 0x0000:/*Consolidate_Area*/
+					//{
+					//	CP_XML_ATTR(L"type", L"consolidation");
+					//	CP_XML_NODE(L"consolidation")
+					//	{
+					//		CP_XML_ATTR(L"name", bin->stFile.value());
+					//	}
+					//}break;			
+					case 0x0001:/*Auto_Open*/
+					case 0x0002:/*Auto_Close*/
+					case 0x0003:/*Extract*/
+					case 0x0005:/*Criteria*/
+					case 0x0006:/*Print_Area*/
+					case 0x0007:/*Print_Titles*/
+					case 0x0008:/*Recorder*/
+					case 0x0009:/*Data_Form*/
+					case 0x000a:/*Auto_Activate*/
+					case 0x000b:/*Auto_Deactivate*/
+					case 0x000c:/*Sheet_Title*/
+					{
+						CP_XML_ATTR(L"type", L"scenario");
+						CP_XML_NODE(L"worksheetSource")
+						{
+							CP_XML_ATTR(L"name", bin->stFile.value());
+						}
+					}break;
+				}
 			}
 			else if(ref)
 			{

ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/FDB.cpp

@@ -78,6 +78,7 @@ FDB::FDB()
 	bDate		= false;
 	bNumber		= false;
 	bEmpty		= false;
+	bInteger	= false;
 }
 
 FDB::~FDB()
@@ -164,6 +165,7 @@ const bool FDB::loadContent(BinProcessor& proc)
 		bDate	|= operatr->bDate;
 		bNumber	|= operatr->bNumber;
 		bEmpty	|= operatr->bEmpty;
+		bInteger|= operatr->bInteger;
 	}	
 
 	return true;
@@ -186,7 +188,7 @@ int FDB::serialize(std::wostream & strm)
 			{
 				CP_XML_ATTR(L"numFmtId", fdb_type->wTypeSql);	
 			}
-			if (m_arSRCSXOPER.empty())
+			if (m_arSRCSXOPER.empty() && m_arGRPSXOPER.empty() == false)
 			{
 				CP_XML_ATTR(L"databaseField", 0);	
 			}
@@ -234,6 +236,11 @@ int FDB::serialize(std::wostream & strm)
 					//		CP_XML_ATTR(L"containsString",	0);
 					//	}
 					//}
+					if	(bInteger)
+					{
+						if (bNumber)	bInteger = false;
+						else			bNumber = true;
+					}
 					if ((bDate & bNumber) || (bNumber & bString))
 					{
 						CP_XML_ATTR(L"containsSemiMixedTypes", 1);
@@ -250,6 +257,7 @@ int FDB::serialize(std::wostream & strm)
 					if (bDate)		CP_XML_ATTR(L"containsDate",	1);
 					if (!bString)	CP_XML_ATTR(L"containsString",	0);
 					if (bEmpty)		CP_XML_ATTR(L"containsBlank",	1);
+					if (bInteger)	CP_XML_ATTR(L"containsInteger",	1);
 
 					if (fdb->fnumMinMaxValid)
 					{

ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/FDB.h

@@ -64,6 +64,7 @@ public:
 	bool	bDate;
 	bool	bNumber;
 	bool	bEmpty;
+	bool	bInteger;
 
 };
 

ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/PIVOTLI.cpp

@@ -95,7 +95,12 @@ int PIVOTLI::serialize(std::wostream & strm)
 					case 0x000E:	CP_XML_ATTR(L"t", L"blank");	break;
 				}
 
- 				for (size_t j = 0; j < line_items->m_arItems[i].rgisxvi.size(); j++)
+				if (line_items->m_arItems[i].cSic > 0 && line_items->m_arItems[i].itmType == 0)//??
+				{
+					CP_XML_ATTR(L"r", line_items->m_arItems[i].cSic);
+				}
+
+ 				for (size_t j = line_items->m_arItems[i].cSic; j < line_items->m_arItems[i].rgisxvi.size(); j++)
 				{
 					CP_XML_NODE(L"x")
 					{

ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/PIVOTVD.cpp

@@ -106,7 +106,6 @@ int PIVOTVD::serialize(std::wostream & strm)
 
 			if (vd->fCounta)	CP_XML_ATTR(L"countASubtotal",	1);
 			if (vd->fCount)		CP_XML_ATTR(L"countSubtotal",	1);
-			if (vd->fDefault)	CP_XML_ATTR(L"defaultSubtotal",	1);
 			if (vd->fSum)		CP_XML_ATTR(L"sumSubtotal",		1);
 			if (vd->fAverage)	CP_XML_ATTR(L"avgSubtotal",		1);
 			if (vd->fMax)		CP_XML_ATTR(L"maxSubtotal",		1);
@@ -147,6 +146,7 @@ int PIVOTVD::serialize(std::wostream & strm)
 			{
 				CP_XML_ATTR(L"rankBy", vd_ex->isxdiAutoShow);
 			}		
+			if (!vd->fDefault)	CP_XML_ATTR(L"defaultSubtotal",	0);
 			if (!m_arSXVI.empty())
 			{
 				CP_XML_NODE(L"items")

ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/PIVOTVIEW.cpp

@@ -137,7 +137,7 @@ int PIVOTVIEW::serialize(std::wostream & strm)
 					core->m_arPIVOTVD[i]->serialize(CP_XML_STREAM());
 				}
 			}
-			if (core->m_arPIVOTIVD.size() == 2)//0 or 2
+			if (core->m_arPIVOTIVD.size() >= 1)
 			{
 				CP_XML_NODE(L"rowFields")
 				{
@@ -147,7 +147,7 @@ int PIVOTVIEW::serialize(std::wostream & strm)
 					ivd->serialize(CP_XML_STREAM());
 				}
 			}
-			if (core->m_arPIVOTLI.size() == 2)//0 or 2
+			if (core->m_arPIVOTLI.size() >= 1)//0 or 2
 			{
 				CP_XML_NODE(L"rowItems")
 				{

ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/SXOPER.cpp

@@ -47,6 +47,7 @@ SXOPER::SXOPER()
 	bDate	= false;
 	bNumber	= false;
 	bEmpty	= false;
+	bInteger= false;
 }
 
 SXOPER::~SXOPER()
@@ -67,7 +68,16 @@ const bool SXOPER::loadContent(BinProcessor& proc)
 	}
 	else if(proc.optional<SXNum>())
 	{
-		bNumber = true;
+
+		SXNum *num = dynamic_cast<SXNum*>(elements_.back().get());
+		if (num)
+		{
+			bInteger = (num->num.data.bytes.Byte1==num->num.data.bytes.Byte2 && 
+						num->num.data.bytes.Byte2==num->num.data.bytes.Byte3 && 
+						num->num.data.bytes.Byte3==num->num.data.bytes.Byte4 && 
+						num->num.data.bytes.Byte4==0);
+		}
+		bNumber = !bInteger;
 	}
 	else if(proc.optional<SxBool>())
 	{

ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/SXOPER.h

@@ -57,6 +57,7 @@ public:
 	bool	bDate;
 	bool	bNumber;
 	bool	bEmpty;
+	bool	bInteger;
 };
 
 } // namespace XLS

ASCOfficeXlsFile2/source/XlsXlsxConverter/xlsx_drawing_context.cpp

@@ -2423,7 +2423,7 @@ void xlsx_drawing_context::set_custom_connection(std::vector<ODRAW::MSOPOINT>& p
 
 	current_drawing_states->back()->custom_connection = points;
 }
-void xlsx_drawing_context::set_custom_connectionDir(std::vector<ODRAW::FixedPoint>& points)
+void xlsx_drawing_context::set_custom_connectionDir(std::vector<OSHARED::FixedPoint>& points)
 {
 	if (current_drawing_states == NULL) return;	
 	if (current_drawing_states->empty()) return;

ASCOfficeXlsFile2/source/XlsXlsxConverter/xlsx_drawing_context.h

@@ -182,7 +182,7 @@ public:
 	std::vector<ODRAW::MSOPOINT>	custom_verticles;
 	std::vector<ODRAW::ADJH>		custom_adjustHandles;
 	std::vector<ODRAW::MSOPOINT>	custom_connection;
-	std::vector<ODRAW::FixedPoint>	custom_connectionDir;
+	std::vector<OSHARED::FixedPoint>custom_connectionDir;
 	std::vector<ODRAW::MSORECT>		custom_inscribe;
 
 	_rect							custom_rect;
@@ -413,7 +413,7 @@ public:
 		void set_custom_adjustValues(std::vector<_CP_OPT(int)>		& values);
 		void set_custom_path		(int type_path);
 		void set_custom_connection	(std::vector<ODRAW::MSOPOINT>	& points);
-		void set_custom_connectionDir(std::vector<ODRAW::FixedPoint>& points);
+		void set_custom_connectionDir(std::vector<OSHARED::FixedPoint>& points);
 		void set_custom_inscribe	(std::vector<ODRAW::MSORECT>	& rects);
 		void set_custom_x_limo		(int val);
 		void set_custom_y_limo		(int val);