Skip to content

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

changed CAtlMap to std::map in IFileContainer 

git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@58309 954022d7-b5bf-4e40-9824-e11837661b57
parent 28438a70
Hide whitespace changes
Inline Side-by-side
Showing with 70 additions and 123 deletions
Common/DocxFormat/Source/Common/SimpleTypes_Word.cpp
View file @ 30fd8af8
......@@ -2,7 +2,6 @@
namespace SimpleTypes
{
//template<EHexColor eDefValue = hexcolorAuto>
template<>
EHexColor CHexColor<EHexColor::hexcolorAuto>::FromString (CString &sValue)
{
......
Common/DocxFormat/Source/Common/SimpleTypes_Word.h
View file @ 30fd8af8
......@@ -2569,51 +2569,9 @@ namespace SimpleTypes
m_unB = b;
}
//template <>
//class CHighlightColor;
//template<EHighlightColor>
//class CHighlightColor;
void SetColorByString ();
virtual EHexColor FromString(CString &sValue);
/*
{
if ( _T("auto") == sValue || _T("none") == sValue )
this->m_eValue = hexcolorAuto;
else
{
// , , word .
//CHighlightColor<highlightcolorNone> oHighlightColor(sValue);
CHighlightColor<> oHighlightColor(sValue);
if(SimpleTypes::highlightcolorNone != oHighlightColor.GetValue())
{
this->m_eValue = hexcolorRGB;
m_unR = oHighlightColor.Get_R();
m_unG = oHighlightColor.Get_G();
m_unB = oHighlightColor.Get_B();
}
else if ( 6 <= sValue.GetLength() )
{
this->m_eValue = hexcolorRGB;
m_sValue = sValue.Mid( 0, 6 );
Parse();
}
else if ( 3 == sValue.GetLength() )// a la #339 (Compo 3AP.docx)
{
this->m_eValue = hexcolorRGB;
m_sValue = sValue;
Parse3();
}
else this->m_eValue = eDefValue;
}
return this->m_eValue;
}
*/
virtual CString ToString () const
{
......
Common/DocxFormat/Source/DocxFormat/IFileContainer.cpp
View file @ 30fd8af8
......@@ -56,35 +56,29 @@ namespace OOX
}
void IFileContainer::Write(OOX::CRels& oRels, const OOX::CPath& oCurrent, const OOX::CPath& oDir, OOX::CContentTypes& oContent) const
{
CAtlMap<CString, size_t> mNamePair;
POSITION pos = m_mContainer.GetStartPosition();
while ( NULL != pos )
std::map<CString, size_t> mNamePair;
for (std::map<CString, smart_ptr<OOX::File>>::const_iterator it = m_mContainer.begin(); it != m_mContainer.end(); ++it)
{
const CAtlMap<CString, smart_ptr<OOX::File>>::CPair* pPair = m_mContainer.GetNext( pos );
smart_ptr<OOX::File> pFile = pPair->m_value;
smart_ptr<OOX::File> pFile = it->second;
smart_ptr<OOX::External> pExt = pFile.smart_dynamic_cast<OOX::External>();
if ( !pExt.IsInit() )
{
OOX::CPath oDefDir = pFile->DefaultDirectory();
OOX::CPath oName = pFile->DefaultFileName();
CAtlMap<CString, size_t>::CPair* pNamePair = mNamePair.Lookup( oName.m_strFilename );
if ( NULL == pNamePair )
mNamePair.SetAt( oName.m_strFilename, 1 );
std::map<CString, size_t>::const_iterator pNamePair = mNamePair.find( oName.m_strFilename );
if ( pNamePair == mNamePair.end())
mNamePair [oName.m_strFilename] = 1;
else
oName = oName + pNamePair->m_key;
oName = oName + pNamePair->first;
OOX::CSystemUtility::CreateDirectories( oCurrent / oDefDir );
pFile->write( oCurrent / oDefDir / oName, oDir / oDefDir, oContent );
oRels.Registration( pPair->m_key, pFile->type(), oDefDir / oName );
oRels.Registration( it->first, pFile->type(), oDefDir / oName );
}
else
{
oRels.Registration( pPair->m_key, pExt );
oRels.Registration( it->first, pExt );
}
}
}
......@@ -92,14 +86,12 @@ namespace OOX
void IFileContainer::Commit (const OOX::CPath& oPath)
{
CAtlMap<CString, size_t> mNamepair;
POSITION pos = m_mContainer.GetStartPosition();
while ( NULL != pos )
std::map<CString, size_t> mNamepair;
for (std::map<CString, smart_ptr<OOX::File>>::const_iterator it = m_mContainer.begin(); it != m_mContainer.end(); ++it)
{
CAtlMap<CString, smart_ptr<OOX::File>>::CPair* pPair = m_mContainer.GetNext( pos );
smart_ptr<OOX::File> pFile = pPair->m_value;
smart_ptr<OOX::File> pFile = it->second;
smart_ptr<OOX::External> pExt = pFile.smart_dynamic_cast<OOX::External>();
if (!pExt.IsInit())
......@@ -107,15 +99,16 @@ namespace OOX
OOX::CPath oDefDir = pFile->DefaultDirectory();
OOX::CPath oName = pFile->DefaultFileName();
CAtlMap<CString, size_t>::CPair* pNamePair = mNamepair.Lookup( oName.m_strFilename );
if (NULL == pNamePair)
mNamepair.SetAt( oName.m_strFilename, 1 );
std::map<CString, size_t>::const_iterator pNamePair = mNamepair.find( oName.m_strFilename );
if (pNamePair == mNamepair.end())
mNamepair [oName.m_strFilename] = 1;
else
oName = oName + pNamePair->m_key;
oName = oName + pNamePair->first;
OOX::CSystemUtility::CreateDirectories( oPath / oDefDir );
smart_ptr<OOX::IFileBuilder> pFileBuilder = pPair->m_value.smart_dynamic_cast<OOX::IFileBuilder>();
smart_ptr<OOX::IFileBuilder> pFileBuilder = it->second.smart_dynamic_cast<OOX::IFileBuilder>();
if ( pFileBuilder.is_init() )
pFileBuilder->Commit( oPath / oDefDir / oName );
}
......@@ -133,14 +126,11 @@ namespace OOX
}
void IFileContainer::Finalize(OOX::CRels& oRels, const OOX::CPath& oCurrent, const OOX::CPath& oDir, OOX::CContentTypes& oContent)
{
CAtlMap<CString, size_t> mNamepair;
std::map<CString, size_t> mNamepair;
POSITION pos = m_mContainer.GetStartPosition();
while ( NULL != pos )
{
CAtlMap<CString, smart_ptr<OOX::File>>::CPair* pPair = m_mContainer.GetNext( pos );
smart_ptr<OOX::File> pFile = pPair->m_value;
for (std::map<CString, smart_ptr<OOX::File>>::const_iterator it = m_mContainer.begin(); it != m_mContainer.end(); ++it)
{
smart_ptr<OOX::File> pFile = it->second;
smart_ptr<OOX::External> pExt = pFile.smart_dynamic_cast<OOX::External>();
if ( !pExt.IsInit() )
......@@ -148,11 +138,11 @@ namespace OOX
OOX::CPath oDefDir = pFile->DefaultDirectory();
OOX::CPath oName = pFile->DefaultFileName();
CAtlMap<CString, size_t>::CPair* pNamePair = mNamepair.Lookup( oName.m_strFilename );
if ( NULL == pNamePair )
mNamepair.SetAt( oName.m_strFilename, 1 );
std::map<CString, size_t>::iterator pNamePair = mNamepair.find( oName.m_strFilename );
if ( pNamePair == mNamepair.end() )
mNamepair [oName.m_strFilename] = 1;
else
oName = oName + pNamePair->m_key;
oName = oName + pNamePair->first;
OOX::CSystemUtility::CreateDirectories( oCurrent / oDefDir );
smart_ptr<OOX::IFileBuilder> pFileBuilder = pFile.smart_dynamic_cast<OOX::IFileBuilder>();
......@@ -165,11 +155,11 @@ namespace OOX
pFile->write( oCurrent / oDefDir / oName, oDir / oDefDir, oContent );
}
oRels.Registration( pPair->m_key, pFile->type(), oDefDir / oName );
oRels.Registration( it->first, pFile->type(), oDefDir / oName );
}
else
{
oRels.Registration( pPair->m_key, pExt );
oRels.Registration( it->first, pExt );
}
}
}
......@@ -177,10 +167,9 @@ namespace OOX
void IFileContainer::ExtractPictures(const OOX::CPath& oPath) const
{
POSITION pos = m_mContainer.GetStartPosition();
while ( NULL != pos )
for (std::map<CString, smart_ptr<OOX::File>>::const_iterator it = m_mContainer.begin(); it != m_mContainer.end(); ++it)
{
smart_ptr<OOX::File> pFile = m_mContainer.GetNextValue( pos );
smart_ptr<OOX::File> pFile = it->second;
smart_ptr<Image> pImage = pFile.smart_dynamic_cast<Image>();
if ( pImage.is_init() )
......@@ -201,43 +190,42 @@ namespace OOX
smart_ptr<Image> IFileContainer::GetImage (const RId& rId) const
{
const CAtlMap<CString, smart_ptr<OOX::File>>::CPair* pPair = m_mContainer.Lookup(rId.get());
if (NULL == pPair)
std::map<CString, smart_ptr<OOX::File>>::const_iterator pPair = m_mContainer.find(rId.get());
if (pPair == m_mContainer.end ())
return smart_ptr<Image>();
return pPair->m_value.smart_dynamic_cast<Image>();
return pPair->second.smart_dynamic_cast<Image>();
}
smart_ptr<HyperLink> IFileContainer::GetHyperlink(const RId& rId) const
{
const CAtlMap<CString, smart_ptr<OOX::File>>::CPair* pPair = m_mContainer.Lookup(rId.get());
if (NULL == pPair)
std::map<CString, smart_ptr<OOX::File>>::const_iterator pPair = m_mContainer.find(rId.get());
if (pPair == m_mContainer.end ())
return smart_ptr<HyperLink>();
return pPair->m_value.smart_dynamic_cast<HyperLink>();
return pPair->second.smart_dynamic_cast<HyperLink>();
}
smart_ptr<OleObject> IFileContainer::GetOleObject(const RId& rId) const
{
const CAtlMap<CString, smart_ptr<OOX::File>>::CPair* pPair = m_mContainer.Lookup(rId.get());
if (NULL == pPair)
std::map<CString, smart_ptr<OOX::File>>::const_iterator pPair = m_mContainer.find(rId.get());
if (pPair == m_mContainer.end ())
return smart_ptr<OleObject>();
return pPair->m_value.smart_dynamic_cast<OleObject>();
return pPair->second.smart_dynamic_cast<OleObject>();
}
const bool IFileContainer::IsExist(const FileType& oType) const
{
POSITION pos = m_mContainer.GetStartPosition();
while ( NULL != pos )
for (std::map<CString, smart_ptr<OOX::File>>::const_iterator it = m_mContainer.begin(); it != m_mContainer.end(); ++it)
{
const CAtlMap<CString, smart_ptr<OOX::File>>::CPair* pPair = m_mContainer.GetNext( pos );
if ( oType == pPair->m_value->type() )
if (oType == it->second->type())
return true;
}
return false;
}
const bool IFileContainer::IsExist(const RId& rId) const
{
const CAtlMap<CString, smart_ptr<OOX::File>>::CPair* pPair = m_mContainer.Lookup(rId.get());
return ( NULL != pPair );
std::map<CString, smart_ptr<OOX::File>>::const_iterator it = m_mContainer.find(rId.get());
return (it != m_mContainer.end());
}
......@@ -249,12 +237,12 @@ namespace OOX
}
const bool IFileContainer::IsExternal(const OOX::RId& rId) const
{
const CAtlMap<CString, smart_ptr<OOX::File>>::CPair* pPair = m_mContainer.Lookup(rId.get());
std::map<CString, smart_ptr<OOX::File>>::const_iterator it = m_mContainer.find(rId.get());
if ( NULL != pPair )
if (it != m_mContainer.end())
{
CString sType = pPair->m_value->type().RelationType();
CString sName = pPair->m_value->type().DefaultFileName().m_strFilename;
CString sType = it->second->type().RelationType();
CString sName = it->second->type().DefaultFileName().m_strFilename;
return (( ( sType == OOX::FileTypes::ExternalAudio.RelationType() ) || ( sType == OOX::FileTypes::ExternalImage.RelationType() ) || ( sType == OOX::FileTypes::ExternalVideo.RelationType() ) ) && ( sName == _T("") ) );
}
......@@ -264,13 +252,12 @@ namespace OOX
smart_ptr<OOX::File> IFileContainer::Get(const FileType& oType)
{
POSITION pos = m_mContainer.GetStartPosition();
while ( NULL != pos )
for (std::map<CString, smart_ptr<OOX::File>>::const_iterator it = m_mContainer.begin(); it != m_mContainer.end(); ++it)
{
CAtlMap<CString, smart_ptr<OOX::File>>::CPair* pPair = m_mContainer.GetNext( pos );
if ( oType == pPair->m_value->type() )
return pPair->m_value;
if (oType == it->second->type())
return it->second;
}
return smart_ptr<OOX::File>(new UnknowTypeFile( Unknown ));
}
......@@ -286,25 +273,26 @@ namespace OOX
void IFileContainer::Add(const OOX::RId& rId, const smart_ptr<OOX::File>& pFile)
{
m_lMaxRid = max( m_lMaxRid, rId.getNumber() );
m_mContainer.SetAt( rId.get(), pFile );
m_mContainer [rId.get()] = pFile;
}
smart_ptr<OOX::File> IFileContainer::Find(const FileType& oType) const
{
POSITION pos = m_mContainer.GetStartPosition();
while ( NULL != pos )
for (std::map<CString, smart_ptr<OOX::File>>::const_iterator it = m_mContainer.begin(); it != m_mContainer.end(); ++it)
{
const CAtlMap<CString, smart_ptr<OOX::File>>::CPair* pPair = m_mContainer.GetNext( pos );
if ( oType == pPair->m_value->type() )
return pPair->m_value;
if (oType == it->second->type())
return it->second;
}
return smart_ptr<OOX::File>( (OOX::File*)new UnknowTypeFile() );
}
smart_ptr<OOX::File> IFileContainer::Find(const OOX::RId& rId) const
{
const CAtlMap<CString, smart_ptr<OOX::File>>::CPair* pPair = m_mContainer.Lookup(rId.get());
if ( NULL != pPair )
return pPair->m_value;
std::map<CString, smart_ptr<OOX::File>>::const_iterator it = m_mContainer.find(rId.get());
if (it != m_mContainer.end())
return it->second;
return smart_ptr<OOX::File>( (OOX::File*)new UnknowTypeFile() );
}
......@@ -318,9 +306,10 @@ namespace OOX
}
smart_ptr<OOX::File> IFileContainer::operator [](const OOX::RId rId)
{
CAtlMap<CString, smart_ptr<OOX::File>>::CPair* pPair = m_mContainer.Lookup(rId.get());
if ( NULL != pPair )
return pPair->m_value;
std::map<CString, smart_ptr<OOX::File>>::const_iterator it = m_mContainer.find(rId.get());
if (it != m_mContainer.end())
return it->second;
return smart_ptr<OOX::File>( (OOX::File*)new UnknowTypeFile() );
}
......
Common/DocxFormat/Source/DocxFormat/IFileContainer.h
View file @ 30fd8af8
......@@ -5,6 +5,7 @@
#include "RId.h"
#include "UnknowTypeFile.h"
#include "IFileBuilder.h"
#include <map>
namespace OOX
{
......@@ -30,8 +31,8 @@ namespace OOX
}
protected:
CAtlMap<CString, smart_ptr<OOX::File>> m_mContainer;
//std::map<CString, smart_ptr<OOX::File>> m_mContainer;
//CAtlMap<CString, smart_ptr<OOX::File>> m_mContainer;
std::map<CString, smart_ptr<OOX::File>> m_mContainer;
size_t m_lMaxRid;
protected:
......
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