Skip to content

O
onlyoffice_core
Commit 56a4e80c authored by ElenaSubbotina's avatar ElenaSubbotina
Browse files
Options

XlsFormat - tabletyled pivot tables

parent 6f93eeae
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1460 additions and 719 deletions
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/PIVOTADDL.cpp
View file @ 56a4e80c
...@@ -69,109 +69,122 @@ PIVOTADDL = SXAddl_SXCView_SXDId *Continue_SxaddlSxString ...@@ -69,109 +69,122 @@ PIVOTADDL = SXAddl_SXCView_SXDId *Continue_SxaddlSxString
[SXADDLSXFILTERS12] *SXAddl_SXCView_SXDVerUpdInv *SXAddl_SXCView_SXDSXPIIvmb [SXADDLSXFILTERS12] *SXAddl_SXCView_SXDVerUpdInv *SXAddl_SXCView_SXDSXPIIvmb
[SXAddl_SXCView_SXDVerUpdInv] SXAddl_SXCView_SXDEnd [SXAddl_SXCView_SXDVerUpdInv] SXAddl_SXCView_SXDEnd
*/ */
const bool PIVOTADDL::loadContent(BinProcessor& proc) const bool PIVOTADDL::loadContent(BinProcessor& proc)
{ {
if(!proc.mandatory<SXAddl_SXCView_SXDId>()) int count = proc.repeated<SXAddl>(0, 0);
{
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>()) for (std::list<BaseObjectPtr>::iterator it = elements_.begin(); it != elements_.end(); it++)
{ {
elements_.pop_back(); SXAddl* addl = dynamic_cast<SXAddl*>(it->get());
if (!addl) continue;
SXAddl_SXCView_SXDTableStyleClient* p = dynamic_cast<SXAddl_SXCView_SXDTableStyleClient*>(addl->content.get());
if (p)
{
m_SXAddl_SXCView_SXDTableStyleClient = addl->content;
}
} }
//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; return true;
} }
......
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/PIVOTADDL.h
View file @ 56a4e80c
...@@ -49,21 +49,21 @@ public: ...@@ -49,21 +49,21 @@ public:
static const ElementType type = typePIVOTADDL; static const ElementType type = typePIVOTADDL;
BaseObjectPtr m_SXAddl_SXCView_SXDId; BiffStructurePtr m_SXAddl_SXCView_SXDId;
BaseObjectPtr m_SXAddl_SXCView_SXDVer10Info; BiffStructurePtr m_SXAddl_SXCView_SXDVer10Info;
BaseObjectPtr m_SXAddl_SXCView_SXDVer12Info; BiffStructurePtr m_SXAddl_SXCView_SXDVer12Info;
BaseObjectPtr m_SXAddl_SXCView_SXDCompactRwHdr; BiffStructurePtr m_SXAddl_SXCView_SXDCompactRwHdr;
BaseObjectPtr m_SXAddl_SXCView_SXDCompactColHdr; BiffStructurePtr m_SXAddl_SXCView_SXDCompactColHdr;
BaseObjectPtr m_SXAddl_SXADDLSXFILTERS12; BiffStructurePtr m_SXAddl_SXADDLSXFILTERS12;
BaseObjectPtr m_SXADDLCONDFMTS; BiffStructurePtr m_SXADDLCONDFMTS;
BaseObjectPtr m_SXAddl_SXCView_SXDTableStyleClient; BiffStructurePtr m_SXAddl_SXCView_SXDTableStyleClient;
std::vector<BaseObjectPtr> m_arSXAddl_SXCView_SXDVerUpdInv; std::vector<BiffStructurePtr> m_arSXAddl_SXCView_SXDVerUpdInv;
std::vector<BaseObjectPtr> m_arSXAddl_SXCView_SXDSXPIIvmb; std::vector<BiffStructurePtr> m_arSXAddl_SXCView_SXDSXPIIvmb;
std::vector<BaseObjectPtr> m_arSXADDLFIELD; std::vector<BiffStructurePtr> m_arSXADDLFIELD;
std::vector<BaseObjectPtr> m_arSXADDLHIERARCHY; std::vector<BiffStructurePtr> m_arSXADDLHIERARCHY;
std::vector<BaseObjectPtr> m_arSXADDLCALCMEMBER; std::vector<BiffStructurePtr> m_arSXADDLCALCMEMBER;
}; };
......
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/PIVOTFRT.cpp
View file @ 56a4e80c
...@@ -31,8 +31,8 @@ ...@@ -31,8 +31,8 @@
*/ */
#include "PIVOTFRT.h" #include "PIVOTFRT.h"
#include <Logic/Biff_unions/PIVOTFRT9.h> #include "PIVOTFRT9.h"
#include <Logic/Biff_unions/PIVOTADDL.h> #include "PIVOTADDL.h"
namespace XLS namespace XLS
{ {
......
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/PIVOTVIEW.cpp
View file @ 56a4e80c
...@@ -38,9 +38,11 @@ ...@@ -38,9 +38,11 @@
#include "PIVOTPI.h" #include "PIVOTPI.h"
#include "PIVOTLI.h" #include "PIVOTLI.h"
#include "PIVOTEX.h" #include "PIVOTEX.h"
#include "PIVOTADDL.h"
#include "../Biff_records/SXDI.h" #include "../Biff_records/SXDI.h"
#include "../Biff_records/SxView.h" #include "../Biff_records/SxView.h"
#include "../Biff_records/SXAddl.h"
namespace XLS namespace XLS
{ {
...@@ -96,6 +98,8 @@ int PIVOTVIEW::serialize(std::wostream & strm) ...@@ -96,6 +98,8 @@ int PIVOTVIEW::serialize(std::wostream & strm)
PIVOTFRT* frt = dynamic_cast<PIVOTFRT*>(m_PIVOTFRT.get()); PIVOTFRT* frt = dynamic_cast<PIVOTFRT*>(m_PIVOTFRT.get());
PIVOTADDL* addls = frt ? dynamic_cast<PIVOTADDL*>(frt->m_PIVOTADDL.get()) : NULL;
indexCache = view->iCache; indexCache = view->iCache;
CP_XML_WRITER(strm) CP_XML_WRITER(strm)
...@@ -204,14 +208,21 @@ int PIVOTVIEW::serialize(std::wostream & strm) ...@@ -204,14 +208,21 @@ int PIVOTVIEW::serialize(std::wostream & strm)
} }
} }
} }
//CP_XML_NODE(L"pivotTableStyleInfo")
//{
// CP_XML_ATTR(L"showRowHeaders", 1); if ((addls) && (addls->m_SXAddl_SXCView_SXDTableStyleClient))
// CP_XML_ATTR(L"showColHeaders", 1); {
// CP_XML_ATTR(L"showRowStripes", 0); SXAddl_SXCView_SXDTableStyleClient* table_style = dynamic_cast<SXAddl_SXCView_SXDTableStyleClient*>(addls->m_SXAddl_SXCView_SXDTableStyleClient.get());
// CP_XML_ATTR(L"showColStripes", 0); CP_XML_NODE(L"pivotTableStyleInfo")
// CP_XML_ATTR(L"showLastColumn", 1); {
//} CP_XML_ATTR(L"name", table_style->stName.value());
CP_XML_ATTR(L"showRowHeaders", table_style->fRowHeaders);
CP_XML_ATTR(L"showColHeaders", table_style->fColumnHeaders);
CP_XML_ATTR(L"showRowStripes", table_style->fRowStrips);
CP_XML_ATTR(L"showColStripes", table_style->fColumnStrips);
CP_XML_ATTR(L"showLastColumn", table_style->fLastColumn);
}
}
} }
} }
......
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/SXADDLAUTOSORT.cpp
View file @ 56a4e80c
...@@ -57,12 +57,12 @@ BaseObjectPtr SXADDLAUTOSORT::clone() ...@@ -57,12 +57,12 @@ 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>()) //if(!proc.mandatory<SXAddl_SXCAutoSort_SXDId>())
{ //{
return false; // return false;
} //}
proc.mandatory<SXADDLSXRULE>(); //proc.mandatory<SXADDLSXRULE>();
proc.mandatory<SXAddl_SXCAutoSort_SXDEnd>(); //proc.mandatory<SXAddl_SXCAutoSort_SXDEnd>();
return true; return true;
} }
......
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/SXADDLCACHE.cpp
View file @ 56a4e80c
...@@ -60,39 +60,39 @@ BaseObjectPtr SXADDLCACHE::clone() ...@@ -60,39 +60,39 @@ BaseObjectPtr SXADDLCACHE::clone()
//[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>()) //if(!proc.mandatory<SXAddl_SXCCache_SXDId>())
{ //{
return false; // return false;
} //}
m_SXCCache_SXDId = elements_.back(); //m_SXCCache_SXDId = elements_.back();
elements_.pop_back(); //elements_.pop_back();
if (proc.optional<SXAddl_SXCCache_SXDVer10Info>()) //if (proc.optional<SXAddl_SXCCache_SXDVer10Info>())
{ //{
m_SXDVer10Info = elements_.back(); // m_SXDVer10Info = elements_.back();
elements_.pop_back(); // elements_.pop_back();
} //}
if (proc.optional<SXAddl_SXCCache_SXDVerSXMacro>()) //if (proc.optional<SXAddl_SXCCache_SXDVerSXMacro>())
{ //{
m_SXDVerSXMacro = elements_.back(); // m_SXDVerSXMacro = elements_.back();
elements_.pop_back(); // elements_.pop_back();
} //}
if (proc.optional<SXADDLCACHE12>()) //if (proc.optional<SXADDLCACHE12>())
{ //{
m_SXADDLCACHE12 = elements_.back(); // m_SXADDLCACHE12 = elements_.back();
elements_.pop_back(); // elements_.pop_back();
} //}
if (proc.optional<SXADDLDBQUERY>()) //if (proc.optional<SXADDLDBQUERY>())
{ //{
m_SXADDLDBQUERY = elements_.back(); // m_SXADDLDBQUERY = elements_.back();
elements_.pop_back(); // elements_.pop_back();
} //}
int count = proc.repeated<UNKNOWNFRT>(0, 0); //int count = proc.repeated<UNKNOWNFRT>(0, 0);
if (proc.optional<SXAddl_SXCCache_SXDEnd>()) //if (proc.optional<SXAddl_SXCCache_SXDEnd>())
{ //{
elements_.pop_back(); // elements_.pop_back();
} //}
return true; return true;
} }
......
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/SXADDLCACHE12.cpp
View file @ 56a4e80c
...@@ -60,45 +60,45 @@ BaseObjectPtr SXADDLCACHE12::clone() ...@@ -60,45 +60,45 @@ BaseObjectPtr SXADDLCACHE12::clone()
// *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>()) //if(!proc.mandatory<SXAddl_SXCCache_SXDVerUpdInv>())
{ //{
return false; // return false;
} //}
m_SXAddl_SXCCache_SXDVerUpdInv = elements_.back(); //m_SXAddl_SXCCache_SXDVerUpdInv = elements_.back();
elements_.pop_back(); //elements_.pop_back();
if (proc.optional<SXAddl_SXCCache_SXDInfo12>()) //if (proc.optional<SXAddl_SXCCache_SXDInfo12>())
{ //{
m_SXAddl_SXCCache_SXDInfo12 = elements_.back(); // m_SXAddl_SXCCache_SXDInfo12 = elements_.back();
elements_.pop_back(); // elements_.pop_back();
} //}
if (proc.optional<SXAddl_SXCCache_SXDInvRefreshReal>()) //if (proc.optional<SXAddl_SXCCache_SXDInvRefreshReal>())
{ //{
m_SXAddl_SXCCache_SXDInvRefreshReal = elements_.back(); // m_SXAddl_SXCCache_SXDInvRefreshReal = elements_.back();
elements_.pop_back(); // elements_.pop_back();
} //}
//
int count = proc.repeated<SXADDLCACHEFIELD>(0, 0); //int count = proc.repeated<SXADDLCACHEFIELD>(0, 0);
while(count > 0) //while(count > 0)
{ //{
m_arSXADDLCACHEFIELD.push_back(elements_.front()); // m_arSXADDLCACHEFIELD.push_back(elements_.front());
elements_.pop_front(); count--; // elements_.pop_front(); count--;
} //}
if (proc.optional<SXADDLSXDH>()) //if (proc.optional<SXADDLSXDH>())
{ //{
m_SXADDLSXDH = elements_.back(); // m_SXADDLSXDH = elements_.back();
elements_.pop_back(); // elements_.pop_back();
} //}
if (proc.optional<SXADDLSXMGS>()) //if (proc.optional<SXADDLSXMGS>())
{ //{
m_SXADDLSXMGS = elements_.back(); // m_SXADDLSXMGS = elements_.back();
elements_.pop_back(); // elements_.pop_back();
} //}
if (proc.optional<SXAddl_SXCCache_SXDVerUpdInv>()) //if (proc.optional<SXAddl_SXCCache_SXDVerUpdInv>())
{ //{
m_SXAddl_SXCCache_SXDVerUpdInvS = elements_.back(); // m_SXAddl_SXCCache_SXDVerUpdInvS = elements_.back();
elements_.pop_back(); // elements_.pop_back();
} //}
return true; return true;
} }
......
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/SXADDLCACHEFIELD.cpp
View file @ 56a4e80c
...@@ -59,11 +59,11 @@ public: ...@@ -59,11 +59,11 @@ public:
const bool loadContent(BinProcessor& proc) const bool loadContent(BinProcessor& proc)
{ {
if(!proc.mandatory<SXAddl_SXCCacheField_SXDCaption>()) //if(!proc.mandatory<SXAddl_SXCCacheField_SXDCaption>())
{ //{
return false; // return false;
} //}
proc.repeated<Continue_SxaddlSxString>(0, 0); //proc.repeated<Continue_SxaddlSxString>(0, 0);
return true; return true;
}; };
}; };
...@@ -81,11 +81,11 @@ public: ...@@ -81,11 +81,11 @@ public:
const bool loadContent(BinProcessor& proc) const bool loadContent(BinProcessor& proc)
{ {
if(!proc.mandatory<SXAddl_SXCCacheField_SXDPropName>()) //if(!proc.mandatory<SXAddl_SXCCacheField_SXDPropName>())
{ //{
return false; // return false;
} //}
proc.repeated<Continue_SxaddlSxString>(0, 0); //proc.repeated<Continue_SxaddlSxString>(0, 0);
return true; return true;
}; };
}; };
...@@ -102,11 +102,11 @@ public: ...@@ -102,11 +102,11 @@ public:
const bool loadContent(BinProcessor& proc) const bool loadContent(BinProcessor& proc)
{ {
if(!proc.mandatory<SXAddl_SXCCacheField_SXDProperty>()) //if(!proc.mandatory<SXAddl_SXCCacheField_SXDProperty>())
{ //{
return false; // return false;
} //}
proc.optional<Parenthesis_SXADDLCACHEFIELD_3>(); //proc.optional<Parenthesis_SXADDLCACHEFIELD_3>();
return true; return true;
}; };
}; };
...@@ -123,11 +123,11 @@ public: ...@@ -123,11 +123,11 @@ public:
const bool loadContent(BinProcessor& proc) const bool loadContent(BinProcessor& proc)
{ {
if(!proc.mandatory<SXAddl_SXCCacheField_SXDIfdbMpMapCount>()) //if(!proc.mandatory<SXAddl_SXCCacheField_SXDIfdbMpMapCount>())
{ //{
return false; // return false;
} //}
proc.mandatory<SXAddl_SXCCacheField_SXDIfdbMempropMap>(); //proc.mandatory<SXAddl_SXCCacheField_SXDIfdbMempropMap>();
return true; return true;
}; };
}; };
...@@ -144,12 +144,12 @@ public: ...@@ -144,12 +144,12 @@ public:
const bool loadContent(BinProcessor& proc) const bool loadContent(BinProcessor& proc)
{ {
if(!proc.mandatory<SXAddl_SXCCacheField_SXDSxrmitmCount>()) //if(!proc.mandatory<SXAddl_SXCCacheField_SXDSxrmitmCount>())
{ //{
return false; // return false;
} //}
proc.repeated<SXADDLCACHEITEM>(0, 0); //proc.repeated<SXADDLCACHEITEM>(0, 0);
proc.mandatory<SXAddl_SXCCacheItem_SXDEnd>(); //proc.mandatory<SXAddl_SXCCacheItem_SXDEnd>();
return true; return true;
}; };
}; };
...@@ -171,16 +171,16 @@ BaseObjectPtr SXADDLCACHEFIELD::clone() ...@@ -171,16 +171,16 @@ BaseObjectPtr SXADDLCACHEFIELD::clone()
// SXAddl_SXCCacheField_SXDEnd // SXAddl_SXCCacheField_SXDEnd
const bool SXADDLCACHEFIELD::loadContent(BinProcessor& proc) const bool SXADDLCACHEFIELD::loadContent(BinProcessor& proc)
{ {
if(!proc.mandatory<SXAddl_SXCCacheField_SXDId>()) //if(!proc.mandatory<SXAddl_SXCCacheField_SXDId>())
{ //{
return false; // return false;
} //}
proc.repeated<Continue_SxaddlSxString>(0, 0); //proc.repeated<Continue_SxaddlSxString>(0, 0);
proc.optional<Parenthesis_SXADDLCACHEFIELD_1>(); //proc.optional<Parenthesis_SXADDLCACHEFIELD_1>();
proc.optional<Parenthesis_SXADDLCACHEFIELD_2>(); //proc.optional<Parenthesis_SXADDLCACHEFIELD_2>();
proc.optional<Parenthesis_SXADDLCACHEFIELD_4>(); //proc.optional<Parenthesis_SXADDLCACHEFIELD_4>();
proc.optional<Parenthesis_SXADDLCACHEFIELD_5>(); //proc.optional<Parenthesis_SXADDLCACHEFIELD_5>();
proc.optional<SXAddl_SXCCacheField_SXDEnd>(); //proc.optional<SXAddl_SXCCacheField_SXDEnd>();
return true; return true;
} }
......
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/SXADDLCACHEITEM.cpp
View file @ 56a4e80c
...@@ -58,11 +58,11 @@ public: ...@@ -58,11 +58,11 @@ public:
const bool loadContent(BinProcessor& proc) const bool loadContent(BinProcessor& proc)
{ {
if(!proc.mandatory<SXAddl_SXCCacheItem_SXDSxrmitmDisp>()) //if(!proc.mandatory<SXAddl_SXCCacheItem_SXDSxrmitmDisp>())
{ //{
return false; // return false;
} //}
proc.repeated<Continue_SxaddlSxString>(0, 0); //proc.repeated<Continue_SxaddlSxString>(0, 0);
return true; return true;
}; };
}; };
...@@ -79,11 +79,11 @@ public: ...@@ -79,11 +79,11 @@ public:
const bool loadContent(BinProcessor& proc) const bool loadContent(BinProcessor& proc)
{ {
if(!proc.mandatory<SXAddl_SXCCacheItem_SXDItmMpMapCount>()) //if(!proc.mandatory<SXAddl_SXCCacheItem_SXDItmMpMapCount>())
{ //{
return false; // return false;
} //}
proc.mandatory<SXAddl_SXCCacheItem_SXDItmMpropMap>(); //proc.mandatory<SXAddl_SXCCacheItem_SXDItmMpropMap>();
return true; return true;
}; };
}; };
...@@ -99,12 +99,12 @@ BaseObjectPtr SXADDLCACHEITEM::clone() ...@@ -99,12 +99,12 @@ BaseObjectPtr SXADDLCACHEITEM::clone()
// *(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>()) //if(!proc.mandatory<SXAddl_SXCCacheItem_SXDId>())
{ //{
return false; // return false;
} //}
proc.optional<Parenthesis_SXADDLCACHEITEM_1>(); //proc.optional<Parenthesis_SXADDLCACHEITEM_1>();
proc.repeated<Parenthesis_SXADDLCACHEITEM_2>(0, 0); //proc.repeated<Parenthesis_SXADDLCACHEITEM_2>(0, 0);
return true; return true;
} }
......
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/SXADDLCALCMEMBER.cpp
View file @ 56a4e80c
...@@ -56,14 +56,14 @@ BaseObjectPtr SXADDLCALCMEMBER::clone() ...@@ -56,14 +56,14 @@ 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>()) //if(!proc.mandatory<SXAddl_SXCView_SXDCalcMember>())
{ //{
return false; // return false;
} //}
if(proc.optional<SXAddl_SXCView_SXDCalcMemString>()) //if(proc.optional<SXAddl_SXCView_SXDCalcMemString>())
{ //{
int count = proc.repeated<Continue_SxaddlSxString>(0, 0); // int count = proc.repeated<Continue_SxaddlSxString>(0, 0);
} //}
return true; return true;
} }
......
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/SXADDLCONDFMT.cpp
View file @ 56a4e80c
...@@ -57,12 +57,12 @@ BaseObjectPtr SXADDLCONDFMT::clone() ...@@ -57,12 +57,12 @@ 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>()) //if(!proc.mandatory<SXAddl_SXCSXCondFmt_SXDSXCondFmt>())
{ //{
return false; // return false;
} //}
proc.repeated<SXADDLSXRULE>(0, 0); //proc.repeated<SXADDLSXRULE>(0, 0);
proc.mandatory<SXAddl_SXCSXCondFmt_SXDEnd>(); //proc.mandatory<SXAddl_SXCSXCondFmt_SXDEnd>();
return true; return true;
} }
......
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/SXADDLCONDFMTS.cpp
View file @ 56a4e80c
...@@ -57,12 +57,12 @@ BaseObjectPtr SXADDLCONDFMTS::clone() ...@@ -57,12 +57,12 @@ 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>()) //if(!proc.mandatory<SXAddl_SXCSXCondFmts_SXDId>())
{ //{
return false; // return false;
} //}
proc.repeated<SXADDLCONDFMT>(0, 0); //proc.repeated<SXADDLCONDFMT>(0, 0);
proc.optional<SXAddl_SXCSXCondFmts_SXDEnd>(); //proc.optional<SXAddl_SXCSXCondFmts_SXDEnd>();
return true; return true;
} }
......
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/SXADDLDBQUERY.cpp
View file @ 56a4e80c
...@@ -61,39 +61,39 @@ SXADDLDBQUERY = [SXAddl_SXCQuery_SXDXMLSource *Continue_SxaddlSxString] ...@@ -61,39 +61,39 @@ SXADDLDBQUERY = [SXAddl_SXCQuery_SXDXMLSource *Continue_SxaddlSxString]
*/ */
const bool SXADDLDBQUERY::loadContent(BinProcessor& proc) const bool SXADDLDBQUERY::loadContent(BinProcessor& proc)
{ {
int count = 0; //int count = 0;
//
if(proc.optional<SXAddl_SXCQuery_SXDXMLSource>()) //if(proc.optional<SXAddl_SXCQuery_SXDXMLSource>())
{ //{
m_XMLSource = elements_.back(); // m_XMLSource = elements_.back();
elements_.pop_back(); // elements_.pop_back();
count = proc.repeated<Continue_SxaddlSxString>(0, 0); // count = proc.repeated<Continue_SxaddlSxString>(0, 0);
} //}
if(proc.optional<SXAddl_SXCQuery_SXDSrcDataFile>()) //if(proc.optional<SXAddl_SXCQuery_SXDSrcDataFile>())
{ //{
m_SrcDataFile = elements_.back(); // m_SrcDataFile = elements_.back();
elements_.pop_back(); // elements_.pop_back();
count = proc.repeated<Continue_SxaddlSxString>(0, 0); // count = proc.repeated<Continue_SxaddlSxString>(0, 0);
} //}
if(proc.optional<SXAddl_SXCQuery_SXDSrcConnFile>()) //if(proc.optional<SXAddl_SXCQuery_SXDSrcConnFile>())
{ //{
m_SrcConnFile = elements_.back(); // m_SrcConnFile = elements_.back();
elements_.pop_back(); // elements_.pop_back();
count = proc.repeated<Continue_SxaddlSxString>(0, 0); // count = proc.repeated<Continue_SxaddlSxString>(0, 0);
} //}
if(proc.optional<SXAddl_SXCQuery_SXDReconnCond>()) //if(proc.optional<SXAddl_SXCQuery_SXDReconnCond>())
{ //{
m_ReconnCond = elements_.back(); // m_ReconnCond = elements_.back();
elements_.pop_back(); // elements_.pop_back();
} //}
if(proc.mandatory<SXAddl_SXCQuery_SXDEnd>()) //if(proc.mandatory<SXAddl_SXCQuery_SXDEnd>())
{ //{
elements_.pop_back(); // elements_.pop_back();
} //}
return m_XMLSource || m_SrcConnFile || m_SrcDataFile || m_ReconnCond; return m_XMLSource || m_SrcConnFile || m_SrcDataFile || m_ReconnCond;
} }
......
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/SXADDLFIELD.cpp
View file @ 56a4e80c
...@@ -60,22 +60,23 @@ SXADDLFIELD = [SXAddl_SXCField_SXDId *Continue_SxaddlSxString SXAddl_SXCField_SX ...@@ -60,22 +60,23 @@ 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>()) //if(proc.optional<SXAddl_SXCField_SXDId>())
{ //{
int count = proc.repeated<Continue_SxaddlSxString>(0, 0); // int count = proc.repeated<Continue_SxaddlSxString>(0, 0);
if (proc.mandatory<SXAddl_SXCField_SXDVer10Info>()) // if (proc.mandatory<SXAddl_SXCField_SXDVer10Info>())
{ // {
} // }
if (proc.mandatory<SXAddl_SXCField_SXDEnd>()) // if (proc.mandatory<SXAddl_SXCField_SXDEnd>())
{ // {
} // }
if (proc.optional<SXADDLFIELD12>()) // if (proc.optional<SXADDLFIELD12>())
{ // {
} // }
return true; // return true;
} //}
return proc.optional<SXADDLFIELD12>(); //return proc.optional<SXADDLFIELD12>();
return true;
} }
} // namespace XLS } // namespace XLS
......
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/SXADDLFIELD12.cpp
View file @ 56a4e80c
...@@ -63,23 +63,23 @@ SXADDLFIELD12 = SXAddl_SXCField12_SXDId *Continue_SxaddlSxString SXAddl_SXCField ...@@ -63,23 +63,23 @@ 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>()) //if(!proc.mandatory<SXAddl_SXCField12_SXDId>())
{ //{
return false; // return false;
} //}
proc.repeated<Continue_SxaddlSxString>(0, 0); //proc.repeated<Continue_SxaddlSxString>(0, 0);
proc.mandatory<SXAddl_SXCField12_SXDVer12Info>(); //proc.mandatory<SXAddl_SXCField12_SXDVer12Info>();
proc.mandatory<SXAddl_SXCField12_SXDVerUpdInv>(); //proc.mandatory<SXAddl_SXCField12_SXDVerUpdInv>();
if(proc.optional<SXAddl_SXCField12_SXDMemberCaption>()) //if(proc.optional<SXAddl_SXCField12_SXDMemberCaption>())
{ //{
proc.repeated<Continue_SxaddlSxString>(0, 0); // proc.repeated<Continue_SxaddlSxString>(0, 0);
} //}
proc.optional<SXAddl_SXCField12_SXDAutoshow>(); //proc.optional<SXAddl_SXCField12_SXDAutoshow>();
proc.optional<SXAddl_SXCField12_SXDISXTH>(); //proc.optional<SXAddl_SXCField12_SXDISXTH>();
proc.optional<SXADDLAUTOSORT>(); //proc.optional<SXADDLAUTOSORT>();
proc.mandatory<SXAddl_SXCField12_SXDVerUpdInv>(); //proc.mandatory<SXAddl_SXCField12_SXDVerUpdInv>();
proc.repeated<UNKNOWNFRT>(0, 0); //proc.repeated<UNKNOWNFRT>(0, 0);
proc.mandatory<SXAddl_SXCField12_SXDEnd>(); //proc.mandatory<SXAddl_SXCField12_SXDEnd>();
return true; return true;
} }
......
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/SXADDLGROUP.cpp
View file @ 56a4e80c
...@@ -60,15 +60,15 @@ SXADDLGROUP = SXAddl_SXCGroup_SXDId *Continue_SxaddlSxString SXAddl_SXCGroup_SXD ...@@ -60,15 +60,15 @@ 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>()) //if(!proc.mandatory<SXAddl_SXCGroup_SXDId>())
{ //{
return false; // return false;
} //}
proc.repeated<Continue_SxaddlSxString>(0, 0); //proc.repeated<Continue_SxaddlSxString>(0, 0);
proc.mandatory<SXAddl_SXCGroup_SXDGrpInfo>(); //proc.mandatory<SXAddl_SXCGroup_SXDGrpInfo>();
proc.repeated<SXAddl_SXCGroup_SXDMember>(0, 0); //proc.repeated<SXAddl_SXCGroup_SXDMember>(0, 0);
proc.repeated<UNKNOWNFRT>(0, 0); //proc.repeated<UNKNOWNFRT>(0, 0);
proc.mandatory<SXAddl_SXCGroup_SXDEnd>(); //proc.mandatory<SXAddl_SXCGroup_SXDEnd>();
return true; return true;
} }
......
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/SXADDLGRPLEVEL.cpp
View file @ 56a4e80c
...@@ -61,15 +61,15 @@ SXADDLGRPLEVEL = SXAddl_SXCGrpLevel_SXDId *Continue_SxaddlSxString SXAddl_SXCGrp ...@@ -61,15 +61,15 @@ 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>()) //if(!proc.mandatory<SXAddl_SXCGrpLevel_SXDId>())
{ //{
return false; // return false;
} //}
proc.repeated<Continue_SxaddlSxString>(0, 0); //proc.repeated<Continue_SxaddlSxString>(0, 0);
proc.mandatory<SXAddl_SXCGrpLevel_SXDGrpLevelInfo>(); //proc.mandatory<SXAddl_SXCGrpLevel_SXDGrpLevelInfo>();
proc.repeated<SXADDLGROUP>(0, 0); //proc.repeated<SXADDLGROUP>(0, 0);
proc.repeated<UNKNOWNFRT>(0, 0); //proc.repeated<UNKNOWNFRT>(0, 0);
proc.mandatory<SXAddl_SXCGrpLevel_SXDEnd>(); //proc.mandatory<SXAddl_SXCGrpLevel_SXDEnd>();
return true; return true;
} }
......
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/SXADDLHIERARCHY.cpp
View file @ 56a4e80c
...@@ -75,67 +75,67 @@ SXADDLHIERARCHY = SXAddl_SXCHierarchy_SXDId *Continue_SxaddlSxString *SXAddl_SXC ...@@ -75,67 +75,67 @@ 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>()) //if(!proc.mandatory<SXAddl_SXCHierarchy_SXDId>())
{ //{
return false; // return false;
} //}
proc.repeated<Continue_SxaddlSxString>(0, 0); //proc.repeated<Continue_SxaddlSxString>(0, 0);
proc.repeated<SXAddl_SXCHierarchy_SXDProperty>(0, 0); //proc.repeated<SXAddl_SXCHierarchy_SXDProperty>(0, 0);
proc.repeated<SXADDLGRPLEVEL>(0, 0); //proc.repeated<SXADDLGRPLEVEL>(0, 0);
proc.optional<SXAddl_SXCHierarchy_SXDVerUpdInv>(); //proc.optional<SXAddl_SXCHierarchy_SXDVerUpdInv>();
if(proc.optional<SXAddl_SXCHierarchy_SXDSXSetParentUnique>()) //if(proc.optional<SXAddl_SXCHierarchy_SXDSXSetParentUnique>())
{ //{
proc.repeated<Continue_SxaddlSxString>(0, 0); // proc.repeated<Continue_SxaddlSxString>(0, 0);
} //}
proc.optional<SXAddl_SXCHierarchy_SXDIconSet>(); //proc.optional<SXAddl_SXCHierarchy_SXDIconSet>();
if(proc.optional<SXAddl_SXCHierarchy_SXDUserCaption>()) //if(proc.optional<SXAddl_SXCHierarchy_SXDUserCaption>())
{ //{
proc.repeated<Continue_SxaddlSxString>(0, 0); // proc.repeated<Continue_SxaddlSxString>(0, 0);
} //}
proc.repeated<UNKNOWNFRT>(0, 0); //proc.repeated<UNKNOWNFRT>(0, 0);
proc.optional<SXAddl_SXCHierarchy_SXDVerUpdInv>(); //proc.optional<SXAddl_SXCHierarchy_SXDVerUpdInv>();
proc.repeated<SXAddl_SXCHierarchy_SXDUserCaption>(0, 0); //proc.repeated<SXAddl_SXCHierarchy_SXDUserCaption>(0, 0);
proc.optional<SXAddl_SXCHierarchy_SXDVerUpdInv>(); //proc.optional<SXAddl_SXCHierarchy_SXDVerUpdInv>();
proc.optional<SXAddl_SXCHierarchy_SXDInfo12>(); //proc.optional<SXAddl_SXCHierarchy_SXDInfo12>();
if(proc.optional<SXAddl_SXCHierarchy_SXDDisplayFolder>()) //if(proc.optional<SXAddl_SXCHierarchy_SXDDisplayFolder>())
{ //{
proc.repeated<Continue_SxaddlSxString>(0, 0); // proc.repeated<Continue_SxaddlSxString>(0, 0);
} //}
if(proc.optional<SXAddl_SXCHierarchy_SXDMeasureGrp>()) //if(proc.optional<SXAddl_SXCHierarchy_SXDMeasureGrp>())
{ //{
proc.repeated<Continue_SxaddlSxString>(0, 0); // proc.repeated<Continue_SxaddlSxString>(0, 0);
} //}
if(proc.optional<SXAddl_SXCHierarchy_SXDParentKPI>()) //if(proc.optional<SXAddl_SXCHierarchy_SXDParentKPI>())
{ //{
proc.repeated<Continue_SxaddlSxString>(0, 0); // proc.repeated<Continue_SxaddlSxString>(0, 0);
} //}
if(proc.optional<SXAddl_SXCHierarchy_SXDKPIValue>()) //if(proc.optional<SXAddl_SXCHierarchy_SXDKPIValue>())
{ //{
proc.repeated<Continue_SxaddlSxString>(0, 0); // proc.repeated<Continue_SxaddlSxString>(0, 0);
} //}
if(proc.optional<SXAddl_SXCHierarchy_SXDKPIGoal>()) //if(proc.optional<SXAddl_SXCHierarchy_SXDKPIGoal>())
{ //{
proc.repeated<Continue_SxaddlSxString>(0, 0); // proc.repeated<Continue_SxaddlSxString>(0, 0);
} //}
if(proc.optional<SXAddl_SXCHierarchy_SXDKPIStatus>()) //if(proc.optional<SXAddl_SXCHierarchy_SXDKPIStatus>())
{ //{
proc.repeated<Continue_SxaddlSxString>(0, 0); // proc.repeated<Continue_SxaddlSxString>(0, 0);
} //}
if(proc.optional<SXAddl_SXCHierarchy_SXDKPITrend>()) //if(proc.optional<SXAddl_SXCHierarchy_SXDKPITrend>())
{ //{
proc.repeated<Continue_SxaddlSxString>(0, 0); // proc.repeated<Continue_SxaddlSxString>(0, 0);
} //}
if(proc.optional<SXAddl_SXCHierarchy_SXDKPIWeight>()) //if(proc.optional<SXAddl_SXCHierarchy_SXDKPIWeight>())
{ //{
proc.repeated<Continue_SxaddlSxString>(0, 0); // proc.repeated<Continue_SxaddlSxString>(0, 0);
} //}
if(proc.optional<SXAddl_SXCHierarchy_SXDKPITime>()) //if(proc.optional<SXAddl_SXCHierarchy_SXDKPITime>())
{ //{
proc.repeated<Continue_SxaddlSxString>(0, 0); // proc.repeated<Continue_SxaddlSxString>(0, 0);
} //}
proc.mandatory<SXAddl_SXCHierarchy_SXDEnd>(); //proc.mandatory<SXAddl_SXCHierarchy_SXDEnd>();
return true; return true;
} }
......
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/SXADDLQSI.cpp
View file @ 56a4e80c
...@@ -58,13 +58,13 @@ BaseObjectPtr SXADDLQSI::clone() ...@@ -58,13 +58,13 @@ BaseObjectPtr SXADDLQSI::clone()
// 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>()) //if(!proc.mandatory<SXAddl_SXCQsi_SXDId>())
{ //{
return false; // return false;
} //}
proc.mandatory<SXADDLDBQUERY>(); //proc.mandatory<SXADDLDBQUERY>();
proc.repeated<UNKNOWNFRT>(0, 0); //proc.repeated<UNKNOWNFRT>(0, 0);
proc.mandatory<SXAddl_SXCQsi_SXDEnd>(); //proc.mandatory<SXAddl_SXCQsi_SXDEnd>();
return true; return true;
} }
......
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/SXADDLSXDH.cpp
View file @ 56a4e80c
...@@ -57,12 +57,12 @@ BaseObjectPtr SXADDLSXDH::clone() ...@@ -57,12 +57,12 @@ BaseObjectPtr SXADDLSXDH::clone()
const bool SXADDLSXDH::loadContent(BinProcessor& proc) const bool SXADDLSXDH::loadContent(BinProcessor& proc)
{ {
if(!proc.mandatory<SXAddl_SXCSXDH_SXDId>()) //if(!proc.mandatory<SXAddl_SXCSXDH_SXDId>())
{ //{
return false; // return false;
} //}
proc.repeated<SXAddl_SXCSXDH_SXDSxdh>(0, 0); //proc.repeated<SXAddl_SXCSXDH_SXDSxdh>(0, 0);
proc.mandatory<SXAddl_SXCSXDH_SXDEnd>(); //proc.mandatory<SXAddl_SXCSXDH_SXDEnd>();
return true; return true;
} }
......
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/SXADDLSXFILT.cpp
View file @ 56a4e80c
...@@ -56,13 +56,13 @@ BaseObjectPtr SXADDLSXFILT::clone() ...@@ -56,13 +56,13 @@ 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>()) //if(!proc.mandatory<SXAddl_SXCSXfilt_SXDId>())
{ //{
return false; // return false;
} //}
proc.mandatory<SXAddl_SXCSXfilt_SXDSXfilt>(); //proc.mandatory<SXAddl_SXCSXfilt_SXDSXfilt>();
proc.optional<SXAddl_SXCSXfilt_SXDSXItm>(); //proc.optional<SXAddl_SXCSXfilt_SXDSXItm>();
proc.mandatory<SXAddl_SXCSXfilt_SXDEnd>(); //proc.mandatory<SXAddl_SXCSXfilt_SXDEnd>();
return true; return true;
} }
......
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/SXADDLSXFILTER12.cpp
View file @ 56a4e80c
...@@ -65,38 +65,38 @@ SXADDLSXFILTER12 = SXAddl_SXCSXFilter12_SXDId SXAddl_SXCSXFilter12_SXDSXFilter ...@@ -65,38 +65,38 @@ 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>()) //if(!proc.mandatory<SXAddl_SXCSXFilter12_SXDId>())
{ //{
return false; // return false;
} //}
proc.mandatory<SXAddl_SXCSXFilter12_SXDSXFilter>(); //proc.mandatory<SXAddl_SXCSXFilter12_SXDSXFilter>();
if(proc.optional<SXAddl_SXCSXFilter12_SXDCaption>()) //if(proc.optional<SXAddl_SXCSXFilter12_SXDCaption>())
{ //{
proc.repeated<Continue_SxaddlSxString>(0, 0); // proc.repeated<Continue_SxaddlSxString>(0, 0);
} //}
if(proc.optional<SXAddl_SXCSXFilter12_SXDSXFilterDesc>()) //if(proc.optional<SXAddl_SXCSXFilter12_SXDSXFilterDesc>())
{ //{
proc.repeated<Continue_SxaddlSxString>(0, 0); // proc.repeated<Continue_SxaddlSxString>(0, 0);
} //}
if(proc.optional<SXAddl_SXCSXFilter12_SXDSXFilterValue1>()) //if(proc.optional<SXAddl_SXCSXFilter12_SXDSXFilterValue1>())
{ //{
proc.repeated<Continue_SxaddlSxString>(0, 0); // proc.repeated<Continue_SxaddlSxString>(0, 0);
} //}
if(proc.optional<SXAddl_SXCSXFilter12_SXDSXFilterValue2>()) //if(proc.optional<SXAddl_SXCSXFilter12_SXDSXFilterValue2>())
{ //{
proc.repeated<Continue_SxaddlSxString>(0, 0); // proc.repeated<Continue_SxaddlSxString>(0, 0);
} //}
proc.mandatory<SXAddl_SXCSXFilter12_SXDXlsFilter>(); //proc.mandatory<SXAddl_SXCSXFilter12_SXDXlsFilter>();
if(proc.optional<SXAddl_SXCSXFilter12_SXDXlsFilterValue1>()) //if(proc.optional<SXAddl_SXCSXFilter12_SXDXlsFilterValue1>())
{ //{
proc.repeated<Continue_SxaddlSxString>(0, 0); // proc.repeated<Continue_SxaddlSxString>(0, 0);
} //}
if(proc.optional<SXAddl_SXCSXFilter12_SXDXlsFilterValue2>()) //if(proc.optional<SXAddl_SXCSXFilter12_SXDXlsFilterValue2>())
{ //{
proc.repeated<Continue_SxaddlSxString>(0, 0); // proc.repeated<Continue_SxaddlSxString>(0, 0);
} //}
proc.mandatory<SXAddl_SXCSXFilter12_SXDEnd>(); //proc.mandatory<SXAddl_SXCSXFilter12_SXDEnd>();
return true; return true;
} }
......
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/SXADDLSXFILTERS12.cpp
View file @ 56a4e80c
...@@ -57,12 +57,12 @@ BaseObjectPtr SXADDLSXFILTERS12::clone() ...@@ -57,12 +57,12 @@ 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>()) //if(!proc.mandatory<SXAddl_SXCSXFilters12_SXDId>())
{ //{
return false; // return false;
} //}
proc.repeated<SXADDLSXFILTER12>(0, 0); //proc.repeated<SXADDLSXFILTER12>(0, 0);
proc.mandatory<SXAddl_SXCSXFilters12_SXDEnd>(); //proc.mandatory<SXAddl_SXCSXFilters12_SXDEnd>();
return true; return true;
} }
......
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/SXADDLSXMG.cpp
View file @ 56a4e80c
...@@ -59,11 +59,11 @@ public: ...@@ -59,11 +59,11 @@ public:
const bool loadContent(BinProcessor& proc) const bool loadContent(BinProcessor& proc)
{ {
if(!proc.mandatory<SXAddl_SXCSXMg_SXDUserCaption>()) //if(!proc.mandatory<SXAddl_SXCSXMg_SXDUserCaption>())
{ //{
return false; // return false;
} //}
proc.repeated<Continue_SxaddlSxString>(0, 0); //proc.repeated<Continue_SxaddlSxString>(0, 0);
return true; return true;
}; };
}; };
...@@ -80,14 +80,14 @@ BaseObjectPtr SXADDLSXMG::clone() ...@@ -80,14 +80,14 @@ BaseObjectPtr SXADDLSXMG::clone()
// [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>()) //if(!proc.mandatory<SXAddl_SXCSXMg_SXDId>())
{ //{
return false; // return false;
} //}
proc.repeated<Continue_SxaddlSxString>(0, 0); //proc.repeated<Continue_SxaddlSxString>(0, 0);
proc.optional<Parenthesis_SXADDLSXMG_1>(); //proc.optional<Parenthesis_SXADDLSXMG_1>();
proc.repeated<UNKNOWNFRT>(0, 0); //proc.repeated<UNKNOWNFRT>(0, 0);
proc.mandatory<SXAddl_SXCSXMg_SXDEnd>(); //proc.mandatory<SXAddl_SXCSXMg_SXDEnd>();
return true; return true;
} }
......
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/SXADDLSXMGS.cpp
View file @ 56a4e80c
...@@ -58,14 +58,14 @@ BaseObjectPtr SXADDLSXMGS::clone() ...@@ -58,14 +58,14 @@ 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>()) //if(!proc.mandatory<SXAddl_SXCSXMgs_SXDId>())
{ //{
return false; // return false;
} //}
proc.repeated<SXADDLSXMG>(0, 0); //proc.repeated<SXADDLSXMG>(0, 0);
proc.repeated<SXAddl_SXCSXMgs_SXDMGrpSXDHMap>(0, 0); //proc.repeated<SXAddl_SXCSXMgs_SXDMGrpSXDHMap>(0, 0);
proc.repeated<UNKNOWNFRT>(0, 0); //proc.repeated<UNKNOWNFRT>(0, 0);
proc.mandatory<SXAddl_SXCSXMgs_SXDEnd>(); //proc.mandatory<SXAddl_SXCSXMgs_SXDEnd>();
return true; return true;
} }
......
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/SXADDLSXRULE.cpp
View file @ 56a4e80c
...@@ -57,13 +57,13 @@ BaseObjectPtr SXADDLSXRULE::clone() ...@@ -57,13 +57,13 @@ 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>()) //if(!proc.mandatory<SXAddl_SXCSXrule_SXDId>())
{ //{
return false; // return false;
} //}
proc.mandatory<SXAddl_SXCSXrule_SXDSXrule>(); //proc.mandatory<SXAddl_SXCSXrule_SXDSXrule>();
proc.repeated<SXADDLSXFILT>(0, 0); //proc.repeated<SXADDLSXFILT>(0, 0);
proc.mandatory<SXAddl_SXCSXrule_SXDEnd>(); //proc.mandatory<SXAddl_SXCSXrule_SXDEnd>();
return true; return true;
} }
......
ASCOfficeXlsFile2/source/XlsFormat/Logic/XlsElementsType.h
View file @ 56a4e80c
...@@ -310,6 +310,7 @@ enum ElementType ...@@ -310,6 +310,7 @@ enum ElementType
typeStringSegmented, typeStringSegmented,
typeStringSegmentedSXADDL, typeStringSegmentedSXADDL,
typeSXAddl, typeSXAddl,
typeSxaddlSxString,
typeSXDI, typeSXDI,
typeSxDXF, typeSxDXF,
typeSXEx, typeSXEx,
......
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