Skip to content

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

win build 

IFileContainer reverted

git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@58303 954022d7-b5bf-4e40-9824-e11837661b57
parent 6d176785
Show whitespace changes
Inline Side-by-side
Showing with 59 additions and 51 deletions
Common/DocxFormat/Source/DocxFormat/ContentTypes.h
View file @ 68950142
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
#include "FileType.h" #include "FileType.h"
#include "WritingElement.h" #include "WritingElement.h"
#include <map>
namespace OOX namespace OOX
...@@ -17,36 +18,36 @@ namespace OOX ...@@ -17,36 +18,36 @@ namespace OOX
public: public:
CExtensionTable() CExtensionTable()
{ {
m_mTable.insert( _T("bmp"), _T("image/bmp")); m_mTable.insert( std::pair<CString,CString>( _T("bmp"), _T("image/bmp")));
m_mTable.insert( _T("gif"), _T("image/gif")); m_mTable.insert( std::pair<CString,CString>( _T("gif"), _T("image/gif")));
m_mTable.insert( _T("png"), _T("image/png")); m_mTable.insert( std::pair<CString,CString>( _T("png"), _T("image/png")));
m_mTable.insert( _T("tif"), _T("image/tiff")); m_mTable.insert( std::pair<CString,CString>( _T("tif"), _T("image/tiff")));
m_mTable.insert( _T("tiff"), _T("image/tiff")); m_mTable.insert( std::pair<CString,CString>( _T("tiff"), _T("image/tiff")));
m_mTable.insert( _T("jpeg"), _T("image/jpeg")); m_mTable.insert( std::pair<CString,CString>( _T("jpeg"), _T("image/jpeg")));
m_mTable.insert( _T("jpg"), _T("image/jpeg")); m_mTable.insert( std::pair<CString,CString>( _T("jpg"), _T("image/jpeg")));
m_mTable.insert( _T("jpe"), _T("image/jpeg")); m_mTable.insert( std::pair<CString,CString>( _T("jpe"), _T("image/jpeg")));
m_mTable.insert( _T("jfif"), _T("image/jpeg")); m_mTable.insert( std::pair<CString,CString>( _T("jfif"), _T("image/jpeg")));
m_mTable.insert( _T("rels"), _T("application/vnd.openxmlformats-package.relationships+xml")); m_mTable.insert( std::pair<CString,CString>( _T("rels"), _T("application/vnd.openxmlformats-package.relationships+xml")));
m_mTable.insert( _T("bin"), _T("application/vnd.openxmlformats-officedocument.oleObject")); m_mTable.insert( std::pair<CString,CString>( _T("bin"), _T("application/vnd.openxmlformats-officedocument.oleObject")));
m_mTable.insert( _T("xml"), _T("application/xml")); m_mTable.insert( std::pair<CString,CString>( _T("xml"), _T("application/xml")));
m_mTable.insert( _T("emf"), _T("image/x-emf")); m_mTable.insert( std::pair<CString,CString>( _T("emf"), _T("image/x-emf")));
m_mTable.insert( _T("emz"), _T("image/x-emz")); m_mTable.insert( std::pair<CString,CString>( _T("emz"), _T("image/x-emz")));
m_mTable.insert( _T("wmf"), _T("image/x-wmf")); m_mTable.insert( std::pair<CString,CString>( _T("wmf"), _T("image/x-wmf")));
m_mTable.insert( _T("svm"), _T("image/svm")); m_mTable.insert( std::pair<CString,CString>( _T("svm"), _T("image/svm")));
m_mTable.insert( _T("wav"), _T("audio/wav")); m_mTable.insert( std::pair<CString,CString>( _T("wav"), _T("audio/wav")));
m_mTable.insert( _T("xls"), _T("application/vnd.ms-excel")); m_mTable.insert( std::pair<CString,CString>( _T("xls"), _T("application/vnd.ms-excel")));
m_mTable.insert( _T("xlsm"), _T("application/vnd.ms-excel.sheet.macroEnabled.12")); m_mTable.insert( std::pair<CString,CString>( _T("xlsm"), _T("application/vnd.ms-excel.sheet.macroEnabled.12")));
m_mTable.insert( _T("xlsb"), _T("application/vnd.ms-excel.sheet.binary.macroEnabled.12")); m_mTable.insert( std::pair<CString,CString>( _T("xlsb"), _T("application/vnd.ms-excel.sheet.binary.macroEnabled.12")));
m_mTable.insert( _T("xlsx"), _T("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet")); m_mTable.insert( std::pair<CString,CString>( _T("xlsx"), _T("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet")));
m_mTable.insert( _T("ppt"), _T("application/vnd.ms-powerpoint")); m_mTable.insert( std::pair<CString,CString>( _T("ppt"), _T("application/vnd.ms-powerpoint")));
m_mTable.insert( _T("pptm"), _T("application/vnd.ms-powerpoint.presentation.macroEnabled.12")); m_mTable.insert( std::pair<CString,CString>( _T("pptm"), _T("application/vnd.ms-powerpoint.presentation.macroEnabled.12")));
m_mTable.insert( _T("pptx"), _T("application/vnd.openxmlformats-officedocument.presentationml.presentation")); m_mTable.insert( std::pair<CString,CString>( _T("pptx"), _T("application/vnd.openxmlformats-officedocument.presentationml.presentation")));
m_mTable.insert( _T("sldm"), _T("application/vnd.ms-powerpoint.slide.macroEnabled.12")); m_mTable.insert( std::pair<CString,CString>( _T("sldm"), _T("application/vnd.ms-powerpoint.slide.macroEnabled.12")));
m_mTable.insert( _T("sldx"), _T("application/vnd.openxmlformats-officedocument.presentationml.slide")); m_mTable.insert( std::pair<CString,CString>( _T("sldx"), _T("application/vnd.openxmlformats-officedocument.presentationml.slide")));
m_mTable.insert( _T("doc"), _T("application/msword")); m_mTable.insert( std::pair<CString,CString>( _T("doc"), _T("application/msword")));
m_mTable.insert( _T("docm"), _T("aapplication/vnd.ms-word.document.macroEnabled.12")); m_mTable.insert( std::pair<CString,CString>( _T("docm"), _T("aapplication/vnd.ms-word.document.macroEnabled.12")));
m_mTable.insert( _T("docx"), _T("application/vnd.openxmlformats-officedocument.wordprocessingml.document")); m_mTable.insert( std::pair<CString,CString>( _T("docx"), _T("application/vnd.openxmlformats-officedocument.wordprocessingml.document")));
m_mTable.insert( _T("vml"), _T("application/vnd.openxmlformats-officedocument.vmlDrawing")); m_mTable.insert( std::pair<CString,CString>( _T("vml"), _T("application/vnd.openxmlformats-officedocument.vmlDrawing")));
} }
const CString operator[] (const CString& sExtension) const const CString operator[] (const CString& sExtension) const
{ {
......
Common/DocxFormat/Source/DocxFormat/IFileContainer.cpp
View file @ 68950142
...@@ -56,18 +56,15 @@ namespace OOX ...@@ -56,18 +56,15 @@ namespace OOX
} }
void IFileContainer::Write(OOX::CRels& oRels, const OOX::CPath& oCurrent, const OOX::CPath& oDir, OOX::CContentTypes& oContent) const void IFileContainer::Write(OOX::CRels& oRels, const OOX::CPath& oCurrent, const OOX::CPath& oDir, OOX::CContentTypes& oContent) const
{ {
// CAtlMap<CString, size_t> mNamePair; CAtlMap<CString, size_t> mNamePair;
std::map<CString, size_t> mNamePair;
//POSITION pos = m_mContainer.GetStartPosition(); POSITION pos = m_mContainer.GetStartPosition();
for (std::map<CString, size_t>::const_iterator it = mNamePair.begin(); it != mNamePair.end(); ++it) while ( NULL != pos )
{
//while ( NULL != pos )
{ {
//const CAtlMap<CString, smart_ptr<OOX::File>>::CPair* pPair = m_mContainer.GetNext( pos ); const CAtlMap<CString, smart_ptr<OOX::File>>::CPair* pPair = m_mContainer.GetNext( pos );
smart_ptr<OOX::File> pFile = it->second; //pPair->m_value; smart_ptr<OOX::File> pFile = pPair->m_value;
smart_ptr<OOX::External> pExt = pFile.smart_dynamic_cast<OOX::External>(); smart_ptr<OOX::External> pExt = pFile.smart_dynamic_cast<OOX::External>();
if ( !pExt.IsInit() ) if ( !pExt.IsInit() )
...@@ -75,22 +72,19 @@ namespace OOX ...@@ -75,22 +72,19 @@ namespace OOX
OOX::CPath oDefDir = pFile->DefaultDirectory(); OOX::CPath oDefDir = pFile->DefaultDirectory();
OOX::CPath oName = pFile->DefaultFileName(); OOX::CPath oName = pFile->DefaultFileName();
//CAtlMap<CString, size_t>::CPair* pNamePair = mNamePair.Lookup( oName.m_strFilename ); CAtlMap<CString, size_t>::CPair* pNamePair = mNamePair.Lookup( oName.m_strFilename );
std::map<CString, size_t>::const_iterator pNamePair = mNamePair.find ( oName.m_strFilename ); if ( NULL == pNamePair )
mNamePair.SetAt( oName.m_strFilename, 1 );
if (pNamePair == mNamePair.end())
mNamePair [oName.m_strFilename] = 1 ;
else else
oName = oName + pNamePair->m_key; oName = oName + pNamePair->m_key;
OOX::CSystemUtility::CreateDirectories( oCurrent / oDefDir ); OOX::CSystemUtility::CreateDirectories( oCurrent / oDefDir );
pFile->write( oCurrent / oDefDir / oName, oDir / oDefDir, oContent ); pFile->write( oCurrent / oDefDir / oName, oDir / oDefDir, oContent );
oRels.Registration( it->first /*pPair->m_key*/, pFile->type(), oDefDir / oName ); oRels.Registration( pPair->m_key, pFile->type(), oDefDir / oName );
} }
else else
{ {
oRels.Registration( it->first /*pPair->m_key*/, pExt ); oRels.Registration( pPair->m_key, pExt );
}
} }
} }
} }
......
Common/DocxFormat/Source/DocxFormat/IFileContainer.h
View file @ 68950142
...@@ -30,8 +30,8 @@ namespace OOX ...@@ -30,8 +30,8 @@ namespace OOX
} }
protected: protected:
//CAtlMap<CString, smart_ptr<OOX::File>> m_mContainer; 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;
protected: protected:
......
Common/DocxFormat/Source/XML/XmlSimple.h
View file @ 68950142
...@@ -3,9 +3,9 @@ ...@@ -3,9 +3,9 @@
#include "xmlutils.h" #include "xmlutils.h"
#include "../Base/Nullable.h" #include "../Base/Nullable.h"
//#include "../SystemUtility/File.h" #include "../SystemUtility/File.h"
//#include "../SystemUtility/FileSystem/Directory.h" #include "../SystemUtility/FileSystem/Directory.h"
#include "../../../DesktopEditor/common/File.h" //#include "../../../DesktopEditor/common/File.h"
//#include "../../../DesktopEditor/common/Directory.h" //#include "../../../DesktopEditor/common/Directory.h"
#include "../SystemUtility/SystemUtility.h" #include "../SystemUtility/SystemUtility.h"
......
Common/DocxFormat/Source/XlsxFormat/Xlsx.h
View file @ 68950142
...@@ -16,6 +16,8 @@ ...@@ -16,6 +16,8 @@
#include "Worksheets/Worksheet.h" #include "Worksheets/Worksheet.h"
#include "CalcChain/CalcChain.h" #include "CalcChain/CalcChain.h"
#include <map>
namespace OOX namespace OOX
{ {
namespace Spreadsheet namespace Spreadsheet
...@@ -160,7 +162,16 @@ namespace OOX ...@@ -160,7 +162,16 @@ namespace OOX
CString sAdditionalContentTypesWrapped; CString sAdditionalContentTypesWrapped;
sAdditionalContentTypesWrapped.Format(_T("<Types xmlns=\"http://schemas.openxmlformats.org/package/2006/content-types\">%s</Types>"), sAdditionalContentTypes); sAdditionalContentTypesWrapped.Format(_T("<Types xmlns=\"http://schemas.openxmlformats.org/package/2006/content-types\">%s</Types>"), sAdditionalContentTypes);
OOX::CContentTypes oTempContentTypes; OOX::CContentTypes oTempContentTypes;
oTempContentTypes.ReadFromString(sAdditionalContentTypesWrapped); oTempContentTypes.ReadFromString(sAdditionalContentTypesWrapped);
for (std::map<CString, ContentTypes::COverride>::const_iterator it = oTempContentTypes.m_arrOverride.begin(); it != oTempContentTypes.m_arrOverride.end(); ++it)
{
const ContentTypes::COverride& oOverride = it->second;
const OOX::CPath& oPath = oOverride.filename();
oContentTypes.Registration(oOverride.type(), oPath.GetDirectory(), oPath.GetFilename());
}
/*
POSITION pos = oTempContentTypes.m_arrOverride.GetStartPosition(); POSITION pos = oTempContentTypes.m_arrOverride.GetStartPosition();
while ( NULL != pos ) while ( NULL != pos )
{ {
...@@ -169,6 +180,8 @@ namespace OOX ...@@ -169,6 +180,8 @@ 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());
} }
*/
} }
oContentTypes.Write(oDirPath); oContentTypes.Write(oDirPath);
return TRUE; return TRUE;
......
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