Skip to content

O
onlyoffice_core
Commit fa105ff4 authored by Elen.Subbotina's avatar Elen.Subbotina Committed by Alexander Trofimov
Browse files
Options

XlsFile2 фиксы ошибок 

git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@64225 954022d7-b5bf-4e40-9824-e11837661b57
parent 771ce7b1
Hide whitespace changes
Inline Side-by-side
Showing with 243 additions and 1419 deletions
ASCOfficeXlsFile2/source/XlsFormat/Binary/CFRecord.cpp
View file @ fa105ff4
...@@ -160,17 +160,22 @@ void CFRecord::appendRawData(const char* raw_data, const size_t size) ...@@ -160,17 +160,22 @@ void CFRecord::appendRawData(const char* raw_data, const size_t size)
} }
void CFRecord::loadAnyData(wchar_t & val) bool CFRecord::loadAnyData(wchar_t & val)
{ {
checkFitRead(2); if (checkFitRead(2))
#if defined(_WIN32) || defined(_WIN64) {
val = * getCurData<wchar_t>(); #if defined(_WIN32) || defined(_WIN64)
#else val = * getCurData<wchar_t>();
unsigned short val_utf16 = * getCurData<unsigned short>(); #else
unsigned short val_utf16 = * getCurData<unsigned short>();
val = val_utf16; val = val_utf16;
#endif #endif
rdPtr += 2; rdPtr += 2;
return true;
}
return false;
} }
void CFRecord::insertDataFromRecordToBeginning(CFRecordPtr where_from) void CFRecord::insertDataFromRecordToBeginning(CFRecordPtr where_from)
...@@ -214,12 +219,13 @@ const bool CFRecord::checkFitReadSafe(const size_t size) const ...@@ -214,12 +219,13 @@ const bool CFRecord::checkFitReadSafe(const size_t size) const
// Checks whether the specified number of unsigned chars present in the non-read part of the buffer // Checks whether the specified number of unsigned chars present in the non-read part of the buffer
// Generates an exception // Generates an exception
void CFRecord::checkFitRead(const size_t size) const bool CFRecord::checkFitRead(const size_t size) const
{ {
if(!checkFitReadSafe(size)) if(!checkFitReadSafe(size))
{ {
throw;// EXCEPT::RT::WrongBiffRecord("Wrong record size.", getTypeString()); return false;// EXCEPT::RT::WrongBiffRecord("Wrong record size.", getTypeString());
} }
return true;
} }
...@@ -246,8 +252,10 @@ void CFRecord::checkFitWrite(const size_t size) const ...@@ -246,8 +252,10 @@ void CFRecord::checkFitWrite(const size_t size) const
void CFRecord::skipNunBytes(const size_t n) void CFRecord::skipNunBytes(const size_t n)
{ {
//ASSERT(data_); // This throws if we use skipNunBytes instead of reserveNunBytes //ASSERT(data_); // This throws if we use skipNunBytes instead of reserveNunBytes
checkFitRead(n); if (checkFitRead(n))
rdPtr += n; {
rdPtr += n;
}
} }
...@@ -361,7 +369,7 @@ CFRecord& operator>>(CFRecord & record, std::string & str) ...@@ -361,7 +369,7 @@ CFRecord& operator>>(CFRecord & record, std::string & str)
char symbol; char symbol;
do do
{ {
record.loadAnyData(symbol); if (record.loadAnyData(symbol) == false) break;
str += symbol; str += symbol;
} while (symbol); } while (symbol);
return record; return record;
...@@ -374,7 +382,7 @@ CFRecord& operator>>(CFRecord & record, std::wstring & str) ...@@ -374,7 +382,7 @@ CFRecord& operator>>(CFRecord & record, std::wstring & str)
unsigned short symbol; unsigned short symbol;
do do
{ {
record.loadAnyData(symbol); if (record.loadAnyData(symbol) == false) break;
utf16.push_back(symbol); utf16.push_back(symbol);
} while (symbol); } while (symbol);
......
ASCOfficeXlsFile2/source/XlsFormat/Binary/CFRecord.h
View file @ fa105ff4
...@@ -71,7 +71,7 @@ public: ...@@ -71,7 +71,7 @@ public:
const bool checkFitReadSafe(const size_t size) const; const bool checkFitReadSafe(const size_t size) const;
// Checks whether the specified number of unsigned chars present in the non-read part of the buffer // Checks whether the specified number of unsigned chars present in the non-read part of the buffer
// Generates an exception // Generates an exception
void checkFitRead(const size_t size) const; bool checkFitRead(const size_t size) const;
// Checks whether the specified number of unsigned chars fits in max size of the buffer // Checks whether the specified number of unsigned chars fits in max size of the buffer
// Doesn't generate an exception // Doesn't generate an exception
const bool checkFitWriteSafe(const size_t size) const; const bool checkFitWriteSafe(const size_t size) const;
...@@ -121,15 +121,19 @@ public: ...@@ -121,15 +121,19 @@ public:
const size_t getRdPtr() const; const size_t getRdPtr() const;
template<class T> template<class T>
void loadAnyData(T& val) bool loadAnyData(T& val)
{ {
////ASSERT(data_); // This throws if we use >> instead of << ////ASSERT(data_); // This throws if we use >> instead of <<
checkFitRead(sizeof(T)); if (checkFitRead(sizeof(T)))
val = * getCurData<T>(); {
rdPtr += sizeof(T); val = * getCurData<T>();
rdPtr += sizeof(T);
return true;
}
return false;
} }
void loadAnyData(wchar_t & val); bool loadAnyData(wchar_t & val);
template<class T> template<class T>
void storeAnyData(const T& val) void storeAnyData(const T& val)
...@@ -215,7 +219,8 @@ CFRecord& operator<<(CFRecord& record, std::vector<T>& vec) ...@@ -215,7 +219,8 @@ CFRecord& operator<<(CFRecord& record, std::vector<T>& vec)
T symbol; T symbol;
do do
{ {
record.loadAnyData(symbol); if (record.loadAnyData(symbol) == false)
break;
str += symbol; str += symbol;
} while (symbol); } while (symbol);
return record; return record;
...@@ -241,8 +246,10 @@ template<class T> ...@@ -241,8 +246,10 @@ template<class T>
CFRecord& operator>>(CFRecord & record, _CP_OPT(T)& val) CFRecord& operator>>(CFRecord & record, _CP_OPT(T)& val)
{ {
T temp_val; T temp_val;
record.loadAnyData(temp_val); if (record.loadAnyData(temp_val))
val = temp_val; {
val = temp_val;
}
return record; return record;
} }
...@@ -251,6 +258,8 @@ CFRecord& operator>>(CFRecord & record, _CP_OPT(T)& val) ...@@ -251,6 +258,8 @@ CFRecord& operator>>(CFRecord & record, _CP_OPT(T)& val)
template<class T> template<class T>
CFRecord& operator<<(CFRecord & record, _CP_OPT(T)& val) CFRecord& operator<<(CFRecord & record, _CP_OPT(T)& val)
{ {
if (!val) return record;
T temp_val(*val); T temp_val(*val);
record.storeAnyData(temp_val); record.storeAnyData(temp_val);
return record; return record;
......
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BookExt.cpp
View file @ fa105ff4
...@@ -52,17 +52,20 @@ void BookExt::readFields(CFRecord& record) ...@@ -52,17 +52,20 @@ void BookExt::readFields(CFRecord& record)
record >> cb; record >> cb;
unsigned int flags; unsigned int flags;
record.loadAnyData(flags);
fDontAutoRecover = GETBIT(flags, 0); if (record.loadAnyData(flags))
fHidePivotList = GETBIT(flags, 1); {
fFilterPrivacy = GETBIT(flags, 2); fDontAutoRecover = GETBIT(flags, 0);
fEmbedFactoids = GETBIT(flags, 3); fHidePivotList = GETBIT(flags, 1);
mdFactoidDisplay = static_cast<unsigned char>(GETBITS(flags, 4, 5)); fFilterPrivacy = GETBIT(flags, 2);
fSavedDuringRecovery = GETBIT(flags, 6); fEmbedFactoids = GETBIT(flags, 3);
fCreatedViaMinimalSave = GETBIT(flags, 7); mdFactoidDisplay = static_cast<unsigned char>(GETBITS(flags, 4, 5));
fOpenedViaDataRecovery = GETBIT(flags, 8); fSavedDuringRecovery = GETBIT(flags, 6);
fOpenedViaSafeLoad = GETBIT(flags, 9); fCreatedViaMinimalSave = GETBIT(flags, 7);
fOpenedViaDataRecovery = GETBIT(flags, 8);
fOpenedViaSafeLoad = GETBIT(flags, 9);
}
else return;
if(cb > 20) if(cb > 20)
......
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Pls.cpp
View file @ fa105ff4
...@@ -60,7 +60,8 @@ void Pls::writeFields(CFRecord& record) ...@@ -60,7 +60,8 @@ void Pls::writeFields(CFRecord& record)
void Pls::readFields(CFRecord& record) void Pls::readFields(CFRecord& record)
{ {
record.skipNunBytes(2); // reserved record.skipNunBytes(2); // reserved
record.loadAnyData(rgb);
if (record.loadAnyData(rgb) == false) return;
int size = record.getDataSize() - 2; int size = record.getDataSize() - 2;
const char* data = record.getData() + 2; const char* data = record.getData() + 2;
......
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/BiffString.cpp
View file @ fa105ff4
...@@ -72,29 +72,25 @@ void BiffString::load(CFRecord& record, const size_t cch1, const bool is_wide1) ...@@ -72,29 +72,25 @@ void BiffString::load(CFRecord& record, const size_t cch1, const bool is_wide1)
size_t cch = cch1; size_t cch = cch1;
size_t raw_length = cch << (is_wide ? 1 : 0); size_t raw_length = cch << (is_wide ? 1 : 0);
//record.checkFitRead(raw_length);
if (record.checkFitRead(raw_length))
if (record.getDataSize() - record.getRdPtr() < raw_length)
{
raw_length = record.getDataSize() - record.getRdPtr();
cch = is_wide ? raw_length/2 : raw_length ;
}
if(is_wide)
{
#if defined(_WIN32) || defined(_WIN64)
std::wstring int_str(record.getCurData<wchar_t>(), cch);
str_ = int_str.c_str();
#else
str_= convertUtf16ToWString(record.getCurData<UTF16>(), cch);
#endif
}
else
{ {
std::string int_str(record.getCurData<char>(), cch); if(is_wide)
str_ = STR::toStdWString(int_str, record.getGlobalWorkbookInfo()->CodePage).c_str(); {
#if defined(_WIN32) || defined(_WIN64)
std::wstring int_str(record.getCurData<wchar_t>(), cch);
str_ = int_str.c_str();
#else
str_= convertUtf16ToWString(record.getCurData<UTF16>(), cch);
#endif
}
else
{
std::string int_str(record.getCurData<char>(), cch);
str_ = STR::toStdWString(int_str, record.getGlobalWorkbookInfo()->CodePage).c_str();
}
record.skipNunBytes(raw_length);
} }
record.skipNunBytes(raw_length);
} }
......
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/BiffString.h
View file @ fa105ff4
...@@ -136,6 +136,10 @@ CFRecord& operator>>(CFRecord& record, XLUnicodeString_T<cchType, det_id, cch_wh ...@@ -136,6 +136,10 @@ CFRecord& operator>>(CFRecord& record, XLUnicodeString_T<cchType, det_id, cch_wh
{ {
size_t cch; size_t cch;
size_t struct_size = 0; size_t struct_size = 0;
if (record.getRdPtr() >= record.getDataSize())
return record;
switch(cch_where) switch(cch_where)
{ {
case cch_READ_FROM_RECORD: case cch_READ_FROM_RECORD:
......
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/ExtProp.cpp
View file @ fa105ff4
...@@ -46,7 +46,8 @@ void ExtProp::load(CFRecord& record) ...@@ -46,7 +46,8 @@ void ExtProp::load(CFRecord& record)
record >> extPropData.indent_level; record >> extPropData.indent_level;
break; break;
default: default:
throw;// EXCEPT::RT::WrongBiffRecord("Unsupported type of the extension.", record.getTypeString()); //throw EXCEPT::RT::WrongBiffRecord("Unsupported type of the extension.", record.getTypeString());
break;
} }
} }
......
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/Feat11FieldDataItem.cpp
View file @ fa105ff4
...@@ -83,6 +83,9 @@ void Feat11FieldDataItem::load(CFRecord& record) ...@@ -83,6 +83,9 @@ void Feat11FieldDataItem::load(CFRecord& record)
record >> strFieldName; record >> strFieldName;
record >> strCaption; record >> strCaption;
if (record.getRdPtr() >= record.getDataSize())
return;//125 Planilhas de Excel.xls
if (cbFmtAgg > 0) if (cbFmtAgg > 0)
record >> dxfFmtAgg; record >> dxfFmtAgg;
if (cbFmtInsertRow > 0) if (cbFmtInsertRow > 0)
......
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/ODRAW/OfficeArtContainer.cpp
View file @ fa105ff4
...@@ -137,8 +137,12 @@ void OfficeArtContainer::loadFields(XLS::CFRecord& record) ...@@ -137,8 +137,12 @@ void OfficeArtContainer::loadFields(XLS::CFRecord& record)
} }
else if(record.getRdPtr() > child_beginning_ptr + rh_child.recLen) else if(record.getRdPtr() > child_beginning_ptr + rh_child.recLen)
{ {
throw;// EXCEPT::RT::WrongBiffRecord("Wrong data parsed in OfficeArt record of type 0x" + //throw EXCEPT::RT::WrongBiffRecord("Wrong data parsed in OfficeArt record of type 0x" +
//STR::int2hex_wstr(rh_child.recType, sizeof(rh_child.recType)), record.getTypeString()); //STR::int2hex_wstr(rh_child.recType, sizeof(rh_child.recType)), record.getTypeString());
Log::warning(std::wstring(L"Wrong data parsed in OfficeArt record of type 0x") +
STR::int2hex_wstr(rh_child.recType, sizeof(rh_child.recType)));
record.RollRdPtrBack( record.getRdPtr() - child_beginning_ptr + rh_child.recLen);
} }
} }
} }
......
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/ODRAW/OfficeArtMetafileHeader.cpp
View file @ fa105ff4
...@@ -23,8 +23,9 @@ void OfficeArtMetafileHeader::store(XLS::CFRecord& record) ...@@ -23,8 +23,9 @@ void OfficeArtMetafileHeader::store(XLS::CFRecord& record)
void OfficeArtMetafileHeader::load(XLS::CFRecord& record) void OfficeArtMetafileHeader::load(XLS::CFRecord& record)
{ {
record >> cbSize; record >> cbSize;
record.loadAnyData(rcBounds); if (record.loadAnyData(rcBounds) == false) return;
record.loadAnyData(ptSize); if (record.loadAnyData(ptSize) == false) return;
record >> cbSave >> compression >> filter; record >> cbSave >> compression >> filter;
} }
......
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/TableFeatureType.cpp
View file @ fa105ff4
...@@ -141,6 +141,8 @@ void TableFeatureType::load(CFRecord& record) ...@@ -141,6 +141,8 @@ void TableFeatureType::load(CFRecord& record)
record >> rgbName; record >> rgbName;
record >> cFieldData; record >> cFieldData;
int r = cFieldData;
if (fLoadCSPName) if (fLoadCSPName)
record >> cSPName; record >> cSPName;
...@@ -149,6 +151,9 @@ void TableFeatureType::load(CFRecord& record) ...@@ -149,6 +151,9 @@ void TableFeatureType::load(CFRecord& record)
for (size_t i = 0; i < cFieldData; i++) for (size_t i = 0; i < cFieldData; i++)
{ {
if (record.getRdPtr() >= record.getDataSize())
return;
Feat11FieldDataItemPtr item(new Feat11FieldDataItem); Feat11FieldDataItemPtr item(new Feat11FieldDataItem);
item->load(record); item->load(record);
fieldData.push_back(item); fieldData.push_back(item);
......
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/URLMoniker.cpp
View file @ fa105ff4
...@@ -40,12 +40,12 @@ void URLMoniker::load(XLS::CFRecord& record) ...@@ -40,12 +40,12 @@ void URLMoniker::load(XLS::CFRecord& record)
{ {
} }
if(!record.isEOF()) //if(!record.isEOF())
{ //{
_GUID_ guid; // _GUID_ guid;
record >> guid >> serialVersion >> uriFlags; // record >> guid >> serialVersion >> uriFlags;
serialGUID = STR::guid2bstr(guid); // serialGUID = STR::guid2bstr(guid);
} //}
} }
......
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/XLUnicodeRichExtendedString.cpp
View file @ fa105ff4
...@@ -256,23 +256,24 @@ void XLUnicodeRichExtendedString::load(CFRecord& record) ...@@ -256,23 +256,24 @@ void XLUnicodeRichExtendedString::load(CFRecord& record)
void XLUnicodeRichExtendedString::loadSymbols(CFRecord& record, const size_t cch, const bool is_wide) void XLUnicodeRichExtendedString::loadSymbols(CFRecord& record, const size_t cch, const bool is_wide)
{ {
size_t raw_length = cch << (is_wide ? 1 : 0); size_t raw_length = cch << (is_wide ? 1 : 0);
record.checkFitRead(raw_length); if (record.checkFitRead(raw_length))
if(is_wide)
{
#if defined(_WIN32) || defined(_WIN64)
std::wstring int_str(record.getCurData<wchar_t>(), cch);
str_ = int_str.c_str();
#else
str_ = convertUtf16ToWString(record.getCurData<UTF16>(), cch);
#endif
}
else
{ {
std::string int_str(record.getCurData<char>(), cch); if(is_wide)
str_ = STR::toStdWString(int_str, record.getGlobalWorkbookInfo()->CodePage).c_str(); {
#if defined(_WIN32) || defined(_WIN64)
std::wstring int_str(record.getCurData<wchar_t>(), cch);
str_ = int_str.c_str();
#else
str_ = convertUtf16ToWString(record.getCurData<UTF16>(), cch);
#endif
}
else
{
std::string int_str(record.getCurData<char>(), cch);
str_ = STR::toStdWString(int_str, record.getGlobalWorkbookInfo()->CodePage).c_str();
}
record.skipNunBytes(raw_length);
} }
record.skipNunBytes(raw_length);
} }
......
ASCOfficeXlsFile2/source/XlsFormat/Logic/WorkbookStreamObject.cpp
View file @ fa105ff4
...@@ -103,7 +103,7 @@ const bool WorkbookStreamObject::loadContent(BinProcessor& proc) ...@@ -103,7 +103,7 @@ const bool WorkbookStreamObject::loadContent(BinProcessor& proc)
if ((proc.mandatory<ChartSheetSubstream>()) && (elements_.size() > 0)) if ((proc.mandatory<ChartSheetSubstream>()) && (elements_.size() > 0))
{ {
WorksheetSubstream_found = true; WorksheetSubstream_found = true;
m_ChartSheetSubstream.push_back(elements_.back()); m_WorksheetSubstream.push_back(elements_.back());
elements_.pop_back(); elements_.pop_back();
} }
} }
......
ASCOfficeXlsFile2/source/XlsFormat/Logic/WorkbookStreamObject.h
View file @ fa105ff4
...@@ -30,7 +30,6 @@ public: ...@@ -30,7 +30,6 @@ public:
BaseObjectPtr m_GlobalsSubstream; BaseObjectPtr m_GlobalsSubstream;
std::vector<BaseObjectPtr> m_WorksheetSubstream; std::vector<BaseObjectPtr> m_WorksheetSubstream;
std::vector<BaseObjectPtr> m_ChartSheetSubstream;
std::vector<BaseObjectPtr> m_MacroSheetSubstream; std::vector<BaseObjectPtr> m_MacroSheetSubstream;
unsigned short code_page_; unsigned short code_page_;
......
ASCOfficeXlsFile2/source/XlsXlsxConverter/XlsConverter.cpp
View file @ fa105ff4
...@@ -231,7 +231,17 @@ void XlsConverter::convert(XLS::WorkbookStreamObject* woorkbook) ...@@ -231,7 +231,17 @@ void XlsConverter::convert(XLS::WorkbookStreamObject* woorkbook)
for (int i=0 ; i < woorkbook->m_WorksheetSubstream.size(); i++) for (int i=0 ; i < woorkbook->m_WorksheetSubstream.size(); i++)
{ {
xlsx_context->start_table(xls_global_info->sheets_names[i]); xlsx_context->start_table(xls_global_info->sheets_names[i]);
convert((XLS::WorksheetSubstream*)woorkbook->m_WorksheetSubstream[i].get());
if (woorkbook->m_WorksheetSubstream[i]->get_type() == XLS::typeWorksheetSubstream)
{
convert(dynamic_cast<XLS::WorksheetSubstream*>(woorkbook->m_WorksheetSubstream[i].get()));
}
else if (woorkbook->m_WorksheetSubstream[i]->get_type() == XLS::typeChartSheetSubstream)
{
//в xl\chartsheets
convert(dynamic_cast<XLS::ChartSheetSubstream*>(woorkbook->m_WorksheetSubstream[i].get()));
}
xlsx_context->end_table(); xlsx_context->end_table();
} }
...@@ -505,81 +515,12 @@ void XlsConverter::convert(XLS::OBJECTS* objects) ...@@ -505,81 +515,12 @@ void XlsConverter::convert(XLS::OBJECTS* objects)
if (objects == NULL) return; if (objects == NULL) return;
ODRAW::OfficeArtSpgrContainer *spgr = dynamic_cast<ODRAW::OfficeArtSpgrContainer*>(objects->m_MsoDrawing.get()->rgChildRec.m_OfficeArtSpgrContainer.get()); ODRAW::OfficeArtSpgrContainer *spgr = dynamic_cast<ODRAW::OfficeArtSpgrContainer*>(objects->m_MsoDrawing.get()->rgChildRec.m_OfficeArtSpgrContainer.get());
/*
for (int i = 0 ; i < objects->m_OBJs.size(); i++)
{
int ind = objects->m_OBJs[i].second;
XLS::OBJ* OBJ = dynamic_cast<XLS::OBJ*>(objects->m_OBJs[i].first.get());
XLS::Obj *obj = dynamic_cast<XLS::Obj*>(OBJ->m_Obj.get());
ODRAW::OfficeArtSpContainer *sp = NULL;
if (obj->m_OfficeArtSpContainer)
{
sp = dynamic_cast<ODRAW::OfficeArtSpContainer*>(obj->m_OfficeArtSpContainer.get());
}
else if ( (spgr) && (ind < spgr->child_records.size()))
{
sp = dynamic_cast<ODRAW::OfficeArtSpContainer*>(spgr->child_records[ind+1].get());
}
//else continue;
if (xlsx_context->get_drawing_context().start_drawing(obj->cmo.ot))//тут тип шейпа ВРАНЬЕ !!! пример - 7.SINIF I.DÖNEM III.YAZILI SINAV.xls
{
convert(sp);
xlsx_context->get_drawing_context().end_drawing();
}
}
for (int i = 0; i <objects->m_TEXTOBJECTs.size(); i++)
{
int ind = objects->m_OBJs[i].second;
XLS::TEXTOBJECT* textObject = dynamic_cast<XLS::TEXTOBJECT*>(objects->m_TEXTOBJECTs[i].first.get());
if (textObject == NULL) continue;
XLS::TxO * txO = dynamic_cast<XLS::TxO *>(textObject->m_TxO.get());
if (txO == NULL) continue;
ODRAW::OfficeArtSpContainer *sp = NULL;
if (txO->m_OfficeArtSpContainer)
{
sp = dynamic_cast<ODRAW::OfficeArtSpContainer*>(txO->m_OfficeArtSpContainer.get());
}
else if ( (spgr) && (ind < spgr->child_records.size()))
{
sp = dynamic_cast<ODRAW::OfficeArtSpContainer*>(spgr->child_records[ind+1].get());
}
if (xlsx_context->get_drawing_context().start_drawing(0x0006))
{
convert(sp);
std::wstringstream strm;
txO->serialize(strm);
xlsx_context->get_drawing_context().set_text(strm.str());
xlsx_context->get_drawing_context().end_drawing();
}
}
for (int i = 0 ; i < objects->m_CHARTs.size(); i++)
{
int ind = objects->m_OBJs[i].second;
//xlsx_context->get_chart_context().start_drawing();
//xlsx_context->get_chart_context().end_drawing();
}
*/
bool note = false; bool note = false;
int ind = 0; int ind = 0;
for ( std::list<XLS::BaseObjectPtr>::iterator elem = objects->elements_.begin(); elem != objects->elements_.end(); elem++) for ( std::list<XLS::BaseObjectPtr>::iterator elem = objects->elements_.begin(); elem != objects->elements_.end(); elem++)
{ {
short type_object = 0; short type_object = -1;
ODRAW::OfficeArtSpContainer *sp = NULL; ODRAW::OfficeArtSpContainer *sp = NULL;
ODRAW::OfficeArtSpContainer *sp_common = NULL; ODRAW::OfficeArtSpContainer *sp_common = NULL;
...@@ -609,7 +550,9 @@ void XlsConverter::convert(XLS::OBJECTS* objects) ...@@ -609,7 +550,9 @@ void XlsConverter::convert(XLS::OBJECTS* objects)
type_object = 0x0006; type_object = 0x0006;
if (text_obj->m_OfficeArtSpContainer) if (text_obj->m_OfficeArtSpContainer)
{
sp = dynamic_cast<ODRAW::OfficeArtSpContainer*>(text_obj->m_OfficeArtSpContainer.get()); sp = dynamic_cast<ODRAW::OfficeArtSpContainer*>(text_obj->m_OfficeArtSpContainer.get());
}
} }
if (chart) if (chart)
{ {
...@@ -618,7 +561,18 @@ void XlsConverter::convert(XLS::OBJECTS* objects) ...@@ -618,7 +561,18 @@ void XlsConverter::convert(XLS::OBJECTS* objects)
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
if ( (spgr) && (ind+1< spgr->child_records.size())) if ( (spgr) && (ind+1< spgr->child_records.size()))
{ {
sp_common = dynamic_cast<ODRAW::OfficeArtSpContainer*>(spgr->child_records[ind+1].get()); ODRAW::OfficeArtClientData* client_data = NULL;
sp_common = dynamic_cast<ODRAW::OfficeArtSpContainer*>(spgr->child_records[ind+1].get());
client_data = dynamic_cast<ODRAW::OfficeArtClientData*>(spgr->child_records[ind+1].get());
if (sp_common == NULL && client_data)
{
ind++;
if (ind+1< spgr->child_records.size())
sp_common = dynamic_cast<ODRAW::OfficeArtSpContainer*>(spgr->child_records[ind+1].get());
}
} }
if (note && text_obj) if (note && text_obj)
...@@ -629,6 +583,8 @@ void XlsConverter::convert(XLS::OBJECTS* objects) ...@@ -629,6 +583,8 @@ void XlsConverter::convert(XLS::OBJECTS* objects)
} }
note = false; note = false;
if (type_object < 0)continue;
if (xlsx_context->get_drawing_context().start_drawing(type_object)) if (xlsx_context->get_drawing_context().start_drawing(type_object))
{ {
convert(sp); convert(sp);
...@@ -651,7 +607,26 @@ void XlsConverter::convert(XLS::OBJECTS* objects) ...@@ -651,7 +607,26 @@ void XlsConverter::convert(XLS::OBJECTS* objects)
note = true; note = true;
} }
} }
if (sp == NULL) ind++; if (sp == NULL)
{
ind++;
if ( spgr )
{
while (ind+1 < spgr->child_records.size())
{
ODRAW::OfficeArtClientData* client_data = NULL;
ODRAW::OfficeArtClientTextbox* text_client_data = NULL;
client_data = dynamic_cast<ODRAW::OfficeArtClientData*> (spgr->child_records[ind+1].get());
text_client_data = dynamic_cast<ODRAW::OfficeArtClientTextbox*> (spgr->child_records[ind+1].get());
if (client_data || text_client_data)
{
ind++;
}else break;
}
}
}
} }
} }
......
ASCOfficeXlsFile2/source/XlsXlsxConverter/xlsx_drawing_context.cpp
View file @ fa105ff4
...@@ -171,11 +171,11 @@ void xlsx_drawing_context::end_drawing() ...@@ -171,11 +171,11 @@ void xlsx_drawing_context::end_drawing()
{ {
if (drawing_state.size() < 1 )return; if (drawing_state.size() < 1 )return;
if (drawing_state.back().anchor.empty()) //if (drawing_state.back().anchor.empty())
{ //{
drawing_state.pop_back(); // drawing_state.pop_back();
return; // return;
} //}
std::wstringstream strm; std::wstringstream strm;
...@@ -540,7 +540,9 @@ void xlsx_drawing_context::set_description(const std::wstring & str) ...@@ -540,7 +540,9 @@ void xlsx_drawing_context::set_description(const std::wstring & str)
} }
void xlsx_drawing_context::set_anchor(const std::wstring & str) void xlsx_drawing_context::set_anchor(const std::wstring & str)
{ {
if (drawing_state.size() < 1 )return; if (str.empty()) return;
if (drawing_state.size() < 1 ) return;
drawing_state.back().anchor = str; drawing_state.back().anchor = str;
} }
void xlsx_drawing_context::set_image(const std::wstring & str) void xlsx_drawing_context::set_image(const std::wstring & str)
......
ASCOfficeXlsFile2/source/win32/XlsFormat.vcproj
View file @ fa105ff4
...@@ -5034,91 +5034,19 @@ ...@@ -5034,91 +5034,19 @@
> >
</File> </File>
<File <File
RelativePath="..\XlsFormat\Logic\Biff_unions\ATTACHEDLABEL.cpp" RelativePath="..\XlsFormat\Logic\Biff_unions\ATTACHEDLABEL.h"
> >
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\$(InputName)1.obj"
XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|x64"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\$(InputName)1.obj"
XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\$(InputName)1.obj"
XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|x64"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\$(InputName)1.obj"
XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/>
</FileConfiguration>
</File> </File>
<File <File
RelativePath="..\XlsFormat\Logic\Biff_unions\ATTACHEDLABEL.h" RelativePath="..\XlsFormat\Logic\Biff_unions\ATTACHEDLABEL_bu.cpp"
> >
</File> </File>
<File <File
RelativePath="..\XlsFormat\Logic\Biff_unions\AUTOFILTER.cpp" RelativePath="..\XlsFormat\Logic\Biff_unions\AUTOFILTER.h"
> >
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\$(InputName)1.obj"
XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|x64"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\$(InputName)1.obj"
XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\$(InputName)1.obj"
XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|x64"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\$(InputName)1.obj"
XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/>
</FileConfiguration>
</File> </File>
<File <File
RelativePath="..\XlsFormat\Logic\Biff_unions\AUTOFILTER.h" RelativePath="..\XlsFormat\Logic\Biff_unions\AUTOFILTER_bu.cpp"
> >
</File> </File>
<File <File
...@@ -5130,47 +5058,11 @@ ...@@ -5130,47 +5058,11 @@
> >
</File> </File>
<File <File
RelativePath="..\XlsFormat\Logic\Biff_unions\AXISPARENT.cpp" RelativePath="..\XlsFormat\Logic\Biff_unions\AXISPARENT.h"
> >
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\$(InputName)1.obj"
XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|x64"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\$(InputName)1.obj"
XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\$(InputName)1.obj"
XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|x64"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\$(InputName)1.obj"
XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/>
</FileConfiguration>
</File> </File>
<File <File
RelativePath="..\XlsFormat\Logic\Biff_unions\AXISPARENT.h" RelativePath="..\XlsFormat\Logic\Biff_unions\AXISPARENT_bu.cpp"
> >
</File> </File>
<File <File
...@@ -5198,47 +5090,11 @@ ...@@ -5198,47 +5090,11 @@
> >
</File> </File>
<File <File
RelativePath="..\XlsFormat\Logic\Biff_unions\BIGNAME.cpp" RelativePath="..\XlsFormat\Logic\Biff_unions\BIGNAME.h"
> >
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\$(InputName)1.obj"
XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|x64"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\$(InputName)1.obj"
XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\$(InputName)1.obj"
XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|x64"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\$(InputName)1.obj"
XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/>
</FileConfiguration>
</File> </File>
<File <File
RelativePath="..\XlsFormat\Logic\Biff_unions\BIGNAME.h" RelativePath="..\XlsFormat\Logic\Biff_unions\BIGNAME_bu.cpp"
> >
</File> </File>
<File <File
...@@ -5250,47 +5106,11 @@ ...@@ -5250,47 +5106,11 @@
> >
</File> </File>
<File <File
RelativePath="..\XlsFormat\Logic\Biff_unions\CELL.cpp" RelativePath="..\XlsFormat\Logic\Biff_unions\CELL.h"
> >
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\$(InputName)1.obj"
XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|x64"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\$(InputName)1.obj"
XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\$(InputName)1.obj"
XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|x64"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\$(InputName)1.obj"
XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/>
</FileConfiguration>
</File> </File>
<File <File
RelativePath="..\XlsFormat\Logic\Biff_unions\CELL.h" RelativePath="..\XlsFormat\Logic\Biff_unions\CELL_bu.cpp"
> >
</File> </File>
<File <File
...@@ -5302,47 +5122,11 @@ ...@@ -5302,47 +5122,11 @@
> >
</File> </File>
<File <File
RelativePath="..\XlsFormat\Logic\Biff_unions\CHART.cpp" RelativePath="..\XlsFormat\Logic\Biff_unions\CHART.h"
> >
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\$(InputName)1.obj"
XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|x64"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\$(InputName)1.obj"
XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\$(InputName)1.obj"
XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|x64"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\$(InputName)1.obj"
XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/>
</FileConfiguration>
</File> </File>
<File <File
RelativePath="..\XlsFormat\Logic\Biff_unions\CHART.h" RelativePath="..\XlsFormat\Logic\Biff_unions\CHART_bu.cpp"
> >
</File> </File>
<File <File
...@@ -5362,91 +5146,19 @@ ...@@ -5362,91 +5146,19 @@
> >
</File> </File>
<File <File
RelativePath="..\XlsFormat\Logic\Biff_unions\CONDFMT.cpp" RelativePath="..\XlsFormat\Logic\Biff_unions\CONDFMT.h"
> >
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\$(InputName)1.obj"
XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|x64"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\$(InputName)1.obj"
XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\$(InputName)1.obj"
XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|x64"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\$(InputName)1.obj"
XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/>
</FileConfiguration>
</File> </File>
<File <File
RelativePath="..\XlsFormat\Logic\Biff_unions\CONDFMT.h" RelativePath="..\XlsFormat\Logic\Biff_unions\CONDFMT12.h"
> >
</File> </File>
<File <File
RelativePath="..\XlsFormat\Logic\Biff_unions\CONDFMT12.cpp" RelativePath="..\XlsFormat\Logic\Biff_unions\CONDFMT12_bu.cpp"
> >
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\$(InputName)1.obj"
XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|x64"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\$(InputName)1.obj"
XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\$(InputName)1.obj"
XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|x64"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\$(InputName)1.obj"
XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/>
</FileConfiguration>
</File> </File>
<File <File
RelativePath="..\XlsFormat\Logic\Biff_unions\CONDFMT12.h" RelativePath="..\XlsFormat\Logic\Biff_unions\CONDFMT_bu.cpp"
> >
</File> </File>
<File <File
...@@ -5466,47 +5178,11 @@ ...@@ -5466,47 +5178,11 @@
> >
</File> </File>
<File <File
RelativePath="..\XlsFormat\Logic\Biff_unions\CRTMLFRT.cpp" RelativePath="..\XlsFormat\Logic\Biff_unions\CRTMLFRT.h"
> >
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\$(InputName)1.obj"
XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|x64"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\$(InputName)1.obj"
XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\$(InputName)1.obj"
XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|x64"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\$(InputName)1.obj"
XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/>
</FileConfiguration>
</File> </File>
<File <File
RelativePath="..\XlsFormat\Logic\Biff_unions\CRTMLFRT.h" RelativePath="..\XlsFormat\Logic\Biff_unions\CRTMLFRT_bu.cpp"
> >
</File> </File>
<File <File
...@@ -5518,47 +5194,11 @@ ...@@ -5518,47 +5194,11 @@
> >
</File> </File>
<File <File
RelativePath="..\XlsFormat\Logic\Biff_unions\DAT.cpp" RelativePath="..\XlsFormat\Logic\Biff_unions\DAT.h"
> >
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\$(InputName)1.obj"
XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|x64"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\$(InputName)1.obj"
XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\$(InputName)1.obj"
XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|x64"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\$(InputName)1.obj"
XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/>
</FileConfiguration>
</File> </File>
<File <File
RelativePath="..\XlsFormat\Logic\Biff_unions\DAT.h" RelativePath="..\XlsFormat\Logic\Biff_unions\DAT_bu.cpp"
> >
</File> </File>
<File <File
...@@ -5570,91 +5210,19 @@ ...@@ -5570,91 +5210,19 @@
> >
</File> </File>
<File <File
RelativePath="..\XlsFormat\Logic\Biff_unions\DBQUERYEXT.cpp" RelativePath="..\XlsFormat\Logic\Biff_unions\DBQUERYEXT.h"
> >
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\$(InputName)1.obj"
XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|x64"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\$(InputName)1.obj"
XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\$(InputName)1.obj"
XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|x64"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\$(InputName)1.obj"
XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/>
</FileConfiguration>
</File> </File>
<File <File
RelativePath="..\XlsFormat\Logic\Biff_unions\DBQUERYEXT.h" RelativePath="..\XlsFormat\Logic\Biff_unions\DBQUERYEXT_bu.cpp"
> >
</File> </File>
<File <File
RelativePath="..\XlsFormat\Logic\Biff_unions\DCON.cpp" RelativePath="..\XlsFormat\Logic\Biff_unions\DCON.h"
> >
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\$(InputName)1.obj"
XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|x64"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\$(InputName)1.obj"
XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\$(InputName)1.obj"
XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|x64"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\$(InputName)1.obj"
XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/>
</FileConfiguration>
</File> </File>
<File <File
RelativePath="..\XlsFormat\Logic\Biff_unions\DCON.h" RelativePath="..\XlsFormat\Logic\Biff_unions\DCON_bu.cpp"
> >
</File> </File>
<File <File
...@@ -5666,47 +5234,11 @@ ...@@ -5666,47 +5234,11 @@
> >
</File> </File>
<File <File
RelativePath="..\XlsFormat\Logic\Biff_unions\DOCROUTE.cpp" RelativePath="..\XlsFormat\Logic\Biff_unions\DOCROUTE.h"
> >
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\$(InputName)1.obj"
XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|x64"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\$(InputName)1.obj"
XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\$(InputName)1.obj"
XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|x64"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\$(InputName)1.obj"
XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/>
</FileConfiguration>
</File> </File>
<File <File
RelativePath="..\XlsFormat\Logic\Biff_unions\DOCROUTE.h" RelativePath="..\XlsFormat\Logic\Biff_unions\DOCROUTE_bu.cpp"
> >
</File> </File>
<File <File
...@@ -5717,141 +5249,29 @@ ...@@ -5717,141 +5249,29 @@
RelativePath="..\XlsFormat\Logic\Biff_unions\DREF.h" RelativePath="..\XlsFormat\Logic\Biff_unions\DREF.h"
> >
</File> </File>
<File
RelativePath="..\XlsFormat\Logic\Biff_unions\DROPBAR.cpp"
>
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\$(InputName)1.obj"
XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|x64"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\$(InputName)1.obj"
XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\$(InputName)1.obj"
XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|x64"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\$(InputName)1.obj"
XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/>
</FileConfiguration>
</File>
<File <File
RelativePath="..\XlsFormat\Logic\Biff_unions\DROPBAR.h" RelativePath="..\XlsFormat\Logic\Biff_unions\DROPBAR.h"
> >
</File> </File>
<File <File
RelativePath="..\XlsFormat\Logic\Biff_unions\DVAL.cpp" RelativePath="..\XlsFormat\Logic\Biff_unions\DROPBAR_bu.cpp"
> >
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\$(InputName)1.obj"
XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|x64"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\$(InputName)1.obj"
XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\$(InputName)1.obj"
XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|x64"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\$(InputName)1.obj"
XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/>
</FileConfiguration>
</File> </File>
<File <File
RelativePath="..\XlsFormat\Logic\Biff_unions\DVAL.h" RelativePath="..\XlsFormat\Logic\Biff_unions\DVAL.h"
> >
</File> </File>
<File <File
RelativePath="..\XlsFormat\Logic\Biff_unions\DVAXIS.cpp" RelativePath="..\XlsFormat\Logic\Biff_unions\DVAL_bu.cpp"
> >
</File> </File>
<File <File
RelativePath="..\XlsFormat\Logic\Biff_unions\DVAXIS.h" RelativePath="..\XlsFormat\Logic\Biff_unions\DVAXIS.cpp"
> >
</File> </File>
<File <File
RelativePath="..\XlsFormat\Logic\Biff_unions\FEAT.cpp" RelativePath="..\XlsFormat\Logic\Biff_unions\DVAXIS.h"
> >
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\$(InputName)1.obj"
XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|x64"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\$(InputName)1.obj"
XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\$(InputName)1.obj"
XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|x64"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\$(InputName)1.obj"
XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/>
</FileConfiguration>
</File> </File>
<File <File
RelativePath="..\XlsFormat\Logic\Biff_unions\FEAT.h" RelativePath="..\XlsFormat\Logic\Biff_unions\FEAT.h"
...@@ -5865,6 +5285,10 @@ ...@@ -5865,6 +5285,10 @@
RelativePath="..\XlsFormat\Logic\Biff_unions\FEAT11.h" RelativePath="..\XlsFormat\Logic\Biff_unions\FEAT11.h"
> >
</File> </File>
<File
RelativePath="..\XlsFormat\Logic\Biff_unions\FEAT_bu.cpp"
>
</File>
<File <File
RelativePath="..\XlsFormat\Logic\Biff_unions\FNGROUPS.cpp" RelativePath="..\XlsFormat\Logic\Biff_unions\FNGROUPS.cpp"
> >
...@@ -5889,138 +5313,30 @@ ...@@ -5889,138 +5313,30 @@
RelativePath="..\XlsFormat\Logic\Biff_unions\FORMATTING.h" RelativePath="..\XlsFormat\Logic\Biff_unions\FORMATTING.h"
> >
</File> </File>
<File
RelativePath="..\XlsFormat\Logic\Biff_unions\FORMULA.cpp"
>
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\$(InputName)1.obj"
XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|x64"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\$(InputName)1.obj"
XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\$(InputName)1.obj"
XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|x64"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\$(InputName)1.obj"
XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/>
</FileConfiguration>
</File>
<File <File
RelativePath="..\XlsFormat\Logic\Biff_unions\FORMULA.h" RelativePath="..\XlsFormat\Logic\Biff_unions\FORMULA.h"
> >
</File> </File>
<File <File
RelativePath="..\XlsFormat\Logic\Biff_unions\FRAME.cpp" RelativePath="..\XlsFormat\Logic\Biff_unions\FORMULA_bu.cpp"
> >
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\$(InputName)1.obj"
XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|x64"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\$(InputName)1.obj"
XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\$(InputName)1.obj"
XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|x64"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\$(InputName)1.obj"
XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/>
</FileConfiguration>
</File> </File>
<File <File
RelativePath="..\XlsFormat\Logic\Biff_unions\FRAME.h" RelativePath="..\XlsFormat\Logic\Biff_unions\FRAME.h"
> >
</File> </File>
<File <File
RelativePath="..\XlsFormat\Logic\Biff_unions\GELFRAME.cpp" RelativePath="..\XlsFormat\Logic\Biff_unions\FRAME_bu.cpp"
> >
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\$(InputName)1.obj"
XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|x64"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\$(InputName)1.obj"
XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\$(InputName)1.obj"
XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|x64"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\$(InputName)1.obj"
XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/>
</FileConfiguration>
</File> </File>
<File <File
RelativePath="..\XlsFormat\Logic\Biff_unions\GELFRAME.h" RelativePath="..\XlsFormat\Logic\Biff_unions\GELFRAME.h"
> >
</File> </File>
<File
RelativePath="..\XlsFormat\Logic\Biff_unions\GELFRAME_bu.cpp"
>
</File>
<File <File
RelativePath="..\XlsFormat\Logic\Biff_unions\GLOBALS.cpp" RelativePath="..\XlsFormat\Logic\Biff_unions\GLOBALS.cpp"
> >
...@@ -6030,47 +5346,11 @@ ...@@ -6030,47 +5346,11 @@
> >
</File> </File>
<File <File
RelativePath="..\XlsFormat\Logic\Biff_unions\HLINK.cpp" RelativePath="..\XlsFormat\Logic\Biff_unions\HLINK.h"
> >
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\$(InputName)1.obj"
XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|x64"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\$(InputName)1.obj"
XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\$(InputName)1.obj"
XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|x64"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\$(InputName)1.obj"
XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/>
</FileConfiguration>
</File> </File>
<File <File
RelativePath="..\XlsFormat\Logic\Biff_unions\HLINK.h" RelativePath="..\XlsFormat\Logic\Biff_unions\HLINK_bu.cpp"
> >
</File> </File>
<File <File
...@@ -6090,47 +5370,11 @@ ...@@ -6090,47 +5370,11 @@
> >
</File> </File>
<File <File
RelativePath="..\XlsFormat\Logic\Biff_unions\LBL.cpp" RelativePath="..\XlsFormat\Logic\Biff_unions\LBL.h"
> >
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\$(InputName)1.obj"
XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|x64"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\$(InputName)1.obj"
XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\$(InputName)1.obj"
XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|x64"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\$(InputName)1.obj"
XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/>
</FileConfiguration>
</File> </File>
<File <File
RelativePath="..\XlsFormat\Logic\Biff_unions\LBL.h" RelativePath="..\XlsFormat\Logic\Biff_unions\LBL_bu.cpp"
> >
</File> </File>
<File <File
...@@ -6158,91 +5402,19 @@ ...@@ -6158,91 +5402,19 @@
> >
</File> </File>
<File <File
RelativePath="..\XlsFormat\Logic\Biff_unions\MDTINFO.cpp" RelativePath="..\XlsFormat\Logic\Biff_unions\MDTINFO.h"
> >
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\$(InputName)1.obj"
XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|x64"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\$(InputName)1.obj"
XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\$(InputName)1.obj"
XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|x64"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\$(InputName)1.obj"
XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/>
</FileConfiguration>
</File> </File>
<File <File
RelativePath="..\XlsFormat\Logic\Biff_unions\MDTINFO.h" RelativePath="..\XlsFormat\Logic\Biff_unions\MDTINFO_bu.cpp"
> >
</File> </File>
<File <File
RelativePath="..\XlsFormat\Logic\Biff_unions\MDXSTR.cpp" RelativePath="..\XlsFormat\Logic\Biff_unions\MDXSTR.h"
> >
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\$(InputName)1.obj"
XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|x64"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\$(InputName)1.obj"
XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\$(InputName)1.obj"
XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|x64"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\$(InputName)1.obj"
XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/>
</FileConfiguration>
</File> </File>
<File <File
RelativePath="..\XlsFormat\Logic\Biff_unions\MDXSTR.h" RelativePath="..\XlsFormat\Logic\Biff_unions\MDXSTR_bu.cpp"
> >
</File> </File>
<File <File
...@@ -6262,91 +5434,19 @@ ...@@ -6262,91 +5434,19 @@
> >
</File> </File>
<File <File
RelativePath="..\XlsFormat\Logic\Biff_unions\MSODRAWINGGROUP.cpp" RelativePath="..\XlsFormat\Logic\Biff_unions\MSODRAWINGGROUP.h"
> >
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\$(InputName)1.obj"
XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|x64"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\$(InputName)1.obj"
XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\$(InputName)1.obj"
XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|x64"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\$(InputName)1.obj"
XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/>
</FileConfiguration>
</File> </File>
<File <File
RelativePath="..\XlsFormat\Logic\Biff_unions\MSODRAWINGGROUP.h" RelativePath="..\XlsFormat\Logic\Biff_unions\MSODRAWINGGROUP_bu.cpp"
> >
</File> </File>
<File <File
RelativePath="..\XlsFormat\Logic\Biff_unions\OBJ.cpp" RelativePath="..\XlsFormat\Logic\Biff_unions\OBJ.h"
> >
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\$(InputName)1.obj"
XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|x64"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\$(InputName)1.obj"
XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\$(InputName)1.obj"
XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|x64"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\$(InputName)1.obj"
XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/>
</FileConfiguration>
</File> </File>
<File <File
RelativePath="..\XlsFormat\Logic\Biff_unions\OBJ.h" RelativePath="..\XlsFormat\Logic\Biff_unions\OBJ_bu.cpp"
> >
</File> </File>
<File <File
...@@ -6366,91 +5466,19 @@ ...@@ -6366,91 +5466,19 @@
> >
</File> </File>
<File <File
RelativePath="..\XlsFormat\Logic\Biff_unions\PHONETICINFO.cpp" RelativePath="..\XlsFormat\Logic\Biff_unions\PHONETICINFO.h"
> >
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\$(InputName)1.obj"
XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|x64"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\$(InputName)1.obj"
XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\$(InputName)1.obj"
XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|x64"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\$(InputName)1.obj"
XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/>
</FileConfiguration>
</File> </File>
<File <File
RelativePath="..\XlsFormat\Logic\Biff_unions\PHONETICINFO.h" RelativePath="..\XlsFormat\Logic\Biff_unions\PHONETICINFO_bu.cpp"
> >
</File> </File>
<File <File
RelativePath="..\XlsFormat\Logic\Biff_unions\PICF.cpp" RelativePath="..\XlsFormat\Logic\Biff_unions\PICF.h"
> >
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\$(InputName)1.obj"
XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|x64"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\$(InputName)1.obj"
XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\$(InputName)1.obj"
XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|x64"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\$(InputName)1.obj"
XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/>
</FileConfiguration>
</File> </File>
<File <File
RelativePath="..\XlsFormat\Logic\Biff_unions\PICF.h" RelativePath="..\XlsFormat\Logic\Biff_unions\PICF_bu.cpp"
> >
</File> </File>
<File <File
...@@ -6614,47 +5642,11 @@ ...@@ -6614,47 +5642,11 @@
> >
</File> </File>
<File <File
RelativePath="..\XlsFormat\Logic\Biff_unions\QSIR.cpp" RelativePath="..\XlsFormat\Logic\Biff_unions\QSIR.h"
> >
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\$(InputName)1.obj"
XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|x64"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\$(InputName)1.obj"
XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\$(InputName)1.obj"
XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|x64"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\$(InputName)1.obj"
XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/>
</FileConfiguration>
</File> </File>
<File <File
RelativePath="..\XlsFormat\Logic\Biff_unions\QSIR.h" RelativePath="..\XlsFormat\Logic\Biff_unions\QSIR_bu.cpp"
> >
</File> </File>
<File <File
...@@ -6738,47 +5730,11 @@ ...@@ -6738,47 +5730,11 @@
> >
</File> </File>
<File <File
RelativePath="..\XlsFormat\Logic\Biff_unions\SORT.cpp" RelativePath="..\XlsFormat\Logic\Biff_unions\SORT.h"
> >
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\$(InputName)1.obj"
XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|x64"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\$(InputName)1.obj"
XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\$(InputName)1.obj"
XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|x64"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\$(InputName)1.obj"
XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/>
</FileConfiguration>
</File> </File>
<File <File
RelativePath="..\XlsFormat\Logic\Biff_unions\SORT.h" RelativePath="..\XlsFormat\Logic\Biff_unions\SORT_bu.cpp"
> >
</File> </File>
<File <File
...@@ -6822,47 +5778,11 @@ ...@@ -6822,47 +5778,11 @@
> >
</File> </File>
<File <File
RelativePath="..\XlsFormat\Logic\Biff_unions\SUPBOOK.cpp" RelativePath="..\XlsFormat\Logic\Biff_unions\SUPBOOK.h"
> >
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\$(InputName)1.obj"
XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|x64"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\$(InputName)1.obj"
XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\$(InputName)1.obj"
XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|x64"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\$(InputName)1.obj"
XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/>
</FileConfiguration>
</File> </File>
<File <File
RelativePath="..\XlsFormat\Logic\Biff_unions\SUPBOOK.h" RelativePath="..\XlsFormat\Logic\Biff_unions\SUPBOOK_bu.cpp"
> >
</File> </File>
<File <File
...@@ -7050,91 +5970,19 @@ ...@@ -7050,91 +5970,19 @@
> >
</File> </File>
<File <File
RelativePath="..\XlsFormat\Logic\Biff_unions\SXTBL.cpp" RelativePath="..\XlsFormat\Logic\Biff_unions\SXTBL.h"
> >
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\$(InputName)1.obj"
XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|x64"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\$(InputName)1.obj"
XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\$(InputName)1.obj"
XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|x64"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\$(InputName)1.obj"
XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/>
</FileConfiguration>
</File> </File>
<File <File
RelativePath="..\XlsFormat\Logic\Biff_unions\SXTBL.h" RelativePath="..\XlsFormat\Logic\Biff_unions\SXTBL_bu.cpp"
> >
</File> </File>
<File <File
RelativePath="..\XlsFormat\Logic\Biff_unions\TABLESTYLES.cpp" RelativePath="..\XlsFormat\Logic\Biff_unions\TABLESTYLES.h"
> >
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\$(InputName)1.obj"
XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|x64"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\$(InputName)1.obj"
XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\$(InputName)1.obj"
XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|x64"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\$(InputName)1.obj"
XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/>
</FileConfiguration>
</File> </File>
<File <File
RelativePath="..\XlsFormat\Logic\Biff_unions\TABLESTYLES.h" RelativePath="..\XlsFormat\Logic\Biff_unions\TABLESTYLES_bu.cpp"
> >
</File> </File>
<File <File
...@@ -7154,47 +6002,11 @@ ...@@ -7154,47 +6002,11 @@
> >
</File> </File>
<File <File
RelativePath="..\XlsFormat\Logic\Biff_unions\THEME.cpp" RelativePath="..\XlsFormat\Logic\Biff_unions\THEME.h"
> >
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\$(InputName)1.obj"
XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|x64"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\$(InputName)1.obj"
XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\$(InputName)1.obj"
XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|x64"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\$(InputName)1.obj"
XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/>
</FileConfiguration>
</File> </File>
<File <File
RelativePath="..\XlsFormat\Logic\Biff_unions\THEME.h" RelativePath="..\XlsFormat\Logic\Biff_unions\THEME_bu.cpp"
> >
</File> </File>
<File <File
......
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