Skip to content

O
onlyoffice_core
Commit 32448298 authored by Alexey.Musinov's avatar Alexey.Musinov
Browse files
Options

Merge branch 'develop' of https://github.com/ONLYOFFICE/core into develop 

* 'develop' of https://github.com/ONLYOFFICE/core:
  .
  OdfFormatReader - fix spreadsheets margins PptFormatReader - fix previous users picture, fix read picture stream version up
  XlsFormat - convert pivot tables
  debug
  .
  .
parents b3384f14 93274395
Hide whitespace changes
Inline Side-by-side
Showing with 415 additions and 140 deletions
ASCOfficeOdfFile/src/docx/xlsx_output_xml.cpp
View file @ 32448298
...@@ -189,14 +189,14 @@ void xlsx_xml_worksheet::write_to(std::wostream & strm) ...@@ -189,14 +189,14 @@ void xlsx_xml_worksheet::write_to(std::wostream & strm)
CP_XML_STREAM() << impl_->hyperlinks_.str(); CP_XML_STREAM() << impl_->hyperlinks_.str();
} }
} }
CP_XML_STREAM() << impl_->drawing_.str();
if (!impl_->page_props_.str().empty()) if (!impl_->page_props_.str().empty())
{ {
CP_XML_STREAM() << impl_->page_props_.str(); CP_XML_STREAM() << impl_->page_props_.str();
}//props выше legacyDrawing !! }//props выше legacyDrawing !!
CP_XML_STREAM() << impl_->drawing_.str();
if (impl_->commentsId_.length()>0) if (impl_->commentsId_.length()>0)
{ {
CP_XML_NODE(L"legacyDrawing") CP_XML_NODE(L"legacyDrawing")
......
ASCOfficePPTFile/PPTFormatLib/Reader/PPTDocumentInfoOneUser.cpp
View file @ 32448298
...@@ -601,12 +601,14 @@ void CPPTUserInfo::LoadNotes(DWORD dwNoteID, CSlide* pNotes) ...@@ -601,12 +601,14 @@ void CPPTUserInfo::LoadNotes(DWORD dwNoteID, CSlide* pNotes)
CSlideInfo* pNotesWrapper = &m_arNotesWrapper.back(); CSlideInfo* pNotesWrapper = &m_arNotesWrapper.back();
int indexUser = pRecordSlide->m_IndexUser; int indexUser = pRecordSlide->m_IndexUser;
pNotesWrapper->m_parEmptyPictures = &m_pDocumentInfo->m_arUsers[indexUser]->m_arOffsetPictures; if (m_pDocumentInfo->m_arUsers[indexUser]->m_arOffsetPictures.empty())
pNotesWrapper->m_mapFilePictures = &m_pDocumentInfo->m_mapStoreImageFile; pNotesWrapper->m_parEmptyPictures = &m_pDocumentInfo->m_arUsers[0]->m_arOffsetPictures;
else
pNotesWrapper->m_parEmptyPictures = &m_pDocumentInfo->m_arUsers[indexUser]->m_arOffsetPictures;
//грузим placeholder pNotesWrapper->m_mapFilePictures = &m_pDocumentInfo->m_mapStoreImageFile;
pNotesWrapper->m_arTextPlaceHolders = pRecordSlide->m_oPersist.m_arTextAttrs; pNotesWrapper->m_arTextPlaceHolders = pRecordSlide->m_oPersist.m_arTextAttrs;
std::vector<CRecordNotesAtom*> oArrayNotesAtoms; std::vector<CRecordNotesAtom*> oArrayNotesAtoms;
...@@ -627,6 +629,9 @@ void CPPTUserInfo::LoadNotes(DWORD dwNoteID, CSlide* pNotes) ...@@ -627,6 +629,9 @@ void CPPTUserInfo::LoadNotes(DWORD dwNoteID, CSlide* pNotes)
//????? у заметок нет слайда !!! //????? у заметок нет слайда !!!
} }
//----------------------------------------------------- //-----------------------------------------------------
size_t index = pPairSlide->second->m_Index;
if (index >= m_arSlides.size())
return;
CSlide* pSlide = m_arSlides[pPairSlide->second->m_Index]; CSlide* pSlide = m_arSlides[pPairSlide->second->m_Index];
pNotes->m_lSlideID = pPairSlide->second->m_Index; pNotes->m_lSlideID = pPairSlide->second->m_Index;
...@@ -796,12 +801,14 @@ void CPPTUserInfo::LoadSlide(DWORD dwSlideID, CSlide* pSlide) ...@@ -796,12 +801,14 @@ void CPPTUserInfo::LoadSlide(DWORD dwSlideID, CSlide* pSlide)
CSlideInfo* pSlideWrapper = &m_arSlideWrapper.back(); CSlideInfo* pSlideWrapper = &m_arSlideWrapper.back();
int indexUser = pRecordSlide->m_IndexUser; int indexUser = pRecordSlide->m_IndexUser;
pSlideWrapper->m_parEmptyPictures = &m_pDocumentInfo->m_arUsers[indexUser]->m_arOffsetPictures; if (m_pDocumentInfo->m_arUsers[indexUser]->m_arOffsetPictures.empty())
pSlideWrapper->m_parEmptyPictures = &m_pDocumentInfo->m_arUsers[0]->m_arOffsetPictures;
else
pSlideWrapper->m_parEmptyPictures = &m_pDocumentInfo->m_arUsers[indexUser]->m_arOffsetPictures;
pSlideWrapper->m_mapFilePictures = &m_pDocumentInfo->m_mapStoreImageFile; pSlideWrapper->m_mapFilePictures = &m_pDocumentInfo->m_mapStoreImageFile;
// вот, грузим placeholder
pSlideWrapper->m_arTextPlaceHolders = pRecordSlide->m_oPersist.m_arTextAttrs; pSlideWrapper->m_arTextPlaceHolders = pRecordSlide->m_oPersist.m_arTextAttrs;
// записываем шрифты // записываем шрифты
...@@ -1402,7 +1409,11 @@ void CPPTUserInfo::LoadMainMaster(DWORD dwMasterID, const LONG& lOriginWidth, co ...@@ -1402,7 +1409,11 @@ void CPPTUserInfo::LoadMainMaster(DWORD dwMasterID, const LONG& lOriginWidth, co
indexUser = pPairMaster1->second->m_IndexUser; indexUser = pPairMaster1->second->m_IndexUser;
pMasterWrapper->m_arTextPlaceHolders = pPairMaster1->second->m_oPersist.m_arTextAttrs; pMasterWrapper->m_arTextPlaceHolders = pPairMaster1->second->m_oPersist.m_arTextAttrs;
} }
pMasterWrapper->m_parEmptyPictures = &m_pDocumentInfo->m_arUsers[indexUser]->m_arOffsetPictures; if (m_pDocumentInfo->m_arUsers[indexUser]->m_arOffsetPictures.empty() == false)
pMasterWrapper->m_parEmptyPictures = &m_pDocumentInfo->m_arUsers[indexUser]->m_arOffsetPictures;
else
pMasterWrapper->m_parEmptyPictures = &m_pDocumentInfo->m_arUsers[0]->m_arOffsetPictures;
pMasterWrapper->m_mapFilePictures = &m_pDocumentInfo->m_mapStoreImageFile; pMasterWrapper->m_mapFilePictures = &m_pDocumentInfo->m_mapStoreImageFile;
// читаем настройки текстовых стилей ----------------------------------------------- // читаем настройки текстовых стилей -----------------------------------------------
...@@ -1784,11 +1795,13 @@ void CPPTUserInfo::LoadNoMainMaster(DWORD dwMasterID, const LONG& lOriginWidth, ...@@ -1784,11 +1795,13 @@ void CPPTUserInfo::LoadNoMainMaster(DWORD dwMasterID, const LONG& lOriginWidth,
CSlideInfo* pMasterWrapper = &m_arMasterWrapper[m_arMasterWrapper.size() - 1]; CSlideInfo* pMasterWrapper = &m_arMasterWrapper[m_arMasterWrapper.size() - 1];
// вот, грузим placeholder pMasterWrapper->m_arTextPlaceHolders = pCurMaster->m_oPersist.m_arTextAttrs;
pMasterWrapper->m_arTextPlaceHolders = pCurMaster->m_oPersist.m_arTextAttrs;
pMasterWrapper->m_parEmptyPictures = &m_pDocumentInfo->m_arUsers[pCurMaster->m_IndexUser]->m_arOffsetPictures;
pMasterWrapper->m_mapFilePictures = &m_pDocumentInfo->m_mapStoreImageFile; pMasterWrapper->m_mapFilePictures = &m_pDocumentInfo->m_mapStoreImageFile;
if (m_pDocumentInfo->m_arUsers[pCurMaster->m_IndexUser]->m_arOffsetPictures.empty() == false)
pMasterWrapper->m_parEmptyPictures = &m_pDocumentInfo->m_arUsers[pCurMaster->m_IndexUser]->m_arOffsetPictures;
else
pMasterWrapper->m_parEmptyPictures = &m_pDocumentInfo->m_arUsers[0]->m_arOffsetPictures;
std::map<DWORD, LONG>::iterator pPairTheme = m_mapMasterToTheme.find(dwID); std::map<DWORD, LONG>::iterator pPairTheme = m_mapMasterToTheme.find(dwID);
......
ASCOfficePPTFile/PPTFormatLib/Reader/PPTFileReader.cpp
View file @ 32448298
...@@ -232,10 +232,12 @@ void CPPTFileReader::ReadPictures() ...@@ -232,10 +232,12 @@ void CPPTFileReader::ReadPictures()
while (true) while (true)
{ {
if (pStream->isEOF()) //if (pStream->isEOF()) случаются неверно записанные стримы
break; // break;
int pos = pStream->getStreamPointer(); int pos = pStream->getStreamPointer();
if (pos >= pStream->getStreamSize())
break;
SRecordHeader oHeader; SRecordHeader oHeader;
if (pDecryptor) if (pDecryptor)
...@@ -256,6 +258,9 @@ void CPPTFileReader::ReadPictures() ...@@ -256,6 +258,9 @@ void CPPTFileReader::ReadPictures()
else else
oHeader.ReadFromStream(pStream->stream_); oHeader.ReadFromStream(pStream->stream_);
if (oHeader.RecType == 0 && oHeader.RecLen == 0 )
break;// окончание стрима забито нулями (выравнивание)
CRecordOfficeArtBlip art_blip; CRecordOfficeArtBlip art_blip;
art_blip.m_strTmpDirectory = m_strTmpDirectory; art_blip.m_strTmpDirectory = m_strTmpDirectory;
art_blip.m_oDocumentInfo = &m_oDocumentInfo; art_blip.m_oDocumentInfo = &m_oDocumentInfo;
......
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/SXDI.cpp
View file @ 32448298
...@@ -39,12 +39,10 @@ SXDI::SXDI() ...@@ -39,12 +39,10 @@ SXDI::SXDI()
{ {
} }
SXDI::~SXDI() SXDI::~SXDI()
{ {
} }
BaseObjectPtr SXDI::clone() BaseObjectPtr SXDI::clone()
{ {
return BaseObjectPtr(new SXDI(*this)); return BaseObjectPtr(new SXDI(*this));
...@@ -61,5 +59,22 @@ void SXDI::readFields(CFRecord& record) ...@@ -61,5 +59,22 @@ void SXDI::readFields(CFRecord& record)
} }
} }
int SXDI::serialize(std::wostream & strm)
{
CP_XML_WRITER(strm)
{
CP_XML_NODE(L"dataField")
{
if (stName.value().empty() == false)
CP_XML_ATTR(L"name", stName.value());
CP_XML_ATTR(L"fld", isxvdData);
CP_XML_ATTR(L"baseField", df);
CP_XML_ATTR(L"baseItem", isxvi);
CP_XML_ATTR(L"numFmtId", ifmt);
}
}
return 0;
}
} // namespace XLS } // namespace XLS
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/SXDI.h
View file @ 32448298
...@@ -49,6 +49,8 @@ public: ...@@ -49,6 +49,8 @@ public:
void readFields(CFRecord& record); void readFields(CFRecord& record);
int serialize(std::wostream & strm);
static const ElementType type = typeSXDI; static const ElementType type = typeSXDI;
short isxvdData; short isxvdData;
......
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/SXDtr.cpp
View file @ 32448298
...@@ -53,6 +53,15 @@ void SXDtr::readFields(CFRecord& record) ...@@ -53,6 +53,15 @@ void SXDtr::readFields(CFRecord& record)
{ {
record >> yr >> mon >> dom >> hr >> min >> sec; record >> yr >> mon >> dom >> hr >> min >> sec;
} }
std::wstring SXDtr::get_string_date()
{
std::wstringstream s;
s << yr << L"-" << (mon < 10 ? L"0" : L"") << mon << L"-" << (dom < 10 ? L"0" : L"") << dom << L"T"
<< (hr < 10 ? L"0" : L"") << hr << L":" << (min < 10 ? L"0" : L"") << min << L":" << (sec < 10 ? L"0" : L"") << sec;
return s.str();
}
int SXDtr::serialize(std::wostream & strm) int SXDtr::serialize(std::wostream & strm)
{ {
...@@ -60,10 +69,8 @@ int SXDtr::serialize(std::wostream & strm) ...@@ -60,10 +69,8 @@ int SXDtr::serialize(std::wostream & strm)
{ {
CP_XML_NODE(L"d") CP_XML_NODE(L"d")
{ {
std::wstringstream s;
s << yr << L"-" << mon << L"-" << dom << L"T" << hr << L":" << min << L":" << sec;
CP_XML_ATTR(L"v", s.str()); CP_XML_ATTR(L"v", get_string_date());
} }
} }
......
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/SXDtr.h
View file @ 32448298
...@@ -59,6 +59,8 @@ public: ...@@ -59,6 +59,8 @@ public:
unsigned char min; unsigned char min;
unsigned char sec; unsigned char sec;
std::wstring get_string_date();
}; };
} // namespace XLS } // namespace XLS
......
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/SXLI.cpp
View file @ 32448298
...@@ -50,17 +50,15 @@ BaseObjectPtr SXLI::clone() ...@@ -50,17 +50,15 @@ BaseObjectPtr SXLI::clone()
} }
void SXLI::readFields(CFRecord& record) void SXLI::readFields(CFRecord& record)
{// 0 or 2 records SXLIItem {
int size_item = (record.getDataSize() - record.getRdPtr()) / 2; while(true)
if (size_item < 8)
{ {
//?? int size_item = record.getDataSize() - record.getRdPtr();
return;
}
for (int k = 0; k < 2; k++) if (size_item < 8)
{ {
break;
}
SXLIItem item; SXLIItem item;
unsigned short flags; unsigned short flags;
...@@ -74,12 +72,13 @@ void SXLI::readFields(CFRecord& record) ...@@ -74,12 +72,13 @@ void SXLI::readFields(CFRecord& record)
item.fGrand = GETBIT(flags, 11); item.fGrand = GETBIT(flags, 11);
item.fMultiDataOnAxis = GETBIT(flags, 12); item.fMultiDataOnAxis = GETBIT(flags, 12);
int count = (size_item - 8) / 2; //if (!item.fGrand && item.itmType != 0x000E)
for (int i = 0; i < count; i++)
{ {
short val; record >> val; for (short i = 0; i < item.isxviMac; i++)
item.rgisxvi.push_back(val); {
short val; record >> val;
item.rgisxvi.push_back(val);
}
} }
m_arItems.push_back(item); m_arItems.push_back(item);
} }
......
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/SXVI.cpp
View file @ 32448298
...@@ -73,10 +73,6 @@ int SXVI::serialize(std::wostream & strm) ...@@ -73,10 +73,6 @@ int SXVI::serialize(std::wostream & strm)
{ {
CP_XML_NODE(L"item") CP_XML_NODE(L"item")
{ {
if (itmType == 0)
{
CP_XML_ATTR(L"x", iCache);
}
if (fMissing) if (fMissing)
CP_XML_ATTR(L"m", 1); CP_XML_ATTR(L"m", 1);
if (fHidden) if (fHidden)
...@@ -86,6 +82,10 @@ int SXVI::serialize(std::wostream & strm) ...@@ -86,6 +82,10 @@ int SXVI::serialize(std::wostream & strm)
if (fFormula) if (fFormula)
CP_XML_ATTR(L"f", 1); CP_XML_ATTR(L"f", 1);
if (itmType == 0)
{
CP_XML_ATTR(L"x", iCache);
}
switch(itmType) switch(itmType)
{ {
case 0x0001: CP_XML_ATTR(L"t", L"default"); break; case 0x0001: CP_XML_ATTR(L"t", L"default"); break;
......
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/DBB.cpp
View file @ 32448298
...@@ -40,6 +40,11 @@ namespace XLS ...@@ -40,6 +40,11 @@ namespace XLS
DBB::DBB() DBB::DBB()
{ {
bString = false;
bDate = false;
bNumber = false;
bEmpty = false;
fShortIitms = false; fShortIitms = false;
} }
...@@ -64,6 +69,12 @@ const bool DBB::loadContent(BinProcessor& proc) ...@@ -64,6 +69,12 @@ const bool DBB::loadContent(BinProcessor& proc)
while(count--) while(count--)
{ {
m_arSXOPER.push_back(elements_.front()); elements_.pop_front(); m_arSXOPER.push_back(elements_.front()); elements_.pop_front();
SXOPER* operatr = dynamic_cast<SXOPER*>(m_arSXOPER.back().get());
bString |= operatr->bString;
bDate |= operatr->bDate;
bNumber |= operatr->bNumber;
bEmpty |= operatr->bEmpty;
} }
if (!m_SXDBB && m_arSXOPER.empty()) if (!m_SXDBB && m_arSXOPER.empty())
......
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/DBB.h
View file @ 32448298
...@@ -55,7 +55,12 @@ public: ...@@ -55,7 +55,12 @@ public:
std::vector<BaseObjectPtr> m_arSXOPER; std::vector<BaseObjectPtr> m_arSXOPER;
//--------------------------------------------------- //---------------------------------------------------
bool fShortIitms; bool fShortIitms;
bool bString;
bool bDate;
bool bNumber;
bool bEmpty;
}; };
} // namespace XLS } // namespace XLS
......
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/DREF.cpp
View file @ 32448298
...@@ -95,6 +95,12 @@ int DREF::serialize(std::wostream & strm) ...@@ -95,6 +95,12 @@ int DREF::serialize(std::wostream & strm)
} }
else if(ref) else if(ref)
{ {
CP_XML_ATTR(L"type", L"worksheet");
CP_XML_NODE(L"worksheetSource")
{
CP_XML_ATTR(L"ref", ref->ref.toString());
CP_XML_ATTR(L"sheet", ref->stFile);
}
} }
} }
} }
......
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/FDB.cpp
View file @ 32448298
...@@ -74,14 +74,16 @@ private: ...@@ -74,14 +74,16 @@ private:
FDB::FDB() FDB::FDB()
{ {
bString = false;
bDate = false;
bNumber = false;
bEmpty = false;
} }
FDB::~FDB() FDB::~FDB()
{ {
} }
BaseObjectPtr FDB::clone() BaseObjectPtr FDB::clone()
{ {
return BaseObjectPtr(new FDB(*this)); return BaseObjectPtr(new FDB(*this));
...@@ -123,10 +125,15 @@ const bool FDB::loadContent(BinProcessor& proc) ...@@ -123,10 +125,15 @@ const bool FDB::loadContent(BinProcessor& proc)
while(count > 0) while(count > 0)
{ {
SXOPER * oper = dynamic_cast<SXOPER*> (elements_.front().get()); SXOPER * operatr = dynamic_cast<SXOPER*> (elements_.front().get());
if (oper) if (operatr)
{ {
m_arGRPSXOPER.push_back(elements_.front()); m_arGRPSXOPER.push_back(elements_.front());
//bString |= operatr->bString;
//bDate |= operatr->bDate;
//bNumber |= operatr->bNumber;
//bEmpty |= operatr->bEmpty;
} }
else else
{ {
...@@ -150,6 +157,13 @@ const bool FDB::loadContent(BinProcessor& proc) ...@@ -150,6 +157,13 @@ const bool FDB::loadContent(BinProcessor& proc)
while(count--) while(count--)
{ {
m_arSRCSXOPER.push_back(elements_.front()); elements_.pop_front(); m_arSRCSXOPER.push_back(elements_.front()); elements_.pop_front();
SXOPER* operatr = dynamic_cast<SXOPER*> (m_arSRCSXOPER.back().get());
bString |= operatr->bString;
bDate |= operatr->bDate;
bNumber |= operatr->bNumber;
bEmpty |= operatr->bEmpty;
} }
return true; return true;
...@@ -167,7 +181,15 @@ int FDB::serialize(std::wostream & strm) ...@@ -167,7 +181,15 @@ int FDB::serialize(std::wostream & strm)
CP_XML_NODE(L"cacheField") CP_XML_NODE(L"cacheField")
{ {
CP_XML_ATTR(L"name", fdb->stFieldName.value()); CP_XML_ATTR(L"name", fdb->stFieldName.value());
CP_XML_ATTR(L"numFmtId", fdb_type->wTypeSql);
if (fdb_type->wTypeSql > 0)
{
CP_XML_ATTR(L"numFmtId", fdb_type->wTypeSql);
}
if (m_arSRCSXOPER.empty())
{
CP_XML_ATTR(L"databaseField", 0);
}
switch(fdb_type->wTypeSql)//format code switch(fdb_type->wTypeSql)//format code
{ {
...@@ -189,32 +211,60 @@ int FDB::serialize(std::wostream & strm) ...@@ -189,32 +211,60 @@ int FDB::serialize(std::wostream & strm)
{ {
//{formula //{formula
} }
//caption, databaseFields, ..
if (m_arSRCSXOPER.empty() == false) if (m_arSRCSXOPER.empty() == false)
{ {
CP_XML_NODE(L"sharedItems") CP_XML_NODE(L"sharedItems")
{ {
//CP_XML_ATTR(L"containsSemiMixedTypes", 0); //использовать поля присутствия из xls низя - они частенько записаны неверно!!
CP_XML_ATTR(L"containsNonDate", fdb->fNonDates); //if (!fdb->fNonDates) CP_XML_ATTR(L"containsNonDate", fdb->fNonDates);
CP_XML_ATTR(L"containsDate", fdb->fDateInField); //if (fdb->fDateInField) CP_XML_ATTR(L"containsDate", fdb->fDateInField);
CP_XML_ATTR(L"containsNumber", fdb->fNumField); //if (fdb->fNumField) CP_XML_ATTR(L"containsNumber", fdb->fNumField);
CP_XML_ATTR(L"containsBlank", fdb->fTextEtcField); ////CP_XML_ATTR(L"containsBlank", fdb->fTextEtcField);
//CP_XML_ATTR(L"containsString", 0);
//if (m_arSRCSXOPER.empty())
//{
// if (!fdb->fTextEtcField)
// {
// CP_XML_ATTR(L"containsString", 0);
// }
// else if (fdb->fNumField || fdb->fDateInField)
// {
// CP_XML_ATTR(L"containsBlank", 1);
// CP_XML_ATTR(L"containsString", 0);
// }
//}
if ((bDate & bNumber) || (bNumber & bString))
{
CP_XML_ATTR(L"containsSemiMixedTypes", 1);
}
else if ( bDate & bString)
{
CP_XML_ATTR(L"containsMixedTypes", 1);
}
else if (!bEmpty && !bString)
{
CP_XML_ATTR(L"containsSemiMixedTypes", 0);
}
if (bNumber) CP_XML_ATTR(L"containsNumber", 1);
if (bDate) CP_XML_ATTR(L"containsDate", 1);
if (!bString) CP_XML_ATTR(L"containsString", 0);
if (bEmpty) CP_XML_ATTR(L"containsBlank", 1);
if (fdb->fnumMinMaxValid) if (fdb->fnumMinMaxValid)
{ {
if (fdb->fDateInField) //if (fdb->fDateInField)
{ //{
CP_XML_ATTR(L"minDate", 0); // "2007-11-18T00:00:00" // CP_XML_ATTR(L"minDate", 0); // "2007-11-18T00:00:00"
CP_XML_ATTR(L"maxDate", 0); // "2007-12-25T00:00:00" // CP_XML_ATTR(L"maxDate", 0); // "2007-12-25T00:00:00"
} //}
else if (fdb->fNumField) //else if (fdb->fNumField)
{ //{
CP_XML_ATTR(L"minValue", 0); // CP_XML_ATTR(L"minValue", 0);
CP_XML_ATTR(L"maxValue", 0); // CP_XML_ATTR(L"maxValue", 0);
} //}
} }
CP_XML_ATTR(L"count", fdb->catm); CP_XML_ATTR(L"count", m_arSRCSXOPER.size());
for (size_t i = 0; i < m_arSRCSXOPER.size(); i++) for (size_t i = 0; i < m_arSRCSXOPER.size(); i++)
{ {
......
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/FDB.h
View file @ 32448298
...@@ -59,6 +59,12 @@ public: ...@@ -59,6 +59,12 @@ public:
std::vector<BaseObjectPtr> m_arGRPSXOPER; std::vector<BaseObjectPtr> m_arGRPSXOPER;
BaseObjectPtr m_SXRANGE; BaseObjectPtr m_SXRANGE;
std::vector<BaseObjectPtr> m_arSxIsxoper; std::vector<BaseObjectPtr> m_arSxIsxoper;
bool bString;
bool bDate;
bool bNumber;
bool bEmpty;
}; };
} // namespace XLS } // namespace XLS
......
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/PIVOTCACHEDEFINITION.cpp
View file @ 32448298
...@@ -116,6 +116,7 @@ int PIVOTCACHEDEFINITION::serialize_definitions(std::wostream & strm) ...@@ -116,6 +116,7 @@ int PIVOTCACHEDEFINITION::serialize_definitions(std::wostream & strm)
{ {
CP_XML_ATTR(L"r:id", L"rId1" ); CP_XML_ATTR(L"r:id", L"rId1" );
} }
CP_XML_ATTR(L"enableRefresh", 1);
CP_XML_ATTR(L"refreshedBy", db->rgb.value()); CP_XML_ATTR(L"refreshedBy", db->rgb.value());
CP_XML_ATTR(L"refreshedDate", db_ex->numDate.data.value); CP_XML_ATTR(L"refreshedDate", db_ex->numDate.data.value);
CP_XML_ATTR(L"recordCount", db->crdbUsed); CP_XML_ATTR(L"recordCount", db->crdbUsed);
......
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/PIVOTLI.cpp
View file @ 32448298
...@@ -31,29 +31,26 @@ ...@@ -31,29 +31,26 @@
*/ */
#include "PIVOTLI.h" #include "PIVOTLI.h"
#include <Logic/Biff_records/SXLI.h>
#include <Logic/Biff_records/Continue.h> #include "../Biff_records/SXLI.h"
#include "../Biff_records/Continue.h"
namespace XLS namespace XLS
{ {
PIVOTLI::PIVOTLI() PIVOTLI::PIVOTLI()
{ {
} }
PIVOTLI::~PIVOTLI() PIVOTLI::~PIVOTLI()
{ {
} }
BaseObjectPtr PIVOTLI::clone() BaseObjectPtr PIVOTLI::clone()
{ {
return BaseObjectPtr(new PIVOTLI(*this)); return BaseObjectPtr(new PIVOTLI(*this));
} }
// PIVOTLI = SXLI *Continue // PIVOTLI = SXLI *Continue
const bool PIVOTLI::loadContent(BinProcessor& proc) const bool PIVOTLI::loadContent(BinProcessor& proc)
{ {
...@@ -61,10 +58,53 @@ const bool PIVOTLI::loadContent(BinProcessor& proc) ...@@ -61,10 +58,53 @@ const bool PIVOTLI::loadContent(BinProcessor& proc)
{ {
return false; return false;
} }
m_SXLI = elements_.back();
elements_.pop_back();
proc.repeated<Continue>(0, 0); proc.repeated<Continue>(0, 0);
return true; return true;
} }
int PIVOTLI::serialize(std::wostream & strm)
{
SXLI* line_items = dynamic_cast<SXLI*>(m_SXLI.get());
if (!line_items) return 0;
CP_XML_WRITER(strm)
{
for (size_t i = 0; i < line_items->m_arItems.size(); i++)
{
CP_XML_NODE(L"i")
{
switch(line_items->m_arItems[i].itmType)
{
case 0x0001: CP_XML_ATTR(L"t", L"default"); break;
case 0x0002: CP_XML_ATTR(L"t", L"sum"); break;
case 0x0003: CP_XML_ATTR(L"t", L"countA"); break;
case 0x0004: CP_XML_ATTR(L"t", L"count"); break;
case 0x0005: CP_XML_ATTR(L"t", L"avg"); break;
case 0x0006: CP_XML_ATTR(L"t", L"max"); break;
case 0x0007: CP_XML_ATTR(L"t", L"min"); break;
case 0x0008: CP_XML_ATTR(L"t", L"product"); break;
case 0x0009: CP_XML_ATTR(L"t", L"stdDev"); break;
case 0x000A: CP_XML_ATTR(L"t", L"stdDevP"); break;
case 0x000B: CP_XML_ATTR(L"t", L"var"); break;
case 0x000C: CP_XML_ATTR(L"t", L"varP"); break;
case 0x000D: CP_XML_ATTR(L"t", L"grand"); break;
case 0x000E: CP_XML_ATTR(L"t", L"blank"); break;
}
for (size_t j = 0; j < line_items->m_arItems[i].rgisxvi.size(); j++)
{
CP_XML_NODE(L"x")
{
CP_XML_ATTR(L"v", line_items->m_arItems[i].rgisxvi[j]);
}
}
}
}
}
}
} // namespace XLS } // namespace XLS
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/PIVOTLI.h
View file @ 32448298
...@@ -36,8 +36,6 @@ ...@@ -36,8 +36,6 @@
namespace XLS namespace XLS
{ {
// Logical representation of PIVOTLI union of records
class PIVOTLI: public CompositeObject class PIVOTLI: public CompositeObject
{ {
BASE_OBJECT_DEFINE_CLASS_NAME(PIVOTLI) BASE_OBJECT_DEFINE_CLASS_NAME(PIVOTLI)
...@@ -49,7 +47,11 @@ public: ...@@ -49,7 +47,11 @@ public:
virtual const bool loadContent(BinProcessor& proc); virtual const bool loadContent(BinProcessor& proc);
static const ElementType type = typePIVOTLI; int serialize(std::wostream & strm);
static const ElementType type = typePIVOTLI;
BaseObjectPtr m_SXLI;
}; };
} // namespace XLS } // namespace XLS
......
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/PIVOTPI.cpp
View file @ 32448298
...@@ -31,13 +31,12 @@ ...@@ -31,13 +31,12 @@
*/ */
#include "PIVOTPI.h" #include "PIVOTPI.h"
#include <Logic/Biff_records/SXPI.h> #include "../Biff_records/SXPI.h"
#include <Logic/Biff_records/Continue.h> #include "../Biff_records/Continue.h"
namespace XLS namespace XLS
{ {
PIVOTPI::PIVOTPI() PIVOTPI::PIVOTPI()
{ {
} }
...@@ -53,7 +52,6 @@ BaseObjectPtr PIVOTPI::clone() ...@@ -53,7 +52,6 @@ BaseObjectPtr PIVOTPI::clone()
return BaseObjectPtr(new PIVOTPI(*this)); return BaseObjectPtr(new PIVOTPI(*this));
} }
// PIVOTPI = SXPI *Continue // PIVOTPI = SXPI *Continue
const bool PIVOTPI::loadContent(BinProcessor& proc) const bool PIVOTPI::loadContent(BinProcessor& proc)
{ {
...@@ -69,5 +67,22 @@ const bool PIVOTPI::loadContent(BinProcessor& proc) ...@@ -69,5 +67,22 @@ const bool PIVOTPI::loadContent(BinProcessor& proc)
return true; return true;
} }
int PIVOTPI::serialize(std::wostream & strm)
{
SXPI* page_items = dynamic_cast<SXPI*>(m_SXPI.get());
if (!page_items) return 0;
CP_XML_WRITER(strm)
{
for (size_t i = 0; i < page_items->m_arItems.size(); i++)
{
CP_XML_NODE(L"pageField")
{
CP_XML_ATTR(L"fld", page_items->m_arItems[i].isxvd);
CP_XML_ATTR(L"hier",0);
}
}
}
}
} // namespace XLS } // namespace XLS
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/PIVOTPI.h
View file @ 32448298
...@@ -47,6 +47,8 @@ public: ...@@ -47,6 +47,8 @@ public:
virtual const bool loadContent(BinProcessor& proc); virtual const bool loadContent(BinProcessor& proc);
int serialize(std::wostream & strm);
static const ElementType type = typePIVOTPI; static const ElementType type = typePIVOTPI;
BaseObjectPtr m_SXPI; BaseObjectPtr m_SXPI;
......
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/PIVOTVD.cpp
View file @ 32448298
...@@ -80,20 +80,73 @@ int PIVOTVD::serialize(std::wostream & strm) ...@@ -80,20 +80,73 @@ int PIVOTVD::serialize(std::wostream & strm)
Sxvd* vd = dynamic_cast<Sxvd*>(m_Sxvd.get()); Sxvd* vd = dynamic_cast<Sxvd*>(m_Sxvd.get());
SXVDEx* vd_ex = dynamic_cast<SXVDEx*>(m_SXVDEx.get()); SXVDEx* vd_ex = dynamic_cast<SXVDEx*>(m_SXVDEx.get());
if (!vd || !vd_ex) return 0;
CP_XML_WRITER(strm) CP_XML_WRITER(strm)
{ {
CP_XML_NODE(L"pivotField") CP_XML_NODE(L"pivotField")
{ {
//CP_XML_ATTR(L"axis", ); if (vd->sxaxis.bRw) CP_XML_ATTR(L"axis", L"axisRow");
//CP_XML_ATTR(L"compact", ); else if (vd->sxaxis.bCol) CP_XML_ATTR(L"axis", L"axisCol");
//CP_XML_ATTR(L"outline", ); else if (vd->sxaxis.bPage) CP_XML_ATTR(L"axis", L"axisPage");
//CP_XML_ATTR(L"subtotalTop", ); else if (vd->sxaxis.bData)
//CP_XML_ATTR(L"showAll", ); {
//CP_XML_ATTR(L"includeNewItemsInFilter", ); CP_XML_ATTR(L"dataField", 1);
//CP_XML_ATTR(L"sortType", ); }
//CP_XML_ATTR(L"rankBy", );
//CP_XML_ATTR(L"axis", ); CP_XML_ATTR(L"compact", 0);
if (vd_ex->ifmt > 0)
{
CP_XML_ATTR(L"numFmtId", vd_ex->ifmt);
}
if (vd->stName.value().empty() == false)
CP_XML_ATTR(L"name", vd->stName.value());
if (vd->fCounta) CP_XML_ATTR(L"countASubtotal", 1);
if (vd->fCount) CP_XML_ATTR(L"countSubtotal", 1);
if (vd->fDefault) CP_XML_ATTR(L"defaultSubtotal", 1);
if (vd->fSum) CP_XML_ATTR(L"sumSubtotal", 1);
if (vd->fAverage) CP_XML_ATTR(L"avgSubtotal", 1);
if (vd->fMax) CP_XML_ATTR(L"maxSubtotal", 1);
if (vd->fMin) CP_XML_ATTR(L"minSubtotal", 1);
if (vd->fProduct) CP_XML_ATTR(L"productSubtotal", 1);
if (vd->fStdev) CP_XML_ATTR(L"stdSubtotal", 1);
if (vd->fStdevp) CP_XML_ATTR(L"stdDevSubtotal", 1);
if (vd->fVariance) CP_XML_ATTR(L"varSubtotal", 1);
if (vd->fVariancep) CP_XML_ATTR(L"varPSubtotal", 1);
CP_XML_ATTR(L"outline", vd_ex->fOutline);
CP_XML_ATTR(L"subtotalTop", vd_ex->fSubtotalAtTop);
CP_XML_ATTR(L"showAll", vd_ex->fShowAllItems);
if (vd_ex->fNotDragToData) CP_XML_ATTR(L"dragToData", 0);
if (!vd_ex->fDragToRow) CP_XML_ATTR(L"dragToRow", 0);
if (!vd_ex->fDragToColumn) CP_XML_ATTR(L"dragToCol", 0);
if (!vd_ex->fDragToPage) CP_XML_ATTR(L"dragToPage", 0);
if (vd_ex->fHideNewItems) CP_XML_ATTR(L"hideNewItems", 1);
if (vd_ex->fInsertBlankRow) CP_XML_ATTR(L"insertBlankRow", 1);
if (vd_ex->fPageBreaksBetweenItems) CP_XML_ATTR(L"insertPageBreak", 1);
if (!vd_ex->fTopAutoShow) CP_XML_ATTR(L"topAutoShow", 0);
//if (!vd_ex->fDragToHide) CP_XML_ATTR(L"dragOff", 0); //??
if (vd_ex->fServerBased) CP_XML_ATTR(L"serverField", 1);
//CP_XML_ATTR(L"", vd_ex->fCalculatedField);
CP_XML_ATTR(L"includeNewItemsInFilter", 1);
//CP_XML_ATTR(L"nonAutoSortDefault", !vd_ex->fAutoSort);
if (vd_ex->fAutoSort)
{
// vd_ex->isxdiAutoSort
if (vd_ex->fAscendSort) CP_XML_ATTR(L"sortType", L"ascending");
}
if (vd_ex->isxdiAutoShow >= 0)
{
CP_XML_ATTR(L"rankBy", vd_ex->isxdiAutoShow);
}
if (!m_arSXVI.empty()) if (!m_arSXVI.empty())
{ {
CP_XML_NODE(L"items") CP_XML_NODE(L"items")
......
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/PIVOTVIEW.cpp
View file @ 32448298
...@@ -107,7 +107,10 @@ int PIVOTVIEW::serialize(std::wostream & strm) ...@@ -107,7 +107,10 @@ int PIVOTVIEW::serialize(std::wostream & strm)
CP_XML_ATTR(L"applyPatternFormats", view->fAtrPat); CP_XML_ATTR(L"applyPatternFormats", view->fAtrPat);
CP_XML_ATTR(L"applyAlignmentFormats", view->fAtrAlc); CP_XML_ATTR(L"applyAlignmentFormats", view->fAtrAlc);
CP_XML_ATTR(L"applyWidthHeightFormats", view->fAtrProc); CP_XML_ATTR(L"applyWidthHeightFormats", view->fAtrProc);
CP_XML_ATTR(L"dataCaption", view->stData.value()); if (!view->stData.value().empty())
{
CP_XML_ATTR(L"dataCaption", view->stData.value());
}
//updatedVersion="2" //updatedVersion="2"
//asteriskTotals="1" //asteriskTotals="1"
//showMemberPropertyTips="0" //showMemberPropertyTips="0"
...@@ -144,14 +147,15 @@ int PIVOTVIEW::serialize(std::wostream & strm) ...@@ -144,14 +147,15 @@ int PIVOTVIEW::serialize(std::wostream & strm)
ivd->serialize(CP_XML_STREAM()); ivd->serialize(CP_XML_STREAM());
} }
} }
CP_XML_NODE(L"rowItems") if (core->m_arPIVOTLI.size() == 2)//0 or 2
{ {
CP_XML_ATTR(L"count", view->cRw); CP_XML_NODE(L"rowItems")
//for (size_t i = 0; i < m_arPIVOTLI.size(); i++) {
//{ CP_XML_ATTR(L"count", view->cRw);
// PIVOTLI* line = dynamic_cast<PIVOTLI*>(m_arPIVOTLI[i].get());
// m_arPIVOTIVD[i]->serialize(CP_XML_STREAM()); PIVOTLI* line = dynamic_cast<PIVOTLI*>(core->m_arPIVOTLI[0].get());
//} line->serialize(CP_XML_STREAM());
}
} }
if (core->m_arPIVOTIVD.size() == 2)//0 or 2 if (core->m_arPIVOTIVD.size() == 2)//0 or 2
{ {
...@@ -163,13 +167,15 @@ int PIVOTVIEW::serialize(std::wostream & strm) ...@@ -163,13 +167,15 @@ int PIVOTVIEW::serialize(std::wostream & strm)
ivd->serialize(CP_XML_STREAM()); ivd->serialize(CP_XML_STREAM());
} }
} }
CP_XML_NODE(L"colItems") if (core->m_arPIVOTLI.size() == 2)//0 or 2
{ {
CP_XML_ATTR(L"count", view->cCol); CP_XML_NODE(L"colItems")
//for (size_t i = 0; i < m_arPIVOTLI.size(); i++) {
//{ CP_XML_ATTR(L"count", view->cCol);
// m_arPIVOTIVD[i]->serialize(CP_XML_STREAM());
//} PIVOTLI* line = dynamic_cast<PIVOTLI*>(core->m_arPIVOTLI[1].get());
line->serialize(CP_XML_STREAM());
}
} }
if (core->m_PIVOTPI) if (core->m_PIVOTPI)
{ {
......
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/SXOPER.cpp
View file @ 32448298
...@@ -43,6 +43,10 @@ namespace XLS ...@@ -43,6 +43,10 @@ namespace XLS
SXOPER::SXOPER() SXOPER::SXOPER()
{ {
bString = false;
bDate = false;
bNumber = false;
bEmpty = false;
} }
SXOPER::~SXOPER() SXOPER::~SXOPER()
...@@ -59,21 +63,27 @@ const bool SXOPER::loadContent(BinProcessor& proc) ...@@ -59,21 +63,27 @@ const bool SXOPER::loadContent(BinProcessor& proc)
{ {
if(proc.optional<SxNil>()) if(proc.optional<SxNil>())
{ {
bEmpty = true;
} }
else if(proc.optional<SXNum>()) else if(proc.optional<SXNum>())
{ {
bNumber = true;
} }
else if(proc.optional<SxBool>()) else if(proc.optional<SxBool>())
{ {
bNumber = true;
} }
else if(proc.optional<SxErr>()) else if(proc.optional<SxErr>())
{ {
bNumber = true;
} }
else if(proc.optional<SXString>()) else if(proc.optional<SXString>())
{ {
bString = true;
} }
else if(proc.optional<SXDtr>()) else if(proc.optional<SXDtr>())
{ {
bDate =true;
} }
else else
return false; return false;
......
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/SXOPER.h
View file @ 32448298
...@@ -52,6 +52,11 @@ public: ...@@ -52,6 +52,11 @@ public:
static const ElementType type = typeSXOPER; static const ElementType type = typeSXOPER;
BaseObjectPtr m_element; BaseObjectPtr m_element;
bool bString;
bool bDate;
bool bNumber;
bool bEmpty;
}; };
} // namespace XLS } // namespace XLS
......
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/SXRANGE.cpp
View file @ 32448298
...@@ -140,12 +140,8 @@ int SXRANGE::serialize(std::wostream & strm) ...@@ -140,12 +140,8 @@ int SXRANGE::serialize(std::wostream & strm)
SXDtr* startDate = dynamic_cast<SXDtr*>(m_arSXDtr[0].get()); SXDtr* startDate = dynamic_cast<SXDtr*>(m_arSXDtr[0].get());
SXDtr* endDate = dynamic_cast<SXDtr*>(m_arSXDtr[1].get()); SXDtr* endDate = dynamic_cast<SXDtr*>(m_arSXDtr[1].get());
std::wstringstream s_start, s_end; CP_XML_ATTR(L"startDate", startDate->get_string_date());
s_start << startDate->yr << L"-" << startDate->mon << L"-" << startDate->dom << L"T" << startDate->hr << L":" << startDate->min << L":" << startDate->sec; CP_XML_ATTR(L"endDate", endDate->get_string_date());
s_end << endDate->yr << L"-" << endDate->mon << L"-" << endDate->dom << L"T" << endDate->hr << L":" << endDate->min << L":" << endDate->sec;
CP_XML_ATTR(L"startDate", s_start.str());
CP_XML_ATTR(L"endDate", s_end.str());
} }
if (m_arSXNum.size() == 3) if (m_arSXNum.size() == 3)
{ {
......
ASCOfficeXlsFile2/source/XlsXlsxConverter/XlsConverter.cpp
View file @ 32448298
...@@ -1920,7 +1920,14 @@ void XlsConverter::convert(XLS::PIVOTVIEW * pivot_view) ...@@ -1920,7 +1920,14 @@ void XlsConverter::convert(XLS::PIVOTVIEW * pivot_view)
pivot_view->serialize(strm); pivot_view->serialize(strm);
xlsx_context->get_pivots_context().add_view(strm.str(), pivot_view->indexCache); int index_view = xlsx_context->get_pivots_context().add_view(strm.str(), pivot_view->indexCache);
if (index_view > 0)
{
xlsx_context->current_sheet().sheet_rels().add(oox::relationship(L"pvId" + std::to_wstring(index_view),
L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/pivotTable",
L"../pivotTables/pivotTable" + std::to_wstring(index_view) + L".xml"));
}
} }
void XlsConverter::convert(XLS::PIVOTCACHEDEFINITION * pivot_cached) void XlsConverter::convert(XLS::PIVOTCACHEDEFINITION * pivot_cached)
......
ASCOfficeXlsFile2/source/XlsXlsxConverter/xlsx_conversion_context.cpp
View file @ 32448298
...@@ -285,10 +285,6 @@ void xlsx_conversion_context::end_document() ...@@ -285,10 +285,6 @@ void xlsx_conversion_context::end_document()
{ {
for (int i = 0; i < pivot_view_count; i++) for (int i = 0; i < pivot_view_count; i++)
{ {
//std::wstring rId = L"pvId" + std::to_wstring(i+1);
//static const std::wstring sType = L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/pivotTable";
//const std::wstring sName = std::wstring(L"../pivotTables/pivotTable" + std::to_wstring(i + 1) + L".xml");
package::pivot_table_content_ptr content = package::pivot_table_content::create(); package::pivot_table_content_ptr content = package::pivot_table_content::create();
xlsx_pivots_context_.dump_rels_view(i, content->get_rels()); xlsx_pivots_context_.dump_rels_view(i, content->get_rels());
......
ASCOfficeXlsFile2/source/XlsXlsxConverter/xlsx_package.cpp
View file @ 32448298
...@@ -176,16 +176,20 @@ void xl_files::write(const std::wstring & RootPath) ...@@ -176,16 +176,20 @@ void xl_files::write(const std::wstring & RootPath)
std::wstring path = RootPath + FILE_SEPARATOR_STR + L"xl"; std::wstring path = RootPath + FILE_SEPARATOR_STR + L"xl";
NSDirectory::CreateDirectory(path.c_str()); NSDirectory::CreateDirectory(path.c_str());
sheets_files_.set_rels(&rels_files_); {
pivot_cache_files_.set_rels(&rels_files_);
pivot_cache_files_.set_main_document(get_main_document());
pivot_cache_files_.write(path);
}
{
pivot_table_files_.set_main_document(get_main_document());
pivot_table_files_.write(path);
}
sheets_files_.set_rels(&rels_files_);
sheets_files_.set_main_document( this->get_main_document() ); sheets_files_.set_main_document( this->get_main_document() );
sheets_files_.write(path); sheets_files_.write(path);
int index = 1;
if (true)
{
//workbook_->hyperlinks->write(path);
rels_files_.add( relationship( L"hId1", L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/officeDocument", L"xl/workbook.xml" ) );
}
if (sharedStrings_) if (sharedStrings_)
{ {
sharedStrings_->write(path); sharedStrings_->write(path);
...@@ -217,15 +221,7 @@ void xl_files::write(const std::wstring & RootPath) ...@@ -217,15 +221,7 @@ void xl_files::write(const std::wstring & RootPath)
charts_files_.set_main_document(get_main_document()); charts_files_.set_main_document(get_main_document());
charts_files_.write(path); charts_files_.write(path);
} }
{
pivot_cache_files_.set_rels(&rels_files_);
pivot_cache_files_.set_main_document(get_main_document());
pivot_cache_files_.write(path);
}
{
pivot_table_files_.set_main_document(get_main_document());
pivot_table_files_.write(path);
}
if (drawings_) if (drawings_)
{ {
drawings_->set_main_document(get_main_document()); drawings_->set_main_document(get_main_document());
...@@ -340,7 +336,7 @@ void xl_pivot_cache_files::write(const std::wstring & RootPath) ...@@ -340,7 +336,7 @@ void xl_pivot_cache_files::write(const std::wstring & RootPath)
{ {
const std::wstring fileNameR = std::wstring(L"pivotCacheRecords") + std::to_wstring(i + 1) + L".xml"; const std::wstring fileNameR = std::wstring(L"pivotCacheRecords") + std::to_wstring(i + 1) + L".xml";
contentTypes.add_override(std::wstring(L"/xl/pivotCache/") + fileNameR, kWSConTypeD); contentTypes.add_override(std::wstring(L"/xl/pivotCache/") + fileNameR, kWSConTypeR);
package::simple_element(fileNameR, content_records).write(path); package::simple_element(fileNameR, content_records).write(path);
} }
......
ASCOfficeXlsFile2/source/XlsXlsxConverter/xlsx_pivots_context.cpp
View file @ 32448298
...@@ -31,14 +31,11 @@ ...@@ -31,14 +31,11 @@
*/ */
#include "xlsx_pivots_context.h" #include "xlsx_pivots_context.h"
#include <boost/make_shared.hpp> #include <boost/make_shared.hpp>
#include <simple_xml_writer.h> #include <simple_xml_writer.h>
namespace oox { namespace oox {
class xlsx_pivots_context::Impl class xlsx_pivots_context::Impl
{ {
public: public:
...@@ -73,13 +70,14 @@ int xlsx_pivots_context::get_cache_count() ...@@ -73,13 +70,14 @@ int xlsx_pivots_context::get_cache_count()
{ {
return (int)impl_->caches_.size(); return (int)impl_->caches_.size();
} }
void xlsx_pivots_context::dump_rels_cache(int index, rels & Rels) void xlsx_pivots_context::dump_rels_cache(int index, rels & Rels)
{ {
if (impl_->caches_[index].recordsData_.empty()) if (impl_->caches_[index].recordsData_.empty() == false)
{ {
Rels.add(relationship(L"rId1", Rels.add(relationship(L"rId1",
L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/pivotCacheRecords", L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/pivotCacheRecords",
L"pivotCacheRecords" + std::to_wstring(index) + L".xml", L"")); L"pivotCacheRecords" + std::to_wstring(index + 1) + L".xml", L""));
} }
} }
void xlsx_pivots_context::dump_rels_view(int index, rels & Rels) void xlsx_pivots_context::dump_rels_view(int index, rels & Rels)
...@@ -104,10 +102,14 @@ void xlsx_pivots_context::write_table_view_to(int index, std::wostream & strm) ...@@ -104,10 +102,14 @@ void xlsx_pivots_context::write_table_view_to(int index, std::wostream & strm)
{ {
strm << impl_->views_[index].data_; strm << impl_->views_[index].data_;
} }
void xlsx_pivots_context::add_view(std::wstring table_view, int indexCache) int xlsx_pivots_context::add_view(std::wstring table_view, int indexCache)
{ {
if (table_view.empty()) return 0;
Impl::_pivot_view v = {table_view, indexCache}; Impl::_pivot_view v = {table_view, indexCache};
impl_->views_.push_back(v); impl_->views_.push_back(v);
return (int)impl_->views_.size();
} }
int xlsx_pivots_context::get_view_count() int xlsx_pivots_context::get_view_count()
......
ASCOfficeXlsFile2/source/XlsXlsxConverter/xlsx_pivots_context.h
View file @ 32448298
...@@ -43,7 +43,7 @@ public: ...@@ -43,7 +43,7 @@ public:
xlsx_pivots_context(); xlsx_pivots_context();
~xlsx_pivots_context(); ~xlsx_pivots_context();
void add_view(std::wstring table_view, int indexCache); int add_view(std::wstring table_view, int indexCache);
int get_view_count(); int get_view_count();
void add_cache(std::wstring definitions, std::wstring records); void add_cache(std::wstring definitions, std::wstring records);
......
Common/3dParty/curl/build.bat
View file @ 32448298
...@@ -27,7 +27,7 @@ if exist %VC64% ( ...@@ -27,7 +27,7 @@ if exist %VC64% (
SET VC=%VC64% SET VC=%VC64%
) )
call "%VC%\vcvarsall.bat %MACHINE%" call "%VC%\vcvarsall.bat" %MACHINE%
cd curl cd curl
call buildconf.bat call buildconf.bat
......
Common/3dParty/curl/fetch.bat
View file @ 32448298
CD /D %~dp0
SET CURL_FOLDER=curl SET CURL_FOLDER=curl
IF NOT EXIST %CURL_FOLDER% CALL git clone https://github.com/curl/curl.git %CURL_FOLDER% IF NOT EXIST %CURL_FOLDER% CALL git clone https://github.com/curl/curl.git %CURL_FOLDER%
CD %CURL_FOLDER% CD %CURL_FOLDER%
......
Common/3dParty/openssl/build.sh
View file @ 32448298
#!/bin/bash #!/bin/bash
export PATH=`pwd`/depot_tools:"$PATH"
SCRIPT=$(readlink -f "$0") SCRIPT=$(readlink -f "$0")
SCRIPTPATH=$(dirname "$SCRIPT") SCRIPTPATH=$(dirname "$SCRIPT")
cd "$SCRIPTPATH"/openssl cd "$SCRIPTPATH"/openssl
perl ./Configure linux-64 os=$(uname -s)
platform=""
case "$os" in
Linux*) platform="linux" ;;
Darwin*) platform="darwin64-x86_64-cc" ;;
*) exit ;;
esac
platformLinux=""
architecture=$(uname -m)
arch=""
if [[ "$platform" == "linux" ]]
then
case "$architecture" in
x86_64*) arch="-64" ;;
*) arch="-32" ;;
esac
fi
echo "$platform$arch"
perl ./Configure $platform$arch
./config ./config
make make
X2tConverter/build/Qt/X2tConverter.pri
View file @ 32448298
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
QT -= core QT -= core
QT -= gui QT -= gui
VERSION = 2.4.467.0 VERSION = 2.4.468.0
DEFINES += INTVER=$$VERSION DEFINES += INTVER=$$VERSION
TARGET = x2t TARGET = x2t
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7