Skip to content

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

linux build 

git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@58270 954022d7-b5bf-4e40-9824-e11837661b57
parent 059e0989
Hide whitespace changes
Inline Side-by-side
Showing with 73 additions and 43 deletions
Common/DocxFormat/DocxFormatLib/DocxFormatLib.pro.user
View file @ c5c74198
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE QtCreatorProject> <!DOCTYPE QtCreatorProject>
<!-- Written by QtCreator 3.1.1, 2014-09-12T18:07:16. --> <!-- Written by QtCreator 3.1.1, 2014-09-15T20:00:39. -->
<qtcreator> <qtcreator>
<data> <data>
<variable>ProjectExplorer.Project.ActiveTarget</variable> <variable>ProjectExplorer.Project.ActiveTarget</variable>
......
Common/DocxFormat/Source/DocxFormat/ContentTypes.h
View file @ c5c74198
...@@ -17,47 +17,49 @@ namespace OOX ...@@ -17,47 +17,49 @@ namespace OOX
public: public:
CExtensionTable() CExtensionTable()
{ {
m_mTable.SetAt( _T("bmp"), _T("image/bmp")); m_mTable.insert( _T("bmp"), _T("image/bmp"));
m_mTable.SetAt( _T("gif"), _T("image/gif")); m_mTable.insert( _T("gif"), _T("image/gif"));
m_mTable.SetAt( _T("png"), _T("image/png")); m_mTable.insert( _T("png"), _T("image/png"));
m_mTable.SetAt( _T("tif"), _T("image/tiff")); m_mTable.insert( _T("tif"), _T("image/tiff"));
m_mTable.SetAt( _T("tiff"), _T("image/tiff")); m_mTable.insert( _T("tiff"), _T("image/tiff"));
m_mTable.SetAt( _T("jpeg"), _T("image/jpeg")); m_mTable.insert( _T("jpeg"), _T("image/jpeg"));
m_mTable.SetAt( _T("jpg"), _T("image/jpeg")); m_mTable.insert( _T("jpg"), _T("image/jpeg"));
m_mTable.SetAt( _T("jpe"), _T("image/jpeg")); m_mTable.insert( _T("jpe"), _T("image/jpeg"));
m_mTable.SetAt( _T("jfif"), _T("image/jpeg")); m_mTable.insert( _T("jfif"), _T("image/jpeg"));
m_mTable.SetAt( _T("rels"), _T("application/vnd.openxmlformats-package.relationships+xml")); m_mTable.insert( _T("rels"), _T("application/vnd.openxmlformats-package.relationships+xml"));
m_mTable.SetAt( _T("bin"), _T("application/vnd.openxmlformats-officedocument.oleObject")); m_mTable.insert( _T("bin"), _T("application/vnd.openxmlformats-officedocument.oleObject"));
m_mTable.SetAt( _T("xml"), _T("application/xml")); m_mTable.insert( _T("xml"), _T("application/xml"));
m_mTable.SetAt( _T("emf"), _T("image/x-emf")); m_mTable.insert( _T("emf"), _T("image/x-emf"));
m_mTable.SetAt( _T("emz"), _T("image/x-emz")); m_mTable.insert( _T("emz"), _T("image/x-emz"));
m_mTable.SetAt( _T("wmf"), _T("image/x-wmf")); m_mTable.insert( _T("wmf"), _T("image/x-wmf"));
m_mTable.SetAt( _T("svm"), _T("image/svm")); m_mTable.insert( _T("svm"), _T("image/svm"));
m_mTable.SetAt( _T("wav"), _T("audio/wav")); m_mTable.insert( _T("wav"), _T("audio/wav"));
m_mTable.SetAt( _T("xls"), _T("application/vnd.ms-excel")); m_mTable.insert( _T("xls"), _T("application/vnd.ms-excel"));
m_mTable.SetAt( _T("xlsm"), _T("application/vnd.ms-excel.sheet.macroEnabled.12")); m_mTable.insert( _T("xlsm"), _T("application/vnd.ms-excel.sheet.macroEnabled.12"));
m_mTable.SetAt( _T("xlsb"), _T("application/vnd.ms-excel.sheet.binary.macroEnabled.12")); m_mTable.insert( _T("xlsb"), _T("application/vnd.ms-excel.sheet.binary.macroEnabled.12"));
m_mTable.SetAt( _T("xlsx"), _T("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet")); m_mTable.insert( _T("xlsx"), _T("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"));
m_mTable.SetAt( _T("ppt"), _T("application/vnd.ms-powerpoint")); m_mTable.insert( _T("ppt"), _T("application/vnd.ms-powerpoint"));
m_mTable.SetAt( _T("pptm"), _T("application/vnd.ms-powerpoint.presentation.macroEnabled.12")); m_mTable.insert( _T("pptm"), _T("application/vnd.ms-powerpoint.presentation.macroEnabled.12"));
m_mTable.SetAt( _T("pptx"), _T("application/vnd.openxmlformats-officedocument.presentationml.presentation")); m_mTable.insert( _T("pptx"), _T("application/vnd.openxmlformats-officedocument.presentationml.presentation"));
m_mTable.SetAt( _T("sldm"), _T("application/vnd.ms-powerpoint.slide.macroEnabled.12")); m_mTable.insert( _T("sldm"), _T("application/vnd.ms-powerpoint.slide.macroEnabled.12"));
m_mTable.SetAt( _T("sldx"), _T("application/vnd.openxmlformats-officedocument.presentationml.slide")); m_mTable.insert( _T("sldx"), _T("application/vnd.openxmlformats-officedocument.presentationml.slide"));
m_mTable.SetAt( _T("doc"), _T("application/msword")); m_mTable.insert( _T("doc"), _T("application/msword"));
m_mTable.SetAt( _T("docm"), _T("aapplication/vnd.ms-word.document.macroEnabled.12")); m_mTable.insert( _T("docm"), _T("aapplication/vnd.ms-word.document.macroEnabled.12"));
m_mTable.SetAt( _T("docx"), _T("application/vnd.openxmlformats-officedocument.wordprocessingml.document")); m_mTable.insert( _T("docx"), _T("application/vnd.openxmlformats-officedocument.wordprocessingml.document"));
m_mTable.SetAt( _T("vml"), _T("application/vnd.openxmlformats-officedocument.vmlDrawing")); m_mTable.insert( _T("vml"), _T("application/vnd.openxmlformats-officedocument.vmlDrawing"));
} }
const CString operator[] (const CString& sExtension) const const CString operator[] (const CString& sExtension) const
{ {
const CAtlMap<CString, CString>::CPair* pPair = m_mTable.Lookup( sExtension ); std::map<CString, CString>::const_iterator it = m_mTable.find(sExtension);
if ( NULL == pPair ) if (it == m_mTable.end())
return _T(""); return _T("");
return pPair->m_value;
return it->second;
} }
private: private:
CAtlMap<CString, CString> m_mTable; std::map <CString, CString> m_mTable;
//CAtlMap<CString, CString> m_mTable;
}; };
class CDefault : public WritingElement class CDefault : public WritingElement
{ {
...@@ -252,12 +254,19 @@ namespace OOX ...@@ -252,12 +254,19 @@ namespace OOX
} }
} }
for (std::map<CString, ContentTypes::COverride>::const_iterator it = m_arrOverride.begin(); it != m_arrOverride.end(); ++it)
{
sXml += it->second.toXML();
}
/*
POSITION pos = m_arrOverride.GetStartPosition(); POSITION pos = m_arrOverride.GetStartPosition();
while ( NULL != pos ) while ( NULL != pos )
{ {
const CAtlMap<CString, ContentTypes::COverride>::CPair* pPair = m_arrOverride.GetNext( pos ); const CAtlMap<CString, ContentTypes::COverride>::CPair* pPair = m_arrOverride.GetNext( pos );
sXml += pPair->m_value.toXML(); sXml += pPair->m_value.toXML();
} }
*/
sXml += _T("</Types>"); sXml += _T("</Types>");
...@@ -315,7 +324,7 @@ namespace OOX ...@@ -315,7 +324,7 @@ namespace OOX
else if ( _T("Override") == sName ) else if ( _T("Override") == sName )
{ {
ContentTypes::COverride oOverride = oReader; ContentTypes::COverride oOverride = oReader;
m_arrOverride.SetAt( oOverride.filename().GetPath(), oOverride ); m_arrOverride [oOverride.filename().GetPath()] = oOverride;
} }
} }
...@@ -324,14 +333,15 @@ namespace OOX ...@@ -324,14 +333,15 @@ namespace OOX
void AddOverride(const CString& sType, const CString& sPath) void AddOverride(const CString& sType, const CString& sPath)
{ {
ContentTypes::COverride oOverride( sType, sPath ); ContentTypes::COverride oOverride( sType, sPath );
m_arrOverride.SetAt( oOverride.filename().GetPath(), oOverride ); m_arrOverride [oOverride.filename().GetPath()] = oOverride;
} }
public: public:
std::vector<ContentTypes::CDefault*> m_arrDefault; std::vector<ContentTypes::CDefault*> m_arrDefault;
CAtlMap<CString, ContentTypes::COverride> m_arrOverride; //CAtlMap<CString, ContentTypes::COverride> m_arrOverride;
std::map<CString, ContentTypes::COverride> m_arrOverride;
}; };
} // namespace OOX } // namespace OOX
#endif // OOX_CONTENT_TYPES_INCLUDE_H_ #endif // OOX_CONTENT_TYPES_INCLUDE_H_
\ No newline at end of file
Common/DocxFormat/Source/DocxFormat/Rels.h
View file @ c5c74198
...@@ -113,7 +113,7 @@ namespace OOX ...@@ -113,7 +113,7 @@ namespace OOX
{ {
if ( !m_sMode.IsInit() ) if ( !m_sMode.IsInit() )
return false; return false;
return ( *m_sMode == "External" ); return ( *m_sMode == _T("External" ));
} }
const RId rId() const const RId rId() const
{ {
...@@ -302,4 +302,4 @@ namespace OOX ...@@ -302,4 +302,4 @@ namespace OOX
} // namespace OOX } // namespace OOX
#endif // OOX_RELS_INCLUDE_H_ #endif // OOX_RELS_INCLUDE_H_
\ No newline at end of file
Common/DocxFormat/Source/XML/XmlSimple.h
View file @ c5c74198
...@@ -3,7 +3,8 @@ ...@@ -3,7 +3,8 @@
#include "xmlutils.h" #include "xmlutils.h"
#include "../Base/Nullable.h" #include "../Base/Nullable.h"
#include "../SystemUtility/File.h" //#include "../SystemUtility/File.h"
#include "../../../DesktopEditor/common/File.h"
#include "../SystemUtility/SystemUtility.h" #include "../SystemUtility/SystemUtility.h"
namespace XmlUtils namespace XmlUtils
...@@ -151,6 +152,7 @@ namespace XmlUtils ...@@ -151,6 +152,7 @@ namespace XmlUtils
if (value.IsInit()) if (value.IsInit())
m_strValue += value->toXML(); m_strValue += value->toXML();
} }
#ifdef _WIN32
template <typename T> template <typename T>
AVSINLINE void WriteArray(const CAtlArray<T>& oArray) AVSINLINE void WriteArray(const CAtlArray<T>& oArray)
{ {
...@@ -167,6 +169,24 @@ namespace XmlUtils ...@@ -167,6 +169,24 @@ namespace XmlUtils
m_strValue += oArray[i].toXML(); m_strValue += oArray[i].toXML();
m_strValue += (_T("</") + strNodeName + _T(">")); m_strValue += (_T("</") + strNodeName + _T(">"));
} }
#endif
template <typename T>
AVSINLINE void WriteArray(const std::vector<T>& oArray)
{
size_t count = oArray.size();
for (size_t i = 0; i < count; ++i)
m_strValue += oArray[i].toXML();
}
template <typename T>
AVSINLINE void WriteArray(const CString& strNodeName, const std::vector<T>& oArray)
{
m_strValue += (_T("<") + strNodeName + _T(">"));
size_t count = oArray.size();
for (size_t i = 0; i < count; ++i)
m_strValue += oArray[i].toXML();
m_strValue += (_T("</") + strNodeName + _T(">"));
}
// --------------------------------------------------------------- // // --------------------------------------------------------------- //
AVSINLINE void Write2(const CString& strName, const int& value) AVSINLINE void Write2(const CString& strName, const int& value)
......
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