Skip to content

O
onlyoffice_core
Commit 5ae4d7f8 authored by ElenaSubbotina's avatar ElenaSubbotina
Browse files
Options

XlsFormat - ...

parent 4d836c18
Hide whitespace changes
Inline Side-by-side
Showing with 534 additions and 1059 deletions
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/OleDbConn.cpp
View file @ 5ae4d7f8
...@@ -56,6 +56,8 @@ void OleDbConn::readFields(CFRecord& record) ...@@ -56,6 +56,8 @@ void OleDbConn::readFields(CFRecord& record)
fPasswd = GETBIT(flags, 0); fPasswd = GETBIT(flags, 0);
fLocal = GETBIT(flags, 1); fLocal = GETBIT(flags, 1);
record.skipNunBytes(4); //reserved2
} }
} // namespace XLS } // namespace XLS
......
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/SXAddl.cpp
View file @ 5ae4d7f8
...@@ -48,7 +48,7 @@ void XLUnicodeStringSegmentedSXADDL::load(CFRecord& record) ...@@ -48,7 +48,7 @@ void XLUnicodeStringSegmentedSXADDL::load(CFRecord& record)
} }
//----------------------------------------- //-----------------------------------------
SXAddl::SXAddl() SXAddl::SXAddl() : bEndElement(false), bStartElement(false)
{ {
} }
...@@ -93,6 +93,9 @@ void SXAddl::readFields(CFRecord& record) ...@@ -93,6 +93,9 @@ void SXAddl::readFields(CFRecord& record)
if (content) if (content)
content->load(record); content->load(record);
if (sxd == 0x00) bStartElement = true;
if (sxd == 0xff) bEndElement = true;
} }
BiffStructurePtr SXAddl::createSxcView(CFRecord& record) BiffStructurePtr SXAddl::createSxcView(CFRecord& record)
{ {
...@@ -329,6 +332,16 @@ void SXAddl_SXCView_SXDId::load(CFRecord& record) ...@@ -329,6 +332,16 @@ void SXAddl_SXCView_SXDId::load(CFRecord& record)
record >> stName; record >> stName;
} }
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
BiffStructurePtr SXAddl_SXCQsi_SXDId::clone()
{
return BiffStructurePtr(new SXAddl_SXCQsi_SXDId(*this));
}
void SXAddl_SXCQsi_SXDId::load(CFRecord& record)
{
record >> stName;
}
//----------------------------------------------------------------------------
BiffStructurePtr SXAddl_SXCView_SXDVer10Info::clone() BiffStructurePtr SXAddl_SXCView_SXDVer10Info::clone()
{ {
return BiffStructurePtr(new SXAddl_SXCView_SXDVer10Info(*this)); return BiffStructurePtr(new SXAddl_SXCView_SXDVer10Info(*this));
......
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/SXAddl.h
View file @ 5ae4d7f8
...@@ -68,6 +68,9 @@ public: ...@@ -68,6 +68,9 @@ public:
static const ElementType type = typeSXAddl; static const ElementType type = typeSXAddl;
bool bStartElement;
bool bEndElement;
_UINT32 frtHeaderOld; _UINT32 frtHeaderOld;
unsigned char sxc; unsigned char sxc;
unsigned char sxd; unsigned char sxd;
...@@ -95,6 +98,7 @@ private: ...@@ -95,6 +98,7 @@ private:
BiffStructurePtr createSxcSXFilters12(CFRecord& record); BiffStructurePtr createSxcSXFilters12(CFRecord& record);
BiffStructurePtr createSxcSXFilter12(CFRecord& record); BiffStructurePtr createSxcSXFilter12(CFRecord& record);
}; };
class Continue_SxaddlSxString : public BiffStructure class Continue_SxaddlSxString : public BiffStructure
{ {
BASE_STRUCTURE_DEFINE_CLASS_NAME(Continue_SxaddlSxString) BASE_STRUCTURE_DEFINE_CLASS_NAME(Continue_SxaddlSxString)
...@@ -556,106 +560,21 @@ public: ...@@ -556,106 +560,21 @@ public:
bool fNoHeaders; bool fNoHeaders;
}; };
//class SXAddl_SXCCacheItem_SXDItmMpMapCount : public SXAddl {}; class SXAddl_SXCQsi_SXDId : public BiffStructure
//class SXAddl_SXCCacheItem_SXDItmMpropMap : public SXAddl {}; {
//class SXAddl_SXCCacheItem_SXDSxrmitmDisp : public SXAddl {}; BASE_STRUCTURE_DEFINE_CLASS_NAME(SXAddl_SXCQsi_SXDId)
// public:
//class SXAddl_SXCField12_SXDAutoshow : public SXAddl {}; BiffStructurePtr clone();
//class SXAddl_SXCField12_SXDEnd : public SXAddl {};
//class SXAddl_SXCField12_SXDId : public SXAddl {}; SXAddl_SXCQsi_SXDId(){}
//class SXAddl_SXCField12_SXDISXTH : public SXAddl {}; ~SXAddl_SXCQsi_SXDId(){}
//class SXAddl_SXCField12_SXDMemberCaption : public SXAddl {};
//class SXAddl_SXCField12_SXDVer12Info : public SXAddl {}; static const ElementType type = typeSXAddl;
//class SXAddl_SXCField12_SXDVerUpdInv : public SXAddl {};
// virtual void load(CFRecord& record);
//
//class SXAddl_SXCGroup_SXDEnd : public SXAddl {}; XLUnicodeStringSegmentedSXADDL stName;
//class SXAddl_SXCGroup_SXDGrpInfo : public SXAddl {}; };
//class SXAddl_SXCGroup_SXDId : public SXAddl {};
//class SXAddl_SXCGroup_SXDMember : public SXAddl {};
//
//class SXAddl_SXCGrpLevel_SXDEnd : public SXAddl {};
//class SXAddl_SXCGrpLevel_SXDGrpLevelInfo : public SXAddl {};
//class SXAddl_SXCGrpLevel_SXDId : public SXAddl {};
//
//class SXAddl_SXCHierarchy_SXDDisplayFolder : public SXAddl {};
//class SXAddl_SXCHierarchy_SXDEnd : public SXAddl {};
//class SXAddl_SXCHierarchy_SXDFilterMember : public SXAddl {};
//class SXAddl_SXCHierarchy_SXDFilterMember12 : public SXAddl {};
//class SXAddl_SXCHierarchy_SXDIconSet : public SXAddl {};
//class SXAddl_SXCHierarchy_SXDId : public SXAddl {};
//class SXAddl_SXCHierarchy_SXDInfo12 : public SXAddl {};
//class SXAddl_SXCHierarchy_SXDKPIGoal : public SXAddl {};
//class SXAddl_SXCHierarchy_SXDKPIStatus : public SXAddl {};
//class SXAddl_SXCHierarchy_SXDKPITime : public SXAddl {};
//class SXAddl_SXCHierarchy_SXDKPITrend : public SXAddl {};
//class SXAddl_SXCHierarchy_SXDKPIValue : public SXAddl {};
//class SXAddl_SXCHierarchy_SXDKPIWeight : public SXAddl {};
//class SXAddl_SXCHierarchy_SXDMeasureGrp : public SXAddl {};
//class SXAddl_SXCHierarchy_SXDParentKPI : public SXAddl {};
//class SXAddl_SXCHierarchy_SXDProperty : public SXAddl {};
//class SXAddl_SXCHierarchy_SXDSXSetParentUnique : public SXAddl {};
//class SXAddl_SXCHierarchy_SXDUserCaption : public SXAddl {};
//class SXAddl_SXCHierarchy_SXDVerUpdInv : public SXAddl {};
//
//class SXAddl_SXCQsi_SXDEnd : public SXAddl {};
//class SXAddl_SXCQsi_SXDId : public SXAddl {};
//
//class SXAddl_SXCQuery_SXDEnd : public SXAddl {};
//class SXAddl_SXCQuery_SXDReconnCond : public SXAddl {};
//class SXAddl_SXCQuery_SXDSrcConnFile : public SXAddl {};
//class SXAddl_SXCQuery_SXDSrcDataFile : public SXAddl {};
//class SXAddl_SXCQuery_SXDXMLSource : public SXAddl {};
//
//class SXAddl_SXCSXCondFmt_SXDEnd : public SXAddl {};
//class SXAddl_SXCSXCondFmt_SXDSXCondFmt : public SXAddl {};
//class SXAddl_SXCSXCondFmts_SXDEnd : public SXAddl {};
//class SXAddl_SXCSXCondFmts_SXDId : public SXAddl {};
//class SXAddl_SXCSXDH_SXDEnd : public SXAddl {};
//class SXAddl_SXCSXDH_SXDId : public SXAddl {};
//class SXAddl_SXCSXDH_SXDSxdh : public SXAddl {};
//
//class SXAddl_SXCSXfilt_SXDEnd : public SXAddl {};
//class SXAddl_SXCSXfilt_SXDId : public SXAddl {};
//class SXAddl_SXCSXfilt_SXDSXfilt : public SXAddl {};
//class SXAddl_SXCSXfilt_SXDSXItm : public SXAddl {};
//
//class SXAddl_SXCSXFilter12_SXDCaption : public SXAddl {};
//class SXAddl_SXCSXFilter12_SXDEnd : public SXAddl {};
//class SXAddl_SXCSXFilter12_SXDId : public SXAddl {};
//class SXAddl_SXCSXFilter12_SXDSXFilter : public SXAddl {};
//class SXAddl_SXCSXFilter12_SXDSXFilterDesc : public SXAddl {};
//class SXAddl_SXCSXFilter12_SXDSXFilterValue1: public SXAddl {};
//class SXAddl_SXCSXFilter12_SXDSXFilterValue2: public SXAddl {};
//class SXAddl_SXCSXFilter12_SXDXlsFilter : public SXAddl {};
//class SXAddl_SXCSXFilter12_SXDXlsFilterValue1: public SXAddl {};
//class SXAddl_SXCSXFilter12_SXDXlsFilterValue2: public SXAddl {};
//class SXAddl_SXCSXFilters12_SXDEnd : public SXAddl {};
//class SXAddl_SXCSXFilters12_SXDId : public SXAddl {};
//
//class SXAddl_SXCSXMg_SXDEnd : public SXAddl {};
//class SXAddl_SXCSXMg_SXDId : public SXAddl {};
//class SXAddl_SXCSXMg_SXDUserCaption : public SXAddl {};
//
//class SXAddl_SXCSXMgs_SXDEnd : public SXAddl {};
//class SXAddl_SXCSXMgs_SXDId : public SXAddl {};
//class SXAddl_SXCSXMgs_SXDMGrpSXDHMap : public SXAddl {};
//
//class SXAddl_SXCSXrule_SXDEnd : public SXAddl {};
//class SXAddl_SXCSXrule_SXDId : public SXAddl {};
//class SXAddl_SXCSXrule_SXDSXrule : public SXAddl {};
//
//class SXAddl_SXCView_SXDCalcMember : public SXAddl {};
//class SXAddl_SXCView_SXDCalcMemString : public SXAddl {};
//class SXAddl_SXCView_SXDCompactColHdr : public SXAddl {};
//class SXAddl_SXCView_SXDCompactRwHdr : public SXAddl {};
//class SXAddl_SXCView_SXDSXPIIvmb
//{
// SXAddl_SXCView_SXDSXPIIvmb(CFRecord& record);
//};
//class SXAddl_SXCView_SXDVerUpdInv : public SXAddl {};
} // namespace XLS } // namespace XLS
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/DBQUERY.cpp
View file @ 5ae4d7f8
...@@ -31,8 +31,11 @@ ...@@ -31,8 +31,11 @@
*/ */
#include "DBQUERY.h" #include "DBQUERY.h"
#include "DBQUERYEXT.h"
#include "../Biff_records/DbOrParamQry.h" #include "../Biff_records/DbOrParamQry.h"
#include "../Biff_records/SXString.h" #include "../Biff_records/SXString.h"
#include "../Biff_records/TxtQry.h"
namespace XLS namespace XLS
{ {
...@@ -184,7 +187,9 @@ const bool DBQUERY::loadContent(BinProcessor& proc) ...@@ -184,7 +187,9 @@ const bool DBQUERY::loadContent(BinProcessor& proc)
int DBQUERY::serialize(std::wostream & strm) int DBQUERY::serialize(std::wostream & strm)
{ {
int connectionId = serialize_connection(); std::wstring name;
int connectionId = serialize_connection(name);
CP_XML_WRITER(strm) CP_XML_WRITER(strm)
{ {
...@@ -197,55 +202,90 @@ int DBQUERY::serialize(std::wostream & strm) ...@@ -197,55 +202,90 @@ int DBQUERY::serialize(std::wostream & strm)
return 0; return 0;
} }
int DBQUERY::serialize_connection() int DBQUERY::serialize_connection(std::wstring & name, DBQUERYEXT *query_ext)
{ {
DbOrParamQry* queryOrParam = dynamic_cast<DbOrParamQry*>(m_DbQry.get()); DbOrParamQry* queryOrParam = dynamic_cast<DbOrParamQry*>(m_DbQry.get());
if (!queryOrParam) return -1; if (!queryOrParam) return -1;
int connectionId = ++global_info->connectionId; ++global_info->connectionId;
if (name.empty())
name = L"Connection" + std::to_wstring(global_info->connectionId);
CP_XML_WRITER(global_info->connections_stream) CP_XML_WRITER(global_info->connections_stream)
{ {
CP_XML_NODE(L"connection") CP_XML_NODE(L"connection")
{ {
CP_XML_ATTR(L"id", connectionId); CP_XML_ATTR(L"id", global_info->connectionId);
CP_XML_ATTR(L"name", L"Connection" + std::to_wstring(connectionId)); CP_XML_ATTR(L"name", name);
CP_XML_ATTR(L"type", queryOrParam->query.dbt); CP_XML_ATTR(L"type", queryOrParam->query.dbt);
//switch(queryOrParam->query.dbt) //background="1"
//{ //saveData="1"
// case 0x1:
// case 0x2:
// case 0x3:
// case 0x4:
// case 0x5:
// case 0x6:
// case 0x7:
//}
if (queryOrParam->query.fSavePwd) CP_XML_ATTR(L"savePassword", 1); if (queryOrParam->query.fSavePwd) CP_XML_ATTR(L"savePassword", 1);
CP_XML_ATTR(L"refreshedVersion", 1); CP_XML_ATTR(L"refreshedVersion", 1);
int index = 0; if (queryOrParam->query.dbt == 6)
CP_XML_NODE(L"dbPr")
{ {
std::wstring command, connection; TxtQry *query_txt = dynamic_cast<TxtQry*>(query_ext->m_TxtQry.get());
for (index = 0; index < queryOrParam->query.cstQuery; index++) if (query_txt)
{ {
command += m_arSXString[index]; CP_XML_NODE(L"textPr")
{
CP_XML_ATTR(L"sourceFile", query_txt->rgchFile.value());
//delimited="0"
CP_XML_NODE(L"textFields")
{
for (size_t i = 0; i < query_txt->rgtxtwf.size(); i++)
{
CP_XML_NODE(L"textField")
{
switch(query_txt->rgtxtwf[i].fieldType)
{
case 0: CP_XML_ATTR(L"type", L"general"); break;
case 1: CP_XML_ATTR(L"type", L"text"); break;
case 2: CP_XML_ATTR(L"type", L"MDY"); break;
case 3: CP_XML_ATTR(L"type", L"DMY"); break;
case 4: CP_XML_ATTR(L"type", L"YMD"); break;
case 5: CP_XML_ATTR(L"type", L"MYD"); break;
case 6: CP_XML_ATTR(L"type", L"DYM"); break;
case 7: CP_XML_ATTR(L"type", L"YDM"); break;
case 8: CP_XML_ATTR(L"type", L"skip"); break;
case 9: CP_XML_ATTR(L"type", L"EMD"); break;
}
CP_XML_ATTR(L"position", query_txt->rgtxtwf[i].fieldStart);
}
}
}
}
} }
}
for (; index < queryOrParam->query.cstQuery + queryOrParam->query.cstOdbcConn; index++) else
{
int index = 0;
CP_XML_NODE(L"dbPr")
{ {
connection += m_arSXString[index]; std::wstring command, connection;
for (index = 0; index < queryOrParam->query.cstQuery; index++)
{
command += m_arSXString[index];
}
for (; index < queryOrParam->query.cstQuery + queryOrParam->query.cstOdbcConn; index++)
{
connection += m_arSXString[index];
}
CP_XML_ATTR(L"connection", connection);
CP_XML_ATTR(L"command", command);
} }
CP_XML_ATTR(L"connection", connection);
CP_XML_ATTR(L"command", command);
} }
} }
} }
return connectionId; return global_info->connectionId;
} }
......
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/DBQUERY.h
View file @ 5ae4d7f8
...@@ -35,11 +35,13 @@ ...@@ -35,11 +35,13 @@
namespace XLS namespace XLS
{ {
struct _DbParam struct _DbParam
{ {
std::wstring string; std::wstring string;
BaseObjectPtr param; BaseObjectPtr param;
}; };
class DBQUERYEXT;
class DBQUERY: public CompositeObject class DBQUERY: public CompositeObject
{ {
...@@ -53,7 +55,8 @@ public: ...@@ -53,7 +55,8 @@ public:
virtual const bool loadContent(BinProcessor& proc); virtual const bool loadContent(BinProcessor& proc);
int serialize(std::wostream & stream); int serialize(std::wostream & stream);
int serialize_connection();
int serialize_connection(std::wstring & name, DBQUERYEXT *query_ext = NULL);
BaseObjectPtr m_DbQry; BaseObjectPtr m_DbQry;
......
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/PIVOTADDL.cpp
View file @ 5ae4d7f8
...@@ -31,20 +31,17 @@ ...@@ -31,20 +31,17 @@
*/ */
#include "PIVOTADDL.h" #include "PIVOTADDL.h"
#include <Logic/Biff_records/SXAddl.h>
#include <Logic/Biff_unions/SXADDLCALCMEMBER.h> #include "../Biff_records/SXAddl.h"
#include <Logic/Biff_unions/SXADDLHIERARCHY.h>
#include <Logic/Biff_unions/SXADDLFIELD.h>
#include <Logic/Biff_unions/UNKNOWNFRT.h>
#include <Logic/Biff_unions/SXADDLCONDFMTS.h>
#include <Logic/Biff_unions/SXADDLSXFILTERS12.h>
namespace XLS namespace XLS
{ {
PIVOTADDL::PIVOTADDL() PIVOTADDL::PIVOTADDL() : current( &content)
{ {
_sxAddl elm(NULL, 0);
current->push_back(elm);
} }
PIVOTADDL::~PIVOTADDL() PIVOTADDL::~PIVOTADDL()
...@@ -72,133 +69,70 @@ PIVOTADDL = SXAddl_SXCView_SXDId *Continue_SxaddlSxString ...@@ -72,133 +69,70 @@ PIVOTADDL = SXAddl_SXCView_SXDId *Continue_SxaddlSxString
const bool PIVOTADDL::loadContent(BinProcessor& proc) const bool PIVOTADDL::loadContent(BinProcessor& proc)
{ {
int count = proc.repeated<SXAddl>(0, 0); bool result = false;
int level = 0;
for (std::list<BaseObjectPtr>::iterator it = elements_.begin(); it != elements_.end(); it++) while (true)
{ {
SXAddl* addl = dynamic_cast<SXAddl*>(it->get()); CFRecordType::TypeId type = proc.getNextRecordType();
if (type != rt_SXAddl) break;
proc.optional<SXAddl>();
SXAddl* addl = dynamic_cast<SXAddl*>(elements_.back().get());
if (!addl) continue; if (!addl) continue;
SXAddl_SXCView_SXDTableStyleClient* p1 = dynamic_cast<SXAddl_SXCView_SXDTableStyleClient*>(addl->content.get());
if (p1) if (result && addl->bStartElement)
{
level++;
_sxAddl elm(current, level);
current = &current->back().levels;
current->push_back(elm);
}
result = true;
if (addl->bEndElement)
{
if (level == 0)
break;
else level--;
current = current->back().prev;
elements_.pop_back();
continue;
}
if (level == 0)
{ {
m_SXAddl_SXCView_SXDTableStyleClient = addl->content; SXAddl_SXCView_SXDId* p0 = dynamic_cast<SXAddl_SXCView_SXDId*>(addl->content.get());
continue; if (p0)
{
m_SXAddl_SXCView_SXDId = addl->content;
}
SXAddl_SXCView_SXDTableStyleClient* p1 = dynamic_cast<SXAddl_SXCView_SXDTableStyleClient*>(addl->content.get());
if (p1)
{
m_SXAddl_SXCView_SXDTableStyleClient = addl->content;
}
SXAddl_SXCView_SXDVer10Info* p2 = dynamic_cast<SXAddl_SXCView_SXDVer10Info*>(addl->content.get());
if (p2)
{
m_SXAddl_SXCView_SXDVer10Info = addl->content;
}
SXAddl_SXCView_SXDVer12Info* p3 = dynamic_cast<SXAddl_SXCView_SXDVer12Info*>(addl->content.get());
if (p3)
{
m_SXAddl_SXCView_SXDVer12Info = addl->content;
}
} }
SXAddl_SXCView_SXDVer10Info* p2 = dynamic_cast<SXAddl_SXCView_SXDVer10Info*>(addl->content.get());
if (p2) current->back().elements.push_back(elements_.back());
{ elements_.pop_back();
m_SXAddl_SXCView_SXDVer10Info = addl->content; }
continue;
} return result;
SXAddl_SXCView_SXDVer12Info* p3 = dynamic_cast<SXAddl_SXCView_SXDVer12Info*>(addl->content.get());
if (p3)
{
m_SXAddl_SXCView_SXDVer12Info = addl->content;
continue;
}
}
//if(!proc.mandatory<SXAddl_SXCView_SXDId>())
//{
// return false;
//}
//m_SXAddl_SXCView_SXDId = elements_.back();
//elements_.pop_back();
//
//int count = proc.repeated<Continue_SxaddlSxString>(0, 0);
//
//if (proc.optional<SXAddl_SXCView_SXDVer10Info>())
//{
// m_SXAddl_SXCView_SXDVer10Info = elements_.back();
// elements_.pop_back();
//}
//if (proc.optional<SXAddl_SXCView_SXDVer12Info>())
//{
// m_SXAddl_SXCView_SXDVer12Info = elements_.back();
// elements_.pop_back();
//}
//count = proc.repeated<SXADDLCALCMEMBER>(0, 0);
//while(count > 0)
//{
// m_arSXADDLCALCMEMBER.push_back(elements_.front());
// elements_.pop_front(); count--;
//}
//count = proc.repeated<SXADDLHIERARCHY>(0, 0);
//while(count > 0)
//{
// m_arSXADDLHIERARCHY.push_back(elements_.front());
// elements_.pop_front(); count--;
//}
//count = proc.repeated<SXADDLFIELD>(0, 0);
//while(count > 0)
//{
// m_arSXADDLFIELD.push_back(elements_.front());
// elements_.pop_front(); count--;
//}
//count = proc.repeated<UNKNOWNFRT>(0, 0);
//
//if (proc.optional<SXAddl_SXCView_SXDTableStyleClient>())
//{
// m_SXAddl_SXCView_SXDTableStyleClient = elements_.back();
// elements_.pop_back();
//}
//if(proc.optional<SXAddl_SXCView_SXDCompactRwHdr>())
//{
// m_SXAddl_SXCView_SXDCompactRwHdr = elements_.back();
// elements_.pop_back();
// count = proc.repeated<Continue_SxaddlSxString>(0, 0);
//}
//if(proc.optional<SXAddl_SXCView_SXDCompactColHdr>())
//{
// m_SXAddl_SXCView_SXDCompactColHdr = elements_.back();
// elements_.pop_back();
// count = proc.repeated<Continue_SxaddlSxString>(0, 0);
//}
//if (proc.optional<SXAddl_SXCView_SXDVerUpdInv>())
//{
// m_arSXAddl_SXCView_SXDVerUpdInv.push_back(elements_.back());
// elements_.pop_back();
//}
//if (proc.optional<SXADDLCONDFMTS>())
//{
// m_SXADDLCONDFMTS = elements_.back();
// elements_.pop_back();
//}
//if (proc.optional<SXADDLSXFILTERS12>())
//{
// m_SXAddl_SXADDLSXFILTERS12 = elements_.back();
// elements_.pop_back();
//}
//count = proc.repeated<SXAddl_SXCView_SXDVerUpdInv>(0, 0);
//while(count > 0)
//{
// m_arSXAddl_SXCView_SXDVerUpdInv.push_back(elements_.front());
// elements_.pop_front(); count--;
//}
//count = proc.repeated<SXAddl_SXCView_SXDSXPIIvmb>(0, 0);
//while(count > 0)
//{
// m_arSXAddl_SXCView_SXDSXPIIvmb.push_back(elements_.front());
// elements_.pop_front(); count--;
//}
//if (proc.optional<SXAddl_SXCView_SXDVerUpdInv>())
//{
// m_arSXAddl_SXCView_SXDVerUpdInv.push_back(elements_.front());
// elements_.pop_front();
//}
//if (proc.optional<SXAddl_SXCView_SXDEnd>())
//{
// elements_.pop_back();
//}
return true;
} }
} // namespace XLS } // namespace XLS
......
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/PIVOTADDL.h
View file @ 5ae4d7f8
...@@ -36,6 +36,16 @@ ...@@ -36,6 +36,16 @@
namespace XLS namespace XLS
{ {
struct _sxAddl
{
_sxAddl(std::vector<_sxAddl> *p, int l) : prev(p), level (l) {}
std::vector<_sxAddl>* prev = NULL;
int level = 0;
std::vector<BaseObjectPtr> elements;
std::vector<_sxAddl> levels;
};
class PIVOTADDL: public CompositeObject class PIVOTADDL: public CompositeObject
{ {
BASE_OBJECT_DEFINE_CLASS_NAME(PIVOTADDL) BASE_OBJECT_DEFINE_CLASS_NAME(PIVOTADDL)
...@@ -55,15 +65,13 @@ public: ...@@ -55,15 +65,13 @@ public:
BiffStructurePtr m_SXAddl_SXCView_SXDCompactRwHdr; BiffStructurePtr m_SXAddl_SXCView_SXDCompactRwHdr;
BiffStructurePtr m_SXAddl_SXCView_SXDCompactColHdr; BiffStructurePtr m_SXAddl_SXCView_SXDCompactColHdr;
BiffStructurePtr m_SXAddl_SXADDLSXFILTERS12;
BiffStructurePtr m_SXADDLCONDFMTS;
BiffStructurePtr m_SXAddl_SXCView_SXDTableStyleClient; BiffStructurePtr m_SXAddl_SXCView_SXDTableStyleClient;
std::vector<BiffStructurePtr> m_arSXAddl_SXCView_SXDVerUpdInv; std::vector<BiffStructurePtr> m_arSXAddl_SXCView_SXDVerUpdInv;
std::vector<BiffStructurePtr> m_arSXAddl_SXCView_SXDSXPIIvmb; std::vector<BiffStructurePtr> m_arSXAddl_SXCView_SXDSXPIIvmb;
std::vector<BiffStructurePtr> m_arSXADDLFIELD;
std::vector<BiffStructurePtr> m_arSXADDLHIERARCHY; std::vector<_sxAddl> content;
std::vector<BiffStructurePtr> m_arSXADDLCALCMEMBER; std::vector<_sxAddl> *current;
}; };
......
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/QUERYTABLE.cpp
View file @ 5ae4d7f8
...@@ -41,7 +41,6 @@ ...@@ -41,7 +41,6 @@
#include "../Biff_records/QsiSXTag.h" #include "../Biff_records/QsiSXTag.h"
#include "../Biff_records/DbOrParamQry.h" #include "../Biff_records/DbOrParamQry.h"
#include "../Biff_records/SXString.h" #include "../Biff_records/SXString.h"
#include "../Biff_records/TxtQry.h"
namespace XLS namespace XLS
{ {
...@@ -101,12 +100,16 @@ int QUERYTABLE::serialize(std::wostream & strm) ...@@ -101,12 +100,16 @@ int QUERYTABLE::serialize(std::wostream & strm)
Qsi *info = dynamic_cast<Qsi*>(m_Qsi.get()); Qsi *info = dynamic_cast<Qsi*>(m_Qsi.get());
if (!info) return 0; if (!info) return 0;
int connectionId = serialize_connection(); DBQUERY *query = dynamic_cast<DBQUERY*>(m_DBQUERY.get());
if (connectionId < 1) return 0; if (!query) return -1;
DBQUERYEXT *query_ext = dynamic_cast<DBQUERYEXT*>(m_DBQUERYEXT.get());
std::wstring name = info->rgchName.value(); std::wstring name = info->rgchName.value();
if (name.empty())
name = L"Connection" + std::to_wstring(connectionId); int connectionId = query->serialize_connection(name, query_ext);
if (connectionId < 1) return 0;
CP_XML_WRITER(strm) CP_XML_WRITER(strm)
{ {
...@@ -131,100 +134,5 @@ int QUERYTABLE::serialize(std::wostream & strm) ...@@ -131,100 +134,5 @@ int QUERYTABLE::serialize(std::wostream & strm)
return 0; return 0;
} }
int QUERYTABLE::serialize_connection()
{
Qsi *info = dynamic_cast<Qsi*>(m_Qsi.get());
if (!info) return -1;
DBQUERY *query = dynamic_cast<DBQUERY*>(m_DBQUERY.get());
if (!query) return -1;
DbOrParamQry* queryOrParam = dynamic_cast<DbOrParamQry*>(query->m_DbQry.get());
if (!queryOrParam) return -1;
DBQUERYEXT *query_ext = dynamic_cast<DBQUERYEXT*>(m_DBQUERYEXT.get());
int connectionId = ++global_info->connectionId;
std::wstring name = info->rgchName.value();
if (name.empty())
name = L"Connection" + std::to_wstring(connectionId);
CP_XML_WRITER(global_info->connections_stream)
{
CP_XML_NODE(L"connection")
{
CP_XML_ATTR(L"id", connectionId);
CP_XML_ATTR(L"name", name);
CP_XML_ATTR(L"type", queryOrParam->query.dbt);
//background="1"
//saveData="1"
if (queryOrParam->query.fSavePwd) CP_XML_ATTR(L"savePassword", 1);
CP_XML_ATTR(L"refreshedVersion", 1);
if (queryOrParam->query.dbt == 6)
{
TxtQry *query_txt = dynamic_cast<TxtQry*>(query_ext->m_TxtQry.get());
if (query_txt)
{
CP_XML_NODE(L"textPr")
{
CP_XML_ATTR(L"sourceFile", query_txt->rgchFile.value());
//delimited="0"
CP_XML_NODE(L"textFields")
{
for (size_t i = 0; i < query_txt->rgtxtwf.size(); i++)
{
CP_XML_NODE(L"textField")
{
switch(query_txt->rgtxtwf[i].fieldType)
{
case 0: CP_XML_ATTR(L"type", L"general"); break;
case 1: CP_XML_ATTR(L"type", L"text"); break;
case 2: CP_XML_ATTR(L"type", L"MDY"); break;
case 3: CP_XML_ATTR(L"type", L"DMY"); break;
case 4: CP_XML_ATTR(L"type", L"YMD"); break;
case 5: CP_XML_ATTR(L"type", L"MYD"); break;
case 6: CP_XML_ATTR(L"type", L"DYM"); break;
case 7: CP_XML_ATTR(L"type", L"YDM"); break;
case 8: CP_XML_ATTR(L"type", L"skip"); break;
case 9: CP_XML_ATTR(L"type", L"EMD"); break;
}
CP_XML_ATTR(L"position", query_txt->rgtxtwf[i].fieldStart);
}
}
}
}
}
}
else
{
int index = 0;
CP_XML_NODE(L"dbPr")
{
std::wstring command, connection;
for (index = 0; index < queryOrParam->query.cstQuery; index++)
{
command += query->m_arSXString[index];
}
for (; index < queryOrParam->query.cstQuery + queryOrParam->query.cstOdbcConn; index++)
{
connection += query->m_arSXString[index];
}
CP_XML_ATTR(L"connection", connection);
CP_XML_ATTR(L"command", command);
}
}
}
}
return connectionId;
}
} // namespace XLS } // namespace XLS
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/QUERYTABLE.h
View file @ 5ae4d7f8
...@@ -48,7 +48,6 @@ public: ...@@ -48,7 +48,6 @@ public:
virtual const bool loadContent(BinProcessor& proc); virtual const bool loadContent(BinProcessor& proc);
int serialize(std::wostream & strm); int serialize(std::wostream & strm);
int serialize_connection();
static const ElementType type = typeQUERYTABLE; static const ElementType type = typeQUERYTABLE;
......
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/SXADDLAUTOSORT.cpp
View file @ 5ae4d7f8
...@@ -31,8 +31,8 @@ ...@@ -31,8 +31,8 @@
*/ */
#include "SXADDLAUTOSORT.h" #include "SXADDLAUTOSORT.h"
#include <Logic/Biff_unions/SXADDLSXRULE.h>
#include <Logic/Biff_records/SXAddl.h> #include "../Biff_records/SXAddl.h"
namespace XLS namespace XLS
{ {
...@@ -57,13 +57,7 @@ BaseObjectPtr SXADDLAUTOSORT::clone() ...@@ -57,13 +57,7 @@ BaseObjectPtr SXADDLAUTOSORT::clone()
// SXADDLAUTOSORT = SXAddl_SXCAutoSort_SXDId SXADDLSXRULE SXAddl_SXCAutoSort_SXDEnd // SXADDLAUTOSORT = SXAddl_SXCAutoSort_SXDId SXADDLSXRULE SXAddl_SXCAutoSort_SXDEnd
const bool SXADDLAUTOSORT::loadContent(BinProcessor& proc) const bool SXADDLAUTOSORT::loadContent(BinProcessor& proc)
{ {
//if(!proc.mandatory<SXAddl_SXCAutoSort_SXDId>()) return false;
//{
// return false;
//}
//proc.mandatory<SXADDLSXRULE>();
//proc.mandatory<SXAddl_SXCAutoSort_SXDEnd>();
return true;
} }
} // namespace XLS } // namespace XLS
......
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/SXADDLAUTOSORT.h
View file @ 5ae4d7f8
...@@ -35,9 +35,6 @@ ...@@ -35,9 +35,6 @@
namespace XLS namespace XLS
{ {
// Logical representation of SXADDLAUTOSORT union of records
class SXADDLAUTOSORT: public CompositeObject class SXADDLAUTOSORT: public CompositeObject
{ {
BASE_OBJECT_DEFINE_CLASS_NAME(SXADDLAUTOSORT) BASE_OBJECT_DEFINE_CLASS_NAME(SXADDLAUTOSORT)
...@@ -49,7 +46,7 @@ public: ...@@ -49,7 +46,7 @@ public:
virtual const bool loadContent(BinProcessor& proc); virtual const bool loadContent(BinProcessor& proc);
static const ElementType type = typeSXADDLAUTOSORT; static const ElementType type = typeSXADDLAUTOSORT;
}; };
......
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/SXADDLCACHE.cpp
View file @ 5ae4d7f8
...@@ -31,69 +31,86 @@ ...@@ -31,69 +31,86 @@
*/ */
#include "SXADDLCACHE.h" #include "SXADDLCACHE.h"
#include <Logic/Biff_records/SXAddl.h>
#include <Logic/Biff_unions/SXADDLCACHE12.h> #include "../Biff_records/SXAddl.h"
#include <Logic/Biff_unions/SXADDLDBQUERY.h>
#include <Logic/Biff_unions/UNKNOWNFRT.h>
namespace XLS namespace XLS
{ {
SXADDLCACHE::SXADDLCACHE() : current( &content)
SXADDLCACHE::SXADDLCACHE()
{ {
_sxAddl elm(NULL, 0);
current->push_back(elm);
} }
SXADDLCACHE::~SXADDLCACHE() SXADDLCACHE::~SXADDLCACHE()
{ {
} }
// SXADDLCACHE = SXAddl_SXCCache_SXDId SXAddl_SXCCache_SXDVer10Info [SXAddl_SXCCache_SXDVerSXMacro]
BaseObjectPtr SXADDLCACHE::clone() BaseObjectPtr SXADDLCACHE::clone()
{ {
return BaseObjectPtr(new SXADDLCACHE(*this)); return BaseObjectPtr(new SXADDLCACHE(*this));
} }
// SXADDLCACHE = SXAddl_SXCCache_SXDId SXAddl_SXCCache_SXDVer10Info [SXAddl_SXCCache_SXDVerSXMacro]
//[SXADDLCACHE12] [SXADDLDBQUERY] *UNKNOWNFRT SXAddl_SXCCache_SXDEnd //[SXADDLCACHE12] [SXADDLDBQUERY] *UNKNOWNFRT SXAddl_SXCCache_SXDEnd
const bool SXADDLCACHE::loadContent(BinProcessor& proc) const bool SXADDLCACHE::loadContent(BinProcessor& proc)
{ {
//if(!proc.mandatory<SXAddl_SXCCache_SXDId>()) bool result = false;
//{ int level = 0;
// return false; while (true)
//} {
//m_SXCCache_SXDId = elements_.back(); CFRecordType::TypeId type = proc.getNextRecordType();
//elements_.pop_back();
if (type != rt_SXAddl) break;
proc.optional<SXAddl>();
SXAddl* addl = dynamic_cast<SXAddl*>(elements_.back().get());
if (!addl) continue;
if (result && addl->bStartElement)
{
level++;
_sxAddl elm(current, level);
current = &current->back().levels;
current->push_back(elm);
elements_.pop_back();
continue;
}
result = true;
if (addl->bEndElement)
{
if (level == 0)
break;
else level--;
current = current->back().prev;
elements_.pop_back();
continue;
}
if (level == 0)
{
SXAddl_SXCCache_SXDId* p0 = dynamic_cast<SXAddl_SXCCache_SXDId*>(addl->content.get());
if (p0)
{
m_SXAddl_SXCCache_SXDId = addl->content;
}
//SXAddl_SXCCache_SXDVer10Info
//[SXAddl_SXCCache_SXDVerSXMacro]
}
//if (proc.optional<SXAddl_SXCCache_SXDVer10Info>()) current->back().elements.push_back(elements_.back());
//{ elements_.pop_back();
// m_SXDVer10Info = elements_.back(); }
// elements_.pop_back();
//}
//if (proc.optional<SXAddl_SXCCache_SXDVerSXMacro>())
//{
// m_SXDVerSXMacro = elements_.back();
// elements_.pop_back();
//}
//if (proc.optional<SXADDLCACHE12>())
//{
// m_SXADDLCACHE12 = elements_.back();
// elements_.pop_back();
//}
//if (proc.optional<SXADDLDBQUERY>())
//{
// m_SXADDLDBQUERY = elements_.back();
// elements_.pop_back();
//}
//int count = proc.repeated<UNKNOWNFRT>(0, 0);
//if (proc.optional<SXAddl_SXCCache_SXDEnd>()) return result;
//{
// elements_.pop_back();
//}
return true;
} }
} // namespace XLS } // namespace XLS
......
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/SXADDLCACHE.h
View file @ 5ae4d7f8
...@@ -36,6 +36,16 @@ ...@@ -36,6 +36,16 @@
namespace XLS namespace XLS
{ {
struct _sxAddl
{
_sxAddl(std::vector<_sxAddl> *p, int l) : prev(p), level (l) {}
std::vector<_sxAddl>* prev = NULL;
int level = 0;
std::vector<BaseObjectPtr> elements;
std::vector<_sxAddl> levels;
};
class SXADDLCACHE: public CompositeObject class SXADDLCACHE: public CompositeObject
{ {
BASE_OBJECT_DEFINE_CLASS_NAME(SXADDLCACHE) BASE_OBJECT_DEFINE_CLASS_NAME(SXADDLCACHE)
...@@ -47,14 +57,12 @@ public: ...@@ -47,14 +57,12 @@ public:
virtual const bool loadContent(BinProcessor& proc); virtual const bool loadContent(BinProcessor& proc);
static const ElementType type = typeSXADDLCACHE; static const ElementType type = typeSXADDLCACHE;
BaseObjectPtr m_SXCCache_SXDId;
BaseObjectPtr m_SXDVer10Info;
BaseObjectPtr m_SXDVerSXMacro;
BaseObjectPtr m_SXADDLDBQUERY;
BaseObjectPtr m_SXADDLCACHE12;
BiffStructurePtr m_SXAddl_SXCCache_SXDId;
std::vector<_sxAddl> content;
std::vector<_sxAddl> *current;
}; };
} // namespace XLS } // namespace XLS
......
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/SXADDLCACHE12.cpp
View file @ 5ae4d7f8
...@@ -31,10 +31,12 @@ ...@@ -31,10 +31,12 @@
*/ */
#include "SXADDLCACHE12.h" #include "SXADDLCACHE12.h"
#include <Logic/Biff_records/SXAddl.h> #include "SXADDLCACHEFIELD.h"
#include <Logic/Biff_unions/SXADDLCACHEFIELD.h> #include "SXADDLSXDH.h"
#include <Logic/Biff_unions/SXADDLSXDH.h> #include "SXADDLSXMGS.h"
#include <Logic/Biff_unions/SXADDLSXMGS.h>
#include "../Biff_records/SXAddl.h"
namespace XLS namespace XLS
{ {
...@@ -50,57 +52,17 @@ SXADDLCACHE12::~SXADDLCACHE12() ...@@ -50,57 +52,17 @@ SXADDLCACHE12::~SXADDLCACHE12()
} }
// SXADDLCACHE12 = SXAddl_SXCCache_SXDVerUpdInv SXAddl_SXCCache_SXDInfo12 SXAddl_SXCCache_SXDInvRefreshReal
BaseObjectPtr SXADDLCACHE12::clone() BaseObjectPtr SXADDLCACHE12::clone()
{ {
return BaseObjectPtr(new SXADDLCACHE12(*this)); return BaseObjectPtr(new SXADDLCACHE12(*this));
} }
// SXADDLCACHE12 = SXAddl_SXCCache_SXDVerUpdInv SXAddl_SXCCache_SXDInfo12 SXAddl_SXCCache_SXDInvRefreshReal
// *SXADDLCACHEFIELD [SXADDLSXDH] [SXADDLSXMGS] SXAddl_SXCCache_SXDVerUpdInv // *SXADDLCACHEFIELD [SXADDLSXDH] [SXADDLSXMGS] SXAddl_SXCCache_SXDVerUpdInv
const bool SXADDLCACHE12::loadContent(BinProcessor& proc) const bool SXADDLCACHE12::loadContent(BinProcessor& proc)
{ {
//if(!proc.mandatory<SXAddl_SXCCache_SXDVerUpdInv>()) return false;
//{
// return false;
//}
//m_SXAddl_SXCCache_SXDVerUpdInv = elements_.back();
//elements_.pop_back();
//if (proc.optional<SXAddl_SXCCache_SXDInfo12>())
//{
// m_SXAddl_SXCCache_SXDInfo12 = elements_.back();
// elements_.pop_back();
//}
//if (proc.optional<SXAddl_SXCCache_SXDInvRefreshReal>())
//{
// m_SXAddl_SXCCache_SXDInvRefreshReal = elements_.back();
// elements_.pop_back();
//}
//
//int count = proc.repeated<SXADDLCACHEFIELD>(0, 0);
//while(count > 0)
//{
// m_arSXADDLCACHEFIELD.push_back(elements_.front());
// elements_.pop_front(); count--;
//}
//if (proc.optional<SXADDLSXDH>())
//{
// m_SXADDLSXDH = elements_.back();
// elements_.pop_back();
//}
//if (proc.optional<SXADDLSXMGS>())
//{
// m_SXADDLSXMGS = elements_.back();
// elements_.pop_back();
//}
//if (proc.optional<SXAddl_SXCCache_SXDVerUpdInv>())
//{
// m_SXAddl_SXCCache_SXDVerUpdInvS = elements_.back();
// elements_.pop_back();
//}
return true;
} }
} // namespace XLS } // namespace XLS
......
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/SXADDLCACHE12.h
View file @ 5ae4d7f8
...@@ -48,15 +48,6 @@ public: ...@@ -48,15 +48,6 @@ public:
virtual const bool loadContent(BinProcessor& proc); virtual const bool loadContent(BinProcessor& proc);
static const ElementType type = typeSXADDLCACHE12; static const ElementType type = typeSXADDLCACHE12;
BaseObjectPtr m_SXAddl_SXCCache_SXDVerUpdInv;
BaseObjectPtr m_SXAddl_SXCCache_SXDVerUpdInvS;
BaseObjectPtr m_SXADDLSXMGS;
BaseObjectPtr m_SXADDLSXDH;
BaseObjectPtr m_SXAddl_SXCCache_SXDInfo12;
BaseObjectPtr m_SXAddl_SXCCache_SXDInvRefreshReal;
std::vector<BaseObjectPtr> m_arSXADDLCACHEFIELD;
}; };
} // namespace XLS } // namespace XLS
......
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/SXADDLCACHEFIELD.cpp
View file @ 5ae4d7f8
...@@ -31,8 +31,8 @@ ...@@ -31,8 +31,8 @@
*/ */
#include "SXADDLCACHEFIELD.h" #include "SXADDLCACHEFIELD.h"
#include <Logic/Biff_records/SXAddl.h>
#include <Logic/Biff_unions/SXADDLCACHEITEM.h> #include "../Biff_records/SXAddl.h"
namespace XLS namespace XLS
{ {
...@@ -46,115 +46,10 @@ SXADDLCACHEFIELD::SXADDLCACHEFIELD() ...@@ -46,115 +46,10 @@ SXADDLCACHEFIELD::SXADDLCACHEFIELD()
SXADDLCACHEFIELD::~SXADDLCACHEFIELD() SXADDLCACHEFIELD::~SXADDLCACHEFIELD()
{ {
} }
BaseObjectPtr SXADDLCACHEFIELD::clone()
class Parenthesis_SXADDLCACHEFIELD_1: public ABNFParenthesis
{
BASE_OBJECT_DEFINE_CLASS_NAME(Parenthesis_SXADDLCACHEFIELD_1)
public:
BaseObjectPtr clone()
{
return BaseObjectPtr(new Parenthesis_SXADDLCACHEFIELD_1(*this));
}
const bool loadContent(BinProcessor& proc)
{
//if(!proc.mandatory<SXAddl_SXCCacheField_SXDCaption>())
//{
// return false;
//}
//proc.repeated<Continue_SxaddlSxString>(0, 0);
return true;
};
};
class Parenthesis_SXADDLCACHEFIELD_3: public ABNFParenthesis
{
BASE_OBJECT_DEFINE_CLASS_NAME(Parenthesis_SXADDLCACHEFIELD_3)
public:
BaseObjectPtr clone()
{
return BaseObjectPtr(new Parenthesis_SXADDLCACHEFIELD_3(*this));
}
const bool loadContent(BinProcessor& proc)
{
//if(!proc.mandatory<SXAddl_SXCCacheField_SXDPropName>())
//{
// return false;
//}
//proc.repeated<Continue_SxaddlSxString>(0, 0);
return true;
};
};
class Parenthesis_SXADDLCACHEFIELD_2: public ABNFParenthesis
{
BASE_OBJECT_DEFINE_CLASS_NAME(Parenthesis_SXADDLCACHEFIELD_2)
public:
BaseObjectPtr clone()
{
return BaseObjectPtr(new Parenthesis_SXADDLCACHEFIELD_2(*this));
}
const bool loadContent(BinProcessor& proc)
{
//if(!proc.mandatory<SXAddl_SXCCacheField_SXDProperty>())
//{
// return false;
//}
//proc.optional<Parenthesis_SXADDLCACHEFIELD_3>();
return true;
};
};
class Parenthesis_SXADDLCACHEFIELD_4: public ABNFParenthesis
{
BASE_OBJECT_DEFINE_CLASS_NAME(Parenthesis_SXADDLCACHEFIELD_4)
public:
BaseObjectPtr clone()
{
return BaseObjectPtr(new Parenthesis_SXADDLCACHEFIELD_4(*this));
}
const bool loadContent(BinProcessor& proc)
{
//if(!proc.mandatory<SXAddl_SXCCacheField_SXDIfdbMpMapCount>())
//{
// return false;
//}
//proc.mandatory<SXAddl_SXCCacheField_SXDIfdbMempropMap>();
return true;
};
};
class Parenthesis_SXADDLCACHEFIELD_5: public ABNFParenthesis
{ {
BASE_OBJECT_DEFINE_CLASS_NAME(Parenthesis_SXADDLCACHEFIELD_5) return BaseObjectPtr(new SXADDLCACHEFIELD(*this));
public: }
BaseObjectPtr clone()
{
return BaseObjectPtr(new Parenthesis_SXADDLCACHEFIELD_5(*this));
}
const bool loadContent(BinProcessor& proc)
{
//if(!proc.mandatory<SXAddl_SXCCacheField_SXDSxrmitmCount>())
//{
// return false;
//}
//proc.repeated<SXADDLCACHEITEM>(0, 0);
//proc.mandatory<SXAddl_SXCCacheItem_SXDEnd>();
return true;
};
};
// SXADDLCACHEFIELD = SXAddl_SXCCacheField_SXDId *Continue_SxaddlSxString // SXADDLCACHEFIELD = SXAddl_SXCCacheField_SXDId *Continue_SxaddlSxString
...@@ -162,26 +57,10 @@ public: ...@@ -162,26 +57,10 @@ public:
// [SXAddl_SXCCacheField_SXDProperty [SXAddl_SXCCacheField_SXDPropName *Continue_SxaddlSxString]] // [SXAddl_SXCCacheField_SXDProperty [SXAddl_SXCCacheField_SXDPropName *Continue_SxaddlSxString]]
// [SXAddl_SXCCacheField_SXDIfdbMpMapCount SXAddl_SXCCacheField_SXDIfdbMempropMap] // [SXAddl_SXCCacheField_SXDIfdbMpMapCount SXAddl_SXCCacheField_SXDIfdbMempropMap]
// [SXAddl_SXCCacheField_SXDSxrmitmCount *SXADDLCACHEITEM SXAddl_SXCCacheItem_SXDEnd] // [SXAddl_SXCCacheField_SXDSxrmitmCount *SXADDLCACHEITEM SXAddl_SXCCacheItem_SXDEnd]
BaseObjectPtr SXADDLCACHEFIELD::clone()
{
return BaseObjectPtr(new SXADDLCACHEFIELD(*this));
}
// SXAddl_SXCCacheField_SXDEnd // SXAddl_SXCCacheField_SXDEnd
const bool SXADDLCACHEFIELD::loadContent(BinProcessor& proc) const bool SXADDLCACHEFIELD::loadContent(BinProcessor& proc)
{ {
//if(!proc.mandatory<SXAddl_SXCCacheField_SXDId>()) return false;
//{
// return false;
//}
//proc.repeated<Continue_SxaddlSxString>(0, 0);
//proc.optional<Parenthesis_SXADDLCACHEFIELD_1>();
//proc.optional<Parenthesis_SXADDLCACHEFIELD_2>();
//proc.optional<Parenthesis_SXADDLCACHEFIELD_4>();
//proc.optional<Parenthesis_SXADDLCACHEFIELD_5>();
//proc.optional<SXAddl_SXCCacheField_SXDEnd>();
return true;
} }
} // namespace XLS } // namespace XLS
......
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/SXADDLCACHEITEM.cpp
View file @ 5ae4d7f8
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
*/ */
#include "SXADDLCACHEITEM.h" #include "SXADDLCACHEITEM.h"
#include <Logic/Biff_records/SXAddl.h> #include "../Biff_records/SXAddl.h"
namespace XLS namespace XLS
{ {
...@@ -46,67 +46,35 @@ SXADDLCACHEITEM::~SXADDLCACHEITEM() ...@@ -46,67 +46,35 @@ SXADDLCACHEITEM::~SXADDLCACHEITEM()
{ {
} }
class Parenthesis_SXADDLCACHEITEM_1: public ABNFParenthesis
{
BASE_OBJECT_DEFINE_CLASS_NAME(Parenthesis_SXADDLCACHEITEM_1)
public:
BaseObjectPtr clone()
{
return BaseObjectPtr(new Parenthesis_SXADDLCACHEITEM_1(*this));
}
const bool loadContent(BinProcessor& proc)
{
//if(!proc.mandatory<SXAddl_SXCCacheItem_SXDSxrmitmDisp>())
//{
// return false;
//}
//proc.repeated<Continue_SxaddlSxString>(0, 0);
return true;
};
};
class Parenthesis_SXADDLCACHEITEM_2: public ABNFParenthesis
{
BASE_OBJECT_DEFINE_CLASS_NAME(Parenthesis_SXADDLCACHEITEM_2)
public:
BaseObjectPtr clone()
{
return BaseObjectPtr(new Parenthesis_SXADDLCACHEITEM_2(*this));
}
const bool loadContent(BinProcessor& proc)
{
//if(!proc.mandatory<SXAddl_SXCCacheItem_SXDItmMpMapCount>())
//{
// return false;
//}
//proc.mandatory<SXAddl_SXCCacheItem_SXDItmMpropMap>();
return true;
};
};
// SXADDLCACHEITEM = SXAddl_SXCCacheItem_SXDId [SXAddl_SXCCacheItem_SXDSxrmitmDisp *Continue_SxaddlSxString]
BaseObjectPtr SXADDLCACHEITEM::clone() BaseObjectPtr SXADDLCACHEITEM::clone()
{ {
return BaseObjectPtr(new SXADDLCACHEITEM(*this)); return BaseObjectPtr(new SXADDLCACHEITEM(*this));
} }
// SXADDLCACHEITEM = SXAddl_SXCCacheItem_SXDId [SXAddl_SXCCacheItem_SXDSxrmitmDisp *Continue_SxaddlSxString]
// *(SXAddl_SXCCacheItem_SXDItmMpMapCount SXAddl_SXCCacheItem_SXDItmMpropMap) // *(SXAddl_SXCCacheItem_SXDItmMpMapCount SXAddl_SXCCacheItem_SXDItmMpropMap)
const bool SXADDLCACHEITEM::loadContent(BinProcessor& proc) const bool SXADDLCACHEITEM::loadContent(BinProcessor& proc)
{ {
//if(!proc.mandatory<SXAddl_SXCCacheItem_SXDId>()) bool result = false;
//{ while (true)
// return false; {
//} CFRecordType::TypeId type = proc.getNextRecordType();
//proc.optional<Parenthesis_SXADDLCACHEITEM_1>();
//proc.repeated<Parenthesis_SXADDLCACHEITEM_2>(0, 0); if (type == rt_SXAddl)
{
return true; result = true;
proc.optional<SXAddl>();
SXAddl* addl = dynamic_cast<SXAddl*>(elements_.back().get());
if (!addl) continue;
if (addl->bEndElement)
break;
}
else
break;
}
return result;
} }
} // namespace XLS } // namespace XLS
......
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/SXADDLCACHEITEM.h
View file @ 5ae4d7f8
...@@ -36,8 +36,6 @@ ...@@ -36,8 +36,6 @@
namespace XLS namespace XLS
{ {
// Logical representation of SXADDLCACHEITEM union of records
class SXADDLCACHEITEM: public CompositeObject class SXADDLCACHEITEM: public CompositeObject
{ {
BASE_OBJECT_DEFINE_CLASS_NAME(SXADDLCACHEITEM) BASE_OBJECT_DEFINE_CLASS_NAME(SXADDLCACHEITEM)
...@@ -49,10 +47,7 @@ public: ...@@ -49,10 +47,7 @@ public:
virtual const bool loadContent(BinProcessor& proc); virtual const bool loadContent(BinProcessor& proc);
static const ElementType type = typeSXADDLCACHEITEM; static const ElementType type = typeSXADDLCACHEITEM;
}; };
} // namespace XLS } // namespace XLS
......
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/SXADDLCALCMEMBER.cpp
View file @ 5ae4d7f8
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
*/ */
#include "SXADDLCALCMEMBER.h" #include "SXADDLCALCMEMBER.h"
#include <Logic/Biff_records/SXAddl.h> #include "../Biff_records/SXAddl.h"
namespace XLS namespace XLS
{ {
...@@ -56,16 +56,26 @@ BaseObjectPtr SXADDLCALCMEMBER::clone() ...@@ -56,16 +56,26 @@ BaseObjectPtr SXADDLCALCMEMBER::clone()
// SXADDLCALCMEMBER = (SXAddl_SXCView_SXDCalcMember [SXAddl_SXCView_SXDCalcMemString *Continue_SxaddlSxString]) // SXADDLCALCMEMBER = (SXAddl_SXCView_SXDCalcMember [SXAddl_SXCView_SXDCalcMemString *Continue_SxaddlSxString])
const bool SXADDLCALCMEMBER::loadContent(BinProcessor& proc) const bool SXADDLCALCMEMBER::loadContent(BinProcessor& proc)
{ {
//if(!proc.mandatory<SXAddl_SXCView_SXDCalcMember>()) bool result = false;
//{ while (true)
// return false; {
//} CFRecordType::TypeId type = proc.getNextRecordType();
//if(proc.optional<SXAddl_SXCView_SXDCalcMemString>())
//{
// int count = proc.repeated<Continue_SxaddlSxString>(0, 0);
//}
return true; if (type == rt_SXAddl)
{
result = true;
proc.optional<SXAddl>();
SXAddl* addl = dynamic_cast<SXAddl*>(elements_.back().get());
if (!addl) continue;
if (addl->bEndElement)
break;
}
else
break;
}
return result;
} }
} // namespace XLS } // namespace XLS
......
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/SXADDLCALCMEMBER.h
View file @ 5ae4d7f8
...@@ -36,8 +36,6 @@ ...@@ -36,8 +36,6 @@
namespace XLS namespace XLS
{ {
// Logical representation of SXADDLCALCMEMBER union of records
class SXADDLCALCMEMBER: public CompositeObject class SXADDLCALCMEMBER: public CompositeObject
{ {
BASE_OBJECT_DEFINE_CLASS_NAME(SXADDLCALCMEMBER) BASE_OBJECT_DEFINE_CLASS_NAME(SXADDLCALCMEMBER)
......
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/SXADDLCONDFMT.cpp
View file @ 5ae4d7f8
...@@ -31,8 +31,8 @@ ...@@ -31,8 +31,8 @@
*/ */
#include "SXADDLCONDFMT.h" #include "SXADDLCONDFMT.h"
#include <Logic/Biff_records/SXAddl.h>
#include <Logic/Biff_unions/SXADDLSXRULE.h> #include "../Biff_records/SXAddl.h"
namespace XLS namespace XLS
{ {
...@@ -57,14 +57,8 @@ BaseObjectPtr SXADDLCONDFMT::clone() ...@@ -57,14 +57,8 @@ BaseObjectPtr SXADDLCONDFMT::clone()
// SXADDLCONDFMT = SXAddl_SXCSXCondFmt_SXDSXCondFmt *SXADDLSXRULE SXAddl_SXCSXCondFmt_SXDEnd // SXADDLCONDFMT = SXAddl_SXCSXCondFmt_SXDSXCondFmt *SXADDLSXRULE SXAddl_SXCSXCondFmt_SXDEnd
const bool SXADDLCONDFMT::loadContent(BinProcessor& proc) const bool SXADDLCONDFMT::loadContent(BinProcessor& proc)
{ {
//if(!proc.mandatory<SXAddl_SXCSXCondFmt_SXDSXCondFmt>()) return false;
//{
// return false;
//}
//proc.repeated<SXADDLSXRULE>(0, 0);
//proc.mandatory<SXAddl_SXCSXCondFmt_SXDEnd>();
return true;
} }
} // namespace XLS } // namespace XLS
......
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/SXADDLCONDFMT.h
View file @ 5ae4d7f8
...@@ -36,8 +36,6 @@ ...@@ -36,8 +36,6 @@
namespace XLS namespace XLS
{ {
// Logical representation of SXADDLCONDFMT union of records
class SXADDLCONDFMT: public CompositeObject class SXADDLCONDFMT: public CompositeObject
{ {
BASE_OBJECT_DEFINE_CLASS_NAME(SXADDLCONDFMT) BASE_OBJECT_DEFINE_CLASS_NAME(SXADDLCONDFMT)
...@@ -49,9 +47,7 @@ public: ...@@ -49,9 +47,7 @@ public:
virtual const bool loadContent(BinProcessor& proc); virtual const bool loadContent(BinProcessor& proc);
static const ElementType type = typeSXADDLCONDFMT; static const ElementType type = typeSXADDLCONDFMT;
}; };
} // namespace XLS } // namespace XLS
......
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/SXADDLCONDFMTS.cpp
View file @ 5ae4d7f8
...@@ -31,8 +31,8 @@ ...@@ -31,8 +31,8 @@
*/ */
#include "SXADDLCONDFMTS.h" #include "SXADDLCONDFMTS.h"
#include <Logic/Biff_records/SXAddl.h>
#include <Logic/Biff_unions/SXADDLCONDFMT.h> #include "../Biff_records/SXAddl.h"
namespace XLS namespace XLS
{ {
...@@ -56,15 +56,9 @@ BaseObjectPtr SXADDLCONDFMTS::clone() ...@@ -56,15 +56,9 @@ BaseObjectPtr SXADDLCONDFMTS::clone()
// SXADDLCONDFMTS = SXAddl_SXCSXCondFmts_SXDId *SXADDLCONDFMT SXAddl_SXCSXCondFmts_SXDEnd // SXADDLCONDFMTS = SXAddl_SXCSXCondFmts_SXDId *SXADDLCONDFMT SXAddl_SXCSXCondFmts_SXDEnd
const bool SXADDLCONDFMTS::loadContent(BinProcessor& proc) const bool SXADDLCONDFMTS::loadContent(BinProcessor& proc)
{ {
//if(!proc.mandatory<SXAddl_SXCSXCondFmts_SXDId>()) return false;
//{
// return false;
//}
//proc.repeated<SXADDLCONDFMT>(0, 0);
//proc.optional<SXAddl_SXCSXCondFmts_SXDEnd>();
return true;
} }
} // namespace XLS } // namespace XLS
......
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/SXADDLCONDFMTS.h
View file @ 5ae4d7f8
...@@ -48,7 +48,6 @@ public: ...@@ -48,7 +48,6 @@ public:
virtual const bool loadContent(BinProcessor& proc); virtual const bool loadContent(BinProcessor& proc);
static const ElementType type = typeSXADDLCONDFMTS; static const ElementType type = typeSXADDLCONDFMTS;
}; };
} // namespace XLS } // namespace XLS
......
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/SXADDLDBQUERY.cpp
View file @ 5ae4d7f8
...@@ -31,7 +31,8 @@ ...@@ -31,7 +31,8 @@
*/ */
#include "SXADDLDBQUERY.h" #include "SXADDLDBQUERY.h"
#include <Logic/Biff_records/SXAddl.h>
#include "../Biff_records/SXAddl.h"
namespace XLS namespace XLS
{ {
...@@ -61,41 +62,26 @@ SXADDLDBQUERY = [SXAddl_SXCQuery_SXDXMLSource *Continue_SxaddlSxString] ...@@ -61,41 +62,26 @@ SXADDLDBQUERY = [SXAddl_SXCQuery_SXDXMLSource *Continue_SxaddlSxString]
*/ */
const bool SXADDLDBQUERY::loadContent(BinProcessor& proc) const bool SXADDLDBQUERY::loadContent(BinProcessor& proc)
{ {
//int count = 0; bool result = false;
// while (true)
//if(proc.optional<SXAddl_SXCQuery_SXDXMLSource>()) {
//{ CFRecordType::TypeId type = proc.getNextRecordType();
// m_XMLSource = elements_.back();
// elements_.pop_back(); if (type == rt_SXAddl)
{
// count = proc.repeated<Continue_SxaddlSxString>(0, 0); result = true;
//} proc.optional<SXAddl>();
//if(proc.optional<SXAddl_SXCQuery_SXDSrcDataFile>())
//{ SXAddl* addl = dynamic_cast<SXAddl*>(elements_.back().get());
// m_SrcDataFile = elements_.back(); if (!addl) continue;
// elements_.pop_back();
if (addl->bEndElement)
// count = proc.repeated<Continue_SxaddlSxString>(0, 0); break;
//} }
//if(proc.optional<SXAddl_SXCQuery_SXDSrcConnFile>()) else
//{ break;
// m_SrcConnFile = elements_.back(); }
// elements_.pop_back(); return result;
// count = proc.repeated<Continue_SxaddlSxString>(0, 0);
//}
//if(proc.optional<SXAddl_SXCQuery_SXDReconnCond>())
//{
// m_ReconnCond = elements_.back();
// elements_.pop_back();
//}
//if(proc.mandatory<SXAddl_SXCQuery_SXDEnd>())
//{
// elements_.pop_back();
//}
return m_XMLSource || m_SrcConnFile || m_SrcDataFile || m_ReconnCond;
} }
} // namespace XLS } // namespace XLS
......
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/SXADDLDBQUERY.h
View file @ 5ae4d7f8
...@@ -36,8 +36,6 @@ ...@@ -36,8 +36,6 @@
namespace XLS namespace XLS
{ {
// Logical representation of SXADDLDBQUERY union of records
class SXADDLDBQUERY: public CompositeObject class SXADDLDBQUERY: public CompositeObject
{ {
BASE_OBJECT_DEFINE_CLASS_NAME(SXADDLDBQUERY) BASE_OBJECT_DEFINE_CLASS_NAME(SXADDLDBQUERY)
...@@ -51,12 +49,6 @@ public: ...@@ -51,12 +49,6 @@ public:
static const ElementType type = typeSXADDLDBQUERY; static const ElementType type = typeSXADDLDBQUERY;
BaseObjectPtr m_SrcConnFile;
BaseObjectPtr m_SrcDataFile;
BaseObjectPtr m_XMLSource;
BaseObjectPtr m_ReconnCond;
}; };
} // namespace XLS } // namespace XLS
......
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/SXADDLFIELD.cpp
View file @ 5ae4d7f8
...@@ -31,8 +31,8 @@ ...@@ -31,8 +31,8 @@
*/ */
#include "SXADDLFIELD.h" #include "SXADDLFIELD.h"
#include <Logic/Biff_records/SXAddl.h>
#include <Logic/Biff_unions/SXADDLFIELD12.h> #include "../Biff_records/SXAddl.h"
namespace XLS namespace XLS
{ {
...@@ -60,23 +60,8 @@ SXADDLFIELD = [SXAddl_SXCField_SXDId *Continue_SxaddlSxString SXAddl_SXCField_SX ...@@ -60,23 +60,8 @@ SXADDLFIELD = [SXAddl_SXCField_SXDId *Continue_SxaddlSxString SXAddl_SXCField_SX
*/ */
const bool SXADDLFIELD::loadContent(BinProcessor& proc) const bool SXADDLFIELD::loadContent(BinProcessor& proc)
{ {
//if(proc.optional<SXAddl_SXCField_SXDId>()) return false;
//{
// int count = proc.repeated<Continue_SxaddlSxString>(0, 0);
// if (proc.mandatory<SXAddl_SXCField_SXDVer10Info>())
// {
// }
// if (proc.mandatory<SXAddl_SXCField_SXDEnd>())
// {
// }
// if (proc.optional<SXADDLFIELD12>())
// {
// }
// return true;
//}
//return proc.optional<SXADDLFIELD12>();
return true;
} }
} // namespace XLS } // namespace XLS
......
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/SXADDLFIELD.h
View file @ 5ae4d7f8
...@@ -36,8 +36,6 @@ ...@@ -36,8 +36,6 @@
namespace XLS namespace XLS
{ {
// Logical representation of SXADDLFIELD union of records
class SXADDLFIELD: public CompositeObject class SXADDLFIELD: public CompositeObject
{ {
BASE_OBJECT_DEFINE_CLASS_NAME(SXADDLFIELD) BASE_OBJECT_DEFINE_CLASS_NAME(SXADDLFIELD)
...@@ -50,7 +48,6 @@ public: ...@@ -50,7 +48,6 @@ public:
virtual const bool loadContent(BinProcessor& proc); virtual const bool loadContent(BinProcessor& proc);
static const ElementType type = typeSXADDLFIELD; static const ElementType type = typeSXADDLFIELD;
}; };
} // namespace XLS } // namespace XLS
......
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/SXADDLFIELD12.cpp
View file @ 5ae4d7f8
...@@ -31,9 +31,10 @@ ...@@ -31,9 +31,10 @@
*/ */
#include "SXADDLFIELD12.h" #include "SXADDLFIELD12.h"
#include <Logic/Biff_records/SXAddl.h> #include "SXADDLAUTOSORT.h"
#include <Logic/Biff_unions/SXADDLAUTOSORT.h> #include "UNKNOWNFRT.h"
#include <Logic/Biff_unions/UNKNOWNFRT.h>
#include "../Biff_records/SXAddl.h"
namespace XLS namespace XLS
{ {
...@@ -63,25 +64,7 @@ SXADDLFIELD12 = SXAddl_SXCField12_SXDId *Continue_SxaddlSxString SXAddl_SXCField ...@@ -63,25 +64,7 @@ SXADDLFIELD12 = SXAddl_SXCField12_SXDId *Continue_SxaddlSxString SXAddl_SXCField
*/ */
const bool SXADDLFIELD12::loadContent(BinProcessor& proc) const bool SXADDLFIELD12::loadContent(BinProcessor& proc)
{ {
//if(!proc.mandatory<SXAddl_SXCField12_SXDId>()) return false;
//{
// return false;
//}
//proc.repeated<Continue_SxaddlSxString>(0, 0);
//proc.mandatory<SXAddl_SXCField12_SXDVer12Info>();
//proc.mandatory<SXAddl_SXCField12_SXDVerUpdInv>();
//if(proc.optional<SXAddl_SXCField12_SXDMemberCaption>())
//{
// proc.repeated<Continue_SxaddlSxString>(0, 0);
//}
//proc.optional<SXAddl_SXCField12_SXDAutoshow>();
//proc.optional<SXAddl_SXCField12_SXDISXTH>();
//proc.optional<SXADDLAUTOSORT>();
//proc.mandatory<SXAddl_SXCField12_SXDVerUpdInv>();
//proc.repeated<UNKNOWNFRT>(0, 0);
//proc.mandatory<SXAddl_SXCField12_SXDEnd>();
return true;
} }
} // namespace XLS } // namespace XLS
......
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/SXADDLFIELD12.h
View file @ 5ae4d7f8
...@@ -36,8 +36,6 @@ ...@@ -36,8 +36,6 @@
namespace XLS namespace XLS
{ {
// Logical representation of SXADDLFIELD12 union of records
class SXADDLFIELD12: public CompositeObject class SXADDLFIELD12: public CompositeObject
{ {
BASE_OBJECT_DEFINE_CLASS_NAME(SXADDLFIELD12) BASE_OBJECT_DEFINE_CLASS_NAME(SXADDLFIELD12)
...@@ -49,8 +47,7 @@ public: ...@@ -49,8 +47,7 @@ public:
virtual const bool loadContent(BinProcessor& proc); virtual const bool loadContent(BinProcessor& proc);
static const ElementType type = typeSXADDLFIELD12; static const ElementType type = typeSXADDLFIELD12;
}; };
} // namespace XLS } // namespace XLS
......
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/SXADDLGROUP.cpp
View file @ 5ae4d7f8
...@@ -31,8 +31,8 @@ ...@@ -31,8 +31,8 @@
*/ */
#include "SXADDLGROUP.h" #include "SXADDLGROUP.h"
#include <Logic/Biff_records/SXAddl.h> #include "UNKNOWNFRT.h"
#include <Logic/Biff_unions/UNKNOWNFRT.h> #include "../Biff_records/SXAddl.h"
namespace XLS namespace XLS
{ {
...@@ -60,17 +60,7 @@ SXADDLGROUP = SXAddl_SXCGroup_SXDId *Continue_SxaddlSxString SXAddl_SXCGroup_SXD ...@@ -60,17 +60,7 @@ SXADDLGROUP = SXAddl_SXCGroup_SXDId *Continue_SxaddlSxString SXAddl_SXCGroup_SXD
*/ */
const bool SXADDLGROUP::loadContent(BinProcessor& proc) const bool SXADDLGROUP::loadContent(BinProcessor& proc)
{ {
//if(!proc.mandatory<SXAddl_SXCGroup_SXDId>()) return false;
//{
// return false;
//}
//proc.repeated<Continue_SxaddlSxString>(0, 0);
//proc.mandatory<SXAddl_SXCGroup_SXDGrpInfo>();
//proc.repeated<SXAddl_SXCGroup_SXDMember>(0, 0);
//proc.repeated<UNKNOWNFRT>(0, 0);
//proc.mandatory<SXAddl_SXCGroup_SXDEnd>();
return true;
} }
} // namespace XLS } // namespace XLS
......
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/SXADDLGROUP.h
View file @ 5ae4d7f8
...@@ -36,8 +36,6 @@ ...@@ -36,8 +36,6 @@
namespace XLS namespace XLS
{ {
// Logical representation of SXADDLGROUP union of records
class SXADDLGROUP: public CompositeObject class SXADDLGROUP: public CompositeObject
{ {
BASE_OBJECT_DEFINE_CLASS_NAME(SXADDLGROUP) BASE_OBJECT_DEFINE_CLASS_NAME(SXADDLGROUP)
...@@ -50,7 +48,6 @@ public: ...@@ -50,7 +48,6 @@ public:
virtual const bool loadContent(BinProcessor& proc); virtual const bool loadContent(BinProcessor& proc);
static const ElementType type = typeSXADDLGROUP; static const ElementType type = typeSXADDLGROUP;
}; };
} // namespace XLS } // namespace XLS
......
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/SXADDLGRPLEVEL.cpp
View file @ 5ae4d7f8
...@@ -31,9 +31,8 @@ ...@@ -31,9 +31,8 @@
*/ */
#include "SXADDLGRPLEVEL.h" #include "SXADDLGRPLEVEL.h"
#include <Logic/Biff_records/SXAddl.h>
#include <Logic/Biff_unions/SXADDLGROUP.h> #include "../Biff_records/SXAddl.h"
#include <Logic/Biff_unions/UNKNOWNFRT.h>
namespace XLS namespace XLS
{ {
...@@ -61,17 +60,7 @@ SXADDLGRPLEVEL = SXAddl_SXCGrpLevel_SXDId *Continue_SxaddlSxString SXAddl_SXCGrp ...@@ -61,17 +60,7 @@ SXADDLGRPLEVEL = SXAddl_SXCGrpLevel_SXDId *Continue_SxaddlSxString SXAddl_SXCGrp
*/ */
const bool SXADDLGRPLEVEL::loadContent(BinProcessor& proc) const bool SXADDLGRPLEVEL::loadContent(BinProcessor& proc)
{ {
//if(!proc.mandatory<SXAddl_SXCGrpLevel_SXDId>()) return false;
//{
// return false;
//}
//proc.repeated<Continue_SxaddlSxString>(0, 0);
//proc.mandatory<SXAddl_SXCGrpLevel_SXDGrpLevelInfo>();
//proc.repeated<SXADDLGROUP>(0, 0);
//proc.repeated<UNKNOWNFRT>(0, 0);
//proc.mandatory<SXAddl_SXCGrpLevel_SXDEnd>();
return true;
} }
} // namespace XLS } // namespace XLS
......
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/SXADDLGRPLEVEL.h
View file @ 5ae4d7f8
...@@ -35,9 +35,6 @@ ...@@ -35,9 +35,6 @@
namespace XLS namespace XLS
{ {
// Logical representation of SXADDLGRPLEVEL union of records
class SXADDLGRPLEVEL: public CompositeObject class SXADDLGRPLEVEL: public CompositeObject
{ {
BASE_OBJECT_DEFINE_CLASS_NAME(SXADDLGRPLEVEL) BASE_OBJECT_DEFINE_CLASS_NAME(SXADDLGRPLEVEL)
...@@ -50,7 +47,6 @@ public: ...@@ -50,7 +47,6 @@ public:
virtual const bool loadContent(BinProcessor& proc); virtual const bool loadContent(BinProcessor& proc);
static const ElementType type = typeSXADDLGRPLEVEL; static const ElementType type = typeSXADDLGRPLEVEL;
}; };
} // namespace XLS } // namespace XLS
......
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/SXADDLHIERARCHY.cpp
View file @ 5ae4d7f8
...@@ -31,9 +31,8 @@ ...@@ -31,9 +31,8 @@
*/ */
#include "SXADDLHIERARCHY.h" #include "SXADDLHIERARCHY.h"
#include <Logic/Biff_records/SXAddl.h>
#include <Logic/Biff_unions/SXADDLGRPLEVEL.h> #include "../Biff_records/SXAddl.h"
#include <Logic/Biff_unions/UNKNOWNFRT.h>
namespace XLS namespace XLS
{ {
...@@ -75,69 +74,8 @@ SXADDLHIERARCHY = SXAddl_SXCHierarchy_SXDId *Continue_SxaddlSxString *SXAddl_SXC ...@@ -75,69 +74,8 @@ SXADDLHIERARCHY = SXAddl_SXCHierarchy_SXDId *Continue_SxaddlSxString *SXAddl_SXC
*/ */
const bool SXADDLHIERARCHY::loadContent(BinProcessor& proc) const bool SXADDLHIERARCHY::loadContent(BinProcessor& proc)
{ {
//if(!proc.mandatory<SXAddl_SXCHierarchy_SXDId>()) return false;
//{
// return false;
//}
//proc.repeated<Continue_SxaddlSxString>(0, 0);
//proc.repeated<SXAddl_SXCHierarchy_SXDProperty>(0, 0);
//proc.repeated<SXADDLGRPLEVEL>(0, 0);
//proc.optional<SXAddl_SXCHierarchy_SXDVerUpdInv>();
//if(proc.optional<SXAddl_SXCHierarchy_SXDSXSetParentUnique>())
//{
// proc.repeated<Continue_SxaddlSxString>(0, 0);
//}
//proc.optional<SXAddl_SXCHierarchy_SXDIconSet>();
//if(proc.optional<SXAddl_SXCHierarchy_SXDUserCaption>())
//{
// proc.repeated<Continue_SxaddlSxString>(0, 0);
//}
//proc.repeated<UNKNOWNFRT>(0, 0);
//proc.optional<SXAddl_SXCHierarchy_SXDVerUpdInv>();
//proc.repeated<SXAddl_SXCHierarchy_SXDUserCaption>(0, 0);
//proc.optional<SXAddl_SXCHierarchy_SXDVerUpdInv>();
//proc.optional<SXAddl_SXCHierarchy_SXDInfo12>();
//if(proc.optional<SXAddl_SXCHierarchy_SXDDisplayFolder>())
//{
// proc.repeated<Continue_SxaddlSxString>(0, 0);
//}
//if(proc.optional<SXAddl_SXCHierarchy_SXDMeasureGrp>())
//{
// proc.repeated<Continue_SxaddlSxString>(0, 0);
//}
//if(proc.optional<SXAddl_SXCHierarchy_SXDParentKPI>())
//{
// proc.repeated<Continue_SxaddlSxString>(0, 0);
//}
//if(proc.optional<SXAddl_SXCHierarchy_SXDKPIValue>())
//{
// proc.repeated<Continue_SxaddlSxString>(0, 0);
//}
//if(proc.optional<SXAddl_SXCHierarchy_SXDKPIGoal>())
//{
// proc.repeated<Continue_SxaddlSxString>(0, 0);
//}
//if(proc.optional<SXAddl_SXCHierarchy_SXDKPIStatus>())
//{
// proc.repeated<Continue_SxaddlSxString>(0, 0);
//}
//if(proc.optional<SXAddl_SXCHierarchy_SXDKPITrend>())
//{
// proc.repeated<Continue_SxaddlSxString>(0, 0);
//}
//if(proc.optional<SXAddl_SXCHierarchy_SXDKPIWeight>())
//{
// proc.repeated<Continue_SxaddlSxString>(0, 0);
//}
//if(proc.optional<SXAddl_SXCHierarchy_SXDKPITime>())
//{
// proc.repeated<Continue_SxaddlSxString>(0, 0);
//}
//proc.mandatory<SXAddl_SXCHierarchy_SXDEnd>();
return true;
} }
} // namespace XLS } // namespace XLS
......
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/SXADDLHIERARCHY.h
View file @ 5ae4d7f8
...@@ -36,8 +36,6 @@ ...@@ -36,8 +36,6 @@
namespace XLS namespace XLS
{ {
// Logical representation of SXADDLHIERARCHY union of records
class SXADDLHIERARCHY: public CompositeObject class SXADDLHIERARCHY: public CompositeObject
{ {
BASE_OBJECT_DEFINE_CLASS_NAME(SXADDLHIERARCHY) BASE_OBJECT_DEFINE_CLASS_NAME(SXADDLHIERARCHY)
...@@ -50,7 +48,6 @@ public: ...@@ -50,7 +48,6 @@ public:
virtual const bool loadContent(BinProcessor& proc); virtual const bool loadContent(BinProcessor& proc);
static const ElementType type = typeSXADDLHIERARCHY; static const ElementType type = typeSXADDLHIERARCHY;
}; };
} // namespace XLS } // namespace XLS
......
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/SXADDLQSI.cpp
View file @ 5ae4d7f8
...@@ -31,19 +31,17 @@ ...@@ -31,19 +31,17 @@
*/ */
#include "SXADDLQSI.h" #include "SXADDLQSI.h"
#include <Logic/Biff_records/SXAddl.h> #include "../Biff_records/SXAddl.h"
#include <Logic/Biff_unions/SXADDLDBQUERY.h>
#include <Logic/Biff_unions/UNKNOWNFRT.h>
namespace XLS namespace XLS
{ {
SXADDLQSI::SXADDLQSI() : current( &content)
SXADDLQSI::SXADDLQSI()
{ {
_sxAddl elm(NULL, 0);
current->push_back(elm);
} }
SXADDLQSI::~SXADDLQSI() SXADDLQSI::~SXADDLQSI()
{ {
} }
...@@ -54,19 +52,62 @@ BaseObjectPtr SXADDLQSI::clone() ...@@ -54,19 +52,62 @@ BaseObjectPtr SXADDLQSI::clone()
return BaseObjectPtr(new SXADDLQSI(*this)); return BaseObjectPtr(new SXADDLQSI(*this));
} }
// SXADDLQSI = SXAddl_SXCQsi_SXDId SXADDLDBQUERY *UNKNOWNFRT SXAddl_SXCQsi_SXDEnd // SXADDLQSI = SXAddl_SXCQsi_SXDId SXADDLDBQUERY *UNKNOWNFRT SXAddl_SXCQsi_SXDEnd
const bool SXADDLQSI::loadContent(BinProcessor& proc) const bool SXADDLQSI::loadContent(BinProcessor& proc)
{ {
//if(!proc.mandatory<SXAddl_SXCQsi_SXDId>()) bool result = false;
//{ int level = 0;
// return false;
//} while (true)
//proc.mandatory<SXADDLDBQUERY>(); {
//proc.repeated<UNKNOWNFRT>(0, 0); CFRecordType::TypeId type = proc.getNextRecordType();
//proc.mandatory<SXAddl_SXCQsi_SXDEnd>();
if (type != rt_SXAddl) break;
proc.optional<SXAddl>();
SXAddl* addl = dynamic_cast<SXAddl*>(elements_.back().get());
if (!addl) continue;
if (result && addl->bStartElement)
{
level++;
_sxAddl elm(current, level);
current = &current->back().levels;
current->push_back(elm);
elements_.pop_back();
continue;
}
result = true;
if (addl->bEndElement)
{
if (level == 0)
break;
else level--;
current = current->back().prev;
elements_.pop_back();
continue;
}
if (level == 0)
{
SXAddl_SXCQsi_SXDId* p0 = dynamic_cast<SXAddl_SXCQsi_SXDId*>(addl->content.get());
if (p0)
{
m_SXAddl_SXCQsi_SXDId = addl->content;
}
}
current->back().elements.push_back(elements_.back());
elements_.pop_back();
}
return true; return result;
} }
} // namespace XLS } // namespace XLS
......
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/SXADDLQSI.h
View file @ 5ae4d7f8
...@@ -36,8 +36,16 @@ ...@@ -36,8 +36,16 @@
namespace XLS namespace XLS
{ {
struct _sxAddl
{
_sxAddl(std::vector<_sxAddl> *p, int l) : prev(p), level (l) {}
std::vector<_sxAddl>* prev = NULL;
int level = 0;
std::vector<BaseObjectPtr> elements;
std::vector<_sxAddl> levels;
};
// Logical representation of SXADDLQSI union of records
class SXADDLQSI: public CompositeObject class SXADDLQSI: public CompositeObject
{ {
BASE_OBJECT_DEFINE_CLASS_NAME(SXADDLQSI) BASE_OBJECT_DEFINE_CLASS_NAME(SXADDLQSI)
...@@ -49,8 +57,12 @@ public: ...@@ -49,8 +57,12 @@ public:
virtual const bool loadContent(BinProcessor& proc); virtual const bool loadContent(BinProcessor& proc);
static const ElementType type = typeSXADDLQSI; static const ElementType type = typeSXADDLQSI;
BiffStructurePtr m_SXAddl_SXCQsi_SXDId;
std::vector<_sxAddl> content;
std::vector<_sxAddl> *current;
}; };
} // namespace XLS } // namespace XLS
......
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/SXADDLSXDH.cpp
View file @ 5ae4d7f8
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
*/ */
#include "SXADDLSXDH.h" #include "SXADDLSXDH.h"
#include <Logic/Biff_records/SXAddl.h> #include "../Biff_records/SXAddl.h"
namespace XLS namespace XLS
{ {
...@@ -56,14 +56,28 @@ BaseObjectPtr SXADDLSXDH::clone() ...@@ -56,14 +56,28 @@ BaseObjectPtr SXADDLSXDH::clone()
// SXADDLSXDH = SXAddl_SXCSXDH_SXDId *SXAddl_SXCSXDH_SXDSxdh SXAddl_SXCSXDH_SXDEnd // SXADDLSXDH = SXAddl_SXCSXDH_SXDId *SXAddl_SXCSXDH_SXDSxdh SXAddl_SXCSXDH_SXDEnd
const bool SXADDLSXDH::loadContent(BinProcessor& proc) const bool SXADDLSXDH::loadContent(BinProcessor& proc)
{ {
bool result = false;
while (true)
{
CFRecordType::TypeId type = proc.getNextRecordType();
//if(!proc.mandatory<SXAddl_SXCSXDH_SXDId>()) if (type == rt_SXAddl)
//{ {
// return false; result = true;
//} proc.optional<SXAddl>();
//proc.repeated<SXAddl_SXCSXDH_SXDSxdh>(0, 0);
//proc.mandatory<SXAddl_SXCSXDH_SXDEnd>(); SXAddl* addl = dynamic_cast<SXAddl*>(elements_.back().get());
return true; if (!addl) continue;
if (addl->bEndElement)
break;
}
else
{
break;
}
}
return result;
} }
} // namespace XLS } // namespace XLS
......
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/SXADDLSXDH.h
View file @ 5ae4d7f8
...@@ -36,8 +36,6 @@ ...@@ -36,8 +36,6 @@
namespace XLS namespace XLS
{ {
// Logical representation of SXADDLSXDH union of records
class SXADDLSXDH: public CompositeObject class SXADDLSXDH: public CompositeObject
{ {
BASE_OBJECT_DEFINE_CLASS_NAME(SXADDLSXDH) BASE_OBJECT_DEFINE_CLASS_NAME(SXADDLSXDH)
......
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/SXADDLSXFILT.cpp
View file @ 5ae4d7f8
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
*/ */
#include "SXADDLSXFILT.h" #include "SXADDLSXFILT.h"
#include <Logic/Biff_records/SXAddl.h> #include "../Biff_records/SXAddl.h"
namespace XLS namespace XLS
{ {
...@@ -56,15 +56,28 @@ BaseObjectPtr SXADDLSXFILT::clone() ...@@ -56,15 +56,28 @@ BaseObjectPtr SXADDLSXFILT::clone()
// SXADDLSXFILT = SXAddl_SXCSXfilt_SXDId SXAddl_SXCSXfilt_SXDSXfilt [SXAddl_SXCSXfilt_SXDSXItm] SXAddl_SXCSXfilt_SXDEnd // SXADDLSXFILT = SXAddl_SXCSXfilt_SXDId SXAddl_SXCSXfilt_SXDSXfilt [SXAddl_SXCSXfilt_SXDSXItm] SXAddl_SXCSXfilt_SXDEnd
const bool SXADDLSXFILT::loadContent(BinProcessor& proc) const bool SXADDLSXFILT::loadContent(BinProcessor& proc)
{ {
//if(!proc.mandatory<SXAddl_SXCSXfilt_SXDId>()) bool result = false;
//{ while (true)
// return false; {
//} CFRecordType::TypeId type = proc.getNextRecordType();
//proc.mandatory<SXAddl_SXCSXfilt_SXDSXfilt>();
//proc.optional<SXAddl_SXCSXfilt_SXDSXItm>();
//proc.mandatory<SXAddl_SXCSXfilt_SXDEnd>();
return true; if (type == rt_SXAddl)
{
result = true;
proc.optional<SXAddl>();
SXAddl* addl = dynamic_cast<SXAddl*>(elements_.back().get());
if (!addl) continue;
if (addl->bEndElement)//?? SXAddl_SXCView_SXDEnd
break;
}
else
{
break;
}
}
return result;
} }
} // namespace XLS } // namespace XLS
......
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/SXADDLSXFILT.h
View file @ 5ae4d7f8
...@@ -35,9 +35,6 @@ ...@@ -35,9 +35,6 @@
namespace XLS namespace XLS
{ {
// Logical representation of SXADDLSXFILT union of records
class SXADDLSXFILT: public CompositeObject class SXADDLSXFILT: public CompositeObject
{ {
BASE_OBJECT_DEFINE_CLASS_NAME(SXADDLSXFILT) BASE_OBJECT_DEFINE_CLASS_NAME(SXADDLSXFILT)
...@@ -49,7 +46,7 @@ public: ...@@ -49,7 +46,7 @@ public:
virtual const bool loadContent(BinProcessor& proc); virtual const bool loadContent(BinProcessor& proc);
static const ElementType type = typeSXADDLSXFILT; static const ElementType type = typeSXADDLSXFILT;
}; };
......
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/SXADDLSXFILTER12.cpp
View file @ 5ae4d7f8
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
*/ */
#include "SXADDLSXFILTER12.h" #include "SXADDLSXFILTER12.h"
#include <Logic/Biff_records/SXAddl.h> #include "../Biff_records/SXAddl.h"
namespace XLS namespace XLS
{ {
...@@ -65,40 +65,28 @@ SXADDLSXFILTER12 = SXAddl_SXCSXFilter12_SXDId SXAddl_SXCSXFilter12_SXDSXFilter ...@@ -65,40 +65,28 @@ SXADDLSXFILTER12 = SXAddl_SXCSXFilter12_SXDId SXAddl_SXCSXFilter12_SXDSXFilter
*/ */
const bool SXADDLSXFILTER12::loadContent(BinProcessor& proc) const bool SXADDLSXFILTER12::loadContent(BinProcessor& proc)
{ {
//if(!proc.mandatory<SXAddl_SXCSXFilter12_SXDId>()) bool result = false;
//{ while (true)
// return false; {
//} CFRecordType::TypeId type = proc.getNextRecordType();
//proc.mandatory<SXAddl_SXCSXFilter12_SXDSXFilter>();
//if(proc.optional<SXAddl_SXCSXFilter12_SXDCaption>()) if (type == rt_SXAddl)
//{ {
// proc.repeated<Continue_SxaddlSxString>(0, 0); result = true;
//} proc.optional<SXAddl>();
//if(proc.optional<SXAddl_SXCSXFilter12_SXDSXFilterDesc>())
//{
// proc.repeated<Continue_SxaddlSxString>(0, 0);
//}
//if(proc.optional<SXAddl_SXCSXFilter12_SXDSXFilterValue1>())
//{
// proc.repeated<Continue_SxaddlSxString>(0, 0);
//}
//if(proc.optional<SXAddl_SXCSXFilter12_SXDSXFilterValue2>())
//{
// proc.repeated<Continue_SxaddlSxString>(0, 0);
//}
//proc.mandatory<SXAddl_SXCSXFilter12_SXDXlsFilter>();
//if(proc.optional<SXAddl_SXCSXFilter12_SXDXlsFilterValue1>())
//{
// proc.repeated<Continue_SxaddlSxString>(0, 0);
//}
//if(proc.optional<SXAddl_SXCSXFilter12_SXDXlsFilterValue2>())
//{
// proc.repeated<Continue_SxaddlSxString>(0, 0);
//}
//proc.mandatory<SXAddl_SXCSXFilter12_SXDEnd>();
return true; SXAddl* addl = dynamic_cast<SXAddl*>(elements_.back().get());
if (!addl) continue;
if (addl->bEndElement)
break;
}
else
{
break;
}
}
return result;
} }
} // namespace XLS } // namespace XLS
......
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/SXADDLSXFILTERS12.cpp
View file @ 5ae4d7f8
...@@ -31,8 +31,8 @@ ...@@ -31,8 +31,8 @@
*/ */
#include "SXADDLSXFILTERS12.h" #include "SXADDLSXFILTERS12.h"
#include <Logic/Biff_records/SXAddl.h>
#include <Logic/Biff_unions/SXADDLSXFILTER12.h> #include "../Biff_records/SXAddl.h"
namespace XLS namespace XLS
{ {
...@@ -57,14 +57,8 @@ BaseObjectPtr SXADDLSXFILTERS12::clone() ...@@ -57,14 +57,8 @@ BaseObjectPtr SXADDLSXFILTERS12::clone()
// SXADDLSXFILTERS12 = SXAddl_SXCSXFilters12_SXDId *SXADDLSXFILTER12 SXAddl_SXCSXFilters12_SXDEnd // SXADDLSXFILTERS12 = SXAddl_SXCSXFilters12_SXDId *SXADDLSXFILTER12 SXAddl_SXCSXFilters12_SXDEnd
const bool SXADDLSXFILTERS12::loadContent(BinProcessor& proc) const bool SXADDLSXFILTERS12::loadContent(BinProcessor& proc)
{ {
//if(!proc.mandatory<SXAddl_SXCSXFilters12_SXDId>()) return false;
//{
// return false;
//}
//proc.repeated<SXADDLSXFILTER12>(0, 0);
//proc.mandatory<SXAddl_SXCSXFilters12_SXDEnd>();
return true;
} }
} // namespace XLS } // namespace XLS
......
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/SXADDLSXFILTERS12.h
View file @ 5ae4d7f8
...@@ -50,7 +50,6 @@ public: ...@@ -50,7 +50,6 @@ public:
virtual const bool loadContent(BinProcessor& proc); virtual const bool loadContent(BinProcessor& proc);
static const ElementType type = typeSXADDLSXFILTERS12; static const ElementType type = typeSXADDLSXFILTERS12;
}; };
} // namespace XLS } // namespace XLS
......
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/SXADDLSXMG.cpp
View file @ 5ae4d7f8
...@@ -31,8 +31,9 @@ ...@@ -31,8 +31,9 @@
*/ */
#include "SXADDLSXMG.h" #include "SXADDLSXMG.h"
#include <Logic/Biff_records/SXAddl.h> #include "UNKNOWNFRT.h"
#include <Logic/Biff_unions/UNKNOWNFRT.h>
#include "../Biff_records/SXAddl.h"
namespace XLS namespace XLS
{ {
...@@ -47,48 +48,17 @@ SXADDLSXMG::~SXADDLSXMG() ...@@ -47,48 +48,17 @@ SXADDLSXMG::~SXADDLSXMG()
{ {
} }
class Parenthesis_SXADDLSXMG_1: public ABNFParenthesis
{
BASE_OBJECT_DEFINE_CLASS_NAME(Parenthesis_SXADDLSXMG_1)
public:
BaseObjectPtr clone()
{
return BaseObjectPtr(new Parenthesis_SXADDLSXMG_1(*this));
}
const bool loadContent(BinProcessor& proc)
{
//if(!proc.mandatory<SXAddl_SXCSXMg_SXDUserCaption>())
//{
// return false;
//}
//proc.repeated<Continue_SxaddlSxString>(0, 0);
return true;
};
};
// SXADDLSXMG = SXAddl_SXCSXMg_SXDId *Continue_SxaddlSxString
BaseObjectPtr SXADDLSXMG::clone() BaseObjectPtr SXADDLSXMG::clone()
{ {
return BaseObjectPtr(new SXADDLSXMG(*this)); return BaseObjectPtr(new SXADDLSXMG(*this));
} }
// SXADDLSXMG = SXAddl_SXCSXMg_SXDId *Continue_SxaddlSxString
// [SXAddl_SXCSXMg_SXDUserCaption *Continue_SxaddlSxString] *UNKNOWNFRT SXAddl_SXCSXMg_SXDEnd // [SXAddl_SXCSXMg_SXDUserCaption *Continue_SxaddlSxString] *UNKNOWNFRT SXAddl_SXCSXMg_SXDEnd
const bool SXADDLSXMG::loadContent(BinProcessor& proc) const bool SXADDLSXMG::loadContent(BinProcessor& proc)
{ {
//if(!proc.mandatory<SXAddl_SXCSXMg_SXDId>()) return false;
//{
// return false;
//}
//proc.repeated<Continue_SxaddlSxString>(0, 0);
//proc.optional<Parenthesis_SXADDLSXMG_1>();
//proc.repeated<UNKNOWNFRT>(0, 0);
//proc.mandatory<SXAddl_SXCSXMg_SXDEnd>();
return true;
} }
} // namespace XLS } // namespace XLS
......
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/SXADDLSXMG.h
View file @ 5ae4d7f8
...@@ -35,9 +35,6 @@ ...@@ -35,9 +35,6 @@
namespace XLS namespace XLS
{ {
// Logical representation of SXADDLSXMG union of records
class SXADDLSXMG: public CompositeObject class SXADDLSXMG: public CompositeObject
{ {
BASE_OBJECT_DEFINE_CLASS_NAME(SXADDLSXMG) BASE_OBJECT_DEFINE_CLASS_NAME(SXADDLSXMG)
...@@ -50,7 +47,6 @@ public: ...@@ -50,7 +47,6 @@ public:
virtual const bool loadContent(BinProcessor& proc); virtual const bool loadContent(BinProcessor& proc);
static const ElementType type = typeSXADDLSXMG; static const ElementType type = typeSXADDLSXMG;
}; };
} // namespace XLS } // namespace XLS
......
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/SXADDLSXMGS.cpp
View file @ 5ae4d7f8
...@@ -31,9 +31,8 @@ ...@@ -31,9 +31,8 @@
*/ */
#include "SXADDLSXMGS.h" #include "SXADDLSXMGS.h"
#include <Logic/Biff_unions/SXADDLSXMG.h>
#include <Logic/Biff_unions/UNKNOWNFRT.h> #include "../Biff_records/SXAddl.h"
#include <Logic/Biff_records/SXAddl.h>
namespace XLS namespace XLS
{ {
...@@ -58,15 +57,8 @@ BaseObjectPtr SXADDLSXMGS::clone() ...@@ -58,15 +57,8 @@ BaseObjectPtr SXADDLSXMGS::clone()
// SXADDLSXMGS = SXAddl_SXCSXMgs_SXDId *SXADDLSXMG *SXAddl_SXCSXMgs_SXDMGrpSXDHMap *UNKNOWNFRT SXAddl_SXCSXMgs_SXDEnd // SXADDLSXMGS = SXAddl_SXCSXMgs_SXDId *SXADDLSXMG *SXAddl_SXCSXMgs_SXDMGrpSXDHMap *UNKNOWNFRT SXAddl_SXCSXMgs_SXDEnd
const bool SXADDLSXMGS::loadContent(BinProcessor& proc) const bool SXADDLSXMGS::loadContent(BinProcessor& proc)
{ {
//if(!proc.mandatory<SXAddl_SXCSXMgs_SXDId>()) return false;
//{
// return false;
//}
//proc.repeated<SXADDLSXMG>(0, 0);
//proc.repeated<SXAddl_SXCSXMgs_SXDMGrpSXDHMap>(0, 0);
//proc.repeated<UNKNOWNFRT>(0, 0);
//proc.mandatory<SXAddl_SXCSXMgs_SXDEnd>();
return true;
} }
} // namespace XLS } // namespace XLS
......
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/SXADDLSXMGS.h
View file @ 5ae4d7f8
...@@ -35,9 +35,6 @@ ...@@ -35,9 +35,6 @@
namespace XLS namespace XLS
{ {
// Logical representation of SXADDLSXMGS union of records
class SXADDLSXMGS: public CompositeObject class SXADDLSXMGS: public CompositeObject
{ {
BASE_OBJECT_DEFINE_CLASS_NAME(SXADDLSXMGS) BASE_OBJECT_DEFINE_CLASS_NAME(SXADDLSXMGS)
...@@ -50,7 +47,6 @@ public: ...@@ -50,7 +47,6 @@ public:
virtual const bool loadContent(BinProcessor& proc); virtual const bool loadContent(BinProcessor& proc);
static const ElementType type = typeSXADDLSXMGS; static const ElementType type = typeSXADDLSXMGS;
}; };
} // namespace XLS } // namespace XLS
......
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/SXADDLSXRULE.cpp
View file @ 5ae4d7f8
...@@ -31,8 +31,8 @@ ...@@ -31,8 +31,8 @@
*/ */
#include "SXADDLSXRULE.h" #include "SXADDLSXRULE.h"
#include <Logic/Biff_records/SXAddl.h>
#include <Logic/Biff_unions/SXADDLSXFILT.h> #include "../Biff_records/SXAddl.h"
namespace XLS namespace XLS
{ {
...@@ -57,15 +57,7 @@ BaseObjectPtr SXADDLSXRULE::clone() ...@@ -57,15 +57,7 @@ BaseObjectPtr SXADDLSXRULE::clone()
// SXADDLSXRULE = SXAddl_SXCSXrule_SXDId SXAddl_SXCSXrule_SXDSXrule *SXADDLSXFILT SXAddl_SXCSXrule_SXDEnd // SXADDLSXRULE = SXAddl_SXCSXrule_SXDId SXAddl_SXCSXrule_SXDSXrule *SXADDLSXFILT SXAddl_SXCSXrule_SXDEnd
const bool SXADDLSXRULE::loadContent(BinProcessor& proc) const bool SXADDLSXRULE::loadContent(BinProcessor& proc)
{ {
//if(!proc.mandatory<SXAddl_SXCSXrule_SXDId>()) return false;
//{
// return false;
//}
//proc.mandatory<SXAddl_SXCSXrule_SXDSXrule>();
//proc.repeated<SXADDLSXFILT>(0, 0);
//proc.mandatory<SXAddl_SXCSXrule_SXDEnd>();
return true;
} }
} // namespace XLS } // namespace XLS
......
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/SXADDLSXRULE.h
View file @ 5ae4d7f8
...@@ -36,8 +36,6 @@ ...@@ -36,8 +36,6 @@
namespace XLS namespace XLS
{ {
// Logical representation of SXADDLSXRULE union of records
class SXADDLSXRULE: public CompositeObject class SXADDLSXRULE: public CompositeObject
{ {
BASE_OBJECT_DEFINE_CLASS_NAME(SXADDLSXRULE) BASE_OBJECT_DEFINE_CLASS_NAME(SXADDLSXRULE)
...@@ -50,7 +48,7 @@ public: ...@@ -50,7 +48,7 @@ public:
virtual const bool loadContent(BinProcessor& proc); virtual const bool loadContent(BinProcessor& proc);
static const ElementType type = typeSXADDLSXRULE; static const ElementType type = typeSXADDLSXRULE;
}; };
} // namespace XLS } // namespace XLS
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7