diff --git a/ASCOfficeDocxFile2/DocWrapper/ChartWriter.cpp b/ASCOfficeDocxFile2/DocWrapper/ChartWriter.cpp index 065184f57a..e7b175031f 100644 --- a/ASCOfficeDocxFile2/DocWrapper/ChartWriter.cpp +++ b/ASCOfficeDocxFile2/DocWrapper/ChartWriter.cpp @@ -127,11 +127,11 @@ namespace BinXlsxRW{ } ChartWriter::~ChartWriter() { - for (boost::unordered_map*>*>::iterator it = m_mapSheets.begin(); it != m_mapSheets.end(); ++it) + for (std::map*>*>::iterator it = m_mapSheets.begin(); it != m_mapSheets.end(); ++it) { - boost::unordered_map*>* rows = it->second; + std::map*>* rows = it->second; - for(boost::unordered_map*>::iterator itRow = rows->begin(); itRow != rows->end(); itRow++) + for(std::map*>::iterator itRow = rows->begin(); itRow != rows->end(); itRow++) { delete itRow->second; } @@ -149,7 +149,7 @@ namespace BinXlsxRW{ int nSheetId = 1; OOX::Spreadsheet::CWorksheet* pFirstWorksheet = NULL; - for (boost::unordered_map*>*>::iterator it = m_mapSheets.begin(); it != m_mapSheets.end(); ++it) + for (std::map*>*>::iterator it = m_mapSheets.begin(); it != m_mapSheets.end(); ++it) { const std::wstring& sSheetName = it->first; OOX::Spreadsheet::CWorksheet* pWorksheet = toXlsxGetSheet(mapWorksheets, sSheetName); @@ -462,15 +462,15 @@ namespace BinXlsxRW{ //проверяем можем ли создать таблицу if(m_mapSheets.size() > 0 && m_nRow1 > 0 && m_nRow2 > 0 && m_nCol1 > 0 && m_nCol2 > 0 && m_nRow1 < m_nRow2) { - boost::unordered_map*>* rows = m_mapSheets.begin()->second; - boost::unordered_map*>::iterator itRows = rows->find(m_nRow1); + std::map*>* rows = m_mapSheets.begin()->second; + std::map*>::iterator itRows = rows->find(m_nRow1); if(itRows != rows->end()) { - boost::unordered_map* cells = itRows->second; + std::map* cells = itRows->second; std::vector aIndexesCell; - for(boost::unordered_map::const_iterator it = cells->begin(); it != cells->end(); ++it) + for(std::map::const_iterator it = cells->begin(); it != cells->end(); ++it) { aIndexesCell.push_back(it->first); } @@ -524,12 +524,12 @@ namespace BinXlsxRW{ } return pWorksheet; } - void ChartWriter::toXlsxSheetdata(OOX::Spreadsheet::CWorksheet* pWorksheet, const boost::unordered_map*>& rows, std::vector& aSharedStrings) + void ChartWriter::toXlsxSheetdata(OOX::Spreadsheet::CWorksheet* pWorksheet, const std::map*>& rows, std::vector& aSharedStrings) { pWorksheet->m_oSheetData.Init(); std::vector aIndexesRow; - for(boost::unordered_map*>::const_iterator it = rows.begin(); it != rows.end(); ++it) + for(std::map*>::const_iterator it = rows.begin(); it != rows.end(); ++it) { aIndexesRow.push_back(it->first); } @@ -544,10 +544,10 @@ namespace BinXlsxRW{ pRow->m_oR.Init(); pRow->m_oR->SetValue(nIndexRow); - const boost::unordered_map& cells = *rows.at(nIndexRow); + const std::map& cells = *rows.at(nIndexRow); std::vector aIndexesCell; - for(boost::unordered_map::const_iterator it = cells.begin(); it != cells.end(); ++it) + for(std::map::const_iterator it = cells.begin(); it != cells.end(); ++it) { aIndexesCell.push_back(it->first); } @@ -605,24 +605,24 @@ namespace BinXlsxRW{ } void ChartWriter::parseCell(const std::wstring& sheet, const int& nRow, const int& nCol, const std::wstring& val, std::wstring* format = NULL) { - boost::unordered_map*>*>::const_iterator itSheets = m_mapSheets.find(sheet); - boost::unordered_map*>* rows = NULL; + std::map*>*>::const_iterator itSheets = m_mapSheets.find(sheet); + std::map*>* rows = NULL; if(itSheets == m_mapSheets.end()) { - rows = new boost::unordered_map*>(); + rows = new std::map*>(); m_mapSheets.insert(std::make_pair(sheet, rows)); } else { rows = itSheets->second; } - boost::unordered_map*>::const_iterator itRows = rows->find(nRow); - boost::unordered_map* cells = NULL; + std::map*>::const_iterator itRows = rows->find(nRow); + std::map* cells = NULL; if(itRows == rows->end()) { - cells = new boost::unordered_map(); + cells = new std::map(); rows->insert(std::make_pair(nRow, cells)); } else diff --git a/ASCOfficeDocxFile2/DocWrapper/ChartWriter.h b/ASCOfficeDocxFile2/DocWrapper/ChartWriter.h index 835dddf71f..eb7dfe4180 100644 --- a/ASCOfficeDocxFile2/DocWrapper/ChartWriter.h +++ b/ASCOfficeDocxFile2/DocWrapper/ChartWriter.h @@ -59,8 +59,8 @@ namespace BinXlsxRW { class ChartWriter { public: - boost::unordered_map*>*> m_mapSheets; - boost::unordered_map m_mapFormats; + std::map*>*> m_mapSheets; + boost::unordered_map m_mapFormats; std::vector m_aXfs; std::vector m_aTableNames; @@ -77,7 +77,7 @@ namespace BinXlsxRW { private: OOX::Spreadsheet::CWorksheet* toXlsxGetSheet(boost::unordered_map& mapWorksheets, const std::wstring& sName); - void toXlsxSheetdata(OOX::Spreadsheet::CWorksheet* pWorksheet, const boost::unordered_map*>& rows, std::vector& aSharedStrings); + void toXlsxSheetdata(OOX::Spreadsheet::CWorksheet* pWorksheet, const std::map*>& rows, std::vector& aSharedStrings); void parseCell(const std::wstring& sheet, const int& nRow, const int& nCol, const std::wstring& val, std::wstring* format); OOX::Spreadsheet::CCell* parseCreateCell(const int& nRow, const int& nCol, const std::wstring& val, std::wstring* format); void parseStrRef(const OOX::Spreadsheet::CT_StrRef* pStrRef, bool bUpdateRange, const wchar_t* cRangeName); diff --git a/ASCOfficeXlsFile2/source/linux/XlsFormatLib.pro b/ASCOfficeXlsFile2/source/linux/XlsFormatLib.pro index aa0a5ba846..e680b3c826 100644 --- a/ASCOfficeXlsFile2/source/linux/XlsFormatLib.pro +++ b/ASCOfficeXlsFile2/source/linux/XlsFormatLib.pro @@ -781,7 +781,6 @@ SOURCES += \ ../XlsFormat/Logic/Biff_unions/SXFORMULA_bu.cpp \ ../XlsFormat/Logic/Biff_unions/SXOPER.cpp \ ../XlsFormat/Logic/Biff_unions/SXRANGE.cpp \ - ../XlsFormat/Logic/SummaryInformationStream/Structures/Property_Structures.cpp \ ../XlsFormat/Logic/SummaryInformationStream/Structures/PropertyFactory.cpp \ ../XlsFormat/Logic/SummaryInformationStream/Structures/PropertySet.cpp \ ../XlsFormat/Logic/SummaryInformationStream/Structures/PropertySetStream.cpp \ diff --git a/ASCOfficeXlsFile2/source/linux/xlsformatlib_logic.cpp b/ASCOfficeXlsFile2/source/linux/xlsformatlib_logic.cpp index a5aa45927b..6015b1f9e8 100644 --- a/ASCOfficeXlsFile2/source/linux/xlsformatlib_logic.cpp +++ b/ASCOfficeXlsFile2/source/linux/xlsformatlib_logic.cpp @@ -760,7 +760,6 @@ #include "../XlsFormat/Logic/Biff_unions/SXOPER.cpp" #include "../XlsFormat/Logic/Biff_unions/SXRANGE.cpp" -#include "../XlsFormat/Logic/SummaryInformationStream/Structures/Property_Structures.cpp" #include "../XlsFormat/Logic/SummaryInformationStream/Structures/PropertyFactory.cpp" #include "../XlsFormat/Logic/SummaryInformationStream/Structures/PropertySet.cpp" #include "../XlsFormat/Logic/SummaryInformationStream/Structures/PropertySetStream.cpp" diff --git a/X2tConverter/build/Qt/X2tConverter.pri b/X2tConverter/build/Qt/X2tConverter.pri index 1af7be33b5..1a01a01331 100755 --- a/X2tConverter/build/Qt/X2tConverter.pri +++ b/X2tConverter/build/Qt/X2tConverter.pri @@ -7,7 +7,7 @@ QT -= core QT -= gui -VERSION = 2.4.505.0 +VERSION = 2.4.506.0 DEFINES += INTVER=$$VERSION TARGET = x2t diff --git a/XlsxSerializerCom/Reader/BinaryWriter.h b/XlsxSerializerCom/Reader/BinaryWriter.h index 1fe0882ae9..38ff9924db 100755 --- a/XlsxSerializerCom/Reader/BinaryWriter.h +++ b/XlsxSerializerCom/Reader/BinaryWriter.h @@ -2715,7 +2715,7 @@ namespace BinXlsxRW m_oBcw.m_oStream.WriteStringW(oHyperlink.m_oDisplay.get2()); } } - }; + } void WriteMergeCells(const OOX::Spreadsheet::CMergeCells& oMergeCells) { for(size_t i = 0, length = oMergeCells.m_arrItems.size(); i < length; ++i) @@ -2727,7 +2727,7 @@ namespace BinXlsxRW m_oBcw.m_oStream.WriteStringW(pMergeCell->m_oRef.get2()); } } - }; + } void WriteSheetData(const OOX::Spreadsheet::CSheetData& oSheetData) { int nCurPos; @@ -2738,7 +2738,7 @@ namespace BinXlsxRW WriteRow(*pRow); m_oBcw.WriteItemEnd(nCurPos); } - }; + } void WriteRow(const OOX::Spreadsheet::CRow& oRows) { int nCurPos; @@ -2791,7 +2791,7 @@ namespace BinXlsxRW WriteCells(oRows); m_oBcw.WriteItemWithLengthEnd(nCurPos); } - }; + } void WriteCells(const OOX::Spreadsheet::CRow& oRows) { int nCurPos; @@ -2802,7 +2802,7 @@ namespace BinXlsxRW WriteCell(*oCell); m_oBcw.WriteItemWithLengthEnd(nCurPos); } - }; + } void WriteCell(const OOX::Spreadsheet::CCell& oCell) { int nCurPos; @@ -2861,7 +2861,7 @@ namespace BinXlsxRW m_oBcw.m_oStream.WriteDoubleReal(dValue); m_oBcw.WriteItemEnd(nCurPos); } - }; + } void WriteFormula(OOX::Spreadsheet::CFormula& oFormula) { //Aca @@ -2958,7 +2958,7 @@ namespace BinXlsxRW if(NULL != m_pEmbeddedFontsManager) m_pEmbeddedFontsManager->CheckString(oFormula.m_sText); } - }; + } void WriteDrawings(const OOX::Spreadsheet::CWorksheet& oWorksheet, OOX::Spreadsheet::CDrawing* pDrawing, OOX::CVmlDrawing *pVmlDrawing = NULL) {