Commit 58f8d13d authored by ElenaSubbotina's avatar ElenaSubbotina

.

parent d6413057
...@@ -894,7 +894,9 @@ namespace BinXlsxRW ...@@ -894,7 +894,9 @@ namespace BinXlsxRW
else if(c_oserct_chartspaceCLRMAPOVR == type) else if(c_oserct_chartspaceCLRMAPOVR == type)
{ {
poVal->m_oClrMapOvr = new PPTX::Logic::ClrMap(); poVal->m_oClrMapOvr = new PPTX::Logic::ClrMap();
res = Read1(length, &BinaryChartReader::ReadCT_ClrMapOvr, this, poVal->m_oClrMapOvr.GetPointer());
poVal->m_oClrMapOvr->m_name = L"c:clrMapOvr";
poVal->m_oClrMapOvr->fromPPTY(&m_oBufferedStream);
} }
else if(c_oserct_chartspacePIVOTSOURCE == type) else if(c_oserct_chartspacePIVOTSOURCE == type)
{ {
...@@ -1029,22 +1031,6 @@ namespace BinXlsxRW ...@@ -1029,22 +1031,6 @@ namespace BinXlsxRW
} }
return res; return res;
} }
int BinaryChartReader::ReadCT_ClrMapOvr(BYTE type, long length, void* poResult)
{
int res = c_oSerConstants::ReadOk;
PPTX::Logic::ClrMap* poVal = static_cast<PPTX::Logic::ClrMap*>(poResult);
if(length > 0)
{
poVal->m_name = L"c:clrMapOvr";
long nCurPos = m_oBufferedStream.GetPos();
//BYTE typeRec1 = m_oBufferedStream.GetUChar();
poVal->fromPPTY(&m_oBufferedStream);
m_oBufferedStream.Seek(nCurPos + length);
}
return res;
}
int BinaryChartReader::ReadCT_RelId(long length, CT_RelId* poResult) int BinaryChartReader::ReadCT_RelId(long length, CT_RelId* poResult)
{ {
return Read1(length, &BinaryChartReader::ReadCT_RelId, this, poResult); return Read1(length, &BinaryChartReader::ReadCT_RelId, this, poResult);
......
...@@ -203,7 +203,6 @@ namespace BinXlsxRW ...@@ -203,7 +203,6 @@ namespace BinXlsxRW
int ReadAlternateContentFallback(BYTE type, long length, void* poResult); int ReadAlternateContentFallback(BYTE type, long length, void* poResult);
int ReadCT_SpPr (BYTE type, long length, void* poResult); int ReadCT_SpPr (BYTE type, long length, void* poResult);
int ReadCT_TxPr (BYTE type, long length, void* poResult); int ReadCT_TxPr (BYTE type, long length, void* poResult);
int ReadCT_ClrMapOvr (BYTE type, long length, void* poResult);
}; };
class BinaryChartWriter class BinaryChartWriter
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment