Compare commits

...

8 Commits

43 changed files with 839 additions and 1571 deletions

View File

@ -54,22 +54,7 @@ namespace Writers
NSFile::CFileBinary oFile;
oFile.CreateFileW(filePath.GetPath());
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: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( 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(m_oBackground.GetData());

View File

@ -36,10 +36,26 @@ namespace BinDocxRW {
int Binary_VbaProjectTableReader::Read()
{
m_oFileWriter.m_pVbaProject = new OOX::VbaProject();
m_oFileWriter.m_pVbaProject->fromPPTY(&m_oBufferedStream);
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);
return c_oSerConstants::ReadOk;
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->set_filename(outputPath.GetPath());
}
else
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)
@ -118,4 +134,4 @@ int Binary_HdrFtrTableReader::ReadHdrFtrItemContent(BYTE type, long length, void
return pBinary_DocumentTableReader->ReadDocumentContent(type, length, NULL);
}
}
}

View File

@ -285,7 +285,8 @@ public:
}
int Read ();
};
int ReadContent (BYTE type, long length, void* poResult);
};
class Binary_HdrFtrTableReader : public Binary_CommonReader<Binary_HdrFtrTableReader>
{

View File

@ -3027,12 +3027,25 @@ namespace BinDocxRW
}
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)
{
m_oBcw.m_oStream.StartRecord(0);
oVbaProject.toPPTY(&m_oBcw.m_oStream);
m_oBcw.m_oStream.EndRecord();
int nStart = m_oBcw.WriteItemWithLengthStart();
WriteVbaProjectContent(oVbaProject);
m_oBcw.WriteItemWithLengthEnd(nStart);
}
void Write(std::vector<OOX::WritingElement*>& aElems)
{

View File

@ -93,9 +93,7 @@ bool BinDocxRW::CDocxSerializer::saveToFile(const std::wstring& sSrcFileName, co
oDrawingConverter.SetFontDir(m_sFontDir);
oDrawingConverter.SetFontPicker(pFontPicker);
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);
@ -265,10 +263,8 @@ bool BinDocxRW::CDocxSerializer::loadFromFile(const std::wstring& sSrcFileName,
if (NULL != pData)
{
oDrawingConverter.SetMainDocument(this);
oDrawingConverter.SetDstPath(sDstPath + FILE_SEPARATOR_STR + L"word");
oDrawingConverter.SetMediaDstPath(sMediaPath);
oDrawingConverter.SetMainDocument(this);
oDrawingConverter.SetMediaDstPath(sMediaPath);
oDrawingConverter.SetEmbedDstPath(sEmbedPath);
m_pCurFileWriter = new Writers::FileWriter(sDstPath, m_sFontDir, false, nVersion, m_bSaveChartAsImg, &oDrawingConverter, sThemePath);
@ -277,7 +273,7 @@ bool BinDocxRW::CDocxSerializer::loadFromFile(const std::wstring& sSrcFileName,
std::wstring strFileInDir = NSSystemPath::GetDirectoryName(sSrcFileName);
std::wstring sFileInDir = strFileInDir.c_str();
oDrawingConverter.SetSrcPath(sFileInDir);
oDrawingConverter.SetSourceFileDir(sFileInDir);
BinaryFileReader oBinaryFileReader(sFileInDir, oBufferedStream, *m_pCurFileWriter);
oBinaryFileReader.ReadFile();

View File

@ -86,16 +86,15 @@ 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)
{
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);
std::wstring strFileInDir = NSSystemPath::GetDirectoryName(sSrcFileName);
oDrawingConverter.SetSourceFileDir(strFileInDir, 2);
BinXlsxRW::BinaryFileReader oBinaryFileReader;
oBinaryFileReader.ReadFile(sSrcFileName, sDstPath, &oDrawingConverter, sXMLOptions);
return true;

View File

@ -913,29 +913,20 @@ HRESULT CDrawingConverter::SetMainDocument(BinDocxRW::CDocxSerializer* pDocument
return S_OK;
}
void CDrawingConverter::SetSrcPath(const std::wstring& sPath, int nDocType)
HRESULT CDrawingConverter::SetMediaDstPath(const std::wstring& bsMediaPath)
{
m_pReader->m_pRels->m_pManager = m_pImageManager;
m_pReader->m_strFolder = sPath;
m_pBinaryWriter->m_pCommon->m_pImageManager->m_strDstMedia = (std::wstring)bsMediaPath;
m_pImageManager->SetDstMedia(m_pBinaryWriter->m_pCommon->m_pImageManager->m_strDstMedia);
m_pImageManager->m_nDocumentType = nDocType;
NSDirectory::CreateDirectory(bsMediaPath);
return S_OK;
}
void CDrawingConverter::SetDstPath(const std::wstring& sPath)
HRESULT CDrawingConverter::SetEmbedDstPath(const std::wstring& bsEmbedPath)
{
m_pImageManager->SetDstFolder(sPath);
}
void CDrawingConverter::SetMediaDstPath(const std::wstring& sPath)
{
m_pBinaryWriter->m_pCommon->m_pImageManager->m_strDstMedia = sPath;
m_pImageManager->SetDstMedia(sPath);
m_pImageManager->SetDstEmbed(bsEmbedPath);
NSDirectory::CreateDirectory(sPath);
}
void CDrawingConverter::SetEmbedDstPath(const std::wstring& sPath)
{
m_pImageManager->SetDstEmbed(sPath);
NSDirectory::CreateDirectory(sPath);
NSDirectory::CreateDirectory(bsEmbedPath);
return S_OK;
}
HRESULT CDrawingConverter::AddShapeType(const std::wstring& bsXml)
{
@ -5283,6 +5274,14 @@ OOX::CContentTypes* CDrawingConverter::GetContentTypes()
//return m_pReader->mm_strContentTypes;
}
void CDrawingConverter::SetSourceFileDir(std::wstring path, int nDocType)
{
m_pReader->m_pRels->m_pManager = m_pImageManager;
m_pReader->m_strFolder = path;
m_pImageManager->m_nDocumentType = nDocType;
}
void CDrawingConverter::Clear()
{
for (std::map<std::wstring, CShape*>::iterator pPair = m_mapShapeTypes.begin(); pPair != m_mapShapeTypes.end(); ++pPair)

View File

@ -215,12 +215,8 @@ namespace NSBinPptxRW
smart_ptr<OOX::IFileContainer> GetRels();
HRESULT SetMainDocument (BinDocxRW::CDocxSerializer* pDocument);
void SetSrcPath (const std::wstring& sPath, int nDocType = 1/*XMLWRITER_DOC_TYPE_DOCX*/);
void SetDstPath (const std::wstring& sPath);
void SetMediaDstPath (const std::wstring& sMediaPath);
void SetEmbedDstPath (const std::wstring& sEmbedPath);
HRESULT SetMediaDstPath (const std::wstring& sMediaPath);
HRESULT SetEmbedDstPath (const std::wstring& sEmbedPath);
HRESULT AddShapeType (const std::wstring& sXml);
HRESULT AddObject (const std::wstring& sXml, std::wstring** pMainProps);
@ -259,6 +255,8 @@ namespace NSBinPptxRW
void SetDocumentChartsCount (int val);
int GetDocumentChartsCount ();
void SetSourceFileDir (std::wstring path, int nDocType = 1/*XMLWRITER_DOC_TYPE_DOCX*/);
OOX::CContentTypes* GetContentTypes();
protected:
nullable<PPTX::Logic::Xfrm> m_oxfrm_override;

View File

@ -134,7 +134,7 @@ namespace PPTX
if (pWriter->m_lDocType == XMLWRITER_DOC_TYPE_XLSX) namespace_ = L"xdr";
if (pWriter->m_lDocType == XMLWRITER_DOC_TYPE_DOCX)
{
namespaceLock_ = L"a";
namespaceLock_ = L"wp";
namespace_ = L"wp";
}

View File

@ -346,11 +346,8 @@ namespace PPTX
pReader->m_pRels = new NSBinPptxRW::CRelsGenerator();
oDrawingConverter.SetMainDocument(&oDocxSerializer);
oDrawingConverter.SetDstPath(sDstEmbeddedTemp + FILE_SEPARATOR_STR + L"word");
oDrawingConverter.SetSrcPath(pReader->m_strFolder, 1);
oDrawingConverter.SetMediaDstPath(sMediaPath);
oDrawingConverter.SetSourceFileDir(pReader->m_strFolder, 1);
oDrawingConverter.SetMediaDstPath(sMediaPath);
oDrawingConverter.SetEmbedDstPath(sEmbedPath);
std::wstring sDocxFilename = L"Microsoft_Word_Document" + std::to_wstring( id ) + L".docx";
@ -437,10 +434,8 @@ namespace PPTX
oDrawingConverter.m_pReader = pReader;
pReader->m_pRels = new NSBinPptxRW::CRelsGenerator();
oDrawingConverter.SetDstPath(sDstEmbeddedTemp + FILE_SEPARATOR_STR + L"xl");
oDrawingConverter.SetSrcPath(pReader->m_strFolder, 2);
oDrawingConverter.SetMediaDstPath(sMediaPath);
oDrawingConverter.SetSourceFileDir(pReader->m_strFolder, 2);
oDrawingConverter.SetMediaDstPath(sMediaPath);
oDrawingConverter.SetEmbedDstPath(sEmbedPath);
std::wstring sXlsxFilename = L"Microsoft_Excel_Worksheet" + std::to_wstring( id ) + L".xlsx";

View File

@ -469,8 +469,8 @@ namespace PPTX
bool m_bMacroEnabled;
smart_ptr<OOX::VbaProject> m_pVbaProject;
void SetClrMap(Logic::ClrMap map) {m_clrMap = map;}
void SetClrScheme(nsTheme::ClrScheme scheme) {m_clrScheme = scheme;}
void SetClrMap(Logic::ClrMap map) {m_clrMap = map;};
void SetClrScheme(nsTheme::ClrScheme scheme) {m_clrScheme = scheme;};
DWORD GetRGBAFromMap(const std::wstring& str)const
{

View File

@ -65,370 +65,60 @@ BaseObjectPtr SXAddl::clone()
void SXAddl::readFields(CFRecord& record)
{
record >> frtHeaderOld >> sxc >> sxd;
switch(sxc)
{
case 0x00: content = createSxcView (record); break;
case 0x01: content = createSxcField (record); break;
case 0x02: content = createSxcHierarchy(record); break;
case 0x03: content = createSxcCache (record); break;
case 0x04: content = createSxcCacheField(record); break;
case 0x05: content = createSxcQsi (record); break;
case 0x06: content = createSxcQuery (record); break;
case 0x07: content = createSxcGrpLevel (record); break;
case 0x08: content = createSxcGroup (record); break;
case 0x09: content = createSxcCacheItem(record); break;
case 0x0C: content = createSxcSXRule (record); break;
case 0x0D: content = createSxcSXFilt (record); break;
case 0x10: content = createSxcSXDH (record); break;
case 0x12: content = createSxcAutoSort (record); break;
case 0x13: content = createSxcSXMgs (record); break;
case 0x14: content = createSxcSXMg (record); break;
case 0x17: content = createSxcField12 (record); break;
case 0x1A: content = createSxcSXCondFmts(record); break;
case 0x1B: content = createSxcSXCondFmt(record); break;
case 0x1C: content = createSxcSXFilters12(record); break;
case 0x1D: content = createSxcSXFilter12(record); break;
}
if (content)
content->load(record);
m_SXAddlHdr.load(record);
Log::error("SXAddl record is not implemented.");
record.skipNunBytes(record.getDataSize() - record.getRdPtr());
}
BiffStructurePtr SXAddl::createSxcView(CFRecord& record)
//-------------------------------------------------------------------------------------------------------
BaseObjectPtr SXAddl_SXCCache_SXDId::clone()
{
BiffStructurePtr result;
return BaseObjectPtr(new SXAddl_SXCCache_SXDId(*this));
}
void SXAddl_SXCCache_SXDId::readFields(CFRecord& record)
{
m_SXAddlHdr.load(record);
switch(sxd)
{
case 0x00: result = BiffStructurePtr(new SXAddl_SXCView_SXDId()); break;
case 0x1E: result = BiffStructurePtr(new SXAddl_SXCView_SXDTableStyleClient()); break;
case 0xff: result = BiffStructurePtr(new SXAddl_SXCView_SXDEnd()); break;
}
return result;
}
BiffStructurePtr SXAddl::createSxcField(CFRecord& record)
{
BiffStructurePtr result;
switch(sxd)
{
case 0x00: result = BiffStructurePtr(new SXAddl_SXCField_SXDId()); break;
case 0x02: result = BiffStructurePtr(new SXAddl_SXCField_SXDVer10Info()); break;
case 0xff: result = BiffStructurePtr(new SXAddl_SXCField_SXDEnd()); break;
}
return result;
}
BiffStructurePtr SXAddl::createSxcHierarchy(CFRecord& record)
{
BiffStructurePtr result;
switch(sxd)
{
case 0xff: break;
}
if (result)
result->load(record);
return result;
}
BiffStructurePtr SXAddl::createSxcCache (CFRecord& record)
{
BiffStructurePtr result;
switch(sxd)
{
case 0x00: result = BiffStructurePtr(new SXAddl_SXCCache_SXDId()); break;
case 0x01: result = BiffStructurePtr(new SXAddl_SXCCache_SXDVerUpdInv()); break;
case 0x02: result = BiffStructurePtr(new SXAddl_SXCCache_SXDVer10Info()); break;
case 0x18: result = BiffStructurePtr(new SXAddl_SXCCache_SXDVerSXMacro()); break;
case 0x34: result = BiffStructurePtr(new SXAddl_SXCCache_SXDInvRefreshReal()); break;
case 0x41: result = BiffStructurePtr(new SXAddl_SXCCache_SXDInfo12()); break;
case 0xff: result = BiffStructurePtr(new SXAddl_SXCCache_SXDEnd()); break;
}
return result;
}
BiffStructurePtr SXAddl::createSxcCacheField(CFRecord& record)
{
BiffStructurePtr result;
switch(sxd)
{
case 0x00: result = BiffStructurePtr(new SXAddl_SXCCacheField_SXDId()); break;
case 0x05: result = BiffStructurePtr(new SXAddl_SXCCacheField_SXDProperty()); break;
case 0x2d: result = BiffStructurePtr(new SXAddl_SXCCacheField_SXDSxrmitmCount()); break;
case 0x2f: result = BiffStructurePtr(new SXAddl_SXCCacheField_SXDCaption()); break;
case 0x30: result = BiffStructurePtr(new SXAddl_SXCCacheField_SXDIfdbMempropMap()); break;
case 0x31: result = BiffStructurePtr(new SXAddl_SXCCacheField_SXDIfdbMpMapCount()); break;
case 0x40: result = BiffStructurePtr(new SXAddl_SXCCacheField_SXDPropName()); break;
case 0xff: result = BiffStructurePtr(new SXAddl_SXCCacheField_SXDEnd()); break;
}
return result;
}
BiffStructurePtr SXAddl::createSxcQsi(CFRecord& record)
{
BiffStructurePtr result;
switch(sxd)
{
case 0xff: break;
}
return result;
}
BiffStructurePtr SXAddl::createSxcQuery(CFRecord& record)
{
BiffStructurePtr result;
switch(sxd)
{
case 0xff: break;
}
return result;
}
BiffStructurePtr SXAddl::createSxcGrpLevel(CFRecord& record)
{
BiffStructurePtr result;
switch(sxd)
{
case 0xff: break;
}
return result;
}
BiffStructurePtr SXAddl::createSxcGroup(CFRecord& record)
{
BiffStructurePtr result;
switch(sxd)
{
case 0xff: break;
}
return result;
}
BiffStructurePtr SXAddl::createSxcCacheItem(CFRecord& record)
{
BiffStructurePtr result;
switch(sxd)
{
case 0xff: break;
}
return result;
}
BiffStructurePtr SXAddl::createSxcSXRule(CFRecord& record)
{
BiffStructurePtr result;
switch(sxd)
{
case 0xff: break;
}
return result;
}
BiffStructurePtr SXAddl::createSxcSXFilt(CFRecord& record)
{
BiffStructurePtr result;
switch(sxd)
{
case 0xff: break;
}
return result;
}
BiffStructurePtr SXAddl::createSxcSXDH(CFRecord& record)
{
BiffStructurePtr result;
switch(sxd)
{
case 0xff: break;
}
return result;
}
BiffStructurePtr SXAddl::createSxcAutoSort(CFRecord& record)
{
BiffStructurePtr result;
switch(sxd)
{
case 0xff: break;
}
return result;
}
BiffStructurePtr SXAddl::createSxcSXMgs(CFRecord& record)
{
BiffStructurePtr result;
switch(sxd)
{
case 0xff: break;
}
return result;
}
BiffStructurePtr SXAddl::createSxcSXMg(CFRecord& record)
{
BiffStructurePtr result;
switch(sxd)
{
case 0xff: break;
}
return result;
}
BiffStructurePtr SXAddl::createSxcField12(CFRecord& record)
{
BiffStructurePtr result;
switch(sxd)
{
case 0xff: break;
}
return result;
}
BiffStructurePtr SXAddl::createSxcSXCondFmts(CFRecord& record)
{
BiffStructurePtr result;
switch(sxd)
{
case 0xff: break;
}
return result;
}
BiffStructurePtr SXAddl::createSxcSXCondFmt(CFRecord& record)
{
BiffStructurePtr result;
switch(sxd)
{
case 0xff: break;
}
return result;
}
BiffStructurePtr SXAddl::createSxcSXFilters12(CFRecord& record)
{
BiffStructurePtr result;
switch(sxd)
{
case 0xff: break;
}
return result;
}
BiffStructurePtr SXAddl::createSxcSXFilter12(CFRecord& record)
{
BiffStructurePtr result;
switch(sxd)
{
case 0xff: break;
}
return result;
}
//----------------------------------------------------------------------------
BiffStructurePtr SXAddl_SXCField_SXDId::clone()
{
return BiffStructurePtr(new SXAddl_SXCField_SXDId(*this));
}
void SXAddl_SXCField_SXDId::load(CFRecord& record)
{
record >> stName;
}
//----------------------------------------------------------------------------
BiffStructurePtr SXAddl_SXCView_SXDId::clone()
{
return BiffStructurePtr(new SXAddl_SXCView_SXDId(*this));
}
void SXAddl_SXCView_SXDId::load(CFRecord& record)
{
record >> stName;
}
//----------------------------------------------------------------------------
BiffStructurePtr SXAddl_SXCField_SXDEnd::clone()
{
return BiffStructurePtr(new SXAddl_SXCField_SXDEnd(*this));
}
void SXAddl_SXCField_SXDEnd::load(CFRecord& record)
{
_UINT32 reserved1;
short reserved2;
record >> reserved1 >> reserved2;
}
//----------------------------------------------------------------------------
BiffStructurePtr SXAddl_SXCView_SXDEnd::clone()
{
return BiffStructurePtr(new SXAddl_SXCView_SXDEnd(*this));
}
void SXAddl_SXCView_SXDEnd::load(CFRecord& record)
{
_UINT32 reserved1;
short reserved2;
record >> reserved1 >> reserved2;
}
//-------------------------------------------------------------------------------------------------------
BiffStructurePtr SXAddl_SXCCacheItem_SXDId::clone()
{
return BiffStructurePtr(new SXAddl_SXCCacheItem_SXDId(*this));
}
void SXAddl_SXCCacheItem_SXDId::load(CFRecord& record)
{
short reserved;
record >> dwItem >> reserved;
}
//-------------------------------------------------------------------------------------------------------
BiffStructurePtr SXAddl_SXCCacheField_SXDId::clone()
{
return BiffStructurePtr(new SXAddl_SXCCacheField_SXDId(*this));
}
void SXAddl_SXCCacheField_SXDId::load(CFRecord& record)
{
record >> stSourceName;
}
//-------------------------------------------------------------------------------------------------------
BiffStructurePtr SXAddl_SXCCache_SXDId::clone()
{
return BiffStructurePtr(new SXAddl_SXCCache_SXDId(*this));
}
void SXAddl_SXCCache_SXDId::load(CFRecord& record)
{
short reserved;
record >> idCache >> reserved;
}
//----------------------------------------------------------------------------
BiffStructurePtr SXAddl_SXCCache_SXDEnd::clone()
BaseObjectPtr SXAddl_SXCCache_SXDEnd::clone()
{
return BiffStructurePtr(new SXAddl_SXCCache_SXDEnd(*this));
return BaseObjectPtr(new SXAddl_SXCCache_SXDEnd(*this));
}
void SXAddl_SXCCache_SXDEnd::load(CFRecord& record)
void SXAddl_SXCCache_SXDEnd::readFields(CFRecord& record)
{
m_SXAddlHdr.load(record);
_UINT32 reserved1;
short reserved2;
record >> reserved1 >> reserved2;
}
//----------------------------------------------------------------------------
BiffStructurePtr SXAddl_SXCField_SXDVer10Info::clone()
BaseObjectPtr Continue_SxaddlSxString::clone()
{
return BiffStructurePtr(new SXAddl_SXCField_SXDVer10Info(*this));
return BaseObjectPtr(new Continue_SxaddlSxString(*this));
}
void SXAddl_SXCField_SXDVer10Info::load(CFRecord& record)
{
_UINT32 flags;
short reserved2;
record >> flags >> reserved2;
fHideDD = GETBIT(flags, 0);
}
//----------------------------------------------------------------------------
BiffStructurePtr Continue_SxaddlSxString::clone()
{
return BiffStructurePtr(new Continue_SxaddlSxString(*this));
}
void Continue_SxaddlSxString::load(CFRecord& record)
void Continue_SxaddlSxString::readFields(CFRecord& record)
{
m_SXAddlHdr.load(record);
int sz = record.getDataSize() - record.getRdPtr();
if (sz > 0)
record >> stContinue;
}
//----------------------------------------------------------------------------
BiffStructurePtr SXAddl_SXCCache_SXDVer10Info::clone()
BaseObjectPtr SXAddl_SXCCache_SXDVer10Info::clone()
{
return BiffStructurePtr(new SXAddl_SXCCache_SXDVer10Info(*this));
return BaseObjectPtr(new SXAddl_SXCCache_SXDVer10Info(*this));
}
void SXAddl_SXCCache_SXDVer10Info::load(CFRecord& record)
void SXAddl_SXCCache_SXDVer10Info::readFields(CFRecord& record)
{
m_SXAddlHdr.load(record);
_UINT32 reserved1;
short reserved2;
record >> reserved1 >> reserved2;
@ -441,28 +131,28 @@ void SXAddl_SXCCache_SXDVer10Info::load(CFRecord& record)
record >> reserved2;
}
//----------------------------------------------------------------------------
BiffStructurePtr SXAddl_SXCCache_SXDVerUpdInv::clone()
BaseObjectPtr SXAddl_SXCCache_SXDVerUpdInv::clone()
{
return BiffStructurePtr(new SXAddl_SXCCache_SXDVerUpdInv(*this));
return BaseObjectPtr(new SXAddl_SXCCache_SXDVerUpdInv(*this));
}
void SXAddl_SXCCache_SXDVerUpdInv::load(CFRecord& record)
void SXAddl_SXCCache_SXDVerUpdInv::readFields(CFRecord& record)
{
m_SXAddlHdr.load(record);
record >> dwVersionInvalidates;
record.skipNunBytes(5);
}
//----------------------------------------------------------------------------
BiffStructurePtr SXAddl_SXCCache_SXDInfo12::clone()
BaseObjectPtr SXAddl_SXCCache_SXDInfo12::clone()
{
return BiffStructurePtr(new SXAddl_SXCCache_SXDInfo12(*this));
return BaseObjectPtr(new SXAddl_SXCCache_SXDInfo12(*this));
}
void SXAddl_SXCCache_SXDInfo12::load(CFRecord& record)
void SXAddl_SXCCache_SXDInfo12::readFields(CFRecord& record)
{
m_SXAddlHdr.load(record);
_UINT32 flags;
short reserved;
@ -473,27 +163,39 @@ void SXAddl_SXCCache_SXDInfo12::load(CFRecord& record)
fSrvSupportSubQuery = GETBIT(flags, 2);
}
//----------------------------------------------------------------------------
BiffStructurePtr SXAddl_SXCCache_SXDVerSXMacro::clone()
BaseObjectPtr SXAddl_SXCCache_SXDVerSXMacro::clone()
{
return BiffStructurePtr(new SXAddl_SXCCache_SXDVerSXMacro(*this));
return BaseObjectPtr(new SXAddl_SXCCache_SXDVerSXMacro(*this));
}
void SXAddl_SXCCache_SXDVerSXMacro::load(CFRecord& record)
void SXAddl_SXCCache_SXDVerSXMacro::readFields(CFRecord& record)
{
m_SXAddlHdr.load(record);
unsigned char reserved1;
short reserved2, reserved3;
record >> dwVer >> reserved1 >> reserved2 >> reserved3;
}
//----------------------------------------------------------------------------
BiffStructurePtr SXAddl_SXCCacheField_SXDIfdbMempropMap::clone()
BaseObjectPtr SXAddl_SXCView_SXDId::clone()
{
return BiffStructurePtr(new SXAddl_SXCCacheField_SXDIfdbMempropMap(*this));
return BaseObjectPtr(new SXAddl_SXCView_SXDId(*this));
}
void SXAddl_SXCCacheField_SXDIfdbMempropMap::load(CFRecord& record)
void SXAddl_SXCView_SXDId::readFields(CFRecord& record)
{
m_SXAddlHdr.load(record);
record >> stName;
}
//----------------------------------------------------------------------------
BaseObjectPtr SXAddl_SXCCacheField_SXDIfdbMempropMap::clone()
{
return BaseObjectPtr(new SXAddl_SXCCacheField_SXDIfdbMempropMap(*this));
}
void SXAddl_SXCCacheField_SXDIfdbMempropMap::readFields(CFRecord& record)
{
m_SXAddlHdr.load(record);
record.skipNunBytes(6);
int sz = record.getDataSize() - record.getRdPtr();
@ -506,106 +208,6 @@ void SXAddl_SXCCacheField_SXDIfdbMempropMap::load(CFRecord& record)
rgMap.push_back(val);
}
}
//----------------------------------------------------------------------------
BiffStructurePtr SXAddl_SXCView_SXDTableStyleClient::clone()
{
return BiffStructurePtr(new SXAddl_SXCView_SXDTableStyleClient(*this));
}
void SXAddl_SXCView_SXDTableStyleClient::load(CFRecord& record)
{
record.skipNunBytes(6);
unsigned short flags;
record >> flags >> stName;
fLastColumn = GETBIT(flags, 1);
fRowStrips = GETBIT(flags, 2);
fColumnStrips = GETBIT(flags, 3);
fRowHeaders = GETBIT(flags, 4);
fColumnHeaders = GETBIT(flags, 5);
fDefaultStyle = GETBIT(flags, 6);
}
//----------------------------------------------------------------------------
BiffStructurePtr SXAddl_SXCCacheField_SXDSxrmitmCount::clone()
{
return BiffStructurePtr(new SXAddl_SXCCacheField_SXDSxrmitmCount(*this));
}
void SXAddl_SXCCacheField_SXDSxrmitmCount::load(CFRecord& record)
{
short reserved2;
record >> citm >> reserved2;
}
//----------------------------------------------------------------------------
BiffStructurePtr SXAddl_SXCCacheField_SXDPropName::clone()
{
return BiffStructurePtr(new SXAddl_SXCCacheField_SXDPropName(*this));
}
void SXAddl_SXCCacheField_SXDPropName::load(CFRecord& record)
{
record >> stPropName;
}
//----------------------------------------------------------------------------
BiffStructurePtr SXAddl_SXCCacheField_SXDProperty::clone()
{
return BiffStructurePtr(new SXAddl_SXCCacheField_SXDProperty(*this));
}
void SXAddl_SXCCacheField_SXDProperty::load(CFRecord& record)
{
short reserved2;
record >> ihdb >> reserved2;
}
//----------------------------------------------------------------------------
BiffStructurePtr SXAddl_SXCCacheField_SXDIfdbMpMapCount::clone()
{
return BiffStructurePtr(new SXAddl_SXCCacheField_SXDIfdbMpMapCount(*this));
}
void SXAddl_SXCCacheField_SXDIfdbMpMapCount::load(CFRecord& record)
{
short reserved2;
record >> ifdbMemProp >> reserved2;
}
//----------------------------------------------------------------------------
BiffStructurePtr SXAddl_SXCCacheField_SXDEnd::clone()
{
return BiffStructurePtr(new SXAddl_SXCCacheField_SXDEnd(*this));
}
void SXAddl_SXCCacheField_SXDEnd::load(CFRecord& record)
{
_UINT32 reserved1;
short reserved2;
record >> reserved1 >> reserved2;
}
//----------------------------------------------------------------------------
BiffStructurePtr SXAddl_SXCCacheField_SXDCaption::clone()
{
return BiffStructurePtr(new SXAddl_SXCCacheField_SXDCaption(*this));
}
void SXAddl_SXCCacheField_SXDCaption::load(CFRecord& record)
{
record >> stCaption;
}
//----------------------------------------------------------------------------
BiffStructurePtr SXAddl_SXCCache_SXDInvRefreshReal::clone()
{
return BiffStructurePtr(new SXAddl_SXCCache_SXDInvRefreshReal(*this));
}
void SXAddl_SXCCache_SXDInvRefreshReal::load(CFRecord& record)
{
_UINT32 flags;
short reserved2;
record >> flags >> reserved2;
fEnableRefresh = GETBIT(flags, 0);
fInvalid = GETBIT(flags, 1);
}
} // namespace XLS

View File

@ -60,6 +60,18 @@ class SXAddl: public BiffRecord
BIFF_RECORD_DEFINE_TYPE_INFO(SXAddl)
BASE_OBJECT_DEFINE_CLASS_NAME(SXAddl)
public:
struct _SXAddlHdr
{
_UINT32 frtHeaderOld;
unsigned char sxc;
unsigned char sxd;
void load(CFRecord& record)
{
record >> frtHeaderOld >> sxc >> sxd;
}
}m_SXAddlHdr;
SXAddl();
~SXAddl();
@ -67,249 +79,57 @@ public:
virtual void readFields(CFRecord& record);
static const ElementType type = typeSXAddl;
_UINT32 frtHeaderOld;
unsigned char sxc;
unsigned char sxd;
BiffStructurePtr content;
private:
BiffStructurePtr createSxcView (CFRecord& record);
BiffStructurePtr createSxcField (CFRecord& record);
BiffStructurePtr createSxcHierarchy (CFRecord& record);
BiffStructurePtr createSxcCache (CFRecord& record);
BiffStructurePtr createSxcCacheField(CFRecord& record);
BiffStructurePtr createSxcQsi (CFRecord& record);
BiffStructurePtr createSxcQuery (CFRecord& record);
BiffStructurePtr createSxcGrpLevel (CFRecord& record);
BiffStructurePtr createSxcGroup (CFRecord& record);
BiffStructurePtr createSxcCacheItem (CFRecord& record);
BiffStructurePtr createSxcSXRule (CFRecord& record);
BiffStructurePtr createSxcSXFilt (CFRecord& record);
BiffStructurePtr createSxcSXDH (CFRecord& record);
BiffStructurePtr createSxcAutoSort (CFRecord& record);
BiffStructurePtr createSxcSXMgs (CFRecord& record);
BiffStructurePtr createSxcSXMg (CFRecord& record);
BiffStructurePtr createSxcField12 (CFRecord& record);
BiffStructurePtr createSxcSXCondFmts(CFRecord& record);
BiffStructurePtr createSxcSXCondFmt (CFRecord& record);
BiffStructurePtr createSxcSXFilters12(CFRecord& record);
BiffStructurePtr createSxcSXFilter12(CFRecord& record);
};
class Continue_SxaddlSxString : public BiffStructure
{
BASE_STRUCTURE_DEFINE_CLASS_NAME(Continue_SxaddlSxString)
class Continue_SxaddlSxString : public SXAddl
{
public:
BiffStructurePtr clone();
Continue_SxaddlSxString(){}
~Continue_SxaddlSxString(){}
static const ElementType type = typeSXAddl;
virtual void load(CFRecord& record);
virtual void readFields(CFRecord& record);
virtual BaseObjectPtr clone();
XLUnicodeStringSegmentedSXADDL stContinue;
};
class SXAddl_SXCField_SXDId : public BiffStructure
{
BASE_STRUCTURE_DEFINE_CLASS_NAME(SXAddl_SXCField_SXDId)
class SXAddl_SXCAutoSort_SXDEnd : public SXAddl {};
class SXAddl_SXCAutoSort_SXDId : public SXAddl {};
class SXAddl_SXCCache_SXDEnd : public SXAddl
{
public:
BiffStructurePtr clone();
SXAddl_SXCField_SXDId(){}
~SXAddl_SXCField_SXDId(){}
static const ElementType type = typeSXAddl;
virtual void load(CFRecord& record);
XLUnicodeStringSegmentedSXADDL stName;
};
class SXAddl_SXCField_SXDEnd : public BiffStructure
{
BASE_STRUCTURE_DEFINE_CLASS_NAME(SXAddl_SXCField_SXDEnd)
public:
BiffStructurePtr clone();
SXAddl_SXCField_SXDEnd(){}
~SXAddl_SXCField_SXDEnd(){}
static const ElementType type = typeSXAddl;
virtual void load(CFRecord& record);
};
class SXAddl_SXCField_SXDVer10Info : public BiffStructure
{
BASE_STRUCTURE_DEFINE_CLASS_NAME(SXAddl_SXCField_SXDVer10Info)
public:
BiffStructurePtr clone();
SXAddl_SXCField_SXDVer10Info(){}
~SXAddl_SXCField_SXDVer10Info(){}
static const ElementType type = typeSXAddl;
virtual void load(CFRecord& record);
bool fHideDD;
virtual void readFields(CFRecord& record);
virtual BaseObjectPtr clone();
};
class SXAddl_SXCView_SXDId : public BiffStructure
{
BASE_STRUCTURE_DEFINE_CLASS_NAME(SXAddl_SXCView_SXDId)
class SXAddl_SXCCache_SXDId : public SXAddl
{
public:
BiffStructurePtr clone();
SXAddl_SXCView_SXDId(){}
~SXAddl_SXCView_SXDId(){}
static const ElementType type = typeSXAddl;
virtual void load(CFRecord& record);
XLUnicodeStringSegmentedSXADDL stName;
};
class SXAddl_SXCView_SXDEnd : public BiffStructure
{
BASE_STRUCTURE_DEFINE_CLASS_NAME(SXAddl_SXCView_SXDEnd)
public:
BiffStructurePtr clone();
SXAddl_SXCView_SXDEnd(){}
~SXAddl_SXCView_SXDEnd(){}
static const ElementType type = typeSXAddl;
virtual void load(CFRecord& record);
};
class SXAddl_SXCView_SXDTableStyleClient : public BiffStructure
{
BASE_STRUCTURE_DEFINE_CLASS_NAME(SXAddl_SXCView_SXDTableStyleClient)
public:
BiffStructurePtr clone();
SXAddl_SXCView_SXDTableStyleClient(){}
~SXAddl_SXCView_SXDTableStyleClient(){}
virtual void load(CFRecord& record);
static const ElementType type = typeSXAddl;
bool fLastColumn;
bool fRowStrips;
bool fColumnStrips;
bool fRowHeaders;
bool fColumnHeaders;
bool fDefaultStyle;
LPWideString stName;
};
class SXAddl_SXCAutoSort_SXDEnd : public BiffStructure
{
BASE_STRUCTURE_DEFINE_CLASS_NAME(SXAddl_SXCAutoSort_SXDEnd)
public:
BiffStructurePtr clone();
SXAddl_SXCAutoSort_SXDEnd(){}
~SXAddl_SXCAutoSort_SXDEnd(){}
virtual void load(CFRecord& record);
static const ElementType type = typeSXAddl;
};
class SXAddl_SXCAutoSort_SXDId : public BiffStructure
{
BASE_STRUCTURE_DEFINE_CLASS_NAME(SXAddl_SXCAutoSort_SXDId)
public:
BiffStructurePtr clone();
SXAddl_SXCAutoSort_SXDId(){}
~SXAddl_SXCAutoSort_SXDId(){}
virtual void load(CFRecord& record);
static const ElementType type = typeSXAddl;
bool fAscendSort;
};
class SXAddl_SXCCache_SXDEnd : public BiffStructure
{
BASE_STRUCTURE_DEFINE_CLASS_NAME(SXAddl_SXCCache_SXDEnd)
public:
BiffStructurePtr clone();
SXAddl_SXCCache_SXDEnd(){}
~SXAddl_SXCCache_SXDEnd(){}
virtual void load(CFRecord& record);
static const ElementType type = typeSXAddl;
SXAddl_SXCCache_SXDEnd(CFRecord& record);
};
class SXAddl_SXCCache_SXDId : public BiffStructure
{
BASE_STRUCTURE_DEFINE_CLASS_NAME(SXAddl_SXCCache_SXDId)
public:
BiffStructurePtr clone();
SXAddl_SXCCache_SXDId(){}
~SXAddl_SXCCache_SXDId(){}
virtual void load(CFRecord& record);
static const ElementType type = typeSXAddl;
virtual void readFields(CFRecord& record);
virtual BaseObjectPtr clone();
_UINT32 idCache;
};
class SXAddl_SXCCache_SXDInfo12 : public BiffStructure
{
BASE_STRUCTURE_DEFINE_CLASS_NAME(SXAddl_SXCCache_SXDInfo12)
class SXAddl_SXCCache_SXDInfo12 : public SXAddl
{
public:
BiffStructurePtr clone();
SXAddl_SXCCache_SXDInfo12(){}
~SXAddl_SXCCache_SXDInfo12(){}
virtual void load(CFRecord& record);
static const ElementType type = typeSXAddl;
virtual void readFields(CFRecord& record);
virtual BaseObjectPtr clone();
bool fSheetData;
bool fSrvSupportAttribDrill;
bool fSrvSupportSubQuery;
};
class SXAddl_SXCCache_SXDInvRefreshReal : public BiffStructure
{
BASE_STRUCTURE_DEFINE_CLASS_NAME(SXAddl_SXCCache_SXDInvRefreshReal)
public:
BiffStructurePtr clone();
SXAddl_SXCCache_SXDInvRefreshReal(){}
~SXAddl_SXCCache_SXDInvRefreshReal(){}
virtual void load(CFRecord& record);
static const ElementType type = typeSXAddl;
bool fEnableRefresh;
bool fInvalid;
class SXAddl_SXCCache_SXDInvRefreshReal : public SXAddl
{
};
class SXAddl_SXCCache_SXDVer10Info : public BiffStructure
{
BASE_STRUCTURE_DEFINE_CLASS_NAME(SXAddl_SXCCache_SXDVer10Info)
class SXAddl_SXCCache_SXDVer10Info : public SXAddl
{
public:
BiffStructurePtr clone();
SXAddl_SXCCache_SXDVer10Info(){}
~SXAddl_SXCCache_SXDVer10Info(){}
virtual void load(CFRecord& record);
static const ElementType type = typeSXAddl;
virtual void readFields(CFRecord& record);
virtual BaseObjectPtr clone();
_INT32 citmGhostMax;
unsigned char bVerCacheLastRefresh;
@ -318,292 +138,155 @@ public:
unsigned char numDateCopy[8];
};
class SXAddl_SXCCache_SXDVerSXMacro : public BiffStructure
{
BASE_STRUCTURE_DEFINE_CLASS_NAME(SXAddl_SXCCache_SXDVerSXMacro)
class SXAddl_SXCCache_SXDVerSXMacro : public SXAddl
{
public:
BiffStructurePtr clone();
SXAddl_SXCCache_SXDVerSXMacro(){}
~SXAddl_SXCCache_SXDVerSXMacro(){}
virtual void load(CFRecord& record);
static const ElementType type = typeSXAddl;
virtual void readFields(CFRecord& record);
virtual BaseObjectPtr clone();
unsigned char dwVer;
};
class SXAddl_SXCCache_SXDVerUpdInv : public BiffStructure
{
BASE_STRUCTURE_DEFINE_CLASS_NAME(SXAddl_SXCCache_SXDVerUpdInv)
class SXAddl_SXCCache_SXDVerUpdInv : public SXAddl
{
public:
BiffStructurePtr clone();
SXAddl_SXCCache_SXDVerUpdInv(){}
~SXAddl_SXCCache_SXDVerUpdInv(){}
virtual void load(CFRecord& record);
static const ElementType type = typeSXAddl;
virtual void readFields(CFRecord& record);
virtual BaseObjectPtr clone();
unsigned char dwVersionInvalidates;
};
class SXAddl_SXCCacheField_SXDCaption : public BiffStructure
{
BASE_STRUCTURE_DEFINE_CLASS_NAME(SXAddl_SXCCacheField_SXDCaption)
class SXAddl_SXCCacheField_SXDCaption : public SXAddl {};
class SXAddl_SXCCacheField_SXDEnd : public SXAddl {};
class SXAddl_SXCCacheField_SXDId : public SXAddl {};
class SXAddl_SXCCacheField_SXDIfdbMempropMap: public SXAddl
{
public:
BiffStructurePtr clone();
SXAddl_SXCCacheField_SXDCaption(){}
~SXAddl_SXCCacheField_SXDCaption(){}
virtual void load(CFRecord& record);
static const ElementType type = typeSXAddl;
XLUnicodeStringSegmentedSXADDL stCaption;
};
class SXAddl_SXCCacheField_SXDEnd : public BiffStructure
{
BASE_STRUCTURE_DEFINE_CLASS_NAME(SXAddl_SXCCacheField_SXDEnd)
public:
BiffStructurePtr clone();
SXAddl_SXCCacheField_SXDEnd(){}
~SXAddl_SXCCacheField_SXDEnd(){}
virtual void load(CFRecord& record);
static const ElementType type = typeSXAddl;
};
class SXAddl_SXCCacheField_SXDId : public BiffStructure
{
BASE_STRUCTURE_DEFINE_CLASS_NAME(SXAddl_SXCCacheField_SXDId)
public:
BiffStructurePtr clone();
SXAddl_SXCCacheField_SXDId(){}
~SXAddl_SXCCacheField_SXDId(){}
virtual void load(CFRecord& record);
static const ElementType type = typeSXAddl;
XLUnicodeStringSegmentedSXADDL stSourceName;
};
class SXAddl_SXCCacheField_SXDIfdbMempropMap : public BiffStructure
{
BASE_STRUCTURE_DEFINE_CLASS_NAME(SXAddl_SXCCacheField_SXDIfdbMempropMap)
public:
BiffStructurePtr clone();
SXAddl_SXCCacheField_SXDIfdbMempropMap(){}
~SXAddl_SXCCacheField_SXDIfdbMempropMap(){}
virtual void load(CFRecord& record);
static const ElementType type = typeSXAddl;
virtual void readFields(CFRecord& record);
virtual BaseObjectPtr clone();
std::vector<unsigned short> rgMap;
};
class SXAddl_SXCCacheField_SXDIfdbMpMapCount : public BiffStructure
{
BASE_STRUCTURE_DEFINE_CLASS_NAME(SXAddl_SXCCacheField_SXDIfdbMpMapCount)
class SXAddl_SXCCacheField_SXDIfdbMpMapCount: public SXAddl {};
class SXAddl_SXCCacheField_SXDProperty : public SXAddl {};
class SXAddl_SXCCacheField_SXDPropName : public SXAddl {};
class SXAddl_SXCCacheField_SXDSxrmitmCount : public SXAddl {};
class SXAddl_SXCCacheItem_SXDEnd : public SXAddl {};
class SXAddl_SXCCacheItem_SXDId : public SXAddl {};
class SXAddl_SXCCacheItem_SXDItmMpMapCount : public SXAddl {};
class SXAddl_SXCCacheItem_SXDItmMpropMap : public SXAddl {};
class SXAddl_SXCCacheItem_SXDSxrmitmDisp : public SXAddl {};
class SXAddl_SXCField12_SXDAutoshow : public SXAddl {};
class SXAddl_SXCField12_SXDEnd : public SXAddl {};
class SXAddl_SXCField12_SXDId : public SXAddl {};
class SXAddl_SXCField12_SXDISXTH : public SXAddl {};
class SXAddl_SXCField12_SXDMemberCaption : public SXAddl {};
class SXAddl_SXCField12_SXDVer12Info : public SXAddl {};
class SXAddl_SXCField12_SXDVerUpdInv : public SXAddl {};
class SXAddl_SXCField_SXDEnd : public SXAddl {};
class SXAddl_SXCField_SXDId : public SXAddl {};
class SXAddl_SXCField_SXDVer10Info : public SXAddl {};
class SXAddl_SXCGroup_SXDEnd : public SXAddl {};
class SXAddl_SXCGroup_SXDGrpInfo : public SXAddl {};
class SXAddl_SXCGroup_SXDId : public SXAddl {};
class SXAddl_SXCGroup_SXDMember : public SXAddl {};
class SXAddl_SXCGrpLevel_SXDEnd : public SXAddl {};
class SXAddl_SXCGrpLevel_SXDGrpLevelInfo : public SXAddl {};
class SXAddl_SXCGrpLevel_SXDId : public SXAddl {};
class SXAddl_SXCHierarchy_SXDDisplayFolder : public SXAddl {};
class SXAddl_SXCHierarchy_SXDEnd : public SXAddl {};
class SXAddl_SXCHierarchy_SXDFilterMember : public SXAddl {};
class SXAddl_SXCHierarchy_SXDFilterMember12 : public SXAddl {};
class SXAddl_SXCHierarchy_SXDIconSet : public SXAddl {};
class SXAddl_SXCHierarchy_SXDId : public SXAddl {};
class SXAddl_SXCHierarchy_SXDInfo12 : public SXAddl {};
class SXAddl_SXCHierarchy_SXDKPIGoal : public SXAddl {};
class SXAddl_SXCHierarchy_SXDKPIStatus : public SXAddl {};
class SXAddl_SXCHierarchy_SXDKPITime : public SXAddl {};
class SXAddl_SXCHierarchy_SXDKPITrend : public SXAddl {};
class SXAddl_SXCHierarchy_SXDKPIValue : public SXAddl {};
class SXAddl_SXCHierarchy_SXDKPIWeight : public SXAddl {};
class SXAddl_SXCHierarchy_SXDMeasureGrp : public SXAddl {};
class SXAddl_SXCHierarchy_SXDParentKPI : public SXAddl {};
class SXAddl_SXCHierarchy_SXDProperty : public SXAddl {};
class SXAddl_SXCHierarchy_SXDSXSetParentUnique : public SXAddl {};
class SXAddl_SXCHierarchy_SXDUserCaption : public SXAddl {};
class SXAddl_SXCHierarchy_SXDVerUpdInv : public SXAddl {};
class SXAddl_SXCQsi_SXDEnd : public SXAddl {};
class SXAddl_SXCQsi_SXDId : public SXAddl {};
class SXAddl_SXCQuery_SXDEnd : public SXAddl {};
class SXAddl_SXCQuery_SXDReconnCond : public SXAddl {};
class SXAddl_SXCQuery_SXDSrcConnFile : public SXAddl {};
class SXAddl_SXCQuery_SXDSrcDataFile : public SXAddl {};
class SXAddl_SXCQuery_SXDXMLSource : public SXAddl {};
class SXAddl_SXCSXCondFmt_SXDEnd : public SXAddl {};
class SXAddl_SXCSXCondFmt_SXDSXCondFmt : public SXAddl {};
class SXAddl_SXCSXCondFmts_SXDEnd : public SXAddl {};
class SXAddl_SXCSXCondFmts_SXDId : public SXAddl {};
class SXAddl_SXCSXDH_SXDEnd : public SXAddl {};
class SXAddl_SXCSXDH_SXDId : public SXAddl {};
class SXAddl_SXCSXDH_SXDSxdh : public SXAddl {};
class SXAddl_SXCSXfilt_SXDEnd : public SXAddl {};
class SXAddl_SXCSXfilt_SXDId : public SXAddl {};
class SXAddl_SXCSXfilt_SXDSXfilt : public SXAddl {};
class SXAddl_SXCSXfilt_SXDSXItm : public SXAddl {};
class SXAddl_SXCSXFilter12_SXDCaption : public SXAddl {};
class SXAddl_SXCSXFilter12_SXDEnd : public SXAddl {};
class SXAddl_SXCSXFilter12_SXDId : public SXAddl {};
class SXAddl_SXCSXFilter12_SXDSXFilter : public SXAddl {};
class SXAddl_SXCSXFilter12_SXDSXFilterDesc : public SXAddl {};
class SXAddl_SXCSXFilter12_SXDSXFilterValue1: public SXAddl {};
class SXAddl_SXCSXFilter12_SXDSXFilterValue2: public SXAddl {};
class SXAddl_SXCSXFilter12_SXDXlsFilter : public SXAddl {};
class SXAddl_SXCSXFilter12_SXDXlsFilterValue1: public SXAddl {};
class SXAddl_SXCSXFilter12_SXDXlsFilterValue2: public SXAddl {};
class SXAddl_SXCSXFilters12_SXDEnd : public SXAddl {};
class SXAddl_SXCSXFilters12_SXDId : public SXAddl {};
class SXAddl_SXCSXMg_SXDEnd : public SXAddl {};
class SXAddl_SXCSXMg_SXDId : public SXAddl {};
class SXAddl_SXCSXMg_SXDUserCaption : public SXAddl {};
class SXAddl_SXCSXMgs_SXDEnd : public SXAddl {};
class SXAddl_SXCSXMgs_SXDId : public SXAddl {};
class SXAddl_SXCSXMgs_SXDMGrpSXDHMap : public SXAddl {};
class SXAddl_SXCSXrule_SXDEnd : public SXAddl {};
class SXAddl_SXCSXrule_SXDId : public SXAddl {};
class SXAddl_SXCSXrule_SXDSXrule : public SXAddl {};
class SXAddl_SXCView_SXDCalcMember : public SXAddl {};
class SXAddl_SXCView_SXDCalcMemString : public SXAddl {};
class SXAddl_SXCView_SXDCompactColHdr : public SXAddl {};
class SXAddl_SXCView_SXDCompactRwHdr : public SXAddl {};
class SXAddl_SXCView_SXDEnd : public SXAddl {};
class SXAddl_SXCView_SXDId : public SXAddl
{
public:
BiffStructurePtr clone();
SXAddl_SXCCacheField_SXDIfdbMpMapCount(){}
~SXAddl_SXCCacheField_SXDIfdbMpMapCount(){}
virtual void load(CFRecord& record);
static const ElementType type = typeSXAddl;
_UINT32 ifdbMemProp;
};
class SXAddl_SXCCacheField_SXDProperty : public BiffStructure
{
BASE_STRUCTURE_DEFINE_CLASS_NAME(SXAddl_SXCCacheField_SXDProperty)
public:
BiffStructurePtr clone();
SXAddl_SXCCacheField_SXDProperty(){}
~SXAddl_SXCCacheField_SXDProperty(){}
virtual void load(CFRecord& record);
static const ElementType type = typeSXAddl;
_UINT32 ihdb;
};
class SXAddl_SXCCacheField_SXDPropName : public BiffStructure
{
BASE_STRUCTURE_DEFINE_CLASS_NAME(SXAddl_SXCCacheField_SXDPropName)
public:
BiffStructurePtr clone();
SXAddl_SXCCacheField_SXDPropName(){}
~SXAddl_SXCCacheField_SXDPropName(){}
virtual void load(CFRecord& record);
static const ElementType type = typeSXAddl;
XLUnicodeStringSegmentedSXADDL stPropName;
};
class SXAddl_SXCCacheField_SXDSxrmitmCount : public BiffStructure
{
BASE_STRUCTURE_DEFINE_CLASS_NAME(SXAddl_SXCCacheField_SXDSxrmitmCount)
public:
BiffStructurePtr clone();
SXAddl_SXCCacheField_SXDSxrmitmCount(){}
~SXAddl_SXCCacheField_SXDSxrmitmCount(){}
virtual void load(CFRecord& record);
static const ElementType type = typeSXAddl;
_UINT32 citm;
};
class SXAddl_SXCCacheItem_SXDEnd : public BiffStructure
{
BASE_STRUCTURE_DEFINE_CLASS_NAME(SXAddl_SXCCacheItem_SXDEnd)
public:
BiffStructurePtr clone();
SXAddl_SXCCacheItem_SXDEnd(){}
~SXAddl_SXCCacheItem_SXDEnd(){}
virtual void load(CFRecord& record);
static const ElementType type = typeSXAddl;
};
class SXAddl_SXCCacheItem_SXDId : public BiffStructure
{
BASE_STRUCTURE_DEFINE_CLASS_NAME(SXAddl_SXCCacheItem_SXDId)
public:
BiffStructurePtr clone();
SXAddl_SXCCacheItem_SXDId(){}
~SXAddl_SXCCacheItem_SXDId(){}
virtual void load(CFRecord& record);
static const ElementType type = typeSXAddl;
_UINT32 dwItem;
virtual void readFields(CFRecord& record);
virtual BaseObjectPtr clone();
XLUnicodeStringSegmentedSXADDL stName;
};
//class SXAddl_SXCCacheItem_SXDItmMpMapCount : public SXAddl {};
//class SXAddl_SXCCacheItem_SXDItmMpropMap : public SXAddl {};
//class SXAddl_SXCCacheItem_SXDSxrmitmDisp : public SXAddl {};
//
//class SXAddl_SXCField12_SXDAutoshow : public SXAddl {};
//class SXAddl_SXCField12_SXDEnd : public SXAddl {};
//class SXAddl_SXCField12_SXDId : public SXAddl {};
//class SXAddl_SXCField12_SXDISXTH : public SXAddl {};
//class SXAddl_SXCField12_SXDMemberCaption : public SXAddl {};
//class SXAddl_SXCField12_SXDVer12Info : public SXAddl {};
//class SXAddl_SXCField12_SXDVerUpdInv : public SXAddl {};
//
//
//class SXAddl_SXCGroup_SXDEnd : public SXAddl {};
//class SXAddl_SXCGroup_SXDGrpInfo : public SXAddl {};
//class SXAddl_SXCGroup_SXDId : public SXAddl {};
//class SXAddl_SXCGroup_SXDMember : public SXAddl {};
//
//class SXAddl_SXCGrpLevel_SXDEnd : public SXAddl {};
//class SXAddl_SXCGrpLevel_SXDGrpLevelInfo : public SXAddl {};
//class SXAddl_SXCGrpLevel_SXDId : public SXAddl {};
//
//class SXAddl_SXCHierarchy_SXDDisplayFolder : public SXAddl {};
//class SXAddl_SXCHierarchy_SXDEnd : public SXAddl {};
//class SXAddl_SXCHierarchy_SXDFilterMember : public SXAddl {};
//class SXAddl_SXCHierarchy_SXDFilterMember12 : public SXAddl {};
//class SXAddl_SXCHierarchy_SXDIconSet : public SXAddl {};
//class SXAddl_SXCHierarchy_SXDId : public SXAddl {};
//class SXAddl_SXCHierarchy_SXDInfo12 : public SXAddl {};
//class SXAddl_SXCHierarchy_SXDKPIGoal : public SXAddl {};
//class SXAddl_SXCHierarchy_SXDKPIStatus : public SXAddl {};
//class SXAddl_SXCHierarchy_SXDKPITime : public SXAddl {};
//class SXAddl_SXCHierarchy_SXDKPITrend : public SXAddl {};
//class SXAddl_SXCHierarchy_SXDKPIValue : public SXAddl {};
//class SXAddl_SXCHierarchy_SXDKPIWeight : public SXAddl {};
//class SXAddl_SXCHierarchy_SXDMeasureGrp : public SXAddl {};
//class SXAddl_SXCHierarchy_SXDParentKPI : public SXAddl {};
//class SXAddl_SXCHierarchy_SXDProperty : public SXAddl {};
//class SXAddl_SXCHierarchy_SXDSXSetParentUnique : public SXAddl {};
//class SXAddl_SXCHierarchy_SXDUserCaption : public SXAddl {};
//class SXAddl_SXCHierarchy_SXDVerUpdInv : public SXAddl {};
//
//class SXAddl_SXCQsi_SXDEnd : public SXAddl {};
//class SXAddl_SXCQsi_SXDId : public SXAddl {};
//
//class SXAddl_SXCQuery_SXDEnd : public SXAddl {};
//class SXAddl_SXCQuery_SXDReconnCond : public SXAddl {};
//class SXAddl_SXCQuery_SXDSrcConnFile : public SXAddl {};
//class SXAddl_SXCQuery_SXDSrcDataFile : public SXAddl {};
//class SXAddl_SXCQuery_SXDXMLSource : public SXAddl {};
//
//class SXAddl_SXCSXCondFmt_SXDEnd : public SXAddl {};
//class SXAddl_SXCSXCondFmt_SXDSXCondFmt : public SXAddl {};
//class SXAddl_SXCSXCondFmts_SXDEnd : public SXAddl {};
//class SXAddl_SXCSXCondFmts_SXDId : public SXAddl {};
//class SXAddl_SXCSXDH_SXDEnd : public SXAddl {};
//class SXAddl_SXCSXDH_SXDId : public SXAddl {};
//class SXAddl_SXCSXDH_SXDSxdh : public SXAddl {};
//
//class SXAddl_SXCSXfilt_SXDEnd : public SXAddl {};
//class SXAddl_SXCSXfilt_SXDId : public SXAddl {};
//class SXAddl_SXCSXfilt_SXDSXfilt : public SXAddl {};
//class SXAddl_SXCSXfilt_SXDSXItm : public SXAddl {};
//
//class SXAddl_SXCSXFilter12_SXDCaption : public SXAddl {};
//class SXAddl_SXCSXFilter12_SXDEnd : public SXAddl {};
//class SXAddl_SXCSXFilter12_SXDId : public SXAddl {};
//class SXAddl_SXCSXFilter12_SXDSXFilter : public SXAddl {};
//class SXAddl_SXCSXFilter12_SXDSXFilterDesc : public SXAddl {};
//class SXAddl_SXCSXFilter12_SXDSXFilterValue1: public SXAddl {};
//class SXAddl_SXCSXFilter12_SXDSXFilterValue2: public SXAddl {};
//class SXAddl_SXCSXFilter12_SXDXlsFilter : public SXAddl {};
//class SXAddl_SXCSXFilter12_SXDXlsFilterValue1: public SXAddl {};
//class SXAddl_SXCSXFilter12_SXDXlsFilterValue2: public SXAddl {};
//class SXAddl_SXCSXFilters12_SXDEnd : public SXAddl {};
//class SXAddl_SXCSXFilters12_SXDId : public SXAddl {};
//
//class SXAddl_SXCSXMg_SXDEnd : public SXAddl {};
//class SXAddl_SXCSXMg_SXDId : public SXAddl {};
//class SXAddl_SXCSXMg_SXDUserCaption : public SXAddl {};
//
//class SXAddl_SXCSXMgs_SXDEnd : public SXAddl {};
//class SXAddl_SXCSXMgs_SXDId : public SXAddl {};
//class SXAddl_SXCSXMgs_SXDMGrpSXDHMap : public SXAddl {};
//
//class SXAddl_SXCSXrule_SXDEnd : public SXAddl {};
//class SXAddl_SXCSXrule_SXDId : public SXAddl {};
//class SXAddl_SXCSXrule_SXDSXrule : public SXAddl {};
//
//class SXAddl_SXCView_SXDCalcMember : public SXAddl {};
//class SXAddl_SXCView_SXDCalcMemString : public SXAddl {};
//class SXAddl_SXCView_SXDCompactColHdr : public SXAddl {};
//class SXAddl_SXCView_SXDCompactRwHdr : public SXAddl {};
//class SXAddl_SXCView_SXDSXPIIvmb
//{
// SXAddl_SXCView_SXDSXPIIvmb(CFRecord& record);
//};
//class SXAddl_SXCView_SXDVer10Info : public SXAddl {};
//class SXAddl_SXCView_SXDVer12Info : public SXAddl {};
//class SXAddl_SXCView_SXDVerUpdInv : public SXAddl {};
class SXAddl_SXCView_SXDSXPIIvmb : public SXAddl {};
class SXAddl_SXCView_SXDTableStyleClient : public SXAddl {};
class SXAddl_SXCView_SXDVer10Info : public SXAddl {};
class SXAddl_SXCView_SXDVer12Info : public SXAddl {};
class SXAddl_SXCView_SXDVerUpdInv : public SXAddl {};
} // namespace XLS

View File

@ -69,122 +69,109 @@ PIVOTADDL = SXAddl_SXCView_SXDId *Continue_SxaddlSxString
[SXADDLSXFILTERS12] *SXAddl_SXCView_SXDVerUpdInv *SXAddl_SXCView_SXDSXPIIvmb
[SXAddl_SXCView_SXDVerUpdInv] SXAddl_SXCView_SXDEnd
*/
const bool PIVOTADDL::loadContent(BinProcessor& proc)
{
int count = proc.repeated<SXAddl>(0, 0);
for (std::list<BaseObjectPtr>::iterator it = elements_.begin(); it != elements_.end(); it++)
if(!proc.mandatory<SXAddl_SXCView_SXDId>())
{
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;
}
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--;
}
//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<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();
//}
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();
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_SXDCompactColHdr>())
{
m_SXAddl_SXCView_SXDCompactColHdr = elements_.back();
elements_.pop_back();
// count = proc.repeated<Continue_SxaddlSxString>(0, 0);
//}
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--;
//}
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--;
//}
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_SXDVerUpdInv>())
{
m_arSXAddl_SXCView_SXDVerUpdInv.push_back(elements_.front());
elements_.pop_front();
}
//if (proc.optional<SXAddl_SXCView_SXDEnd>())
//{
// elements_.pop_back();
//}
if (proc.optional<SXAddl_SXCView_SXDEnd>())
{
elements_.pop_back();
}
return true;
}

View File

@ -49,21 +49,21 @@ public:
static const ElementType type = typePIVOTADDL;
BiffStructurePtr m_SXAddl_SXCView_SXDId;
BiffStructurePtr m_SXAddl_SXCView_SXDVer10Info;
BiffStructurePtr m_SXAddl_SXCView_SXDVer12Info;
BaseObjectPtr m_SXAddl_SXCView_SXDId;
BaseObjectPtr m_SXAddl_SXCView_SXDVer10Info;
BaseObjectPtr m_SXAddl_SXCView_SXDVer12Info;
BiffStructurePtr m_SXAddl_SXCView_SXDCompactRwHdr;
BiffStructurePtr m_SXAddl_SXCView_SXDCompactColHdr;
BiffStructurePtr m_SXAddl_SXADDLSXFILTERS12;
BiffStructurePtr m_SXADDLCONDFMTS;
BiffStructurePtr m_SXAddl_SXCView_SXDTableStyleClient;
BaseObjectPtr m_SXAddl_SXCView_SXDCompactRwHdr;
BaseObjectPtr m_SXAddl_SXCView_SXDCompactColHdr;
BaseObjectPtr m_SXAddl_SXADDLSXFILTERS12;
BaseObjectPtr m_SXADDLCONDFMTS;
BaseObjectPtr m_SXAddl_SXCView_SXDTableStyleClient;
std::vector<BiffStructurePtr> m_arSXAddl_SXCView_SXDVerUpdInv;
std::vector<BiffStructurePtr> m_arSXAddl_SXCView_SXDSXPIIvmb;
std::vector<BiffStructurePtr> m_arSXADDLFIELD;
std::vector<BiffStructurePtr> m_arSXADDLHIERARCHY;
std::vector<BiffStructurePtr> m_arSXADDLCALCMEMBER;
std::vector<BaseObjectPtr> m_arSXAddl_SXCView_SXDVerUpdInv;
std::vector<BaseObjectPtr> m_arSXAddl_SXCView_SXDSXPIIvmb;
std::vector<BaseObjectPtr> m_arSXADDLFIELD;
std::vector<BaseObjectPtr> m_arSXADDLHIERARCHY;
std::vector<BaseObjectPtr> m_arSXADDLCALCMEMBER;
};

View File

@ -31,8 +31,8 @@
*/
#include "PIVOTFRT.h"
#include "PIVOTFRT9.h"
#include "PIVOTADDL.h"
#include <Logic/Biff_unions/PIVOTFRT9.h>
#include <Logic/Biff_unions/PIVOTADDL.h>
namespace XLS
{

View File

@ -38,11 +38,9 @@
#include "PIVOTPI.h"
#include "PIVOTLI.h"
#include "PIVOTEX.h"
#include "PIVOTADDL.h"
#include "../Biff_records/SXDI.h"
#include "../Biff_records/SxView.h"
#include "../Biff_records/SXAddl.h"
namespace XLS
{
@ -98,8 +96,6 @@ int PIVOTVIEW::serialize(std::wostream & strm)
PIVOTFRT* frt = dynamic_cast<PIVOTFRT*>(m_PIVOTFRT.get());
PIVOTADDL* addls = frt ? dynamic_cast<PIVOTADDL*>(frt->m_PIVOTADDL.get()) : NULL;
indexCache = view->iCache;
CP_XML_WRITER(strm)
@ -208,21 +204,14 @@ int PIVOTVIEW::serialize(std::wostream & strm)
}
}
}
if ((addls) && (addls->m_SXAddl_SXCView_SXDTableStyleClient))
{
SXAddl_SXCView_SXDTableStyleClient* table_style = dynamic_cast<SXAddl_SXCView_SXDTableStyleClient*>(addls->m_SXAddl_SXCView_SXDTableStyleClient.get());
CP_XML_NODE(L"pivotTableStyleInfo")
{
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);
}
}
//CP_XML_NODE(L"pivotTableStyleInfo")
//{
// CP_XML_ATTR(L"showRowHeaders", 1);
// CP_XML_ATTR(L"showColHeaders", 1);
// CP_XML_ATTR(L"showRowStripes", 0);
// CP_XML_ATTR(L"showColStripes", 0);
// CP_XML_ATTR(L"showLastColumn", 1);
//}
}
}

View File

@ -57,12 +57,12 @@ BaseObjectPtr SXADDLAUTOSORT::clone()
// SXADDLAUTOSORT = SXAddl_SXCAutoSort_SXDId SXADDLSXRULE SXAddl_SXCAutoSort_SXDEnd
const bool SXADDLAUTOSORT::loadContent(BinProcessor& proc)
{
//if(!proc.mandatory<SXAddl_SXCAutoSort_SXDId>())
//{
// return false;
//}
//proc.mandatory<SXADDLSXRULE>();
//proc.mandatory<SXAddl_SXCAutoSort_SXDEnd>();
if(!proc.mandatory<SXAddl_SXCAutoSort_SXDId>())
{
return false;
}
proc.mandatory<SXADDLSXRULE>();
proc.mandatory<SXAddl_SXCAutoSort_SXDEnd>();
return true;
}

View File

@ -60,39 +60,39 @@ BaseObjectPtr SXADDLCACHE::clone()
//[SXADDLCACHE12] [SXADDLDBQUERY] *UNKNOWNFRT SXAddl_SXCCache_SXDEnd
const bool SXADDLCACHE::loadContent(BinProcessor& proc)
{
//if(!proc.mandatory<SXAddl_SXCCache_SXDId>())
//{
// return false;
//}
//m_SXCCache_SXDId = elements_.back();
//elements_.pop_back();
if(!proc.mandatory<SXAddl_SXCCache_SXDId>())
{
return false;
}
m_SXCCache_SXDId = elements_.back();
elements_.pop_back();
//if (proc.optional<SXAddl_SXCCache_SXDVer10Info>())
//{
// m_SXDVer10Info = elements_.back();
// elements_.pop_back();
//}
//if (proc.optional<SXAddl_SXCCache_SXDVerSXMacro>())
//{
// m_SXDVerSXMacro = elements_.back();
// elements_.pop_back();
//}
//if (proc.optional<SXADDLCACHE12>())
//{
// m_SXADDLCACHE12 = elements_.back();
// elements_.pop_back();
//}
//if (proc.optional<SXADDLDBQUERY>())
//{
// m_SXADDLDBQUERY = elements_.back();
// elements_.pop_back();
//}
//int count = proc.repeated<UNKNOWNFRT>(0, 0);
if (proc.optional<SXAddl_SXCCache_SXDVer10Info>())
{
m_SXDVer10Info = elements_.back();
elements_.pop_back();
}
if (proc.optional<SXAddl_SXCCache_SXDVerSXMacro>())
{
m_SXDVerSXMacro = elements_.back();
elements_.pop_back();
}
if (proc.optional<SXADDLCACHE12>())
{
m_SXADDLCACHE12 = elements_.back();
elements_.pop_back();
}
if (proc.optional<SXADDLDBQUERY>())
{
m_SXADDLDBQUERY = elements_.back();
elements_.pop_back();
}
int count = proc.repeated<UNKNOWNFRT>(0, 0);
//if (proc.optional<SXAddl_SXCCache_SXDEnd>())
//{
// elements_.pop_back();
//}
if (proc.optional<SXAddl_SXCCache_SXDEnd>())
{
elements_.pop_back();
}
return true;
}

View File

@ -60,45 +60,45 @@ BaseObjectPtr SXADDLCACHE12::clone()
// *SXADDLCACHEFIELD [SXADDLSXDH] [SXADDLSXMGS] SXAddl_SXCCache_SXDVerUpdInv
const bool SXADDLCACHE12::loadContent(BinProcessor& proc)
{
//if(!proc.mandatory<SXAddl_SXCCache_SXDVerUpdInv>())
//{
// return false;
//}
//m_SXAddl_SXCCache_SXDVerUpdInv = elements_.back();
//elements_.pop_back();
if(!proc.mandatory<SXAddl_SXCCache_SXDVerUpdInv>())
{
return false;
}
m_SXAddl_SXCCache_SXDVerUpdInv = elements_.back();
elements_.pop_back();
//if (proc.optional<SXAddl_SXCCache_SXDInfo12>())
//{
// m_SXAddl_SXCCache_SXDInfo12 = elements_.back();
// elements_.pop_back();
//}
//if (proc.optional<SXAddl_SXCCache_SXDInvRefreshReal>())
//{
// m_SXAddl_SXCCache_SXDInvRefreshReal = elements_.back();
// elements_.pop_back();
//}
//
//int count = proc.repeated<SXADDLCACHEFIELD>(0, 0);
//while(count > 0)
//{
// m_arSXADDLCACHEFIELD.push_back(elements_.front());
// elements_.pop_front(); count--;
//}
//if (proc.optional<SXADDLSXDH>())
//{
// m_SXADDLSXDH = elements_.back();
// elements_.pop_back();
//}
//if (proc.optional<SXADDLSXMGS>())
//{
// m_SXADDLSXMGS = elements_.back();
// elements_.pop_back();
//}
//if (proc.optional<SXAddl_SXCCache_SXDVerUpdInv>())
//{
// m_SXAddl_SXCCache_SXDVerUpdInvS = elements_.back();
// elements_.pop_back();
//}
if (proc.optional<SXAddl_SXCCache_SXDInfo12>())
{
m_SXAddl_SXCCache_SXDInfo12 = elements_.back();
elements_.pop_back();
}
if (proc.optional<SXAddl_SXCCache_SXDInvRefreshReal>())
{
m_SXAddl_SXCCache_SXDInvRefreshReal = elements_.back();
elements_.pop_back();
}
int count = proc.repeated<SXADDLCACHEFIELD>(0, 0);
while(count > 0)
{
m_arSXADDLCACHEFIELD.push_back(elements_.front());
elements_.pop_front(); count--;
}
if (proc.optional<SXADDLSXDH>())
{
m_SXADDLSXDH = elements_.back();
elements_.pop_back();
}
if (proc.optional<SXADDLSXMGS>())
{
m_SXADDLSXMGS = elements_.back();
elements_.pop_back();
}
if (proc.optional<SXAddl_SXCCache_SXDVerUpdInv>())
{
m_SXAddl_SXCCache_SXDVerUpdInvS = elements_.back();
elements_.pop_back();
}
return true;
}

View File

@ -59,11 +59,11 @@ public:
const bool loadContent(BinProcessor& proc)
{
//if(!proc.mandatory<SXAddl_SXCCacheField_SXDCaption>())
//{
// return false;
//}
//proc.repeated<Continue_SxaddlSxString>(0, 0);
if(!proc.mandatory<SXAddl_SXCCacheField_SXDCaption>())
{
return false;
}
proc.repeated<Continue_SxaddlSxString>(0, 0);
return true;
};
};
@ -81,11 +81,11 @@ public:
const bool loadContent(BinProcessor& proc)
{
//if(!proc.mandatory<SXAddl_SXCCacheField_SXDPropName>())
//{
// return false;
//}
//proc.repeated<Continue_SxaddlSxString>(0, 0);
if(!proc.mandatory<SXAddl_SXCCacheField_SXDPropName>())
{
return false;
}
proc.repeated<Continue_SxaddlSxString>(0, 0);
return true;
};
};
@ -102,11 +102,11 @@ public:
const bool loadContent(BinProcessor& proc)
{
//if(!proc.mandatory<SXAddl_SXCCacheField_SXDProperty>())
//{
// return false;
//}
//proc.optional<Parenthesis_SXADDLCACHEFIELD_3>();
if(!proc.mandatory<SXAddl_SXCCacheField_SXDProperty>())
{
return false;
}
proc.optional<Parenthesis_SXADDLCACHEFIELD_3>();
return true;
};
};
@ -123,11 +123,11 @@ public:
const bool loadContent(BinProcessor& proc)
{
//if(!proc.mandatory<SXAddl_SXCCacheField_SXDIfdbMpMapCount>())
//{
// return false;
//}
//proc.mandatory<SXAddl_SXCCacheField_SXDIfdbMempropMap>();
if(!proc.mandatory<SXAddl_SXCCacheField_SXDIfdbMpMapCount>())
{
return false;
}
proc.mandatory<SXAddl_SXCCacheField_SXDIfdbMempropMap>();
return true;
};
};
@ -144,12 +144,12 @@ public:
const bool loadContent(BinProcessor& proc)
{
//if(!proc.mandatory<SXAddl_SXCCacheField_SXDSxrmitmCount>())
//{
// return false;
//}
//proc.repeated<SXADDLCACHEITEM>(0, 0);
//proc.mandatory<SXAddl_SXCCacheItem_SXDEnd>();
if(!proc.mandatory<SXAddl_SXCCacheField_SXDSxrmitmCount>())
{
return false;
}
proc.repeated<SXADDLCACHEITEM>(0, 0);
proc.mandatory<SXAddl_SXCCacheItem_SXDEnd>();
return true;
};
};
@ -171,16 +171,16 @@ BaseObjectPtr SXADDLCACHEFIELD::clone()
// SXAddl_SXCCacheField_SXDEnd
const bool SXADDLCACHEFIELD::loadContent(BinProcessor& proc)
{
//if(!proc.mandatory<SXAddl_SXCCacheField_SXDId>())
//{
// return false;
//}
//proc.repeated<Continue_SxaddlSxString>(0, 0);
//proc.optional<Parenthesis_SXADDLCACHEFIELD_1>();
//proc.optional<Parenthesis_SXADDLCACHEFIELD_2>();
//proc.optional<Parenthesis_SXADDLCACHEFIELD_4>();
//proc.optional<Parenthesis_SXADDLCACHEFIELD_5>();
//proc.optional<SXAddl_SXCCacheField_SXDEnd>();
if(!proc.mandatory<SXAddl_SXCCacheField_SXDId>())
{
return false;
}
proc.repeated<Continue_SxaddlSxString>(0, 0);
proc.optional<Parenthesis_SXADDLCACHEFIELD_1>();
proc.optional<Parenthesis_SXADDLCACHEFIELD_2>();
proc.optional<Parenthesis_SXADDLCACHEFIELD_4>();
proc.optional<Parenthesis_SXADDLCACHEFIELD_5>();
proc.optional<SXAddl_SXCCacheField_SXDEnd>();
return true;
}

View File

@ -58,11 +58,11 @@ public:
const bool loadContent(BinProcessor& proc)
{
//if(!proc.mandatory<SXAddl_SXCCacheItem_SXDSxrmitmDisp>())
//{
// return false;
//}
//proc.repeated<Continue_SxaddlSxString>(0, 0);
if(!proc.mandatory<SXAddl_SXCCacheItem_SXDSxrmitmDisp>())
{
return false;
}
proc.repeated<Continue_SxaddlSxString>(0, 0);
return true;
};
};
@ -79,11 +79,11 @@ public:
const bool loadContent(BinProcessor& proc)
{
//if(!proc.mandatory<SXAddl_SXCCacheItem_SXDItmMpMapCount>())
//{
// return false;
//}
//proc.mandatory<SXAddl_SXCCacheItem_SXDItmMpropMap>();
if(!proc.mandatory<SXAddl_SXCCacheItem_SXDItmMpMapCount>())
{
return false;
}
proc.mandatory<SXAddl_SXCCacheItem_SXDItmMpropMap>();
return true;
};
};
@ -99,12 +99,12 @@ BaseObjectPtr SXADDLCACHEITEM::clone()
// *(SXAddl_SXCCacheItem_SXDItmMpMapCount SXAddl_SXCCacheItem_SXDItmMpropMap)
const bool SXADDLCACHEITEM::loadContent(BinProcessor& proc)
{
//if(!proc.mandatory<SXAddl_SXCCacheItem_SXDId>())
//{
// return false;
//}
//proc.optional<Parenthesis_SXADDLCACHEITEM_1>();
//proc.repeated<Parenthesis_SXADDLCACHEITEM_2>(0, 0);
if(!proc.mandatory<SXAddl_SXCCacheItem_SXDId>())
{
return false;
}
proc.optional<Parenthesis_SXADDLCACHEITEM_1>();
proc.repeated<Parenthesis_SXADDLCACHEITEM_2>(0, 0);
return true;
}

View File

@ -56,14 +56,14 @@ BaseObjectPtr SXADDLCALCMEMBER::clone()
// SXADDLCALCMEMBER = (SXAddl_SXCView_SXDCalcMember [SXAddl_SXCView_SXDCalcMemString *Continue_SxaddlSxString])
const bool SXADDLCALCMEMBER::loadContent(BinProcessor& proc)
{
//if(!proc.mandatory<SXAddl_SXCView_SXDCalcMember>())
//{
// return false;
//}
//if(proc.optional<SXAddl_SXCView_SXDCalcMemString>())
//{
// int count = proc.repeated<Continue_SxaddlSxString>(0, 0);
//}
if(!proc.mandatory<SXAddl_SXCView_SXDCalcMember>())
{
return false;
}
if(proc.optional<SXAddl_SXCView_SXDCalcMemString>())
{
int count = proc.repeated<Continue_SxaddlSxString>(0, 0);
}
return true;
}

View File

@ -57,12 +57,12 @@ BaseObjectPtr SXADDLCONDFMT::clone()
// SXADDLCONDFMT = SXAddl_SXCSXCondFmt_SXDSXCondFmt *SXADDLSXRULE SXAddl_SXCSXCondFmt_SXDEnd
const bool SXADDLCONDFMT::loadContent(BinProcessor& proc)
{
//if(!proc.mandatory<SXAddl_SXCSXCondFmt_SXDSXCondFmt>())
//{
// return false;
//}
//proc.repeated<SXADDLSXRULE>(0, 0);
//proc.mandatory<SXAddl_SXCSXCondFmt_SXDEnd>();
if(!proc.mandatory<SXAddl_SXCSXCondFmt_SXDSXCondFmt>())
{
return false;
}
proc.repeated<SXADDLSXRULE>(0, 0);
proc.mandatory<SXAddl_SXCSXCondFmt_SXDEnd>();
return true;
}

View File

@ -57,12 +57,12 @@ BaseObjectPtr SXADDLCONDFMTS::clone()
// SXADDLCONDFMTS = SXAddl_SXCSXCondFmts_SXDId *SXADDLCONDFMT SXAddl_SXCSXCondFmts_SXDEnd
const bool SXADDLCONDFMTS::loadContent(BinProcessor& proc)
{
//if(!proc.mandatory<SXAddl_SXCSXCondFmts_SXDId>())
//{
// return false;
//}
//proc.repeated<SXADDLCONDFMT>(0, 0);
//proc.optional<SXAddl_SXCSXCondFmts_SXDEnd>();
if(!proc.mandatory<SXAddl_SXCSXCondFmts_SXDId>())
{
return false;
}
proc.repeated<SXADDLCONDFMT>(0, 0);
proc.optional<SXAddl_SXCSXCondFmts_SXDEnd>();
return true;
}

View File

@ -61,39 +61,39 @@ SXADDLDBQUERY = [SXAddl_SXCQuery_SXDXMLSource *Continue_SxaddlSxString]
*/
const bool SXADDLDBQUERY::loadContent(BinProcessor& proc)
{
//int count = 0;
//
//if(proc.optional<SXAddl_SXCQuery_SXDXMLSource>())
//{
// m_XMLSource = elements_.back();
// elements_.pop_back();
int count = 0;
if(proc.optional<SXAddl_SXCQuery_SXDXMLSource>())
{
m_XMLSource = elements_.back();
elements_.pop_back();
// count = proc.repeated<Continue_SxaddlSxString>(0, 0);
//}
//if(proc.optional<SXAddl_SXCQuery_SXDSrcDataFile>())
//{
// m_SrcDataFile = elements_.back();
// elements_.pop_back();
count = proc.repeated<Continue_SxaddlSxString>(0, 0);
}
if(proc.optional<SXAddl_SXCQuery_SXDSrcDataFile>())
{
m_SrcDataFile = elements_.back();
elements_.pop_back();
// count = proc.repeated<Continue_SxaddlSxString>(0, 0);
//}
//if(proc.optional<SXAddl_SXCQuery_SXDSrcConnFile>())
//{
// m_SrcConnFile = elements_.back();
// elements_.pop_back();
count = proc.repeated<Continue_SxaddlSxString>(0, 0);
}
if(proc.optional<SXAddl_SXCQuery_SXDSrcConnFile>())
{
m_SrcConnFile = elements_.back();
elements_.pop_back();
// count = proc.repeated<Continue_SxaddlSxString>(0, 0);
//}
//if(proc.optional<SXAddl_SXCQuery_SXDReconnCond>())
//{
// m_ReconnCond = elements_.back();
// elements_.pop_back();
//}
count = proc.repeated<Continue_SxaddlSxString>(0, 0);
}
if(proc.optional<SXAddl_SXCQuery_SXDReconnCond>())
{
m_ReconnCond = elements_.back();
elements_.pop_back();
}
//if(proc.mandatory<SXAddl_SXCQuery_SXDEnd>())
//{
// elements_.pop_back();
//}
if(proc.mandatory<SXAddl_SXCQuery_SXDEnd>())
{
elements_.pop_back();
}
return m_XMLSource || m_SrcConnFile || m_SrcDataFile || m_ReconnCond;
}

View File

@ -60,23 +60,22 @@ SXADDLFIELD = [SXAddl_SXCField_SXDId *Continue_SxaddlSxString SXAddl_SXCField_SX
*/
const bool SXADDLFIELD::loadContent(BinProcessor& proc)
{
//if(proc.optional<SXAddl_SXCField_SXDId>())
//{
// int count = proc.repeated<Continue_SxaddlSxString>(0, 0);
// if (proc.mandatory<SXAddl_SXCField_SXDVer10Info>())
// {
// }
// if (proc.mandatory<SXAddl_SXCField_SXDEnd>())
// {
// }
// if (proc.optional<SXADDLFIELD12>())
// {
// }
// return true;
//}
if(proc.optional<SXAddl_SXCField_SXDId>())
{
int count = proc.repeated<Continue_SxaddlSxString>(0, 0);
if (proc.mandatory<SXAddl_SXCField_SXDVer10Info>())
{
}
if (proc.mandatory<SXAddl_SXCField_SXDEnd>())
{
}
if (proc.optional<SXADDLFIELD12>())
{
}
return true;
}
//return proc.optional<SXADDLFIELD12>();
return true;
return proc.optional<SXADDLFIELD12>();
}
} // namespace XLS

View File

@ -63,23 +63,23 @@ SXADDLFIELD12 = SXAddl_SXCField12_SXDId *Continue_SxaddlSxString SXAddl_SXCField
*/
const bool SXADDLFIELD12::loadContent(BinProcessor& proc)
{
//if(!proc.mandatory<SXAddl_SXCField12_SXDId>())
//{
// return false;
//}
//proc.repeated<Continue_SxaddlSxString>(0, 0);
//proc.mandatory<SXAddl_SXCField12_SXDVer12Info>();
//proc.mandatory<SXAddl_SXCField12_SXDVerUpdInv>();
//if(proc.optional<SXAddl_SXCField12_SXDMemberCaption>())
//{
// proc.repeated<Continue_SxaddlSxString>(0, 0);
//}
//proc.optional<SXAddl_SXCField12_SXDAutoshow>();
//proc.optional<SXAddl_SXCField12_SXDISXTH>();
//proc.optional<SXADDLAUTOSORT>();
//proc.mandatory<SXAddl_SXCField12_SXDVerUpdInv>();
//proc.repeated<UNKNOWNFRT>(0, 0);
//proc.mandatory<SXAddl_SXCField12_SXDEnd>();
if(!proc.mandatory<SXAddl_SXCField12_SXDId>())
{
return false;
}
proc.repeated<Continue_SxaddlSxString>(0, 0);
proc.mandatory<SXAddl_SXCField12_SXDVer12Info>();
proc.mandatory<SXAddl_SXCField12_SXDVerUpdInv>();
if(proc.optional<SXAddl_SXCField12_SXDMemberCaption>())
{
proc.repeated<Continue_SxaddlSxString>(0, 0);
}
proc.optional<SXAddl_SXCField12_SXDAutoshow>();
proc.optional<SXAddl_SXCField12_SXDISXTH>();
proc.optional<SXADDLAUTOSORT>();
proc.mandatory<SXAddl_SXCField12_SXDVerUpdInv>();
proc.repeated<UNKNOWNFRT>(0, 0);
proc.mandatory<SXAddl_SXCField12_SXDEnd>();
return true;
}

View File

@ -60,15 +60,15 @@ SXADDLGROUP = SXAddl_SXCGroup_SXDId *Continue_SxaddlSxString SXAddl_SXCGroup_SXD
*/
const bool SXADDLGROUP::loadContent(BinProcessor& proc)
{
//if(!proc.mandatory<SXAddl_SXCGroup_SXDId>())
//{
// return false;
//}
//proc.repeated<Continue_SxaddlSxString>(0, 0);
//proc.mandatory<SXAddl_SXCGroup_SXDGrpInfo>();
//proc.repeated<SXAddl_SXCGroup_SXDMember>(0, 0);
//proc.repeated<UNKNOWNFRT>(0, 0);
//proc.mandatory<SXAddl_SXCGroup_SXDEnd>();
if(!proc.mandatory<SXAddl_SXCGroup_SXDId>())
{
return false;
}
proc.repeated<Continue_SxaddlSxString>(0, 0);
proc.mandatory<SXAddl_SXCGroup_SXDGrpInfo>();
proc.repeated<SXAddl_SXCGroup_SXDMember>(0, 0);
proc.repeated<UNKNOWNFRT>(0, 0);
proc.mandatory<SXAddl_SXCGroup_SXDEnd>();
return true;
}

View File

@ -61,15 +61,15 @@ SXADDLGRPLEVEL = SXAddl_SXCGrpLevel_SXDId *Continue_SxaddlSxString SXAddl_SXCGrp
*/
const bool SXADDLGRPLEVEL::loadContent(BinProcessor& proc)
{
//if(!proc.mandatory<SXAddl_SXCGrpLevel_SXDId>())
//{
// return false;
//}
//proc.repeated<Continue_SxaddlSxString>(0, 0);
//proc.mandatory<SXAddl_SXCGrpLevel_SXDGrpLevelInfo>();
//proc.repeated<SXADDLGROUP>(0, 0);
//proc.repeated<UNKNOWNFRT>(0, 0);
//proc.mandatory<SXAddl_SXCGrpLevel_SXDEnd>();
if(!proc.mandatory<SXAddl_SXCGrpLevel_SXDId>())
{
return false;
}
proc.repeated<Continue_SxaddlSxString>(0, 0);
proc.mandatory<SXAddl_SXCGrpLevel_SXDGrpLevelInfo>();
proc.repeated<SXADDLGROUP>(0, 0);
proc.repeated<UNKNOWNFRT>(0, 0);
proc.mandatory<SXAddl_SXCGrpLevel_SXDEnd>();
return true;
}

View File

@ -75,67 +75,67 @@ SXADDLHIERARCHY = SXAddl_SXCHierarchy_SXDId *Continue_SxaddlSxString *SXAddl_SXC
*/
const bool SXADDLHIERARCHY::loadContent(BinProcessor& proc)
{
//if(!proc.mandatory<SXAddl_SXCHierarchy_SXDId>())
//{
// return false;
//}
//proc.repeated<Continue_SxaddlSxString>(0, 0);
//proc.repeated<SXAddl_SXCHierarchy_SXDProperty>(0, 0);
//proc.repeated<SXADDLGRPLEVEL>(0, 0);
//proc.optional<SXAddl_SXCHierarchy_SXDVerUpdInv>();
if(!proc.mandatory<SXAddl_SXCHierarchy_SXDId>())
{
return false;
}
proc.repeated<Continue_SxaddlSxString>(0, 0);
proc.repeated<SXAddl_SXCHierarchy_SXDProperty>(0, 0);
proc.repeated<SXADDLGRPLEVEL>(0, 0);
proc.optional<SXAddl_SXCHierarchy_SXDVerUpdInv>();
//if(proc.optional<SXAddl_SXCHierarchy_SXDSXSetParentUnique>())
//{
// proc.repeated<Continue_SxaddlSxString>(0, 0);
//}
//proc.optional<SXAddl_SXCHierarchy_SXDIconSet>();
//if(proc.optional<SXAddl_SXCHierarchy_SXDUserCaption>())
//{
// proc.repeated<Continue_SxaddlSxString>(0, 0);
//}
//proc.repeated<UNKNOWNFRT>(0, 0);
//proc.optional<SXAddl_SXCHierarchy_SXDVerUpdInv>();
//proc.repeated<SXAddl_SXCHierarchy_SXDUserCaption>(0, 0);
//proc.optional<SXAddl_SXCHierarchy_SXDVerUpdInv>();
//proc.optional<SXAddl_SXCHierarchy_SXDInfo12>();
//if(proc.optional<SXAddl_SXCHierarchy_SXDDisplayFolder>())
//{
// proc.repeated<Continue_SxaddlSxString>(0, 0);
//}
//if(proc.optional<SXAddl_SXCHierarchy_SXDMeasureGrp>())
//{
// proc.repeated<Continue_SxaddlSxString>(0, 0);
//}
//if(proc.optional<SXAddl_SXCHierarchy_SXDParentKPI>())
//{
// proc.repeated<Continue_SxaddlSxString>(0, 0);
//}
//if(proc.optional<SXAddl_SXCHierarchy_SXDKPIValue>())
//{
// proc.repeated<Continue_SxaddlSxString>(0, 0);
//}
//if(proc.optional<SXAddl_SXCHierarchy_SXDKPIGoal>())
//{
// proc.repeated<Continue_SxaddlSxString>(0, 0);
//}
//if(proc.optional<SXAddl_SXCHierarchy_SXDKPIStatus>())
//{
// proc.repeated<Continue_SxaddlSxString>(0, 0);
//}
//if(proc.optional<SXAddl_SXCHierarchy_SXDKPITrend>())
//{
// proc.repeated<Continue_SxaddlSxString>(0, 0);
//}
//if(proc.optional<SXAddl_SXCHierarchy_SXDKPIWeight>())
//{
// proc.repeated<Continue_SxaddlSxString>(0, 0);
//}
//if(proc.optional<SXAddl_SXCHierarchy_SXDKPITime>())
//{
// proc.repeated<Continue_SxaddlSxString>(0, 0);
//}
if(proc.optional<SXAddl_SXCHierarchy_SXDSXSetParentUnique>())
{
proc.repeated<Continue_SxaddlSxString>(0, 0);
}
proc.optional<SXAddl_SXCHierarchy_SXDIconSet>();
if(proc.optional<SXAddl_SXCHierarchy_SXDUserCaption>())
{
proc.repeated<Continue_SxaddlSxString>(0, 0);
}
proc.repeated<UNKNOWNFRT>(0, 0);
proc.optional<SXAddl_SXCHierarchy_SXDVerUpdInv>();
proc.repeated<SXAddl_SXCHierarchy_SXDUserCaption>(0, 0);
proc.optional<SXAddl_SXCHierarchy_SXDVerUpdInv>();
proc.optional<SXAddl_SXCHierarchy_SXDInfo12>();
if(proc.optional<SXAddl_SXCHierarchy_SXDDisplayFolder>())
{
proc.repeated<Continue_SxaddlSxString>(0, 0);
}
if(proc.optional<SXAddl_SXCHierarchy_SXDMeasureGrp>())
{
proc.repeated<Continue_SxaddlSxString>(0, 0);
}
if(proc.optional<SXAddl_SXCHierarchy_SXDParentKPI>())
{
proc.repeated<Continue_SxaddlSxString>(0, 0);
}
if(proc.optional<SXAddl_SXCHierarchy_SXDKPIValue>())
{
proc.repeated<Continue_SxaddlSxString>(0, 0);
}
if(proc.optional<SXAddl_SXCHierarchy_SXDKPIGoal>())
{
proc.repeated<Continue_SxaddlSxString>(0, 0);
}
if(proc.optional<SXAddl_SXCHierarchy_SXDKPIStatus>())
{
proc.repeated<Continue_SxaddlSxString>(0, 0);
}
if(proc.optional<SXAddl_SXCHierarchy_SXDKPITrend>())
{
proc.repeated<Continue_SxaddlSxString>(0, 0);
}
if(proc.optional<SXAddl_SXCHierarchy_SXDKPIWeight>())
{
proc.repeated<Continue_SxaddlSxString>(0, 0);
}
if(proc.optional<SXAddl_SXCHierarchy_SXDKPITime>())
{
proc.repeated<Continue_SxaddlSxString>(0, 0);
}
//proc.mandatory<SXAddl_SXCHierarchy_SXDEnd>();
proc.mandatory<SXAddl_SXCHierarchy_SXDEnd>();
return true;
}

View File

@ -58,13 +58,13 @@ BaseObjectPtr SXADDLQSI::clone()
// SXADDLQSI = SXAddl_SXCQsi_SXDId SXADDLDBQUERY *UNKNOWNFRT SXAddl_SXCQsi_SXDEnd
const bool SXADDLQSI::loadContent(BinProcessor& proc)
{
//if(!proc.mandatory<SXAddl_SXCQsi_SXDId>())
//{
// return false;
//}
//proc.mandatory<SXADDLDBQUERY>();
//proc.repeated<UNKNOWNFRT>(0, 0);
//proc.mandatory<SXAddl_SXCQsi_SXDEnd>();
if(!proc.mandatory<SXAddl_SXCQsi_SXDId>())
{
return false;
}
proc.mandatory<SXADDLDBQUERY>();
proc.repeated<UNKNOWNFRT>(0, 0);
proc.mandatory<SXAddl_SXCQsi_SXDEnd>();
return true;
}

View File

@ -57,12 +57,12 @@ BaseObjectPtr SXADDLSXDH::clone()
const bool SXADDLSXDH::loadContent(BinProcessor& proc)
{
//if(!proc.mandatory<SXAddl_SXCSXDH_SXDId>())
//{
// return false;
//}
//proc.repeated<SXAddl_SXCSXDH_SXDSxdh>(0, 0);
//proc.mandatory<SXAddl_SXCSXDH_SXDEnd>();
if(!proc.mandatory<SXAddl_SXCSXDH_SXDId>())
{
return false;
}
proc.repeated<SXAddl_SXCSXDH_SXDSxdh>(0, 0);
proc.mandatory<SXAddl_SXCSXDH_SXDEnd>();
return true;
}

View File

@ -56,13 +56,13 @@ BaseObjectPtr SXADDLSXFILT::clone()
// SXADDLSXFILT = SXAddl_SXCSXfilt_SXDId SXAddl_SXCSXfilt_SXDSXfilt [SXAddl_SXCSXfilt_SXDSXItm] SXAddl_SXCSXfilt_SXDEnd
const bool SXADDLSXFILT::loadContent(BinProcessor& proc)
{
//if(!proc.mandatory<SXAddl_SXCSXfilt_SXDId>())
//{
// return false;
//}
//proc.mandatory<SXAddl_SXCSXfilt_SXDSXfilt>();
//proc.optional<SXAddl_SXCSXfilt_SXDSXItm>();
//proc.mandatory<SXAddl_SXCSXfilt_SXDEnd>();
if(!proc.mandatory<SXAddl_SXCSXfilt_SXDId>())
{
return false;
}
proc.mandatory<SXAddl_SXCSXfilt_SXDSXfilt>();
proc.optional<SXAddl_SXCSXfilt_SXDSXItm>();
proc.mandatory<SXAddl_SXCSXfilt_SXDEnd>();
return true;
}

View File

@ -65,38 +65,38 @@ SXADDLSXFILTER12 = SXAddl_SXCSXFilter12_SXDId SXAddl_SXCSXFilter12_SXDSXFilter
*/
const bool SXADDLSXFILTER12::loadContent(BinProcessor& proc)
{
//if(!proc.mandatory<SXAddl_SXCSXFilter12_SXDId>())
//{
// return false;
//}
//proc.mandatory<SXAddl_SXCSXFilter12_SXDSXFilter>();
if(!proc.mandatory<SXAddl_SXCSXFilter12_SXDId>())
{
return false;
}
proc.mandatory<SXAddl_SXCSXFilter12_SXDSXFilter>();
//if(proc.optional<SXAddl_SXCSXFilter12_SXDCaption>())
//{
// proc.repeated<Continue_SxaddlSxString>(0, 0);
//}
//if(proc.optional<SXAddl_SXCSXFilter12_SXDSXFilterDesc>())
//{
// proc.repeated<Continue_SxaddlSxString>(0, 0);
//}
//if(proc.optional<SXAddl_SXCSXFilter12_SXDSXFilterValue1>())
//{
// proc.repeated<Continue_SxaddlSxString>(0, 0);
//}
//if(proc.optional<SXAddl_SXCSXFilter12_SXDSXFilterValue2>())
//{
// proc.repeated<Continue_SxaddlSxString>(0, 0);
//}
//proc.mandatory<SXAddl_SXCSXFilter12_SXDXlsFilter>();
//if(proc.optional<SXAddl_SXCSXFilter12_SXDXlsFilterValue1>())
//{
// proc.repeated<Continue_SxaddlSxString>(0, 0);
//}
//if(proc.optional<SXAddl_SXCSXFilter12_SXDXlsFilterValue2>())
//{
// proc.repeated<Continue_SxaddlSxString>(0, 0);
//}
//proc.mandatory<SXAddl_SXCSXFilter12_SXDEnd>();
if(proc.optional<SXAddl_SXCSXFilter12_SXDCaption>())
{
proc.repeated<Continue_SxaddlSxString>(0, 0);
}
if(proc.optional<SXAddl_SXCSXFilter12_SXDSXFilterDesc>())
{
proc.repeated<Continue_SxaddlSxString>(0, 0);
}
if(proc.optional<SXAddl_SXCSXFilter12_SXDSXFilterValue1>())
{
proc.repeated<Continue_SxaddlSxString>(0, 0);
}
if(proc.optional<SXAddl_SXCSXFilter12_SXDSXFilterValue2>())
{
proc.repeated<Continue_SxaddlSxString>(0, 0);
}
proc.mandatory<SXAddl_SXCSXFilter12_SXDXlsFilter>();
if(proc.optional<SXAddl_SXCSXFilter12_SXDXlsFilterValue1>())
{
proc.repeated<Continue_SxaddlSxString>(0, 0);
}
if(proc.optional<SXAddl_SXCSXFilter12_SXDXlsFilterValue2>())
{
proc.repeated<Continue_SxaddlSxString>(0, 0);
}
proc.mandatory<SXAddl_SXCSXFilter12_SXDEnd>();
return true;
}

View File

@ -57,12 +57,12 @@ BaseObjectPtr SXADDLSXFILTERS12::clone()
// SXADDLSXFILTERS12 = SXAddl_SXCSXFilters12_SXDId *SXADDLSXFILTER12 SXAddl_SXCSXFilters12_SXDEnd
const bool SXADDLSXFILTERS12::loadContent(BinProcessor& proc)
{
//if(!proc.mandatory<SXAddl_SXCSXFilters12_SXDId>())
//{
// return false;
//}
//proc.repeated<SXADDLSXFILTER12>(0, 0);
//proc.mandatory<SXAddl_SXCSXFilters12_SXDEnd>();
if(!proc.mandatory<SXAddl_SXCSXFilters12_SXDId>())
{
return false;
}
proc.repeated<SXADDLSXFILTER12>(0, 0);
proc.mandatory<SXAddl_SXCSXFilters12_SXDEnd>();
return true;
}

View File

@ -59,11 +59,11 @@ public:
const bool loadContent(BinProcessor& proc)
{
//if(!proc.mandatory<SXAddl_SXCSXMg_SXDUserCaption>())
//{
// return false;
//}
//proc.repeated<Continue_SxaddlSxString>(0, 0);
if(!proc.mandatory<SXAddl_SXCSXMg_SXDUserCaption>())
{
return false;
}
proc.repeated<Continue_SxaddlSxString>(0, 0);
return true;
};
};
@ -80,14 +80,14 @@ BaseObjectPtr SXADDLSXMG::clone()
// [SXAddl_SXCSXMg_SXDUserCaption *Continue_SxaddlSxString] *UNKNOWNFRT SXAddl_SXCSXMg_SXDEnd
const bool SXADDLSXMG::loadContent(BinProcessor& proc)
{
//if(!proc.mandatory<SXAddl_SXCSXMg_SXDId>())
//{
// return false;
//}
//proc.repeated<Continue_SxaddlSxString>(0, 0);
//proc.optional<Parenthesis_SXADDLSXMG_1>();
//proc.repeated<UNKNOWNFRT>(0, 0);
//proc.mandatory<SXAddl_SXCSXMg_SXDEnd>();
if(!proc.mandatory<SXAddl_SXCSXMg_SXDId>())
{
return false;
}
proc.repeated<Continue_SxaddlSxString>(0, 0);
proc.optional<Parenthesis_SXADDLSXMG_1>();
proc.repeated<UNKNOWNFRT>(0, 0);
proc.mandatory<SXAddl_SXCSXMg_SXDEnd>();
return true;
}

View File

@ -58,14 +58,14 @@ BaseObjectPtr SXADDLSXMGS::clone()
// SXADDLSXMGS = SXAddl_SXCSXMgs_SXDId *SXADDLSXMG *SXAddl_SXCSXMgs_SXDMGrpSXDHMap *UNKNOWNFRT SXAddl_SXCSXMgs_SXDEnd
const bool SXADDLSXMGS::loadContent(BinProcessor& proc)
{
//if(!proc.mandatory<SXAddl_SXCSXMgs_SXDId>())
//{
// return false;
//}
//proc.repeated<SXADDLSXMG>(0, 0);
//proc.repeated<SXAddl_SXCSXMgs_SXDMGrpSXDHMap>(0, 0);
//proc.repeated<UNKNOWNFRT>(0, 0);
//proc.mandatory<SXAddl_SXCSXMgs_SXDEnd>();
if(!proc.mandatory<SXAddl_SXCSXMgs_SXDId>())
{
return false;
}
proc.repeated<SXADDLSXMG>(0, 0);
proc.repeated<SXAddl_SXCSXMgs_SXDMGrpSXDHMap>(0, 0);
proc.repeated<UNKNOWNFRT>(0, 0);
proc.mandatory<SXAddl_SXCSXMgs_SXDEnd>();
return true;
}

View File

@ -57,13 +57,13 @@ BaseObjectPtr SXADDLSXRULE::clone()
// SXADDLSXRULE = SXAddl_SXCSXrule_SXDId SXAddl_SXCSXrule_SXDSXrule *SXADDLSXFILT SXAddl_SXCSXrule_SXDEnd
const bool SXADDLSXRULE::loadContent(BinProcessor& proc)
{
//if(!proc.mandatory<SXAddl_SXCSXrule_SXDId>())
//{
// return false;
//}
//proc.mandatory<SXAddl_SXCSXrule_SXDSXrule>();
//proc.repeated<SXADDLSXFILT>(0, 0);
//proc.mandatory<SXAddl_SXCSXrule_SXDEnd>();
if(!proc.mandatory<SXAddl_SXCSXrule_SXDId>())
{
return false;
}
proc.mandatory<SXAddl_SXCSXrule_SXDSXrule>();
proc.repeated<SXADDLSXFILT>(0, 0);
proc.mandatory<SXAddl_SXCSXrule_SXDEnd>();
return true;
}

View File

@ -310,7 +310,6 @@ enum ElementType
typeStringSegmented,
typeStringSegmentedSXADDL,
typeSXAddl,
typeSxaddlSxString,
typeSXDI,
typeSxDXF,
typeSXEx,

View File

@ -66,6 +66,7 @@ core_mac {
core_windows {
CONFIG -= debug_and_release debug_and_release_target
QMAKE_CXXFLAGS_RELEASE -= -Zc:strictStrings
QMAKE_CXXFLAGS += /MP
}
core_win_32 {

View File

@ -872,7 +872,6 @@ namespace NSDoctRenderer
oBuilder.WriteString(L"<m_sFontDir>");
oBuilder.WriteEncodeXmlString(m_sX2tPath + L"/sdkjs/common");
oBuilder.WriteString(L"</m_sFontDir>");
oBuilder.WriteString(L"<m_bIsNoBase64>true</m_bIsNoBase64>");
oBuilder.WriteString(L"<m_sThemeDir>./sdkjs/slide/themes</m_sThemeDir><m_bDontSaveAdditional>true</m_bDontSaveAdditional>");
oBuilder.WriteString(params);
oBuilder.WriteString(L"</TaskQueueDataConvert>");

View File

@ -67,7 +67,7 @@ namespace BinXlsxRW
int nCurPos = 0;
for(size_t i = 0, length = oTableParts.m_arrItems.size(); i < length; ++i)
WriteTablePart(oWorksheet, *oTableParts.m_arrItems[i]);
}
};
void WriteTablePart(const OOX::Spreadsheet::CWorksheet& oWorksheet, const OOX::Spreadsheet::CTablePart& oTablePart)
{
int nCurPos = 0;
@ -578,13 +578,13 @@ namespace BinXlsxRW
public:
BinaryStyleTableWriter(NSBinPptxRW::CBinaryFileWriter &oCBufferedStream, NSFontCutter::CEmbeddedFontsManager* pEmbeddedFontsManager):m_oBcw(oCBufferedStream),m_pEmbeddedFontsManager(pEmbeddedFontsManager)
{
}
};
void Write(OOX::Spreadsheet::CStyles& styles, PPTX::Theme* pTheme, DocWrapper::FontProcessor& oFontProcessor)
{
int nStart = m_oBcw.WriteItemWithLengthStart();
WriteStylesContent(styles, pTheme, oFontProcessor);
m_oBcw.WriteItemWithLengthEnd(nStart);
}
};
void WriteStylesContent(OOX::Spreadsheet::CStyles& styles, PPTX::Theme* pTheme, DocWrapper::FontProcessor& oFontProcessor)
{
int nCurPos;
@ -656,7 +656,7 @@ namespace BinXlsxRW
WriteTableStyles(styles.m_oTableStyles.get());
m_oBcw.WriteItemEnd(nCurPos);
}
}
};
void WriteBorders(const OOX::Spreadsheet::CBorders& borders, OOX::Spreadsheet::CIndexedColors* pIndexedColors, PPTX::Theme* pTheme)
{
int nCurPos = 0;
@ -667,7 +667,7 @@ namespace BinXlsxRW
WriteBorder(*pBorder, pIndexedColors, pTheme);
m_oBcw.WriteItemEnd(nCurPos);
}
}
};
void WriteBorder(const OOX::Spreadsheet::CBorder& border, OOX::Spreadsheet::CIndexedColors* pIndexedColors, PPTX::Theme* pTheme)
{
int nCurPos = 0;
@ -741,7 +741,7 @@ namespace BinXlsxRW
m_oBcw.m_oStream.WriteBOOL(border.m_oOutline->ToBool());
m_oBcw.WriteItemEnd(nCurPos);
}
}
};
void WriteBorderProp(const OOX::Spreadsheet::CBorderProp& borderProp, OOX::Spreadsheet::CIndexedColors* pIndexedColors, PPTX::Theme* pTheme)
{
int nCurPos = 0;
@ -761,7 +761,7 @@ namespace BinXlsxRW
m_oBcw.m_oStream.WriteBYTE(c_oSerPropLenType::Byte);
m_oBcw.m_oStream.WriteBYTE((BYTE)borderProp.m_oStyle->GetValue());
}
}
};
void WriteCellStyleXfs(const OOX::Spreadsheet::CCellStyleXfs& cellStyleXfs)
{
int nCurPos = 0;
@ -791,7 +791,7 @@ namespace BinXlsxRW
m_oBcw.WriteItemEnd(nCurPos);
}
}
}
};
void WriteXfs(const OOX::Spreadsheet::CXfs& xfs)
{
int nCurPos = 0;
@ -888,7 +888,7 @@ namespace BinXlsxRW
WriteAligment(xfs.m_oAligment.get());
m_oBcw.WriteItemWithLengthEnd(nCurPos);
}
}
};
void WriteAligment(const OOX::Spreadsheet::CAligment& aligment)
{
int nCurPos = 0;
@ -952,7 +952,7 @@ namespace BinXlsxRW
WriteFill(*pFill, pIndexedColors, pTheme, false);
m_oBcw.WriteItemEnd(nCurPos);
}
}
};
void WriteFill(const OOX::Spreadsheet::CFill& fill, OOX::Spreadsheet::CIndexedColors* pIndexedColors, PPTX::Theme* pTheme, bool bPriorityBg = false)
{
int nCurPos = 0;
@ -1002,7 +1002,7 @@ namespace BinXlsxRW
m_oBcw.WriteItemEnd(nCurPos2);
m_oBcw.WriteItemEnd(nCurPos);
}
}
};
void WriteFonts(const OOX::Spreadsheet::CFonts& fonts, OOX::Spreadsheet::CIndexedColors* pIndexedColors, PPTX::Theme* pTheme, DocWrapper::FontProcessor& oFontProcessor)
{
int nCurPos = 0;
@ -1013,7 +1013,7 @@ namespace BinXlsxRW
WriteFont(*pFont, pIndexedColors, pTheme, oFontProcessor);
m_oBcw.WriteItemEnd(nCurPos);
}
}
};
void WriteFont(const OOX::Spreadsheet::CFont& font, OOX::Spreadsheet::CIndexedColors* pIndexedColors, PPTX::Theme* theme, DocWrapper::FontProcessor& oFontProcessor)
{
int nCurPos = 0;
@ -1092,7 +1092,7 @@ namespace BinXlsxRW
m_oBcw.m_oStream.WriteBYTE(c_oSerPropLenType::Byte);
m_oBcw.m_oStream.WriteBYTE(font.m_oVertAlign->m_oVerticalAlign->GetValue());
}
}
};
void WriteNumFmts(const OOX::Spreadsheet::CNumFmts& numFmts)
{
int nCurPos = 0;
@ -1103,7 +1103,7 @@ namespace BinXlsxRW
WriteNumFmt(*pNumFmt);
m_oBcw.WriteItemEnd(nCurPos);
}
}
};
void WriteNumFmt(const OOX::Spreadsheet::CNumFmt& numFmt)
{
int nCurPos = 0;
@ -1125,7 +1125,7 @@ namespace BinXlsxRW
m_oBcw.m_oStream.WriteBYTE(c_oSerPropLenType::Long);
m_oBcw.m_oStream.WriteLONG(numFmt.m_oNumFmtId->GetValue());
}
}
};
void WriteCellStyles(const OOX::Spreadsheet::CCellStyles& oCellStyles)
{
int nCurPos = 0;
@ -1190,7 +1190,7 @@ namespace BinXlsxRW
WriteDxf(*pDxf, pIndexedColors, pTheme, oFontProcessor);
m_oBcw.WriteItemEnd(nCurPos);
}
}
};
void WriteDxf(const OOX::Spreadsheet::CDxf& oDxf, OOX::Spreadsheet::CIndexedColors* pIndexedColors, PPTX::Theme* pTheme, DocWrapper::FontProcessor& oFontProcessor)
{
int nCurPos = 0;
@ -1328,13 +1328,13 @@ namespace BinXlsxRW
public:
BinarySharedStringTableWriter(NSBinPptxRW::CBinaryFileWriter &oCBufferedStream, NSFontCutter::CEmbeddedFontsManager* pEmbeddedFontsManager):m_oBcw(oCBufferedStream),m_pEmbeddedFontsManager(pEmbeddedFontsManager)
{
}
};
void Write(OOX::Spreadsheet::CSharedStrings& sharedString, OOX::Spreadsheet::CIndexedColors* pIndexedColors, PPTX::Theme* pTheme, DocWrapper::FontProcessor& oFontProcessor)
{
int nStart = m_oBcw.WriteItemWithLengthStart();
WriteSharedStrings(sharedString, pIndexedColors, pTheme, oFontProcessor);
m_oBcw.WriteItemWithLengthEnd(nStart);
}
};
void WriteSharedStrings(OOX::Spreadsheet::CSharedStrings& sharedString, OOX::Spreadsheet::CIndexedColors* pIndexedColors, PPTX::Theme* pTheme, DocWrapper::FontProcessor& oFontProcessor)
{
int nCurPos;
@ -1349,7 +1349,7 @@ namespace BinXlsxRW
m_oBcw.WriteItemWithLengthEnd(nCurPos);
}
}
}
};
void WriteSharedString(OOX::Spreadsheet::CSi& si, OOX::Spreadsheet::CIndexedColors* pIndexedColors, PPTX::Theme* pTheme, DocWrapper::FontProcessor& oFontProcessor)
{
int nCurPos;
@ -1373,7 +1373,7 @@ namespace BinXlsxRW
m_pEmbeddedFontsManager->CheckString(pText->m_sText);
}
}
}
};
void WriteRun(OOX::Spreadsheet::CRun& run, OOX::Spreadsheet::CIndexedColors* pIndexedColors, PPTX::Theme* pTheme, DocWrapper::FontProcessor& oFontProcessor)
{
int nCurPos;
@ -1397,7 +1397,7 @@ namespace BinXlsxRW
m_pEmbeddedFontsManager->CheckString(pText->m_sText);
}
}
}
};
void WriteRPr(const OOX::Spreadsheet::CRPr& rPr, OOX::Spreadsheet::CIndexedColors* pIndexedColors, PPTX::Theme* pTheme, DocWrapper::FontProcessor& oFontProcessor)
{
int nCurPos = 0;
@ -1475,7 +1475,7 @@ namespace BinXlsxRW
m_oBcw.m_oStream.WriteBYTE(c_oSerPropLenType::Byte);
m_oBcw.m_oStream.WriteBYTE(rPr.m_oVertAlign->m_oVerticalAlign->GetValue());
}
}
};
};
class BinaryWorkbookTableWriter
@ -1528,15 +1528,11 @@ namespace BinXlsxRW
{
nCurPos = m_oBcw.WriteItemStart(c_oSerWorkbookTypes::VbaProject);
smart_ptr<OOX::VbaProject> vbaProject = fileVbaProject.smart_dynamic_cast<OOX::VbaProject>();
m_oBcw.m_oStream.StartRecord(0);
vbaProject->toPPTY(&m_oBcw.m_oStream);
m_oBcw.m_oStream.EndRecord();
m_oBcw.WriteItemWithLengthEnd(nCurPos);
smart_ptr<OOX::VbaProject> vbaProject = fileVbaProject.smart_dynamic_cast<OOX::VbaProject>();
WriteVbaProject (vbaProject);
m_oBcw.WriteItemWithLengthEnd(nCurPos);
}
}
};
void WriteWorkbookPr(const OOX::Spreadsheet::CWorkbookPr& workbookPr)
{
//Date1904
@ -1553,7 +1549,7 @@ namespace BinXlsxRW
m_oBcw.m_oStream.WriteBYTE(c_oSerPropLenType::Byte);
m_oBcw.m_oStream.WriteBOOL(workbookPr.m_oDateCompatibility->ToBool());
}
}
};
void WriteBookViews(const OOX::Spreadsheet::CBookViews& bookViews)
{
int nCurPos;
@ -1565,7 +1561,7 @@ namespace BinXlsxRW
WriteWorkbookView(*pWorkbookView);
m_oBcw.WriteItemWithLengthEnd(nCurPos);
}
}
};
void WriteWorkbookView(const OOX::Spreadsheet::CWorkbookView& workbookView)
{
//ActiveTab
@ -1575,7 +1571,7 @@ namespace BinXlsxRW
m_oBcw.m_oStream.WriteBYTE(c_oSerPropLenType::Long);
m_oBcw.m_oStream.WriteLONG(workbookView.m_oActiveTab->GetValue());
}
}
};
void WriteDefinedNames(const OOX::Spreadsheet::CDefinedNames& definedNames)
{
int nCurPos;
@ -1587,7 +1583,7 @@ namespace BinXlsxRW
WriteDefinedName(*pDefinedName);
m_oBcw.WriteItemWithLengthEnd(nCurPos);
}
}
};
void WriteExternalReferences(const OOX::Spreadsheet::CExternalReferences& externalReferences, OOX::Spreadsheet::CWorkbook& workbook)
{
int nCurPos;
@ -1653,7 +1649,7 @@ namespace BinXlsxRW
}
}
}
}
};
void WriteExternalBook(const OOX::Spreadsheet::CExternalBook& externalBook, const std::wstring& sLink)
{
int nCurPos = 0;
@ -1976,6 +1972,18 @@ namespace BinXlsxRW
m_oBcw.m_oStream.WriteStringW(definedName.m_oComment.get2());
}
}
void WriteVbaProject(smart_ptr<OOX::VbaProject> & fileVbaProject)
{
std::wstring file_name = fileVbaProject->filename().GetFilename();
m_oBcw.m_oStream.WriteBYTE(c_oSerWorkbookVbaProjectTypes::Name);
m_oBcw.m_oStream.WriteStringW(file_name);
//... todooo write parsing vba project
//copy file bin
fileVbaProject->copy_to(m_oBcw.m_oStream.m_pCommon->m_pImageManager->m_strDstMedia);
}
};
class BinaryWorksheetTableWriter
{
@ -4121,13 +4129,13 @@ namespace BinXlsxRW
public:
BinaryCalcChainTableWriter(NSBinPptxRW::CBinaryFileWriter &oCBufferedStream) : m_oBcw(oCBufferedStream)
{
}
};
void Write(OOX::Spreadsheet::CCalcChain& pCalcChain)
{
int nStart = m_oBcw.WriteItemWithLengthStart();
WriteCalcChainTableContent(pCalcChain);
m_oBcw.WriteItemWithLengthEnd(nStart);
}
};
void WriteCalcChainTableContent(OOX::Spreadsheet::CCalcChain& pCalcChain)
{
int nCurPos;
@ -4138,7 +4146,7 @@ namespace BinXlsxRW
WriteCalcChain(*pCalcChain.m_arrItems[i]);
m_oBcw.WriteItemWithLengthEnd(nCurPos);
}
}
};
void WriteCalcChain(OOX::Spreadsheet::CCalcCell& oCalcCell)
{
//Array
@ -4183,7 +4191,7 @@ namespace BinXlsxRW
m_oBcw.m_oStream.WriteBYTE(c_oSerPropLenType::Byte);
m_oBcw.m_oStream.WriteBOOL(oCalcCell.m_oNewThread->ToBool());
}
}
};
};
class BinaryOtherTableWriter
{
@ -4217,13 +4225,13 @@ namespace BinXlsxRW
m_pTheme (pTheme),
m_pOfficeDrawingConverter(pOfficeDrawingConverter)
{
}
};
void Write()
{
int nStart = m_oBcw.WriteItemWithLengthStart();
WriteOtherTableContent();
m_oBcw.WriteItemWithLengthEnd(nStart);
}
};
void WriteOtherTableContent()
{
int nCurPos;
@ -4244,7 +4252,7 @@ namespace BinXlsxRW
m_pTheme->toPPTY(&m_oBcw.m_oStream);
m_oBcw.WriteItemWithLengthEnd(nCurPos);
}
}
};
};
class BinaryFileWriter {
private:
@ -4271,8 +4279,7 @@ namespace BinXlsxRW
std::wstring mediaDir = path.GetDirectory() + L"media";
NSDirectory::CreateDirectory(mediaDir);
pOfficeDrawingConverter->SetDstPath(path.GetDirectory() + FILE_SEPARATOR_STR + L"word");
pOfficeDrawingConverter->SetMediaDstPath(mediaDir);
pOfficeDrawingConverter->SetMediaDstPath(mediaDir);
long nGrowSize = 1 * 1024 * 1024;//1мб
NSBinPptxRW::CBinaryFileWriter& oBufferedStream = *pOfficeDrawingConverter->m_pBinaryWriter;