Skip to content

O
onlyoffice_core
Commit bc5a3072 authored by Sergey.Konovalov's avatar Sergey.Konovalov Committed by Alexander Trofimov
Browse files
Options

изменения AtlMap->std::map в DocxFormat 

git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@58322 954022d7-b5bf-4e40-9824-e11837661b57
parent bbe381b8
Hide whitespace changes
Inline Side-by-side
Showing with 25 additions and 27 deletions
XlsxSerializerCom/Reader/BinaryWriter.h
View file @ bc5a3072
...@@ -1560,13 +1560,13 @@ namespace BinXlsxRW { ...@@ -1560,13 +1560,13 @@ namespace BinXlsxRW {
m_oBcw(oCBufferedStream),m_pEmbeddedFontsManager(pEmbeddedFontsManager),m_pIndexedColors(pIndexedColors),m_pTheme(pTheme),m_oFontProcessor(oFontProcessor),m_pOfficeDrawingConverter(pOfficeDrawingConverter) m_oBcw(oCBufferedStream),m_pEmbeddedFontsManager(pEmbeddedFontsManager),m_pIndexedColors(pIndexedColors),m_pTheme(pTheme),m_oFontProcessor(oFontProcessor),m_pOfficeDrawingConverter(pOfficeDrawingConverter)
{ {
}; };
void Write(OOX::Spreadsheet::CWorkbook& workbook, CAtlMap<CString, OOX::Spreadsheet::CWorksheet*>& aWorksheets) void Write(OOX::Spreadsheet::CWorkbook& workbook, std::map<CString, OOX::Spreadsheet::CWorksheet*>& aWorksheets)
{ {
int nStart = m_oBcw.WriteItemWithLengthStart(); int nStart = m_oBcw.WriteItemWithLengthStart();
WriteWorksheets(workbook, aWorksheets); WriteWorksheets(workbook, aWorksheets);
m_oBcw.WriteItemWithLengthEnd(nStart); m_oBcw.WriteItemWithLengthEnd(nStart);
}; };
void WriteWorksheets(OOX::Spreadsheet::CWorkbook& workbook, CAtlMap<CString, OOX::Spreadsheet::CWorksheet*>& aWorksheets) void WriteWorksheets(OOX::Spreadsheet::CWorkbook& workbook, std::map<CString, OOX::Spreadsheet::CWorksheet*>& aWorksheets)
{ {
int nCurPos; int nCurPos;
// //
...@@ -1578,11 +1578,11 @@ namespace BinXlsxRW { ...@@ -1578,11 +1578,11 @@ namespace BinXlsxRW {
OOX::Spreadsheet::CSheet* pSheet = aWs[i]; OOX::Spreadsheet::CSheet* pSheet = aWs[i];
if(pSheet->m_oRid.IsInit()) if(pSheet->m_oRid.IsInit())
{ {
CAtlMap<CString, OOX::Spreadsheet::CWorksheet*>::CPair* pair = aWorksheets.Lookup(pSheet->m_oRid->GetValue()); std::map<CString, OOX::Spreadsheet::CWorksheet*>::const_iterator pair = aWorksheets.find(pSheet->m_oRid->GetValue());
if(NULL != pair) if(aWorksheets.end() != pair)
{ {
nCurPos = m_oBcw.WriteItemStart(c_oSerWorksheetsTypes::Worksheet); nCurPos = m_oBcw.WriteItemStart(c_oSerWorksheetsTypes::Worksheet);
WriteWorksheet(*pSheet, *pair->m_value); WriteWorksheet(*pSheet, *pair->second);
m_oBcw.WriteItemWithLengthEnd(nCurPos); m_oBcw.WriteItemWithLengthEnd(nCurPos);
} }
} }
......
XlsxSerializerCom/Writer/BinaryReader.h
View file @ bc5a3072
...@@ -1737,8 +1737,8 @@ namespace BinXlsxRW { ...@@ -1737,8 +1737,8 @@ namespace BinXlsxRW {
Binary_CommonReader2 m_oBcr2; Binary_CommonReader2 m_oBcr2;
OOX::Spreadsheet::CWorkbook& m_oWorkbook; OOX::Spreadsheet::CWorkbook& m_oWorkbook;
OOX::Spreadsheet::CSharedStrings* m_pSharedStrings; OOX::Spreadsheet::CSharedStrings* m_pSharedStrings;
CAtlMap<CString, OOX::Spreadsheet::CWorksheet*>& m_mapWorksheets; std::map<CString, OOX::Spreadsheet::CWorksheet*>& m_mapWorksheets;
CAtlMap<long, ImageObject*>& m_mapMedia; std::map<long, ImageObject*>& m_mapMedia;
OOX::Spreadsheet::CSheet* m_pCurSheet; OOX::Spreadsheet::CSheet* m_pCurSheet;
OOX::Spreadsheet::CWorksheet* m_pCurWorksheet; OOX::Spreadsheet::CWorksheet* m_pCurWorksheet;
OOX::Spreadsheet::CDrawing* m_pCurDrawing; OOX::Spreadsheet::CDrawing* m_pCurDrawing;
...@@ -1750,8 +1750,8 @@ namespace BinXlsxRW { ...@@ -1750,8 +1750,8 @@ namespace BinXlsxRW {
PPTXFile::IAVSOfficeDrawingConverter* m_pOfficeDrawingConverter; PPTXFile::IAVSOfficeDrawingConverter* m_pOfficeDrawingConverter;
public: public:
BinaryWorksheetsTableReader(Streams::CBufferedStream& oBufferedStream, OOX::Spreadsheet::CWorkbook& oWorkbook, BinaryWorksheetsTableReader(Streams::CBufferedStream& oBufferedStream, OOX::Spreadsheet::CWorkbook& oWorkbook,
OOX::Spreadsheet::CSharedStrings* pSharedStrings, CAtlMap<CString, OOX::Spreadsheet::CWorksheet*>& mapWorksheets, OOX::Spreadsheet::CSharedStrings* pSharedStrings, std::map<CString, OOX::Spreadsheet::CWorksheet*>& mapWorksheets,
CAtlMap<long, ImageObject*>& mapMedia, CString& sDestinationDir, SaveParams& oSaveParams, LPSAFEARRAY pArray, std::map<long, ImageObject*>& mapMedia, CString& sDestinationDir, SaveParams& oSaveParams, LPSAFEARRAY pArray,
PPTXFile::IAVSOfficeDrawingConverter* pOfficeDrawingConverter) : Binary_CommonReader(oBufferedStream), m_oWorkbook(oWorkbook), PPTXFile::IAVSOfficeDrawingConverter* pOfficeDrawingConverter) : Binary_CommonReader(oBufferedStream), m_oWorkbook(oWorkbook),
m_oBcr2(oBufferedStream), m_mapWorksheets(mapWorksheets), m_mapMedia(mapMedia), m_sDestinationDir(sDestinationDir), m_sMediaDir(m_sDestinationDir + _T("\\xl\\media")), m_oSaveParams(oSaveParams), m_pSharedStrings(pSharedStrings) m_oBcr2(oBufferedStream), m_mapWorksheets(mapWorksheets), m_mapMedia(mapMedia), m_sDestinationDir(sDestinationDir), m_sMediaDir(m_sDestinationDir + _T("\\xl\\media")), m_oSaveParams(oSaveParams), m_pSharedStrings(pSharedStrings)
{ {
...@@ -1779,7 +1779,7 @@ namespace BinXlsxRW { ...@@ -1779,7 +1779,7 @@ namespace BinXlsxRW {
const OOX::RId& oRId = m_oWorkbook.Add(smart_ptr<OOX::File>(m_pCurWorksheet)); const OOX::RId& oRId = m_oWorkbook.Add(smart_ptr<OOX::File>(m_pCurWorksheet));
m_pCurSheet->m_oRid.Init(); m_pCurSheet->m_oRid.Init();
m_pCurSheet->m_oRid->SetValue(oRId.get()); m_pCurSheet->m_oRid->SetValue(oRId.get());
m_mapWorksheets.SetAt(m_pCurSheet->m_oName.get(), m_pCurWorksheet); m_mapWorksheets [m_pCurSheet->m_oName.get()] = m_pCurWorksheet;
m_oWorkbook.m_oSheets->m_arrItems.push_back(m_pCurSheet); m_oWorkbook.m_oSheets->m_arrItems.push_back(m_pCurSheet);
} }
} }
...@@ -2543,23 +2543,23 @@ namespace BinXlsxRW { ...@@ -2543,23 +2543,23 @@ namespace BinXlsxRW {
if(c_oSer_DrawingType::PicSrc == type) if(c_oSer_DrawingType::PicSrc == type)
{ {
long nId = m_oBufferedStream.ReadLong(); long nId = m_oBufferedStream.ReadLong();
CAtlMap<long, ImageObject*>::CPair* pair = m_mapMedia.Lookup(nId); std::map<long, ImageObject*>::const_iterator pair = m_mapMedia.find(nId);
if(NULL != pair) if(m_mapMedia.end() != pair)
{ {
CString sRId; CString sRId;
CAtlMap<OOX::Spreadsheet::CDrawing*, CString>::CPair* pPair = pair->m_value->mapDrawings.Lookup(m_pCurDrawing); CAtlMap<OOX::Spreadsheet::CDrawing*, CString>::CPair* pPair = pair->second->mapDrawings.Lookup(m_pCurDrawing);
if(NULL == pPair) if(NULL == pPair)
{ {
CString sNewImageName; CString sNewImageName;
sNewImageName.Format(_T("image%d%s"), pair->m_value->nIndex, OOX::CPath(pair->m_value->sPath).GetExtention(true)); sNewImageName.Format(_T("image%d%s"), pair->second->nIndex, OOX::CPath(pair->second->sPath).GetExtention(true));
CString sNewImagePath = m_sMediaDir + _T("\\") + sNewImageName; CString sNewImagePath = m_sMediaDir + _T("\\") + sNewImageName;
if(pair->m_value->bNeedCreate) if(pair->second->bNeedCreate)
{ {
pair->m_value->bNeedCreate = false; pair->second->bNeedCreate = false;
DWORD dwFileAttr = ::GetFileAttributes( m_sMediaDir ); DWORD dwFileAttr = ::GetFileAttributes( m_sMediaDir );
if( dwFileAttr == INVALID_FILE_ATTRIBUTES ) if( dwFileAttr == INVALID_FILE_ATTRIBUTES )
OOX::CSystemUtility::CreateDirectories(m_sMediaDir); OOX::CSystemUtility::CreateDirectories(m_sMediaDir);
::CopyFile(pair->m_value->sPath, sNewImagePath, FALSE); ::CopyFile(pair->second->sPath, sNewImagePath, FALSE);
} }
long rId; long rId;
CString sNewImgRel; CString sNewImgRel;
...@@ -2569,7 +2569,7 @@ namespace BinXlsxRW { ...@@ -2569,7 +2569,7 @@ namespace BinXlsxRW {
SysFreeString(bstrNewImgRel); SysFreeString(bstrNewImgRel);
sRId.Format(_T("rId%d"), rId); sRId.Format(_T("rId%d"), rId);
pair->m_value->mapDrawings.SetAt(m_pCurDrawing, sRId); pair->second->mapDrawings.SetAt(m_pCurDrawing, sRId);
} }
else else
sRId = pPair->m_value; sRId = pPair->m_value;
...@@ -2827,7 +2827,7 @@ namespace BinXlsxRW { ...@@ -2827,7 +2827,7 @@ namespace BinXlsxRW {
}; };
class BinaryOtherTableReader : public Binary_CommonReader<BinaryOtherTableReader> class BinaryOtherTableReader : public Binary_CommonReader<BinaryOtherTableReader>
{ {
CAtlMap<long, ImageObject*>& m_mapMedia; std::map<long, ImageObject*>& m_mapMedia;
std::vector<CString>& m_aDeleteFiles; std::vector<CString>& m_aDeleteFiles;
CString& m_sFileInDir; CString& m_sFileInDir;
long m_nCurId; long m_nCurId;
...@@ -2837,7 +2837,7 @@ namespace BinXlsxRW { ...@@ -2837,7 +2837,7 @@ namespace BinXlsxRW {
LPSAFEARRAY m_pArray; LPSAFEARRAY m_pArray;
PPTXFile::IAVSOfficeDrawingConverter* m_pOfficeDrawingConverter; PPTXFile::IAVSOfficeDrawingConverter* m_pOfficeDrawingConverter;
public: public:
BinaryOtherTableReader(Streams::CBufferedStream& oBufferedStream, CAtlMap<long, ImageObject*>& mapMedia, CString& sFileInDir, std::vector<CString>& aDeleteFiles, SaveParams& oSaveParams, LPSAFEARRAY pArray, PPTXFile::IAVSOfficeDrawingConverter* pOfficeDrawingConverter):Binary_CommonReader(oBufferedStream), m_mapMedia(mapMedia),m_aDeleteFiles(aDeleteFiles),m_sFileInDir(sFileInDir),m_oSaveParams(oSaveParams),m_pArray(pArray),m_pOfficeDrawingConverter(pOfficeDrawingConverter) BinaryOtherTableReader(Streams::CBufferedStream& oBufferedStream, std::map<long, ImageObject*>& mapMedia, CString& sFileInDir, std::vector<CString>& aDeleteFiles, SaveParams& oSaveParams, LPSAFEARRAY pArray, PPTXFile::IAVSOfficeDrawingConverter* pOfficeDrawingConverter):Binary_CommonReader(oBufferedStream), m_mapMedia(mapMedia),m_aDeleteFiles(aDeleteFiles),m_sFileInDir(sFileInDir),m_oSaveParams(oSaveParams),m_pArray(pArray),m_pOfficeDrawingConverter(pOfficeDrawingConverter)
{ {
m_nCurId = 0; m_nCurId = 0;
m_sCurSrc = _T(""); m_sCurSrc = _T("");
...@@ -2874,7 +2874,7 @@ namespace BinXlsxRW { ...@@ -2874,7 +2874,7 @@ namespace BinXlsxRW {
res = Read1(length, &BinaryOtherTableReader::ReadMediaItem, this, poResult); res = Read1(length, &BinaryOtherTableReader::ReadMediaItem, this, poResult);
if(-1 != m_nCurId && false == m_sCurSrc.IsEmpty()) if(-1 != m_nCurId && false == m_sCurSrc.IsEmpty())
{ {
m_mapMedia.SetAt(m_nCurId, new ImageObject(m_sCurSrc, m_nCurIndex)); m_mapMedia [m_nCurId] = new ImageObject(m_sCurSrc, m_nCurIndex);
m_nCurIndex++; m_nCurIndex++;
} }
} }
...@@ -3100,7 +3100,7 @@ namespace BinXlsxRW { ...@@ -3100,7 +3100,7 @@ namespace BinXlsxRW {
aOffBits.push_back(mtiOffBits); aOffBits.push_back(mtiOffBits);
} }
} }
CAtlMap<long, ImageObject*> mapMedia; std::map<long, ImageObject*> mapMedia;
if(-1 != nOtherOffBits) if(-1 != nOtherOffBits)
{ {
oBufferedStream.Seek(nOtherOffBits); oBufferedStream.Seek(nOtherOffBits);
...@@ -3147,13 +3147,11 @@ namespace BinXlsxRW { ...@@ -3147,13 +3147,11 @@ namespace BinXlsxRW {
if(c_oSerConstants::ReadOk != res) if(c_oSerConstants::ReadOk != res)
return res; return res;
} }
POSITION pos = mapMedia.GetStartPosition(); for (std::map<long, ImageObject*>::const_iterator pPair = mapMedia.begin(); pPair != mapMedia.end(); ++pPair)
while ( NULL != pos )
{ {
CAtlMap<long, ImageObject*>::CPair* pPair = mapMedia.GetNext( pos ); delete pPair->second;
delete pPair->m_value;
} }
mapMedia.RemoveAll(); mapMedia.clear();
return res; return res;
} }
void initWorkbook(OOX::Spreadsheet::CWorkbook* pWorkbook) void initWorkbook(OOX::Spreadsheet::CWorkbook* pWorkbook)
......
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