pengjunjie/core
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/core.git synced 2026-04-07 13:55:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

remove CArray

Browse Source
This commit is contained in:
ElenaSubbotina
2020-10-14 10:21:32 +03:00
parent 7f5692e73b
commit b420e808d8
14 changed files with 271 additions and 593 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
DesktopEditor/doctrenderer/docbuilder_p.h
View File

@ -158,7 +158,7 @@ namespace NSDoctRenderer
class CDocBuilder_Private
{
public:
CArray<std::wstring> m_arrFiles;
std::vector<std::wstring> m_arrFiles;
std::vector<std::wstring> m_arDoctSDK;
std::vector<std::wstring> m_arPpttSDK;

4
DesktopEditor/doctrenderer/doctrenderer.cpp
View File

@ -87,7 +87,7 @@ namespace NSDoctRenderer
std::wstring m_strSrcFilePath;
std::wstring m_strDstFilePath;
CArray<std::wstring> m_arChanges;
std::vector<std::wstring> m_arChanges;
int m_nCountChangesItems;
std::wstring m_strMailMergeDatabasePath;
@ -278,7 +278,7 @@ namespace NSDoctRenderer
std::wstring m_strConfigDir;
std::wstring m_strConfigPath;
CArray<std::wstring> m_arrFiles;
std::vector<std::wstring> m_arrFiles;
std::vector<std::wstring> m_arDoctSDK;
std::vector<std::wstring> m_arPpttSDK;

36
DesktopEditor/doctrenderer/nativecontrol.h
View File

@ -200,7 +200,7 @@ private:
std::wstring m_strFileId;
public:
CArray<std::wstring>* m_pChanges;
std::vector<std::wstring>* m_pChanges;
std::wstring m_strFontsDirectory;
@ -540,13 +540,13 @@ public:
public:
void CheckFiles(CArray<std::wstring>& oFiles)
void CheckFiles(std::vector<std::wstring>& oFiles)
{
int nMax = 0;
int nLen = 0;
int nCount = (int)oFiles.GetCount();
for (int i = 0; i < nCount; ++i)
size_t nCount = oFiles.size();
for (size_t i = 0; i < nCount; ++i)
{
NSFile::CFileBinary oFile;
oFile.OpenFile(oFiles[i]);
@ -578,20 +578,20 @@ public:
m_oArrayBuffer = v8::ArrayBuffer::New(v8::Isolate::GetCurrent(), (void*)m_pData, (size_t)m_nLen);
}
inline int Open(CArray<std::wstring>& oFiles, int nStart)
inline int Open(std::vector<std::wstring>& oFiles, int nStart)
{
return Open_excel(oFiles, nStart);
}
int Open_docx(CArray<std::wstring>& oFiles, int nStart)
int Open_docx(std::vector<std::wstring>& oFiles, int nStart)
{
m_pDataCur = m_pData;
m_pDataCur += 4;
int nCountData = 0;
int nCount = oFiles.GetCount();
size_t nCount = oFiles.size();
int nLenCurrect = 0;
int i = nStart;
size_t i = nStart;
for (; i < nCount; i++)
{
NSFile::CFileBinary oFile;
@ -638,15 +638,15 @@ public:
return i;
}
int Open_excel(CArray<std::wstring>& oFiles, int nStart)
int Open_excel(std::vector<std::wstring>& oFiles, int nStart)
{
m_pDataCur = m_pData;
m_pDataCur += 4;
int nCountData = 0;
int nCount = oFiles.GetCount();
size_t nCount = oFiles.size();
int nLenCurrect = 0;
int i = nStart;
size_t i = nStart;
for (; i < nCount; i++)
{
NSFile::CFileBinary oFile;
@ -693,11 +693,11 @@ public:
}
public:
void OpenFull(CArray<std::wstring>& oFiles)
void OpenFull(std::vector<std::wstring>& oFiles)
{
// определяем размер
int nCount = (int)oFiles.GetCount();
for (int i = 0; i < nCount; ++i)
size_t nCount = oFiles.size();
for (size_t i = 0; i < nCount; ++i)
{
NSFile::CFileBinary oFile;
oFile.OpenFile(oFiles[i]);
@ -751,11 +751,11 @@ public:
*((int*)m_pData) = nCountData;
}
void OpenFull_excel(CArray<std::wstring>& oFiles)
void OpenFull_excel(std::vector<std::wstring>& oFiles)
{
// определяем размер
int nCount = (int)oFiles.GetCount();
for (int i = 0; i < nCount; ++i)
size_t nCount = oFiles.size();
for (size_t i = 0; i < nCount; ++i)
{
NSFile::CFileBinary oFile;
oFile.OpenFile(oFiles[i]);
@ -769,7 +769,7 @@ public:
m_pDataCur += 4;
int nCountData = 0;
for (int i = 0; i < nCount; i++)
for (size_t i = 0; i < nCount; i++)
{
NSFile::CFileBinary oFile;
oFile.OpenFile(oFiles[i]);