diff --git a/Common/DocxFormat/Source/XlsxFormat/Chart/ChartSerialize.cpp b/Common/DocxFormat/Source/XlsxFormat/Chart/ChartSerialize.cpp
index d351787b29..1c9c1d9f27 100644
--- a/Common/DocxFormat/Source/XlsxFormat/Chart/ChartSerialize.cpp
+++ b/Common/DocxFormat/Source/XlsxFormat/Chart/ChartSerialize.cpp
@@ -1041,7 +1041,6 @@ namespace OOX{
}
else if(_T("clrMapOvr") == sName)
{
- //todo
CString* pNewElem = new CString;
CString sVal = oReader.GetOuterXml();
*pNewElem = sVal;
@@ -1132,7 +1131,6 @@ namespace OOX{
}
if(NULL != m_clrMapOvr)
{
- //todo
writer.WriteString(*m_clrMapOvr);
}
if(NULL != m_pivotSource)
diff --git a/Test/Applications/DocxFormatCodeGen/codegen/CodegenCPP.cs b/Test/Applications/DocxFormatCodeGen/codegen/CodegenCPP.cs
index a793f58bac..c6faee4c82 100644
--- a/Test/Applications/DocxFormatCodeGen/codegen/CodegenCPP.cs
+++ b/Test/Applications/DocxFormatCodeGen/codegen/CodegenCPP.cs
@@ -401,7 +401,7 @@ namespace codegen
if (oGenMember.bToDoString)
{
bRes = false;
- if ("spPr" == oGenMember.sName || "txPr" == oGenMember.sName || "rich" == oGenMember.sName)
+ if ("spPr" == oGenMember.sName || "txPr" == oGenMember.sName || "rich" == oGenMember.sName || "clrMapOvr" == oGenMember.sName)
bRes = true;
}
return bRes;
@@ -411,7 +411,7 @@ namespace codegen
string sRes;
if (oGenMember.bToDoString)
{
- if ("spPr" == oGenMember.sName)
+ if ("spPr" == oGenMember.sName || "clrMapOvr" == oGenMember.sName)
sRes = "oReader.GetOuterXml()";
else if ("txPr" == oGenMember.sName || "rich" == oGenMember.sName)
sRes = "oReader.GetInnerXml()";
@@ -433,7 +433,7 @@ namespace codegen
if (oGenMember.bToDoString)
{
bRes = true;
- if ("spPr" == oGenMember.sName)
+ if ("spPr" == oGenMember.sName || "clrMapOvr" == oGenMember.sName)
sb.AppendFormat("writer.WriteString(*{0});\r\n", sPVal);
else if ("txPr" == oGenMember.sName || "rich" == oGenMember.sName)
sb.AppendFormat("writer.WriteString(_T(\"<{0}>\") + *{1} + _T(\"{0}>\"));\r\n", sElemName, sPVal);
@@ -847,7 +847,7 @@ namespace codegen
bool ProcessMemberToBinTodo(StringBuilder sb, GenMember oGenMember, string pValPrefix, string pVal)
{
bool bRes = false;
- if ("spPr" == oGenMember.sName || "txPr" == oGenMember.sName || "rich" == oGenMember.sName)
+ if ("spPr" == oGenMember.sName || "txPr" == oGenMember.sName || "rich" == oGenMember.sName || "clrMapOvr" == oGenMember.sName)
{
bRes = true;
sb.AppendFormat("LPSAFEARRAY pBinaryObj = NULL;\r\n");
@@ -862,6 +862,11 @@ namespace codegen
sb.AppendFormat("BSTR bstrXml = (_T(\"\") + *{0} + _T(\"\")).AllocSysString();\r\n", pValPrefix + pVal);
sb.AppendFormat("HRESULT hRes = m_pOfficeDrawingConverter->GetTxBodyBinary(bstrXml, &pBinaryObj);\r\n");
}
+ else if ("clrMapOvr" == oGenMember.sName)
+ {
+ sb.AppendFormat("BSTR bstrXml = (*{0}).AllocSysString();\r\n", pValPrefix + pVal);
+ sb.AppendFormat("HRESULT hRes = m_pOfficeDrawingConverter->GetRecordBinary(XMLWRITER_RECORD_TYPE_CLRMAPOVR, bstrXml, &pBinaryObj);\r\n");
+ }
sb.AppendFormat("SysFreeString(bstrXml);\r\n");
sb.AppendFormat("if(S_OK == hRes && NULL != pBinaryObj && pBinaryObj->rgsabound[0].cElements > 0)\r\n");
sb.AppendFormat("m_oBcw.m_oStream.WritePointer((BYTE*)pBinaryObj->pvData, pBinaryObj->rgsabound[0].cElements);\r\n");
@@ -983,7 +988,7 @@ namespace codegen
bool ProcessMemberFromBinTodo(StringBuilder sb, GenMember oGenMember, string sElemName)
{
bool bRes = true;
- if ("spPr" == oGenMember.sName || "txPr" == oGenMember.sName || "rich" == oGenMember.sName)
+ if ("spPr" == oGenMember.sName || "txPr" == oGenMember.sName || "rich" == oGenMember.sName || "clrMapOvr" == oGenMember.sName)
{
sb.AppendFormat("if(length > 0)\r\n");
sb.AppendFormat("{{\r\n");
@@ -992,6 +997,8 @@ namespace codegen
sb.AppendFormat("HRESULT hRes = m_pOfficeDrawingConverter->GetRecordXml(m_pArray, m_oBufferedStream.GetPosition(), length, XMLWRITER_RECORD_TYPE_SPPR, XMLWRITER_DOC_TYPE_CHART, &bstrXml);\r\n");
else if ("txPr" == oGenMember.sName || "rich" == oGenMember.sName)
sb.AppendFormat("HRESULT hRes = m_pOfficeDrawingConverter->GetTxBodyXml(m_pArray, m_oBufferedStream.GetPosition(), length, &bstrXml);\r\n");
+ else if ("clrMapOvr" == oGenMember.sName)
+ sb.AppendFormat("HRESULT hRes = m_pOfficeDrawingConverter->GetRecordXml(m_pArray, m_oBufferedStream.GetPosition(), length, XMLWRITER_RECORD_TYPE_CLRMAPOVR, XMLWRITER_DOC_TYPE_CHART, &bstrXml);\r\n");
sb.AppendFormat("if (S_OK == hRes && NULL != bstrXml)\r\n");
sb.AppendFormat("{{\r\n");
sb.AppendFormat("*{0} = bstrXml;\r\n", sElemName);
diff --git a/Test/Applications/DocxFormatCodeGen/codegen/CodegenJS.cs b/Test/Applications/DocxFormatCodeGen/codegen/CodegenJS.cs
index feacbe0ecc..29de988d10 100644
--- a/Test/Applications/DocxFormatCodeGen/codegen/CodegenJS.cs
+++ b/Test/Applications/DocxFormatCodeGen/codegen/CodegenJS.cs
@@ -200,6 +200,11 @@ namespace codegen
//sb.AppendFormat("var oPPTXContentLoader = new CPPTXContentLoader();\r\n");
//sb.AppendFormat("oPPTXContentLoader.ReadTextBody(null, this.stream, {0});\r\n", oVal);
}
+ else if ("clrMapOvr" == oGenMember.sName)
+ {
+ sb.AppendFormat("res = c_oSerConstants.ReadUnknown;\r\n");
+ //sb.AppendFormat("var clrMapOvr = this.ReadClrOverride(length);\r\n");
+ }
else
bRes = false;
}
@@ -332,6 +337,8 @@ namespace codegen
sb.AppendFormat("window.global_pptx_content_writer.WriteSpPr(oThis.memory, {0});\r\n", oVal);
else if ("txPr" == oGenMember.sName || "rich" == oGenMember.sName)
sb.AppendFormat("window.global_pptx_content_writer.WriteTextBody(oThis.memory, {0});\r\n", oVal);
+ else if ("clrMapOvr" == oGenMember.sName)
+ sb.AppendFormat("//todo;\r\n", oVal);
else
bRes = false;
}
@@ -370,7 +377,7 @@ namespace codegen
if (oGenMember.bToDoString)
{
bRes = false;
- if ("spPr" == oGenMember.sName || "txPr" == oGenMember.sName || "rich" == oGenMember.sName)
+ if ("spPr" == oGenMember.sName || "clrMapOvr" == oGenMember.sName || "txPr" == oGenMember.sName || "rich" == oGenMember.sName)
bRes = true;
}
return bRes;
diff --git a/XlsxSerializerCom/Reader/ChartFromToBinary.h b/XlsxSerializerCom/Reader/ChartFromToBinary.h
index 86679835a3..8ef1ba462d 100644
--- a/XlsxSerializerCom/Reader/ChartFromToBinary.h
+++ b/XlsxSerializerCom/Reader/ChartFromToBinary.h
@@ -5,794 +5,6 @@
#include "..\Writer\BinaryCommonReader.h"
using namespace OOX::Spreadsheet;
namespace BinXlsxRW {
- extern BYTE c_oserct_extlstEXT;
-
- extern BYTE c_oserct_chartspaceDATE1904;
- extern BYTE c_oserct_chartspaceLANG;
- extern BYTE c_oserct_chartspaceROUNDEDCORNERS;
- extern BYTE c_oserct_chartspaceALTERNATECONTENT;
- extern BYTE c_oserct_chartspaceSTYLE;
- extern BYTE c_oserct_chartspaceCLRMAPOVR;
- extern BYTE c_oserct_chartspacePIVOTSOURCE;
- extern BYTE c_oserct_chartspacePROTECTION;
- extern BYTE c_oserct_chartspaceCHART;
- extern BYTE c_oserct_chartspaceSPPR;
- extern BYTE c_oserct_chartspaceTXPR;
- extern BYTE c_oserct_chartspaceEXTERNALDATA;
- extern BYTE c_oserct_chartspacePRINTSETTINGS;
- extern BYTE c_oserct_chartspaceUSERSHAPES;
- extern BYTE c_oserct_chartspaceEXTLST;
-
- extern BYTE c_oserct_booleanVAL;
-
- extern BYTE c_oserct_relidID;
-
- extern BYTE c_oserct_pagesetupPAPERSIZE;
- extern BYTE c_oserct_pagesetupPAPERHEIGHT;
- extern BYTE c_oserct_pagesetupPAPERWIDTH;
- extern BYTE c_oserct_pagesetupFIRSTPAGENUMBER;
- extern BYTE c_oserct_pagesetupORIENTATION;
- extern BYTE c_oserct_pagesetupBLACKANDWHITE;
- extern BYTE c_oserct_pagesetupDRAFT;
- extern BYTE c_oserct_pagesetupUSEFIRSTPAGENUMBER;
- extern BYTE c_oserct_pagesetupHORIZONTALDPI;
- extern BYTE c_oserct_pagesetupVERTICALDPI;
- extern BYTE c_oserct_pagesetupCOPIES;
-
- extern BYTE c_oserct_pagemarginsL;
- extern BYTE c_oserct_pagemarginsR;
- extern BYTE c_oserct_pagemarginsT;
- extern BYTE c_oserct_pagemarginsB;
- extern BYTE c_oserct_pagemarginsHEADER;
- extern BYTE c_oserct_pagemarginsFOOTER;
-
- extern BYTE c_oserct_headerfooterODDHEADER;
- extern BYTE c_oserct_headerfooterODDFOOTER;
- extern BYTE c_oserct_headerfooterEVENHEADER;
- extern BYTE c_oserct_headerfooterEVENFOOTER;
- extern BYTE c_oserct_headerfooterFIRSTHEADER;
- extern BYTE c_oserct_headerfooterFIRSTFOOTER;
- extern BYTE c_oserct_headerfooterALIGNWITHMARGINS;
- extern BYTE c_oserct_headerfooterDIFFERENTODDEVEN;
- extern BYTE c_oserct_headerfooterDIFFERENTFIRST;
-
- extern BYTE c_oserct_printsettingsHEADERFOOTER;
- extern BYTE c_oserct_printsettingsPAGEMARGINS;
- extern BYTE c_oserct_printsettingsPAGESETUP;
-
- extern BYTE c_oserct_externaldataAUTOUPDATE;
- extern BYTE c_oserct_externaldataID;
-
- extern BYTE c_oserct_dispblanksasVAL;
-
- extern BYTE c_oserct_legendentryIDX;
- extern BYTE c_oserct_legendentryDELETE;
- extern BYTE c_oserct_legendentryTXPR;
- extern BYTE c_oserct_legendentryEXTLST;
-
- extern BYTE c_oserct_unsignedintVAL;
-
- extern BYTE c_oserct_extensionANY;
- extern BYTE c_oserct_extensionURI;
-
- extern BYTE c_oserct_legendposVAL;
-
- extern BYTE c_oserct_legendLEGENDPOS;
- extern BYTE c_oserct_legendLEGENDENTRY;
- extern BYTE c_oserct_legendLAYOUT;
- extern BYTE c_oserct_legendOVERLAY;
- extern BYTE c_oserct_legendSPPR;
- extern BYTE c_oserct_legendTXPR;
- extern BYTE c_oserct_legendEXTLST;
-
- extern BYTE c_oserct_layoutMANUALLAYOUT;
- extern BYTE c_oserct_layoutEXTLST;
-
- extern BYTE c_oserct_manuallayoutLAYOUTTARGET;
- extern BYTE c_oserct_manuallayoutXMODE;
- extern BYTE c_oserct_manuallayoutYMODE;
- extern BYTE c_oserct_manuallayoutWMODE;
- extern BYTE c_oserct_manuallayoutHMODE;
- extern BYTE c_oserct_manuallayoutX;
- extern BYTE c_oserct_manuallayoutY;
- extern BYTE c_oserct_manuallayoutW;
- extern BYTE c_oserct_manuallayoutH;
- extern BYTE c_oserct_manuallayoutEXTLST;
-
- extern BYTE c_oserct_layouttargetVAL;
-
- extern BYTE c_oserct_layoutmodeVAL;
-
- extern BYTE c_oserct_doubleVAL;
-
- extern BYTE c_oserct_dtableSHOWHORZBORDER;
- extern BYTE c_oserct_dtableSHOWVERTBORDER;
- extern BYTE c_oserct_dtableSHOWOUTLINE;
- extern BYTE c_oserct_dtableSHOWKEYS;
- extern BYTE c_oserct_dtableSPPR;
- extern BYTE c_oserct_dtableTXPR;
- extern BYTE c_oserct_dtableEXTLST;
-
- extern BYTE c_oserct_seraxAXID;
- extern BYTE c_oserct_seraxSCALING;
- extern BYTE c_oserct_seraxDELETE;
- extern BYTE c_oserct_seraxAXPOS;
- extern BYTE c_oserct_seraxMAJORGRIDLINES;
- extern BYTE c_oserct_seraxMINORGRIDLINES;
- extern BYTE c_oserct_seraxTITLE;
- extern BYTE c_oserct_seraxNUMFMT;
- extern BYTE c_oserct_seraxMAJORTICKMARK;
- extern BYTE c_oserct_seraxMINORTICKMARK;
- extern BYTE c_oserct_seraxTICKLBLPOS;
- extern BYTE c_oserct_seraxSPPR;
- extern BYTE c_oserct_seraxTXPR;
- extern BYTE c_oserct_seraxCROSSAX;
- extern BYTE c_oserct_seraxCROSSES;
- extern BYTE c_oserct_seraxCROSSESAT;
- extern BYTE c_oserct_seraxTICKLBLSKIP;
- extern BYTE c_oserct_seraxTICKMARKSKIP;
- extern BYTE c_oserct_seraxEXTLST;
-
- extern BYTE c_oserct_scalingLOGBASE;
- extern BYTE c_oserct_scalingORIENTATION;
- extern BYTE c_oserct_scalingMAX;
- extern BYTE c_oserct_scalingMIN;
- extern BYTE c_oserct_scalingEXTLST;
-
- extern BYTE c_oserct_logbaseVAL;
-
- extern BYTE c_oserct_orientationVAL;
-
- extern BYTE c_oserct_axposVAL;
-
- extern BYTE c_oserct_chartlinesSPPR;
-
- extern BYTE c_oserct_titleTX;
- extern BYTE c_oserct_titleLAYOUT;
- extern BYTE c_oserct_titleOVERLAY;
- extern BYTE c_oserct_titleSPPR;
- extern BYTE c_oserct_titleTXPR;
- extern BYTE c_oserct_titleEXTLST;
-
- extern BYTE c_oserct_txRICH;
- extern BYTE c_oserct_txSTRREF;
-
- extern BYTE c_oserct_strrefF;
- extern BYTE c_oserct_strrefSTRCACHE;
- extern BYTE c_oserct_strrefEXTLST;
-
- extern BYTE c_oserct_strdataPTCOUNT;
- extern BYTE c_oserct_strdataPT;
- extern BYTE c_oserct_strdataEXTLST;
-
- extern BYTE c_oserct_strvalV;
- extern BYTE c_oserct_strvalIDX;
-
- extern BYTE c_oserct_numfmtFORMATCODE;
- extern BYTE c_oserct_numfmtSOURCELINKED;
-
- extern BYTE c_oserct_tickmarkVAL;
-
- extern BYTE c_oserct_ticklblposVAL;
-
- extern BYTE c_oserct_crossesVAL;
-
- extern BYTE c_oserct_skipVAL;
-
- extern BYTE c_oserct_timeunitVAL;
-
- extern BYTE c_oserct_dateaxAXID;
- extern BYTE c_oserct_dateaxSCALING;
- extern BYTE c_oserct_dateaxDELETE;
- extern BYTE c_oserct_dateaxAXPOS;
- extern BYTE c_oserct_dateaxMAJORGRIDLINES;
- extern BYTE c_oserct_dateaxMINORGRIDLINES;
- extern BYTE c_oserct_dateaxTITLE;
- extern BYTE c_oserct_dateaxNUMFMT;
- extern BYTE c_oserct_dateaxMAJORTICKMARK;
- extern BYTE c_oserct_dateaxMINORTICKMARK;
- extern BYTE c_oserct_dateaxTICKLBLPOS;
- extern BYTE c_oserct_dateaxSPPR;
- extern BYTE c_oserct_dateaxTXPR;
- extern BYTE c_oserct_dateaxCROSSAX;
- extern BYTE c_oserct_dateaxCROSSES;
- extern BYTE c_oserct_dateaxCROSSESAT;
- extern BYTE c_oserct_dateaxAUTO;
- extern BYTE c_oserct_dateaxLBLOFFSET;
- extern BYTE c_oserct_dateaxBASETIMEUNIT;
- extern BYTE c_oserct_dateaxMAJORUNIT;
- extern BYTE c_oserct_dateaxMAJORTIMEUNIT;
- extern BYTE c_oserct_dateaxMINORUNIT;
- extern BYTE c_oserct_dateaxMINORTIMEUNIT;
- extern BYTE c_oserct_dateaxEXTLST;
-
- extern BYTE c_oserct_lbloffsetVAL;
-
- extern BYTE c_oserct_axisunitVAL;
-
- extern BYTE c_oserct_lblalgnVAL;
-
- extern BYTE c_oserct_cataxAXID;
- extern BYTE c_oserct_cataxSCALING;
- extern BYTE c_oserct_cataxDELETE;
- extern BYTE c_oserct_cataxAXPOS;
- extern BYTE c_oserct_cataxMAJORGRIDLINES;
- extern BYTE c_oserct_cataxMINORGRIDLINES;
- extern BYTE c_oserct_cataxTITLE;
- extern BYTE c_oserct_cataxNUMFMT;
- extern BYTE c_oserct_cataxMAJORTICKMARK;
- extern BYTE c_oserct_cataxMINORTICKMARK;
- extern BYTE c_oserct_cataxTICKLBLPOS;
- extern BYTE c_oserct_cataxSPPR;
- extern BYTE c_oserct_cataxTXPR;
- extern BYTE c_oserct_cataxCROSSAX;
- extern BYTE c_oserct_cataxCROSSES;
- extern BYTE c_oserct_cataxCROSSESAT;
- extern BYTE c_oserct_cataxAUTO;
- extern BYTE c_oserct_cataxLBLALGN;
- extern BYTE c_oserct_cataxLBLOFFSET;
- extern BYTE c_oserct_cataxTICKLBLSKIP;
- extern BYTE c_oserct_cataxTICKMARKSKIP;
- extern BYTE c_oserct_cataxNOMULTILVLLBL;
- extern BYTE c_oserct_cataxEXTLST;
-
- extern BYTE c_oserct_dispunitslblLAYOUT;
- extern BYTE c_oserct_dispunitslblTX;
- extern BYTE c_oserct_dispunitslblSPPR;
- extern BYTE c_oserct_dispunitslblTXPR;
-
- extern BYTE c_oserct_builtinunitVAL;
-
- extern BYTE c_oserct_dispunitsBUILTINUNIT;
- extern BYTE c_oserct_dispunitsCUSTUNIT;
- extern BYTE c_oserct_dispunitsDISPUNITSLBL;
- extern BYTE c_oserct_dispunitsEXTLST;
-
- extern BYTE c_oserct_crossbetweenVAL;
-
- extern BYTE c_oserct_valaxAXID;
- extern BYTE c_oserct_valaxSCALING;
- extern BYTE c_oserct_valaxDELETE;
- extern BYTE c_oserct_valaxAXPOS;
- extern BYTE c_oserct_valaxMAJORGRIDLINES;
- extern BYTE c_oserct_valaxMINORGRIDLINES;
- extern BYTE c_oserct_valaxTITLE;
- extern BYTE c_oserct_valaxNUMFMT;
- extern BYTE c_oserct_valaxMAJORTICKMARK;
- extern BYTE c_oserct_valaxMINORTICKMARK;
- extern BYTE c_oserct_valaxTICKLBLPOS;
- extern BYTE c_oserct_valaxSPPR;
- extern BYTE c_oserct_valaxTXPR;
- extern BYTE c_oserct_valaxCROSSAX;
- extern BYTE c_oserct_valaxCROSSES;
- extern BYTE c_oserct_valaxCROSSESAT;
- extern BYTE c_oserct_valaxCROSSBETWEEN;
- extern BYTE c_oserct_valaxMAJORUNIT;
- extern BYTE c_oserct_valaxMINORUNIT;
- extern BYTE c_oserct_valaxDISPUNITS;
- extern BYTE c_oserct_valaxEXTLST;
-
- extern BYTE c_oserct_sizerepresentsVAL;
-
- extern BYTE c_oserct_bubblescaleVAL;
-
- extern BYTE c_oserct_bubbleserIDX;
- extern BYTE c_oserct_bubbleserORDER;
- extern BYTE c_oserct_bubbleserTX;
- extern BYTE c_oserct_bubbleserSPPR;
- extern BYTE c_oserct_bubbleserINVERTIFNEGATIVE;
- extern BYTE c_oserct_bubbleserDPT;
- extern BYTE c_oserct_bubbleserDLBLS;
- extern BYTE c_oserct_bubbleserTRENDLINE;
- extern BYTE c_oserct_bubbleserERRBARS;
- extern BYTE c_oserct_bubbleserXVAL;
- extern BYTE c_oserct_bubbleserYVAL;
- extern BYTE c_oserct_bubbleserBUBBLESIZE;
- extern BYTE c_oserct_bubbleserBUBBLE3D;
- extern BYTE c_oserct_bubbleserEXTLST;
-
- extern BYTE c_oserct_sertxSTRREF;
- extern BYTE c_oserct_sertxV;
-
- extern BYTE c_oserct_dptIDX;
- extern BYTE c_oserct_dptINVERTIFNEGATIVE;
- extern BYTE c_oserct_dptMARKER;
- extern BYTE c_oserct_dptBUBBLE3D;
- extern BYTE c_oserct_dptEXPLOSION;
- extern BYTE c_oserct_dptSPPR;
- extern BYTE c_oserct_dptPICTUREOPTIONS;
- extern BYTE c_oserct_dptEXTLST;
-
- extern BYTE c_oserct_markerSYMBOL;
- extern BYTE c_oserct_markerSIZE;
- extern BYTE c_oserct_markerSPPR;
- extern BYTE c_oserct_markerEXTLST;
-
- extern BYTE c_oserct_markerstyleVAL;
-
- extern BYTE c_oserct_markersizeVAL;
-
- extern BYTE c_oserct_pictureoptionsAPPLYTOFRONT;
- extern BYTE c_oserct_pictureoptionsAPPLYTOSIDES;
- extern BYTE c_oserct_pictureoptionsAPPLYTOEND;
- extern BYTE c_oserct_pictureoptionsPICTUREFORMAT;
- extern BYTE c_oserct_pictureoptionsPICTURESTACKUNIT;
-
- extern BYTE c_oserct_pictureformatVAL;
-
- extern BYTE c_oserct_picturestackunitVAL;
-
- extern BYTE c_oserct_dlblsDLBL;
- extern BYTE c_oserct_dlblsITEMS;
- extern BYTE c_oserct_dlblsDLBLPOS;
- extern BYTE c_oserct_dlblsDELETE;
- extern BYTE c_oserct_dlblsLEADERLINES;
- extern BYTE c_oserct_dlblsNUMFMT;
- extern BYTE c_oserct_dlblsSEPARATOR;
- extern BYTE c_oserct_dlblsSHOWBUBBLESIZE;
- extern BYTE c_oserct_dlblsSHOWCATNAME;
- extern BYTE c_oserct_dlblsSHOWLEADERLINES;
- extern BYTE c_oserct_dlblsSHOWLEGENDKEY;
- extern BYTE c_oserct_dlblsSHOWPERCENT;
- extern BYTE c_oserct_dlblsSHOWSERNAME;
- extern BYTE c_oserct_dlblsSHOWVAL;
- extern BYTE c_oserct_dlblsSPPR;
- extern BYTE c_oserct_dlblsTXPR;
- extern BYTE c_oserct_dlblsEXTLST;
-
- extern BYTE c_oserct_dlblIDX;
- extern BYTE c_oserct_dlblITEMS;
- extern BYTE c_oserct_dlblDLBLPOS;
- extern BYTE c_oserct_dlblDELETE;
- extern BYTE c_oserct_dlblLAYOUT;
- extern BYTE c_oserct_dlblNUMFMT;
- extern BYTE c_oserct_dlblSEPARATOR;
- extern BYTE c_oserct_dlblSHOWBUBBLESIZE;
- extern BYTE c_oserct_dlblSHOWCATNAME;
- extern BYTE c_oserct_dlblSHOWLEGENDKEY;
- extern BYTE c_oserct_dlblSHOWPERCENT;
- extern BYTE c_oserct_dlblSHOWSERNAME;
- extern BYTE c_oserct_dlblSHOWVAL;
- extern BYTE c_oserct_dlblSPPR;
- extern BYTE c_oserct_dlblTX;
- extern BYTE c_oserct_dlblTXPR;
- extern BYTE c_oserct_dlblEXTLST;
-
- extern BYTE c_oserct_dlblposVAL;
-
- extern BYTE c_oserct_trendlineNAME;
- extern BYTE c_oserct_trendlineSPPR;
- extern BYTE c_oserct_trendlineTRENDLINETYPE;
- extern BYTE c_oserct_trendlineORDER;
- extern BYTE c_oserct_trendlinePERIOD;
- extern BYTE c_oserct_trendlineFORWARD;
- extern BYTE c_oserct_trendlineBACKWARD;
- extern BYTE c_oserct_trendlineINTERCEPT;
- extern BYTE c_oserct_trendlineDISPRSQR;
- extern BYTE c_oserct_trendlineDISPEQ;
- extern BYTE c_oserct_trendlineTRENDLINELBL;
- extern BYTE c_oserct_trendlineEXTLST;
-
- extern BYTE c_oserct_trendlinetypeVAL;
-
- extern BYTE c_oserct_orderVAL;
-
- extern BYTE c_oserct_periodVAL;
-
- extern BYTE c_oserct_trendlinelblLAYOUT;
- extern BYTE c_oserct_trendlinelblTX;
- extern BYTE c_oserct_trendlinelblNUMFMT;
- extern BYTE c_oserct_trendlinelblSPPR;
- extern BYTE c_oserct_trendlinelblTXPR;
- extern BYTE c_oserct_trendlinelblEXTLST;
-
- extern BYTE c_oserct_errbarsERRDIR;
- extern BYTE c_oserct_errbarsERRBARTYPE;
- extern BYTE c_oserct_errbarsERRVALTYPE;
- extern BYTE c_oserct_errbarsNOENDCAP;
- extern BYTE c_oserct_errbarsPLUS;
- extern BYTE c_oserct_errbarsMINUS;
- extern BYTE c_oserct_errbarsVAL;
- extern BYTE c_oserct_errbarsSPPR;
- extern BYTE c_oserct_errbarsEXTLST;
-
- extern BYTE c_oserct_errdirVAL;
-
- extern BYTE c_oserct_errbartypeVAL;
-
- extern BYTE c_oserct_errvaltypeVAL;
-
- extern BYTE c_oserct_numdatasourceNUMLIT;
- extern BYTE c_oserct_numdatasourceNUMREF;
-
- extern BYTE c_oserct_numdataFORMATCODE;
- extern BYTE c_oserct_numdataPTCOUNT;
- extern BYTE c_oserct_numdataPT;
- extern BYTE c_oserct_numdataEXTLST;
-
- extern BYTE c_oserct_numvalV;
- extern BYTE c_oserct_numvalIDX;
- extern BYTE c_oserct_numvalFORMATCODE;
-
- extern BYTE c_oserct_numrefF;
- extern BYTE c_oserct_numrefNUMCACHE;
- extern BYTE c_oserct_numrefEXTLST;
-
- extern BYTE c_oserct_axdatasourceMULTILVLSTRREF;
- extern BYTE c_oserct_axdatasourceNUMLIT;
- extern BYTE c_oserct_axdatasourceNUMREF;
- extern BYTE c_oserct_axdatasourceSTRLIT;
- extern BYTE c_oserct_axdatasourceSTRREF;
-
- extern BYTE c_oserct_multilvlstrrefF;
- extern BYTE c_oserct_multilvlstrrefMULTILVLSTRCACHE;
- extern BYTE c_oserct_multilvlstrrefEXTLST;
-
- extern BYTE c_oserct_lvlPT;
-
- extern BYTE c_oserct_multilvlstrdataPTCOUNT;
- extern BYTE c_oserct_multilvlstrdataLVL;
- extern BYTE c_oserct_multilvlstrdataEXTLST;
-
- extern BYTE c_oserct_bubblechartVARYCOLORS;
- extern BYTE c_oserct_bubblechartSER;
- extern BYTE c_oserct_bubblechartDLBLS;
- extern BYTE c_oserct_bubblechartBUBBLE3D;
- extern BYTE c_oserct_bubblechartBUBBLESCALE;
- extern BYTE c_oserct_bubblechartSHOWNEGBUBBLES;
- extern BYTE c_oserct_bubblechartSIZEREPRESENTS;
- extern BYTE c_oserct_bubblechartAXID;
- extern BYTE c_oserct_bubblechartEXTLST;
-
- extern BYTE c_oserct_bandfmtsBANDFMT;
-
- extern BYTE c_oserct_surface3dchartWIREFRAME;
- extern BYTE c_oserct_surface3dchartSER;
- extern BYTE c_oserct_surface3dchartBANDFMTS;
- extern BYTE c_oserct_surface3dchartAXID;
- extern BYTE c_oserct_surface3dchartEXTLST;
-
- extern BYTE c_oserct_surfaceserIDX;
- extern BYTE c_oserct_surfaceserORDER;
- extern BYTE c_oserct_surfaceserTX;
- extern BYTE c_oserct_surfaceserSPPR;
- extern BYTE c_oserct_surfaceserCAT;
- extern BYTE c_oserct_surfaceserVAL;
- extern BYTE c_oserct_surfaceserEXTLST;
-
- extern BYTE c_oserct_bandfmtIDX;
- extern BYTE c_oserct_bandfmtSPPR;
-
- extern BYTE c_oserct_surfacechartWIREFRAME;
- extern BYTE c_oserct_surfacechartSER;
- extern BYTE c_oserct_surfacechartBANDFMTS;
- extern BYTE c_oserct_surfacechartAXID;
- extern BYTE c_oserct_surfacechartEXTLST;
-
- extern BYTE c_oserct_secondpiesizeVAL;
-
- extern BYTE c_oserct_splittypeVAL;
-
- extern BYTE c_oserct_ofpietypeVAL;
-
- extern BYTE c_oserct_custsplitSECONDPIEPT;
-
- extern BYTE c_oserct_ofpiechartOFPIETYPE;
- extern BYTE c_oserct_ofpiechartVARYCOLORS;
- extern BYTE c_oserct_ofpiechartSER;
- extern BYTE c_oserct_ofpiechartDLBLS;
- extern BYTE c_oserct_ofpiechartGAPWIDTH;
- extern BYTE c_oserct_ofpiechartSPLITTYPE;
- extern BYTE c_oserct_ofpiechartSPLITPOS;
- extern BYTE c_oserct_ofpiechartCUSTSPLIT;
- extern BYTE c_oserct_ofpiechartSECONDPIESIZE;
- extern BYTE c_oserct_ofpiechartSERLINES;
- extern BYTE c_oserct_ofpiechartEXTLST;
-
- extern BYTE c_oserct_pieserIDX;
- extern BYTE c_oserct_pieserORDER;
- extern BYTE c_oserct_pieserTX;
- extern BYTE c_oserct_pieserSPPR;
- extern BYTE c_oserct_pieserEXPLOSION;
- extern BYTE c_oserct_pieserDPT;
- extern BYTE c_oserct_pieserDLBLS;
- extern BYTE c_oserct_pieserCAT;
- extern BYTE c_oserct_pieserVAL;
- extern BYTE c_oserct_pieserEXTLST;
-
- extern BYTE c_oserct_gapamountVAL;
-
- extern BYTE c_oserct_bar3dchartBARDIR;
- extern BYTE c_oserct_bar3dchartGROUPING;
- extern BYTE c_oserct_bar3dchartVARYCOLORS;
- extern BYTE c_oserct_bar3dchartSER;
- extern BYTE c_oserct_bar3dchartDLBLS;
- extern BYTE c_oserct_bar3dchartGAPWIDTH;
- extern BYTE c_oserct_bar3dchartGAPDEPTH;
- extern BYTE c_oserct_bar3dchartSHAPE;
- extern BYTE c_oserct_bar3dchartAXID;
- extern BYTE c_oserct_bar3dchartEXTLST;
-
- extern BYTE c_oserct_bardirVAL;
-
- extern BYTE c_oserct_bargroupingVAL;
-
- extern BYTE c_oserct_barserIDX;
- extern BYTE c_oserct_barserORDER;
- extern BYTE c_oserct_barserTX;
- extern BYTE c_oserct_barserSPPR;
- extern BYTE c_oserct_barserINVERTIFNEGATIVE;
- extern BYTE c_oserct_barserPICTUREOPTIONS;
- extern BYTE c_oserct_barserDPT;
- extern BYTE c_oserct_barserDLBLS;
- extern BYTE c_oserct_barserTRENDLINE;
- extern BYTE c_oserct_barserERRBARS;
- extern BYTE c_oserct_barserCAT;
- extern BYTE c_oserct_barserVAL;
- extern BYTE c_oserct_barserSHAPE;
- extern BYTE c_oserct_barserEXTLST;
-
- extern BYTE c_oserct_shapeVAL;
-
- extern BYTE c_oserct_overlapVAL;
-
- extern BYTE c_oserct_barchartBARDIR;
- extern BYTE c_oserct_barchartGROUPING;
- extern BYTE c_oserct_barchartVARYCOLORS;
- extern BYTE c_oserct_barchartSER;
- extern BYTE c_oserct_barchartDLBLS;
- extern BYTE c_oserct_barchartGAPWIDTH;
- extern BYTE c_oserct_barchartOVERLAP;
- extern BYTE c_oserct_barchartSERLINES;
- extern BYTE c_oserct_barchartAXID;
- extern BYTE c_oserct_barchartEXTLST;
-
- extern BYTE c_oserct_holesizeVAL;
-
- extern BYTE c_oserct_doughnutchartVARYCOLORS;
- extern BYTE c_oserct_doughnutchartSER;
- extern BYTE c_oserct_doughnutchartDLBLS;
- extern BYTE c_oserct_doughnutchartFIRSTSLICEANG;
- extern BYTE c_oserct_doughnutchartHOLESIZE;
- extern BYTE c_oserct_doughnutchartEXTLST;
-
- extern BYTE c_oserct_firstsliceangVAL;
-
- extern BYTE c_oserct_pie3dchartVARYCOLORS;
- extern BYTE c_oserct_pie3dchartSER;
- extern BYTE c_oserct_pie3dchartDLBLS;
- extern BYTE c_oserct_pie3dchartEXTLST;
-
- extern BYTE c_oserct_piechartVARYCOLORS;
- extern BYTE c_oserct_piechartSER;
- extern BYTE c_oserct_piechartDLBLS;
- extern BYTE c_oserct_piechartFIRSTSLICEANG;
- extern BYTE c_oserct_piechartEXTLST;
-
- extern BYTE c_oserct_scatterserIDX;
- extern BYTE c_oserct_scatterserORDER;
- extern BYTE c_oserct_scatterserTX;
- extern BYTE c_oserct_scatterserSPPR;
- extern BYTE c_oserct_scatterserMARKER;
- extern BYTE c_oserct_scatterserDPT;
- extern BYTE c_oserct_scatterserDLBLS;
- extern BYTE c_oserct_scatterserTRENDLINE;
- extern BYTE c_oserct_scatterserERRBARS;
- extern BYTE c_oserct_scatterserXVAL;
- extern BYTE c_oserct_scatterserYVAL;
- extern BYTE c_oserct_scatterserSMOOTH;
- extern BYTE c_oserct_scatterserEXTLST;
-
- extern BYTE c_oserct_scatterstyleVAL;
-
- extern BYTE c_oserct_scatterchartSCATTERSTYLE;
- extern BYTE c_oserct_scatterchartVARYCOLORS;
- extern BYTE c_oserct_scatterchartSER;
- extern BYTE c_oserct_scatterchartDLBLS;
- extern BYTE c_oserct_scatterchartAXID;
- extern BYTE c_oserct_scatterchartEXTLST;
-
- extern BYTE c_oserct_radarserIDX;
- extern BYTE c_oserct_radarserORDER;
- extern BYTE c_oserct_radarserTX;
- extern BYTE c_oserct_radarserSPPR;
- extern BYTE c_oserct_radarserMARKER;
- extern BYTE c_oserct_radarserDPT;
- extern BYTE c_oserct_radarserDLBLS;
- extern BYTE c_oserct_radarserCAT;
- extern BYTE c_oserct_radarserVAL;
- extern BYTE c_oserct_radarserEXTLST;
-
- extern BYTE c_oserct_radarstyleVAL;
-
- extern BYTE c_oserct_radarchartRADARSTYLE;
- extern BYTE c_oserct_radarchartVARYCOLORS;
- extern BYTE c_oserct_radarchartSER;
- extern BYTE c_oserct_radarchartDLBLS;
- extern BYTE c_oserct_radarchartAXID;
- extern BYTE c_oserct_radarchartEXTLST;
-
- extern BYTE c_oserct_stockchartSER;
- extern BYTE c_oserct_stockchartDLBLS;
- extern BYTE c_oserct_stockchartDROPLINES;
- extern BYTE c_oserct_stockchartHILOWLINES;
- extern BYTE c_oserct_stockchartUPDOWNBARS;
- extern BYTE c_oserct_stockchartAXID;
- extern BYTE c_oserct_stockchartEXTLST;
-
- extern BYTE c_oserct_lineserIDX;
- extern BYTE c_oserct_lineserORDER;
- extern BYTE c_oserct_lineserTX;
- extern BYTE c_oserct_lineserSPPR;
- extern BYTE c_oserct_lineserMARKER;
- extern BYTE c_oserct_lineserDPT;
- extern BYTE c_oserct_lineserDLBLS;
- extern BYTE c_oserct_lineserTRENDLINE;
- extern BYTE c_oserct_lineserERRBARS;
- extern BYTE c_oserct_lineserCAT;
- extern BYTE c_oserct_lineserVAL;
- extern BYTE c_oserct_lineserSMOOTH;
- extern BYTE c_oserct_lineserEXTLST;
-
- extern BYTE c_oserct_updownbarsGAPWIDTH;
- extern BYTE c_oserct_updownbarsUPBARS;
- extern BYTE c_oserct_updownbarsDOWNBARS;
- extern BYTE c_oserct_updownbarsEXTLST;
-
- extern BYTE c_oserct_updownbarSPPR;
-
- extern BYTE c_oserct_line3dchartGROUPING;
- extern BYTE c_oserct_line3dchartVARYCOLORS;
- extern BYTE c_oserct_line3dchartSER;
- extern BYTE c_oserct_line3dchartDLBLS;
- extern BYTE c_oserct_line3dchartDROPLINES;
- extern BYTE c_oserct_line3dchartGAPDEPTH;
- extern BYTE c_oserct_line3dchartAXID;
- extern BYTE c_oserct_line3dchartEXTLST;
-
- extern BYTE c_oserct_groupingVAL;
-
- extern BYTE c_oserct_linechartGROUPING;
- extern BYTE c_oserct_linechartVARYCOLORS;
- extern BYTE c_oserct_linechartSER;
- extern BYTE c_oserct_linechartDLBLS;
- extern BYTE c_oserct_linechartDROPLINES;
- extern BYTE c_oserct_linechartHILOWLINES;
- extern BYTE c_oserct_linechartUPDOWNBARS;
- extern BYTE c_oserct_linechartMARKER;
- extern BYTE c_oserct_linechartSMOOTH;
- extern BYTE c_oserct_linechartAXID;
- extern BYTE c_oserct_linechartEXTLST;
-
- extern BYTE c_oserct_area3dchartGROUPING;
- extern BYTE c_oserct_area3dchartVARYCOLORS;
- extern BYTE c_oserct_area3dchartSER;
- extern BYTE c_oserct_area3dchartDLBLS;
- extern BYTE c_oserct_area3dchartDROPLINES;
- extern BYTE c_oserct_area3dchartGAPDEPTH;
- extern BYTE c_oserct_area3dchartAXID;
- extern BYTE c_oserct_area3dchartEXTLST;
-
- extern BYTE c_oserct_areaserIDX;
- extern BYTE c_oserct_areaserORDER;
- extern BYTE c_oserct_areaserTX;
- extern BYTE c_oserct_areaserSPPR;
- extern BYTE c_oserct_areaserPICTUREOPTIONS;
- extern BYTE c_oserct_areaserDPT;
- extern BYTE c_oserct_areaserDLBLS;
- extern BYTE c_oserct_areaserTRENDLINE;
- extern BYTE c_oserct_areaserERRBARS;
- extern BYTE c_oserct_areaserCAT;
- extern BYTE c_oserct_areaserVAL;
- extern BYTE c_oserct_areaserEXTLST;
-
- extern BYTE c_oserct_areachartGROUPING;
- extern BYTE c_oserct_areachartVARYCOLORS;
- extern BYTE c_oserct_areachartSER;
- extern BYTE c_oserct_areachartDLBLS;
- extern BYTE c_oserct_areachartDROPLINES;
- extern BYTE c_oserct_areachartAXID;
- extern BYTE c_oserct_areachartEXTLST;
-
- extern BYTE c_oserct_plotareaLAYOUT;
- extern BYTE c_oserct_plotareaITEMS;
- extern BYTE c_oserct_plotareaAREA3DCHART;
- extern BYTE c_oserct_plotareaAREACHART;
- extern BYTE c_oserct_plotareaBAR3DCHART;
- extern BYTE c_oserct_plotareaBARCHART;
- extern BYTE c_oserct_plotareaBUBBLECHART;
- extern BYTE c_oserct_plotareaDOUGHNUTCHART;
- extern BYTE c_oserct_plotareaLINE3DCHART;
- extern BYTE c_oserct_plotareaLINECHART;
- extern BYTE c_oserct_plotareaOFPIECHART;
- extern BYTE c_oserct_plotareaPIE3DCHART;
- extern BYTE c_oserct_plotareaPIECHART;
- extern BYTE c_oserct_plotareaRADARCHART;
- extern BYTE c_oserct_plotareaSCATTERCHART;
- extern BYTE c_oserct_plotareaSTOCKCHART;
- extern BYTE c_oserct_plotareaSURFACE3DCHART;
- extern BYTE c_oserct_plotareaSURFACECHART;
- extern BYTE c_oserct_plotareaITEMS1;
- extern BYTE c_oserct_plotareaCATAX;
- extern BYTE c_oserct_plotareaDATEAX;
- extern BYTE c_oserct_plotareaSERAX;
- extern BYTE c_oserct_plotareaVALAX;
- extern BYTE c_oserct_plotareaDTABLE;
- extern BYTE c_oserct_plotareaSPPR;
- extern BYTE c_oserct_plotareaEXTLST;
-
- extern BYTE c_oserct_thicknessVAL;
-
- extern BYTE c_oserct_surfaceTHICKNESS;
- extern BYTE c_oserct_surfaceSPPR;
- extern BYTE c_oserct_surfacePICTUREOPTIONS;
- extern BYTE c_oserct_surfaceEXTLST;
-
- extern BYTE c_oserct_perspectiveVAL;
-
- extern BYTE c_oserct_depthpercentVAL;
-
- extern BYTE c_oserct_rotyVAL;
-
- extern BYTE c_oserct_hpercentVAL;
-
- extern BYTE c_oserct_rotxVAL;
-
- extern BYTE c_oserct_view3dROTX;
- extern BYTE c_oserct_view3dHPERCENT;
- extern BYTE c_oserct_view3dROTY;
- extern BYTE c_oserct_view3dDEPTHPERCENT;
- extern BYTE c_oserct_view3dRANGAX;
- extern BYTE c_oserct_view3dPERSPECTIVE;
- extern BYTE c_oserct_view3dEXTLST;
-
- extern BYTE c_oserct_pivotfmtIDX;
- extern BYTE c_oserct_pivotfmtSPPR;
- extern BYTE c_oserct_pivotfmtTXPR;
- extern BYTE c_oserct_pivotfmtMARKER;
- extern BYTE c_oserct_pivotfmtDLBL;
- extern BYTE c_oserct_pivotfmtEXTLST;
-
- extern BYTE c_oserct_pivotfmtsPIVOTFMT;
-
- extern BYTE c_oserct_chartTITLE;
- extern BYTE c_oserct_chartAUTOTITLEDELETED;
- extern BYTE c_oserct_chartPIVOTFMTS;
- extern BYTE c_oserct_chartVIEW3D;
- extern BYTE c_oserct_chartFLOOR;
- extern BYTE c_oserct_chartSIDEWALL;
- extern BYTE c_oserct_chartBACKWALL;
- extern BYTE c_oserct_chartPLOTAREA;
- extern BYTE c_oserct_chartLEGEND;
- extern BYTE c_oserct_chartPLOTVISONLY;
- extern BYTE c_oserct_chartDISPBLANKSAS;
- extern BYTE c_oserct_chartSHOWDLBLSOVERMAX;
- extern BYTE c_oserct_chartEXTLST;
-
- extern BYTE c_oserct_protectionCHARTOBJECT;
- extern BYTE c_oserct_protectionDATA;
- extern BYTE c_oserct_protectionFORMATTING;
- extern BYTE c_oserct_protectionSELECTION;
- extern BYTE c_oserct_protectionUSERINTERFACE;
-
- extern BYTE c_oserct_pivotsourceNAME;
- extern BYTE c_oserct_pivotsourceFMTID;
- extern BYTE c_oserct_pivotsourceEXTLST;
-
- extern BYTE c_oserct_style1VAL;
-
- extern BYTE c_oserct_styleVAL;
-
- extern BYTE c_oserct_textlanguageidVAL;
-
- extern BYTE c_oseralternatecontentCHOICE;
- extern BYTE c_oseralternatecontentFALLBACK;
-
- extern BYTE c_oseralternatecontentchoiceSTYLE;
- extern BYTE c_oseralternatecontentchoiceREQUIRES;
-
- extern BYTE c_oseralternatecontentfallbackSTYLE;
-
class BinaryChartReader : public Binary_CommonReader
{
LPSAFEARRAY m_pArray;