Skip to content

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

fix revert up (from release)

parent 2bf55b7c
Expand all Show whitespace changes
Inline Side-by-side
Showing with 1542 additions and 816 deletions
ASCOfficeDocxFile2/BinReader/DocumentWriter.h
View file @ b140f4b5
...@@ -54,7 +54,22 @@ namespace Writers ...@@ -54,7 +54,22 @@ namespace Writers
NSFile::CFileBinary oFile; NSFile::CFileBinary oFile;
oFile.CreateFileW(filePath.GetPath()); oFile.CreateFileW(filePath.GetPath());
oFile.WriteStringUTF8( std::wstring(_T("<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>"))); oFile.WriteStringUTF8( std::wstring(_T("<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>")));
oFile.WriteStringUTF8( std::wstring(_T("<w:document xmlns:wpc=\"http://schemas.microsoft.com/office/word/2010/wordprocessingCanvas\" xmlns:mc=\"http://schemas.openxmlformats.org/markup-compatibility/2006\" xmlns:o=\"urn:schemas-microsoft-com:office:office\" xmlns:r=\"http://schemas.openxmlformats.org/officeDocument/2006/relationships\" xmlns:m=\"http://schemas.openxmlformats.org/officeDocument/2006/math\" xmlns:v=\"urn:schemas-microsoft-com:vml\" xmlns:wp14=\"http://schemas.microsoft.com/office/word/2010/wordprocessingDrawing\" xmlns:wp=\"http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing\" xmlns:w10=\"urn:schemas-microsoft-com:office:word\" xmlns:w=\"http://schemas.openxmlformats.org/wordprocessingml/2006/main\" xmlns:w14=\"http://schemas.microsoft.com/office/word/2010/wordml\" xmlns:wpg=\"http://schemas.microsoft.com/office/word/2010/wordprocessingGroup\" xmlns:wpi=\"http://schemas.microsoft.com/office/word/2010/wordprocessingInk\" xmlns:wne=\"http://schemas.microsoft.com/office/word/2006/wordml\" xmlns:wps=\"http://schemas.microsoft.com/office/word/2010/wordprocessingShape\" mc:Ignorable=\"w14 wp14\">"))); oFile.WriteStringUTF8( std::wstring(_T("<w:document \
xmlns:wpc=\"http://schemas.microsoft.com/office/word/2010/wordprocessingCanvas\" xmlns:mc=\"http://schemas.openxmlformats.org/markup-compatibility/2006\" xmlns:o=\"urn:schemas-microsoft-com:office:office\" \
xmlns:r=\"http://schemas.openxmlformats.org/officeDocument/2006/relationships\" \
xmlns:m=\"http://schemas.openxmlformats.org/officeDocument/2006/math\" \
xmlns:v=\"urn:schemas-microsoft-com:vml\" \
xmlns:wp14=\"http://schemas.microsoft.com/office/word/2010/wordprocessingDrawing\" \
xmlns:wp=\"http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing\" \
xmlns:w10=\"urn:schemas-microsoft-com:office:word\" \
xmlns:w=\"http://schemas.openxmlformats.org/wordprocessingml/2006/main\" \
xmlns:w14=\"http://schemas.microsoft.com/office/word/2010/wordml\" \
xmlns:wpg=\"http://schemas.microsoft.com/office/word/2010/wordprocessingGroup\" \
xmlns:wpi=\"http://schemas.microsoft.com/office/word/2010/wordprocessingInk\" \
xmlns:a=\"http://schemas.openxmlformats.org/drawingml/2006/main\" \
xmlns:wne=\"http://schemas.microsoft.com/office/word/2006/wordml\" \
xmlns:wps=\"http://schemas.microsoft.com/office/word/2010/wordprocessingShape\" \
mc:Ignorable=\"w14 wp14\">")));
oFile.WriteStringUTF8(m_oBackground.GetData()); oFile.WriteStringUTF8(m_oBackground.GetData());
......
ASCOfficeDocxFile2/BinReader/Readers.cpp
View file @ b140f4b5
...@@ -36,26 +36,10 @@ namespace BinDocxRW { ...@@ -36,26 +36,10 @@ namespace BinDocxRW {
int Binary_VbaProjectTableReader::Read() int Binary_VbaProjectTableReader::Read()
{ {
return ReadTable(&Binary_VbaProjectTableReader::ReadContent, this);
}
int Binary_VbaProjectTableReader::ReadContent(BYTE type, long length, void* poResult)
{
int res = c_oSerConstants::ReadOk;
if ( c_oSerVbaProjectTypes::Name == type )
{
std::wstring file_name = m_oBufferedStream.GetString4(length);
OOX::CPath inputPath = m_oBufferedStream.m_strFolder + FILE_SEPARATOR_STR + L"media" + FILE_SEPARATOR_STR + file_name;
OOX::CPath outputPath = m_oFileWriter.m_oDocumentWriter.m_sDir + FILE_SEPARATOR_STR + L"word" + FILE_SEPARATOR_STR + L"vbaProject.bin";
NSFile::CFileBinary::Copy(inputPath.GetPath(), outputPath.GetPath());
m_oFileWriter.m_pVbaProject = new OOX::VbaProject(); m_oFileWriter.m_pVbaProject = new OOX::VbaProject();
m_oFileWriter.m_pVbaProject->set_filename(outputPath.GetPath()); m_oFileWriter.m_pVbaProject->fromPPTY(&m_oBufferedStream);
}
else return c_oSerConstants::ReadOk;
res = c_oSerConstants::ReadUnknown;
return res;
} }
//------------------------------------------------------------------------------------- //-------------------------------------------------------------------------------------
Binary_HdrFtrTableReader::Binary_HdrFtrTableReader(NSBinPptxRW::CBinaryFileReader& poBufferedStream, Writers::FileWriter& oFileWriter, CComments* pComments):Binary_CommonReader(poBufferedStream),m_oFileWriter(oFileWriter),m_oHeaderFooterWriter(oFileWriter.m_oHeaderFooterWriter),m_pComments(pComments) Binary_HdrFtrTableReader::Binary_HdrFtrTableReader(NSBinPptxRW::CBinaryFileReader& poBufferedStream, Writers::FileWriter& oFileWriter, CComments* pComments):Binary_CommonReader(poBufferedStream),m_oFileWriter(oFileWriter),m_oHeaderFooterWriter(oFileWriter.m_oHeaderFooterWriter),m_pComments(pComments)
......
ASCOfficeDocxFile2/BinReader/Readers.h
View file @ b140f4b5
...@@ -285,7 +285,6 @@ public: ...@@ -285,7 +285,6 @@ public:
} }
int Read (); int Read ();
int ReadContent (BYTE type, long length, void* poResult);
}; };
class Binary_HdrFtrTableReader : public Binary_CommonReader<Binary_HdrFtrTableReader> class Binary_HdrFtrTableReader : public Binary_CommonReader<Binary_HdrFtrTableReader>
......
ASCOfficeDocxFile2/BinWriter/BinWriters.h
View file @ b140f4b5
...@@ -3027,25 +3027,12 @@ namespace BinDocxRW ...@@ -3027,25 +3027,12 @@ namespace BinDocxRW
} }
pOfficeDrawingConverter->SetRels(oldRels); pOfficeDrawingConverter->SetRels(oldRels);
} }
void WriteVbaProjectContent(OOX::VbaProject& oVbaProject)
{
std::wstring file_name = oVbaProject.filename().GetFilename();
m_oBcw.m_oStream.WriteBYTE(c_oSerVbaProjectTypes::Name);
m_oBcw.m_oStream.WriteStringW(file_name);
//... todooo write parsing vba project
//write vbaData.... todooo
//copy file bin
oVbaProject.copy_to(m_oBcw.m_oStream.m_pCommon->m_pImageManager->m_strDstMedia);
}
void WriteVbaProject(OOX::VbaProject& oVbaProject) void WriteVbaProject(OOX::VbaProject& oVbaProject)
{ {
int nStart = m_oBcw.WriteItemWithLengthStart(); m_oBcw.m_oStream.StartRecord(0);
WriteVbaProjectContent(oVbaProject); oVbaProject.toPPTY(&m_oBcw.m_oStream);
m_oBcw.WriteItemWithLengthEnd(nStart); m_oBcw.m_oStream.EndRecord();
} }
void Write(std::vector<OOX::WritingElement*>& aElems) void Write(std::vector<OOX::WritingElement*>& aElems)
{ {
......
ASCOfficeDocxFile2/DocWrapper/DocxSerializer.cpp
View file @ b140f4b5
...@@ -93,6 +93,8 @@ bool BinDocxRW::CDocxSerializer::saveToFile(const std::wstring& sSrcFileName, co ...@@ -93,6 +93,8 @@ bool BinDocxRW::CDocxSerializer::saveToFile(const std::wstring& sSrcFileName, co
oDrawingConverter.SetFontDir(m_sFontDir); oDrawingConverter.SetFontDir(m_sFontDir);
oDrawingConverter.SetFontPicker(pFontPicker); oDrawingConverter.SetFontPicker(pFontPicker);
oDrawingConverter.SetMainDocument(this); oDrawingConverter.SetMainDocument(this);
oDrawingConverter.SetDstPath(pathMain.GetDirectory() + FILE_SEPARATOR_STR + L"word");
oDrawingConverter.SetMediaDstPath(pathMedia.GetPath()); oDrawingConverter.SetMediaDstPath(pathMedia.GetPath());
m_pParamsWriter = new ParamsWriter(&oBufferedStream, &fp, &oDrawingConverter, pEmbeddedFontsManager); m_pParamsWriter = new ParamsWriter(&oBufferedStream, &fp, &oDrawingConverter, pEmbeddedFontsManager);
...@@ -264,6 +266,8 @@ bool BinDocxRW::CDocxSerializer::loadFromFile(const std::wstring& sSrcFileName, ...@@ -264,6 +266,8 @@ bool BinDocxRW::CDocxSerializer::loadFromFile(const std::wstring& sSrcFileName,
if (NULL != pData) if (NULL != pData)
{ {
oDrawingConverter.SetMainDocument(this); oDrawingConverter.SetMainDocument(this);
oDrawingConverter.SetDstPath(sDstPath + FILE_SEPARATOR_STR + L"word");
oDrawingConverter.SetMediaDstPath(sMediaPath); oDrawingConverter.SetMediaDstPath(sMediaPath);
oDrawingConverter.SetEmbedDstPath(sEmbedPath); oDrawingConverter.SetEmbedDstPath(sEmbedPath);
...@@ -273,7 +277,7 @@ bool BinDocxRW::CDocxSerializer::loadFromFile(const std::wstring& sSrcFileName, ...@@ -273,7 +277,7 @@ bool BinDocxRW::CDocxSerializer::loadFromFile(const std::wstring& sSrcFileName,
std::wstring strFileInDir = NSSystemPath::GetDirectoryName(sSrcFileName); std::wstring strFileInDir = NSSystemPath::GetDirectoryName(sSrcFileName);
std::wstring sFileInDir = strFileInDir.c_str(); std::wstring sFileInDir = strFileInDir.c_str();
oDrawingConverter.SetSourceFileDir(sFileInDir); oDrawingConverter.SetSrcPath(sFileInDir);
BinaryFileReader oBinaryFileReader(sFileInDir, oBufferedStream, *m_pCurFileWriter); BinaryFileReader oBinaryFileReader(sFileInDir, oBufferedStream, *m_pCurFileWriter);
oBinaryFileReader.ReadFile(); oBinaryFileReader.ReadFile();
......
ASCOfficeDocxFile2/DocWrapper/XlsxSerializer.cpp
View file @ b140f4b5
...@@ -86,15 +86,16 @@ namespace BinXlsxRW{ ...@@ -86,15 +86,16 @@ namespace BinXlsxRW{
} }
bool CXlsxSerializer::loadFromFile(const std::wstring& sSrcFileName, const std::wstring& sDstPath, const std::wstring& sXMLOptions, const std::wstring& sMediaDir, const std::wstring& sEmbedDir) bool CXlsxSerializer::loadFromFile(const std::wstring& sSrcFileName, const std::wstring& sDstPath, const std::wstring& sXMLOptions, const std::wstring& sMediaDir, const std::wstring& sEmbedDir)
{ {
std::wstring strFileInDir = NSSystemPath::GetDirectoryName(sSrcFileName);
NSBinPptxRW::CDrawingConverter oDrawingConverter; NSBinPptxRW::CDrawingConverter oDrawingConverter;
oDrawingConverter.SetDstPath(sDstPath + FILE_SEPARATOR_STR + L"xl");
oDrawingConverter.SetSrcPath(strFileInDir, 2);
oDrawingConverter.SetMediaDstPath(sMediaDir); oDrawingConverter.SetMediaDstPath(sMediaDir);
oDrawingConverter.SetEmbedDstPath(sEmbedDir); oDrawingConverter.SetEmbedDstPath(sEmbedDir);
std::wstring strFileInDir = NSSystemPath::GetDirectoryName(sSrcFileName);
oDrawingConverter.SetSourceFileDir(strFileInDir, 2);
BinXlsxRW::BinaryFileReader oBinaryFileReader; BinXlsxRW::BinaryFileReader oBinaryFileReader;
oBinaryFileReader.ReadFile(sSrcFileName, sDstPath, &oDrawingConverter, sXMLOptions); oBinaryFileReader.ReadFile(sSrcFileName, sDstPath, &oDrawingConverter, sXMLOptions);
return true; return true;
......
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/PIVOTADDL.cpp
View file @ b140f4b5
...@@ -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; for (std::list<BaseObjectPtr>::iterator it = elements_.begin(); it != elements_.end(); it++)
} {
m_SXAddl_SXCView_SXDId = elements_.back(); SXAddl* addl = dynamic_cast<SXAddl*>(it->get());
elements_.pop_back(); if (!addl) continue;
SXAddl_SXCView_SXDTableStyleClient* p = dynamic_cast<SXAddl_SXCView_SXDTableStyleClient*>(addl->content.get());
int count = proc.repeated<Continue_SxaddlSxString>(0, 0); if (p)
{
if (proc.optional<SXAddl_SXCView_SXDVer10Info>()) m_SXAddl_SXCView_SXDTableStyleClient = addl->content;
{ }
m_SXAddl_SXCView_SXDVer10Info = elements_.back(); }
elements_.pop_back(); //if(!proc.mandatory<SXAddl_SXCView_SXDId>())
} //{
if (proc.optional<SXAddl_SXCView_SXDVer12Info>()) // return false;
{ //}
m_SXAddl_SXCView_SXDVer12Info = elements_.back(); //m_SXAddl_SXCView_SXDId = elements_.back();
elements_.pop_back(); //elements_.pop_back();
} //
count = proc.repeated<SXADDLCALCMEMBER>(0, 0); //int count = proc.repeated<Continue_SxaddlSxString>(0, 0);
while(count > 0) //
{ //if (proc.optional<SXAddl_SXCView_SXDVer10Info>())
m_arSXADDLCALCMEMBER.push_back(elements_.front()); //{
elements_.pop_front(); count--; // m_SXAddl_SXCView_SXDVer10Info = elements_.back();
} // elements_.pop_back();
//}
count = proc.repeated<SXADDLHIERARCHY>(0, 0); //if (proc.optional<SXAddl_SXCView_SXDVer12Info>())
while(count > 0) //{
{ // m_SXAddl_SXCView_SXDVer12Info = elements_.back();
m_arSXADDLHIERARCHY.push_back(elements_.front()); // elements_.pop_back();
elements_.pop_front(); count--; //}
} //count = proc.repeated<SXADDLCALCMEMBER>(0, 0);
count = proc.repeated<SXADDLFIELD>(0, 0); //while(count > 0)
while(count > 0) //{
{ // m_arSXADDLCALCMEMBER.push_back(elements_.front());
m_arSXADDLFIELD.push_back(elements_.front()); // elements_.pop_front(); count--;
elements_.pop_front(); count--; //}
}
//count = proc.repeated<SXADDLHIERARCHY>(0, 0);
count = proc.repeated<UNKNOWNFRT>(0, 0); //while(count > 0)
//{
if (proc.optional<SXAddl_SXCView_SXDTableStyleClient>()) // m_arSXADDLHIERARCHY.push_back(elements_.front());
{ // elements_.pop_front(); count--;
m_SXAddl_SXCView_SXDTableStyleClient = elements_.back(); //}
elements_.pop_back(); //count = proc.repeated<SXADDLFIELD>(0, 0);
} //while(count > 0)
//{
if(proc.optional<SXAddl_SXCView_SXDCompactRwHdr>()) // m_arSXADDLFIELD.push_back(elements_.front());
{ // elements_.pop_front(); count--;
m_SXAddl_SXCView_SXDCompactRwHdr = elements_.back(); //}
elements_.pop_back();
//count = proc.repeated<UNKNOWNFRT>(0, 0);
count = proc.repeated<Continue_SxaddlSxString>(0, 0); //
} //if (proc.optional<SXAddl_SXCView_SXDTableStyleClient>())
if(proc.optional<SXAddl_SXCView_SXDCompactColHdr>()) //{
{ // m_SXAddl_SXCView_SXDTableStyleClient = elements_.back();
m_SXAddl_SXCView_SXDCompactColHdr = elements_.back(); // elements_.pop_back();
elements_.pop_back(); //}
count = proc.repeated<Continue_SxaddlSxString>(0, 0); //if(proc.optional<SXAddl_SXCView_SXDCompactRwHdr>())
} //{
// m_SXAddl_SXCView_SXDCompactRwHdr = elements_.back();
if (proc.optional<SXAddl_SXCView_SXDVerUpdInv>()) // elements_.pop_back();
{
m_arSXAddl_SXCView_SXDVerUpdInv.push_back(elements_.back()); // count = proc.repeated<Continue_SxaddlSxString>(0, 0);
elements_.pop_back(); //}
} //if(proc.optional<SXAddl_SXCView_SXDCompactColHdr>())
if (proc.optional<SXADDLCONDFMTS>()) //{
{ // m_SXAddl_SXCView_SXDCompactColHdr = elements_.back();
m_SXADDLCONDFMTS = elements_.back(); // elements_.pop_back();
elements_.pop_back();
} // count = proc.repeated<Continue_SxaddlSxString>(0, 0);
if (proc.optional<SXADDLSXFILTERS12>()) //}
{
m_SXAddl_SXADDLSXFILTERS12 = elements_.back(); //if (proc.optional<SXAddl_SXCView_SXDVerUpdInv>())
elements_.pop_back(); //{
} // m_arSXAddl_SXCView_SXDVerUpdInv.push_back(elements_.back());
count = proc.repeated<SXAddl_SXCView_SXDVerUpdInv>(0, 0); // elements_.pop_back();
while(count > 0) //}
{ //if (proc.optional<SXADDLCONDFMTS>())
m_arSXAddl_SXCView_SXDVerUpdInv.push_back(elements_.front()); //{
elements_.pop_front(); count--; // m_SXADDLCONDFMTS = elements_.back();
} // elements_.pop_back();
//}
count = proc.repeated<SXAddl_SXCView_SXDSXPIIvmb>(0, 0); //if (proc.optional<SXADDLSXFILTERS12>())
while(count > 0) //{
{ // m_SXAddl_SXADDLSXFILTERS12 = elements_.back();
m_arSXAddl_SXCView_SXDSXPIIvmb.push_back(elements_.front()); // elements_.pop_back();
elements_.pop_front(); count--; //}
} //count = proc.repeated<SXAddl_SXCView_SXDVerUpdInv>(0, 0);
//while(count > 0)
if (proc.optional<SXAddl_SXCView_SXDVerUpdInv>()) //{
{ // m_arSXAddl_SXCView_SXDVerUpdInv.push_back(elements_.front());
m_arSXAddl_SXCView_SXDVerUpdInv.push_back(elements_.front()); // elements_.pop_front(); count--;
elements_.pop_front(); //}
}
//count = proc.repeated<SXAddl_SXCView_SXDSXPIIvmb>(0, 0);
if (proc.optional<SXAddl_SXCView_SXDEnd>()) //while(count > 0)
{ //{
elements_.pop_back(); // 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 @ b140f4b5
...@@ -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/PIVOTCACHEDEFINITION.cpp
View file @ b140f4b5
...@@ -124,13 +124,15 @@ int PIVOTCACHEDEFINITION::serialize_definitions(std::wostream & strm) ...@@ -124,13 +124,15 @@ int PIVOTCACHEDEFINITION::serialize_definitions(std::wostream & strm)
{ {
CP_XML_ATTR(L"r:id", L"rId1" ); CP_XML_ATTR(L"r:id", L"rId1" );
} }
else
{
CP_XML_ATTR(L"saveData", 0);
}
CP_XML_ATTR(L"enableRefresh", 1); CP_XML_ATTR(L"enableRefresh", 1);
CP_XML_ATTR(L"refreshedBy", db->rgb.value()); CP_XML_ATTR(L"refreshedBy", db->rgb.value());
CP_XML_ATTR(L"refreshedDate", db_ex->numDate.data.value); CP_XML_ATTR(L"refreshedDate", db_ex->numDate.data.value);
CP_XML_ATTR(L"recordCount", db->crdbdb); CP_XML_ATTR(L"recordCount", db->crdbdb);
//createdVersion="1" //upgradeOnRefresh="1"
//refreshedVersion="2"
//upgradeOnRefresh="1">
SXSRC* src = dynamic_cast<SXSRC*>(m_SXSRC.get()); SXSRC* src = dynamic_cast<SXSRC*>(m_SXSRC.get());
if (src) if (src)
{ {
......
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/PIVOTFRT.cpp
View file @ b140f4b5
...@@ -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 @ b140f4b5
...@@ -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 @ b140f4b5
...@@ -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 @ b140f4b5
...@@ -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 @ b140f4b5
...@@ -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 @ b140f4b5
...@@ -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 @ b140f4b5
...@@ -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 @ b140f4b5
...@@ -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 @ b140f4b5
...@@ -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 @ b140f4b5
...@@ -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 @ b140f4b5
...@@ -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 @ b140f4b5
...@@ -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 @ b140f4b5
...@@ -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 @ b140f4b5
...@@ -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 @ b140f4b5
...@@ -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 @ b140f4b5
...@@ -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 @ b140f4b5
...@@ -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 @ b140f4b5
...@@ -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 @ b140f4b5
...@@ -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 @ b140f4b5
...@@ -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 @ b140f4b5
...@@ -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 @ b140f4b5
...@@ -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 @ b140f4b5
...@@ -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 @ b140f4b5
...@@ -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 @ b140f4b5
...@@ -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,
......
XlsxSerializerCom/Reader/BinaryWriter.h
View file @ b140f4b5
This diff is collapsed.
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