Skip to content

O
onlyoffice_core
Commit bbe381b8 authored by Ivan.Shulga's avatar Ivan.Shulga Committed by Alexander Trofimov
Browse files
Options

CAtlMap -> std::map 

git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@58320 954022d7-b5bf-4e40-9824-e11837661b57
parent 02f5801a
Expand all Show whitespace changes
Inline Side-by-side
Showing with 101 additions and 130 deletions
Common/DocxFormat/Source/DocxFormat/IFileContainer.h
View file @ bbe381b8
...@@ -31,7 +31,6 @@ namespace OOX ...@@ -31,7 +31,6 @@ namespace OOX
} }
protected: protected:
//CAtlMap<CString, smart_ptr<OOX::File>> m_mContainer;
std::map<CString, smart_ptr<OOX::File>> m_mContainer; std::map<CString, smart_ptr<OOX::File>> m_mContainer;
size_t m_lMaxRid; size_t m_lMaxRid;
......
Common/DocxFormat/Source/XlsxFormat/IFileContainer_Spreadsheet.h
View file @ bbe381b8
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
#include "../DocxFormat/RId.h" #include "../DocxFormat/RId.h"
#include "../DocxFormat/UnknowTypeFile.h" #include "../DocxFormat/UnknowTypeFile.h"
#include "../DocxFormat/IFileBuilder.h" #include "../DocxFormat/IFileBuilder.h"
#include <map>
namespace OOX namespace OOX
{ {
...@@ -35,9 +36,9 @@ namespace OOX ...@@ -35,9 +36,9 @@ namespace OOX
} }
protected: protected:
CAtlMap<CString, smart_ptr<OOX::File>> m_mContainer; std::map<CString, smart_ptr<OOX::File>> m_mContainer;
size_t m_lMaxRid; size_t m_lMaxRid;
static CAtlMap<CString, size_t> m_mapEnumeratedGlobal; static std::map<CString, size_t> m_mapEnumeratedGlobal;
protected: protected:
...@@ -72,7 +73,7 @@ namespace OOX ...@@ -72,7 +73,7 @@ namespace OOX
template<typename T> template<typename T>
T& Find(); T& Find();
smart_ptr<OOX::File> Find(const FileType& type) const; smart_ptr<OOX::File> Find(const FileType& type) const;
void FindAllByType(const FileType& oType, CAtlMap<CString, smart_ptr<OOX::File>>& aOutput) const; void FindAllByType(const FileType& oType, std::map<CString, smart_ptr<OOX::File>>& aOutput) const;
smart_ptr<OOX::File> Find(const OOX::RId& type) const; smart_ptr<OOX::File> Find(const OOX::RId& type) const;
smart_ptr<OOX::File> operator [](const OOX::RId rId); smart_ptr<OOX::File> operator [](const OOX::RId rId);
...@@ -84,7 +85,7 @@ namespace OOX ...@@ -84,7 +85,7 @@ namespace OOX
static UnknowTypeFile Unknown; static UnknowTypeFile Unknown;
private: private:
CAtlMap<CString, size_t> m_mapAddNamePair; std::map<CString, size_t> m_mapAddNamePair;
OOX::CRels* m_pCurRels; OOX::CRels* m_pCurRels;
const RId GetMaxRId(); const RId GetMaxRId();
}; };
......
Common/DocxFormat/Source/XlsxFormat/Xlsx.h
View file @ bbe381b8
...@@ -50,11 +50,10 @@ namespace OOX ...@@ -50,11 +50,10 @@ namespace OOX
RELEASEOBJECT(m_pCalcChain); RELEASEOBJECT(m_pCalcChain);
if(bDeleteWorksheets) if(bDeleteWorksheets)
{ {
POSITION pos = m_aWorksheets.GetStartPosition(); for (std::map<CString, CWorksheet*>::const_iterator it = m_aWorksheets.begin(); it != m_aWorksheets.end(); ++it)
while ( NULL != pos )
{ {
const CAtlMap<CString, CWorksheet*>::CPair* pPair = m_aWorksheets.GetNext( pos ); if (NULL != it->second)
if (pPair->m_value) delete pPair->m_value; delete it->second;
} }
} }
} }
...@@ -111,15 +110,13 @@ namespace OOX ...@@ -111,15 +110,13 @@ namespace OOX
m_pCalcChain = NULL; m_pCalcChain = NULL;
CAtlMap<CString, smart_ptr<OOX::File>> aWorksheetsFiles; std::map<CString, smart_ptr<OOX::File>> aWorksheetsFiles;
pDocumentContainer->FindAllByType(OOX::Spreadsheet::FileTypes::Worksheet, aWorksheetsFiles); pDocumentContainer->FindAllByType(OOX::Spreadsheet::FileTypes::Worksheet, aWorksheetsFiles);
pDocumentContainer->FindAllByType(OOX::Spreadsheet::FileTypes::Chartsheets, aWorksheetsFiles); pDocumentContainer->FindAllByType(OOX::Spreadsheet::FileTypes::Chartsheets, aWorksheetsFiles);
POSITION pos = aWorksheetsFiles.GetStartPosition(); for (std::map<CString, smart_ptr<OOX::File>>::const_iterator it = aWorksheetsFiles.begin(); it != aWorksheetsFiles.end(); ++it)
while ( NULL != pos )
{ {
const CAtlMap<CString, smart_ptr<OOX::File>>::CPair* pPair = aWorksheetsFiles.GetNext( pos ); m_aWorksheets [it->first] = (OOX::Spreadsheet::CWorksheet*) it->second.operator->();
m_aWorksheets.SetAt(pPair->m_key, (OOX::Spreadsheet::CWorksheet*)pPair->m_value.operator->());
} }
} }
...@@ -127,7 +124,7 @@ namespace OOX ...@@ -127,7 +124,7 @@ namespace OOX
} }
BOOL Write(const CPath& oDirPath, CString& sAdditionalContentTypes) BOOL Write(const CPath& oDirPath, CString& sAdditionalContentTypes)
{ {
if(NULL == m_pWorkbook || 0 == m_aWorksheets.GetCount()) if(NULL == m_pWorkbook || 0 == m_aWorksheets.size ())
return FALSE; return FALSE;
PrepareToWrite(); PrepareToWrite();
...@@ -171,17 +168,6 @@ namespace OOX ...@@ -171,17 +168,6 @@ namespace OOX
const OOX::CPath& oPath = oOverride.filename(); const OOX::CPath& oPath = oOverride.filename();
oContentTypes.Registration(oOverride.type(), oPath.GetDirectory(), oPath.GetFilename()); oContentTypes.Registration(oOverride.type(), oPath.GetDirectory(), oPath.GetFilename());
} }
/*
POSITION pos = oTempContentTypes.m_arrOverride.GetStartPosition();
while ( NULL != pos )
{
CAtlMap<CString, ContentTypes::COverride>::CPair* pPair = oTempContentTypes.m_arrOverride.GetNext( pos );
ContentTypes::COverride& oOverride = pPair->m_value;
const OOX::CPath& oPath = oOverride.filename();
oContentTypes.Registration(oOverride.type(), oPath.GetDirectory(), oPath.GetFilename());
}
*/
} }
oContentTypes.Write(oDirPath); oContentTypes.Write(oDirPath);
return TRUE; return TRUE;
...@@ -220,11 +206,11 @@ namespace OOX ...@@ -220,11 +206,11 @@ namespace OOX
m_pWorkbook->PrepareToWrite(); m_pWorkbook->PrepareToWrite();
if(NULL != m_pStyles) if(NULL != m_pStyles)
m_pStyles->PrepareToWrite(); m_pStyles->PrepareToWrite();
POSITION pos = m_aWorksheets.GetStartPosition();
while ( NULL != pos ) for (std::map<CString, CWorksheet*>::const_iterator it = m_aWorksheets.begin(); it != m_aWorksheets.end(); ++it)
{ {
const CAtlMap<CString, CWorksheet*>::CPair* pPair = m_aWorksheets.GetNext( pos ); if (NULL != it->second)
pPair->m_value->PrepareToWrite(); it->second->PrepareToWrite();
} }
} }
public: public:
...@@ -272,13 +258,13 @@ namespace OOX ...@@ -272,13 +258,13 @@ namespace OOX
{ {
return m_pCalcChain; return m_pCalcChain;
} }
CAtlMap<CString, CWorksheet*> &GetWorksheets () std::map<CString, CWorksheet*> &GetWorksheets ()
{ {
return m_aWorksheets; return m_aWorksheets;
} }
void PrepareWorkbook() void PrepareWorkbook()
{ {
IFileContainer::m_mapEnumeratedGlobal.RemoveAll(); IFileContainer::m_mapEnumeratedGlobal.clear();
if(NULL == m_pWorkbook) if(NULL == m_pWorkbook)
{ {
m_pWorkbook = new OOX::Spreadsheet::CWorkbook(); m_pWorkbook = new OOX::Spreadsheet::CWorkbook();
...@@ -298,7 +284,7 @@ namespace OOX ...@@ -298,7 +284,7 @@ namespace OOX
m_pWorkbook->m_oBookViews->m_arrItems.push_back(pWorkbookView); m_pWorkbook->m_oBookViews->m_arrItems.push_back(pWorkbookView);
} }
// sheet, // sheet,
if(0 == m_aWorksheets.GetCount()) if (m_aWorksheets.empty())
{ {
OOX::Spreadsheet::CWorksheet* pWorksheet = new OOX::Spreadsheet::CWorksheet(); OOX::Spreadsheet::CWorksheet* pWorksheet = new OOX::Spreadsheet::CWorksheet();
pWorksheet->m_oDimension.Init(); pWorksheet->m_oDimension.Init();
...@@ -329,7 +315,7 @@ namespace OOX ...@@ -329,7 +315,7 @@ namespace OOX
pWorksheet->m_oPageMargins->m_oFooter->FromInches(0.3); pWorksheet->m_oPageMargins->m_oFooter->FromInches(0.3);
smart_ptr<OOX::File> pWorksheetFile(pWorksheet); smart_ptr<OOX::File> pWorksheetFile(pWorksheet);
OOX::RId oRId = this->Add(pWorksheetFile); OOX::RId oRId = this->Add(pWorksheetFile);
m_aWorksheets.SetAt(oRId.ToString(), pWorksheet); m_aWorksheets [oRId.ToString()] = pWorksheet;
m_pWorkbook->m_oSheets.Init(); m_pWorkbook->m_oSheets.Init();
OOX::Spreadsheet::CSheet* pSheet = new OOX::Spreadsheet::CSheet(); OOX::Spreadsheet::CSheet* pSheet = new OOX::Spreadsheet::CSheet();
pSheet->m_oName.Init(); pSheet->m_oName.Init();
...@@ -408,11 +394,9 @@ namespace OOX ...@@ -408,11 +394,9 @@ namespace OOX
} }
} }
// <is> str sharedString // <is> str sharedString
POSITION pos = m_aWorksheets.GetStartPosition(); for (std::map<CString, CWorksheet*>::const_iterator it = m_aWorksheets.begin(); it != m_aWorksheets.end(); ++it)
while ( NULL != pos )
{ {
const CAtlMap<CString, CWorksheet*>::CPair* pPair = m_aWorksheets.GetNext( pos ); PrepareWorksheet(it->second);
PrepareWorksheet(pPair->m_value);
} }
//todo iso 8601 //todo iso 8601
} }
...@@ -504,7 +488,7 @@ namespace OOX ...@@ -504,7 +488,7 @@ namespace OOX
bool bDeleteTheme; bool bDeleteTheme;
CCalcChain *m_pCalcChain; CCalcChain *m_pCalcChain;
bool bDeleteCalcChain; bool bDeleteCalcChain;
CAtlMap<CString, CWorksheet*> m_aWorksheets; std::map<CString, CWorksheet*> m_aWorksheets;
bool bDeleteWorksheets; bool bDeleteWorksheets;
}; };
......
XlsxSerializerCom/Reader/CSVReader.cpp
View file @ bbe381b8
#include "CSVReader.h" #include "CSVReader.h"
#include "../../Common/MappingFile.h" #include "../../Common/MappingFile.h"
#include <map>
namespace CSVReader namespace CSVReader
{ {
...@@ -226,7 +227,7 @@ namespace CSVReader ...@@ -226,7 +227,7 @@ namespace CSVReader
RELEASEARRAYOBJECTS(pTemp); RELEASEARRAYOBJECTS(pTemp);
} }
CAtlMap<CString, OOX::Spreadsheet::CWorksheet*> &arrWorksheets = oXlsx.GetWorksheets(); std::map<CString, OOX::Spreadsheet::CWorksheet*> &arrWorksheets = oXlsx.GetWorksheets();
arrWorksheets.SetAt(sSheetRId, pWorksheet); arrWorksheets [sSheetRId] = pWorksheet;
} }
} }
\ No newline at end of file
XlsxSerializerCom/Writer/CSVWriter.cpp
View file @ bbe381b8
...@@ -93,11 +93,11 @@ namespace CSVWriter ...@@ -93,11 +93,11 @@ namespace CSVWriter
sSheetRId = pWorkbook->m_oSheets->m_arrItems[0]->m_oName.get2(); sSheetRId = pWorkbook->m_oSheets->m_arrItems[0]->m_oName.get2();
} }
CAtlMap<CString, OOX::Spreadsheet::CWorksheet*> &arrWorksheets = oXlsx.GetWorksheets(); std::map<CString, OOX::Spreadsheet::CWorksheet*> &arrWorksheets = oXlsx.GetWorksheets();
CAtlMap<CString, OOX::Spreadsheet::CWorksheet*>::CPair* pPair = arrWorksheets.Lookup(sSheetRId); std::map<CString, OOX::Spreadsheet::CWorksheet*>::const_iterator pPair = arrWorksheets.find(sSheetRId);
if (NULL != pPair) if (pPair != arrWorksheets.end())
{ {
OOX::Spreadsheet::CWorksheet *pWorksheet = pPair->m_value; OOX::Spreadsheet::CWorksheet *pWorksheet = pPair->second;
if (NULL != pWorksheet && pWorksheet->m_oSheetData.IsInit()) if (NULL != pWorksheet && pWorksheet->m_oSheetData.IsInit())
{ {
OOX::Spreadsheet::CSharedStrings *pSharedStrings = oXlsx.GetSharedStrings(); OOX::Spreadsheet::CSharedStrings *pSharedStrings = oXlsx.GetSharedStrings();
......
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