Skip to content

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

(2.0.2.336) x2t revision history for math 

git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@66667 954022d7-b5bf-4e40-9824-e11837661b57
parent 0954cf3b
Hide whitespace changes
Inline Side-by-side
Showing with 1019 additions and 755 deletions
ASCOfficeDocxFile2/BinReader/ReaderClasses.h
View file @ 6c8b05b3
......@@ -2514,6 +2514,7 @@ public:
XmlUtils::CStringWriter* trPr;
XmlUtils::CStringWriter* tcPr;
XmlUtils::CStringWriter* content;
XmlUtils::CStringWriter* contentRun;
TrackRevision()
{
Id = NULL;
......@@ -2527,6 +2528,7 @@ public:
trPr = NULL;
tcPr = NULL;
content = NULL;
contentRun = NULL;
}
~TrackRevision()
{
......@@ -2541,6 +2543,7 @@ public:
RELEASEOBJECT(trPr);
RELEASEOBJECT(tcPr);
RELEASEOBJECT(content);
RELEASEOBJECT(contentRun);
}
bool IsNoEmpty()
{
......@@ -2591,7 +2594,7 @@ public:
CString sId;sId.Format(_T(" w:vMergeOrig=\"%d\""), *vMergeOrigin);
pCStringWriter->WriteString(sId);
}
if(NULL != RPr || NULL != PPr || NULL != sectPr || NULL != tblPr || NULL != tblGridChange || NULL != trPr || NULL != tcPr || NULL != content)
if(NULL != RPr || NULL != PPr || NULL != sectPr || NULL != tblPr || NULL != tblGridChange || NULL != trPr || NULL != tcPr || NULL != content|| NULL != contentRun)
{
pCStringWriter->WriteString(CString(_T(">")));
if(NULL != RPr)
......@@ -2636,6 +2639,10 @@ public:
{
pCStringWriter->Write(*content);
}
if(NULL != contentRun)
{
pCStringWriter->Write(*contentRun);
}
pCStringWriter->WriteString(CString(_T("</")));
pCStringWriter->WriteString(sName);
......
ASCOfficeDocxFile2/BinReader/Readers.h
View file @ 6c8b05b3
......@@ -3946,10 +3946,27 @@ public:
if(m_oMath_rPr.IsNoEmpty())
m_oMath_rPr.Write(&GetRunStringWriter());
}
else if ( c_oSerRunType::del == type )
{
TrackRevision oRPrChange;
res = Read1(length, &Binary_DocumentTableReader::ReadMathCtrlPrDelIns, this, &oRPrChange);
oRPrChange.Write(&GetRunStringWriter(), _T("w:del"));
}
else if ( c_oSerRunType::ins == type )
{
TrackRevision oRPrChange;
res = Read1(length, &Binary_DocumentTableReader::ReadMathCtrlPrDelIns, this, &oRPrChange);
oRPrChange.Write(&GetRunStringWriter(), _T("w:ins"));
}
else
res = c_oSerConstants::ReadUnknown;
return res;
}
int ReadMathCtrlPrDelIns(BYTE type, long length, void* poResult)
{
return oBinary_rPrReader.ReadrPrChange(type, length, poResult);
}
int ReadMathDelimiter(BYTE type, long length, void* poResult)
{
int res = c_oSerConstants::ReadOk;
......@@ -4935,10 +4952,39 @@ public:
{
GetRunStringWriter().WriteString(CString(_T("<w:br />")));
}
else if (c_oSer_OMathContentType::Del == type)
{
TrackRevision oTrackRevision;
res = Read1(length, &Binary_DocumentTableReader::ReadMathInsDel, this, &oTrackRevision);
oTrackRevision.Write(&GetRunStringWriter(), _T("w:del"));
}
else if (c_oSer_OMathContentType::Ins == type)
{
TrackRevision oTrackRevision;
res = Read1(length, &Binary_DocumentTableReader::ReadMathInsDel, this, &oTrackRevision);
oTrackRevision.Write(&GetRunStringWriter(), _T("w:ins"));
}
else
res = c_oSerConstants::ReadUnknown;
return res;
}
int ReadMathInsDel(BYTE type, long length, void* poResult)
{
int res = c_oSerConstants::ReadOk;
TrackRevision* pTrackRevision = static_cast<TrackRevision*>(poResult);
READ1_TRACKREV(type, length, pTrackRevision)
else if(c_oSerProp_RevisionType::ContentRun == type)
{
pTrackRevision->contentRun = new XmlUtils::CStringWriter();
XmlUtils::CStringWriter* pPrevWriter = m_pCurWriter;
m_pCurWriter = pTrackRevision->contentRun;
res = Read1(length, &Binary_DocumentTableReader::ReadMathMRun, this, NULL);
m_pCurWriter = pPrevWriter;
}
else
res = c_oSerConstants::ReadUnknown;
return res;
};
int ReadMathRad(BYTE type, long length, void* poResult)
{
int res = c_oSerConstants::ReadOk;
......
ASCOfficeDocxFile2/BinWriter/BinReaderWriterDefines.h
View file @ 6c8b05b3
......@@ -444,7 +444,9 @@ extern int g_nCurFormatVersion;
CommentReference = 11,
pptxDrawing = 12,
object = 14,
delText = 15
delText = 15,
del = 16,
ins = 17
};}
namespace c_oSerImageType{enum c_oSerImageType
{
......@@ -790,7 +792,9 @@ extern int g_nCurFormatVersion;
CtrlPr = 58,
pagebreak = 59,
linebreak = 60,
Run = 61
Run = 61,
Ins = 62,
Del = 63
};}
namespace c_oSer_FramePrType{ enum c_oSer_FramePrType
{
......@@ -846,7 +850,8 @@ extern int g_nCurFormatVersion;
tblGridChange = 10,
tblPrChange = 11,
tcPrChange = 12,
trPrChange = 13
trPrChange = 13,
ContentRun = 14
};}
}
......
ASCOfficeDocxFile2/BinWriter/BinWriters.h
View file @ 6c8b05b3
......@@ -3167,15 +3167,7 @@ namespace BinDocxRW
case OOX::et_m_ctrlPr:
{
OOX::Logic::CCtrlPr* pCtrlPr = static_cast<OOX::Logic::CCtrlPr*>(item);
nCurPos = m_oBcw.WriteItemStart(c_oSer_OMathContentType::CtrlPr);
if ( pCtrlPr->m_oRPr.IsInit() )
{
int nCurPos2 = m_oBcw.WriteItemStart(c_oSerRunType::rPr);
brPrs.Write_rPr(pCtrlPr->m_oRPr.get());
m_oBcw.WriteItemEnd(nCurPos2);
}
m_oBcw.WriteItemEnd(nCurPos);
WriteMathCtrlPr(*pCtrlPr, c_oSer_OMathContentType::CtrlPr);
break;
}
case OOX::et_m_d:
......@@ -3341,34 +3333,7 @@ namespace BinDocxRW
{
OOX::Logic::CMRun* pMRun = static_cast<OOX::Logic::CMRun*>(item);
nCurPos = m_oBcw.WriteItemStart(c_oSer_OMathContentType::MRun);
if ( pMRun->m_oMRPr.IsInit() )
WriteMathMRPr(pMRun->m_oMRPr.get());
if ( pMRun->m_oRPr.IsInit() )
{
int nCurPos2 = m_oBcw.WriteItemStart(c_oSer_OMathContentType::RPr);
brPrs.Write_rPr(pMRun->m_oRPr.get());
m_oBcw.WriteItemEnd(nCurPos2);
}
if ( pMRun->m_oMText.IsInit() )
WriteMathText(pMRun->m_oMText.get());
if ( pMRun->m_oBr.IsInit() )
{
int nBreakType = -1;
switch(pMRun->m_oBr->m_oType.GetValue())
{
case SimpleTypes::brtypeColumn:
case SimpleTypes::brtypePage: nBreakType = c_oSer_OMathContentType::pagebreak;break;
case SimpleTypes::brtypeTextWrapping: nBreakType = c_oSer_OMathContentType::linebreak;break;
}
if(-1 != nBreakType)
{
m_oBcw.m_oStream.WriteBYTE(nBreakType);
m_oBcw.m_oStream.WriteLONG(c_oSerPropLenType::Null);
}
}
WriteMathRunContent(pMRun);
m_oBcw.WriteItemEnd(nCurPos);
break;
}
......@@ -3454,6 +3419,47 @@ namespace BinDocxRW
}
}
}
void WriteMathRunContent(OOX::Logic::CMRun* pMRun)
{
if ( pMRun->m_oMRPr.IsInit() )
WriteMathMRPr(pMRun->m_oMRPr.get());
if ( pMRun->m_oRPr.IsInit() )
{
int nCurPos2 = m_oBcw.WriteItemStart(c_oSer_OMathContentType::RPr);
brPrs.Write_rPr(pMRun->m_oRPr.get());
m_oBcw.WriteItemEnd(nCurPos2);
}
if ( pMRun->m_oMText.IsInit() )
WriteMathText(pMRun->m_oMText.get());
if ( pMRun->m_oBr.IsInit() )
{
int nBreakType = -1;
switch(pMRun->m_oBr->m_oType.GetValue())
{
case SimpleTypes::brtypeColumn:
case SimpleTypes::brtypePage: nBreakType = c_oSer_OMathContentType::pagebreak;break;
case SimpleTypes::brtypeTextWrapping: nBreakType = c_oSer_OMathContentType::linebreak;break;
}
if(-1 != nBreakType)
{
m_oBcw.m_oStream.WriteBYTE(nBreakType);
m_oBcw.m_oStream.WriteLONG(c_oSerPropLenType::Null);
}
}
if ( pMRun->m_oDel.IsInit() )
{
int nCurPos2 = m_oBcw.WriteItemStart(c_oSer_OMathContentType::Del);
WriteMathDel(pMRun->m_oDel.get());
m_oBcw.WriteItemEnd(nCurPos2);
}
if ( pMRun->m_oIns.IsInit() )
{
int nCurPos2 = m_oBcw.WriteItemStart(c_oSer_OMathContentType::Ins);
WriteMathIns(pMRun->m_oIns.get());
m_oBcw.WriteItemEnd(nCurPos2);
}
}
void WriteMathAccPr(const OOX::Logic::CAccPr &pAccPr)
{
int nCurPos = m_oBcw.WriteItemStart(c_oSer_OMathContentType::AccPr);
......@@ -3656,9 +3662,9 @@ namespace BinDocxRW
}
m_oBcw.WriteItemEnd(nCurPos);
}
void WriteMathCtrlPr(const OOX::Logic::CCtrlPr &pCtrlPr)
void WriteMathCtrlPr(const OOX::Logic::CCtrlPr &pCtrlPr, BYTE type = c_oSer_OMathBottomNodesType::CtrlPr)
{
int nCurPos = m_oBcw.WriteItemStart(c_oSer_OMathBottomNodesType::CtrlPr);
int nCurPos = m_oBcw.WriteItemStart(type);
if ( pCtrlPr.m_oRPr.IsInit() )
{
......@@ -3666,6 +3672,18 @@ namespace BinDocxRW
brPrs.Write_rPr(pCtrlPr.m_oRPr.get());
m_oBcw.WriteItemEnd(nCurPos2);
}
if ( pCtrlPr.m_oDel.IsInit() )
{
int nCurPos2 = m_oBcw.WriteItemStart(c_oSerRunType::del);
brPrs.Write_rPrChange(pCtrlPr.m_oDel.get());
m_oBcw.WriteItemEnd(nCurPos2);
}
if ( pCtrlPr.m_oIns.IsInit() )
{
int nCurPos2 = m_oBcw.WriteItemStart(c_oSerRunType::ins);
brPrs.Write_rPrChange(pCtrlPr.m_oIns.get());
m_oBcw.WriteItemEnd(nCurPos2);
}
m_oBcw.WriteItemEnd(nCurPos);
}
void WriteMathDelimiter(const std::vector<OOX::WritingElement*>& m_arrItems, LONG &lColumn)
......@@ -4569,6 +4587,29 @@ namespace BinDocxRW
}
m_oBcw.WriteItemEnd(nCurPos);
}
void WriteMathDel(const OOX::Logic::CMDel &pMDel)
{
int nCurPos = 0;
m_oBcw.WriteTrackRevision(pMDel);
if(pMDel.m_oRun.IsInit())
{
nCurPos = m_oBcw.WriteItemStart(c_oSerProp_RevisionType::ContentRun);
WriteMathRunContent(pMDel.m_oRun.GetPointer());
m_oBcw.WriteItemWithLengthEnd(nCurPos);
}
}
void WriteMathIns(const OOX::Logic::CMIns &pMIns)
{
int nCurPos = 0;
m_oBcw.WriteTrackRevision(pMIns);
if(pMIns.m_oRun.IsInit())
{
nCurPos = m_oBcw.WriteItemStart(c_oSerProp_RevisionType::ContentRun);
WriteMathRunContent(pMIns.m_oRun.GetPointer());
m_oBcw.WriteItemWithLengthEnd(nCurPos);
}
}
void WriteMathText(const OOX::Logic::CMText &pMText)
{
int nCurPos = m_oBcw.WriteItemStart(c_oSer_OMathContentType::MText);
......
ASCOfficePPTXFile/PPTXLib/Linux/PPTXFormatLib/PPTXFormatLib.pro
View file @ 6c8b05b3
#-------------------------------------------------
#
# Project created by QtCreator 2014-10-10T14:24:04
#
#-------------------------------------------------
QT -= core gui
TARGET = PPTXFormatLib
TEMPLATE = lib
CONFIG += staticlib
CONFIG += c++11
win32 {
#todo accentbordercallout90type, вернуть inline оптимизацию Ob2
QMAKE_CXXFLAGS_RELEASE += -Ob0
QMAKE_CXXFLAGS_RELEASE -= -Zc:strictStrings
} else {
QMAKE_CXXFLAGS += -std=c++11 -Wall -Wno-ignored-qualifiers
}
############### destination path ###############
DESTINATION_SDK_PATH = $$PWD/../../../../SDK/lib
# WINDOWS
win32:contains(QMAKE_TARGET.arch, x86_64):{
CONFIG(debug, debug|release) {
DESTDIR = $$DESTINATION_SDK_PATH/win_64/DEBUG
} else {
DESTDIR = $$DESTINATION_SDK_PATH/win_64
}
}
win32:!contains(QMAKE_TARGET.arch, x86_64):{
CONFIG(debug, debug|release) {
DESTDIR = $$DESTINATION_SDK_PATH/win_32/DEBUG
} else {
DESTDIR = $$DESTINATION_SDK_PATH/win_32
}
}
linux-g++ | linux-g++-64 | linux-g++-32:contains(QMAKE_HOST.arch, x86_64):{
DESTDIR = $$DESTINATION_SDK_PATH/linux_64
}
linux-g++ | linux-g++-64 | linux-g++-32:!contains(QMAKE_HOST.arch, x86_64):{
DESTDIR = $$DESTINATION_SDK_PATH/linux_32
}
mac {
DESTDIR = $$DESTINATION_SDK_PATH/mac_64
}
############### destination path ###############
DEFINES += UNICODE \
_UNICODE \
_USE_LIBXML2_READER_ \
_USE_XMLLITE_READER_ \
USE_LITE_READER \
PPTX_DEF\
PPT_DEF\
ENABLE_PPT_TO_PPTX_CONVERT \
AVS_USE_CONVERT_PPTX_TOCUSTOM_VML \
NODOCX \
#DISABLE_FILE_DOWNLOADER \
CXIMAGE_DONT_DECLARE_TCHAR \
BUILD_CONFIG_FULL_VERSION \
DONT_WRITE_EMBEDDED_FONTS \
CXIMAGE_DONT_DECLARE_TCHAR
#################### WINDOWS #####################
win32 {
DEFINES += \
LIBXML_READER_ENABLED
INCLUDEPATH += ../../../../ASCOfficeUtils/ZLIB/zlib-1.2.3
INCLUDEPATH += ../../../../Common/DocxFormat/Source/XML/libxml2/XML/include
}
#################### WINDOWS #####################
#################### LINUX ########################
linux-g++ | linux-g++-64 | linux-g++-32 {
DEFINES += \
LINUX \
_LINUX \
_LINUX_QT \
LIBXML_READER_ENABLED
INCLUDEPATH += /usr/include/libxml2/libxml
}
mac {
DEFINES += \
LINUX \
_LINUX \
_LINUX_QT \
LIBXML_READER_ENABLED \
_MAC \
MAC
}
#################### LINUX ########################
INCLUDEPATH += \
../../../../DesktopEditor/freetype-2.5.2/include \
../../../../Common/ASCDocxFormat/Source/Utility \
../../../../Common/ASCDocxFormat/Source/XML \
../../../../Common/ASCDocxFormat/Source \
../../../../Common/DocxFormat/Source/XML/libxml2/XML/include
SOURCES += pptxformatlib.cpp \
../../../ASCOfficeDrawingConverter.cpp \
../../../ASCOfficePPTXFileRealization.cpp \
../../../../Common/DocxFormat/Source/XML/stringcommon.cpp \
../../../PPTXFormat/DocxFormat/IFileContainer.cpp \
../../../PPTXFormat/Logic/Colors/SchemeClr.cpp \
../../../PPTXFormat/Logic/Fills/Blip.cpp \
../../../PPTXFormat/Logic/Table/TableCell.cpp \
../../../PPTXFormat/Logic/Timing/BuildNodeBase.cpp \
../../../PPTXFormat/Logic/Timing/TimeNodeBase.cpp \
../../../PPTXFormat/Logic/Transitions/TransitionBase.cpp \
../../../PPTXFormat/Logic/Bg.cpp \
../../../PPTXFormat/Logic/CNvGrpSpPr.cpp \
../../../PPTXFormat/Logic/ContentPart.cpp \
../../../PPTXFormat/Logic/CxnSp.cpp \
../../../PPTXFormat/Logic/EffectDag.cpp \
../../../PPTXFormat/Logic/EffectLst.cpp \
../../../PPTXFormat/Logic/EffectProperties.cpp \
../../../PPTXFormat/Logic/EffectStyle.cpp \
../../../PPTXFormat/Logic/Geometry.cpp \
../../../PPTXFormat/Logic/GraphicFrame.cpp \
../../../PPTXFormat/Logic/GrpSpPr.cpp \
../../../PPTXFormat/Logic/Hyperlink.cpp \
../../../PPTXFormat/Logic/NvGraphicFramePr.cpp \
../../../PPTXFormat/Logic/NvGrpSpPr.cpp \
../../../PPTXFormat/Logic/Pic.cpp \
../../../PPTXFormat/Logic/Shape.cpp \
../../../PPTXFormat/Logic/ShapeProperties.cpp \
../../../PPTXFormat/Logic/ShapeTextProperties.cpp \
../../../PPTXFormat/Logic/SmartArt.cpp \
../../../PPTXFormat/Logic/SpPr.cpp \
../../../PPTXFormat/Logic/SpTree.cpp \
../../../PPTXFormat/Logic/SpTreeElem.cpp \
#../../../PPTXFormat/Logic/Timing.cpp \
../../../PPTXFormat/Logic/TxBody.cpp \
../../../PPTXFormat/Logic/UniColor.cpp \
../../../PPTXFormat/Logic/UniEffect.cpp \
../../../PPTXFormat/FileContainer.cpp \
../../../PPTXFormat/FileFactory.cpp \
../../../PPTXFormat/FileMap.cpp \
../../../PPTXFormat/Folder.cpp \
../../../Editor/BinaryFileReaderWriter.cpp \
../../../Editor/FontPicker.cpp \
../../../Editor/Drawing/Layout.cpp \
../../../Editor/Drawing/TextAttributesEx.cpp \
../../../Editor/Drawing/Elements.cpp \
../../../PPTXFormat/Logic/Controls.cpp \
../../../../HtmlRenderer/src/ASCSVGWriter.cpp
HEADERS += pptxformatlib.h \
../../../ASCOfficeDrawingConverter.h \
../../../ASCOfficePPTXFile.h \
../../../../Common/DocxFormat/Source/XML/stringcommon.h \
../../../PPTXFormat/DocxFormat/ContentTypes/Default.h \
../../../PPTXFormat/DocxFormat/ContentTypes/DefaultTable.h \
../../../PPTXFormat/DocxFormat/ContentTypes/ExtensionTable.h \
../../../PPTXFormat/DocxFormat/ContentTypes/File.h \
../../../PPTXFormat/DocxFormat/ContentTypes/Override.h \
../../../PPTXFormat/DocxFormat/ContentTypes/OverrideTable.h \
../../../PPTXFormat/DocxFormat/External/External.h \
../../../PPTXFormat/DocxFormat/External/ExternalAudio.h \
../../../PPTXFormat/DocxFormat/External/ExternalImage.h \
../../../PPTXFormat/DocxFormat/External/ExternalVideo.h \
../../../PPTXFormat/DocxFormat/External/HyperLink.h \
../../../PPTXFormat/DocxFormat/Media/Audio.h \
../../../PPTXFormat/DocxFormat/Media/Image.h \
../../../PPTXFormat/DocxFormat/Media/Media.h \
../../../PPTXFormat/DocxFormat/Media/OleObject.h \
../../../PPTXFormat/DocxFormat/Media/Video.h \
../../../PPTXFormat/DocxFormat/Rels/File.h \
../../../PPTXFormat/DocxFormat/Rels/RelationShip.h \
../../../PPTXFormat/DocxFormat/Rels/RelationTable.h \
../../../PPTXFormat/DocxFormat/DateTime.h \
../../../PPTXFormat/DocxFormat/File.h \
../../../PPTXFormat/DocxFormat/FileType.h \
../../../PPTXFormat/DocxFormat/FileTypes.h \
../../../PPTXFormat/DocxFormat/IFileBuilder.h \
../../../PPTXFormat/DocxFormat/IFileContainer.h \
../../../PPTXFormat/DocxFormat/NamespaceOwn.h \
../../../PPTXFormat/DocxFormat/Namespaces.h \
../../../PPTXFormat/DocxFormat/RId.h \
../../../PPTXFormat/DocxFormat/UnknowTypeFile.h \
../../../PPTXFormat/DocxFormat/WritingElement.h \
../../../PPTXFormat/DocxFormat/WritingVector.h \
../../../PPTXFormat/Limit/AlbumLayout.h \
../../../PPTXFormat/Limit/AnimationDgmBuild.h \
../../../PPTXFormat/Limit/BaseLimit.h \
../../../PPTXFormat/Limit/BevelType.h \
../../../PPTXFormat/Limit/BlendMode.h \
../../../PPTXFormat/Limit/BlipCompression.h \
../../../PPTXFormat/Limit/BWMode.h \
../../../PPTXFormat/Limit/CameraType.h \
../../../PPTXFormat/Limit/ChartBuild.h \
../../../PPTXFormat/Limit/ChartBuildType.h \
../../../PPTXFormat/Limit/ColorSchemeIndex.h \
../../../PPTXFormat/Limit/CompoundLine.h \
../../../PPTXFormat/Limit/Conformance.h \
../../../PPTXFormat/Limit/ContentStatus.h \
../../../PPTXFormat/Limit/CornerDirectionVal.h \
../../../PPTXFormat/Limit/DgmBuild.h \
../../../PPTXFormat/Limit/DgmBuildType.h \
../../../PPTXFormat/Limit/EffectContainerType.h \
../../../PPTXFormat/Limit/EightDirectionVal.h \
../../../PPTXFormat/Limit/FillPath.h \
../../../PPTXFormat/Limit/Flip.h \
../../../PPTXFormat/Limit/FontAlign.h \
../../../PPTXFormat/Limit/FontStyleIndex.h \
../../../PPTXFormat/Limit/FrameShape.h \
../../../PPTXFormat/Limit/HorzOverflow.h \
../../../PPTXFormat/Limit/InOutDirectionVal.h \
../../../PPTXFormat/Limit/IterateType.h \
../../../PPTXFormat/Limit/LastView.h \
../../../PPTXFormat/Limit/LightRigType.h \
../../../PPTXFormat/Limit/LineCap.h \
../../../PPTXFormat/Limit/LineEndSize.h \
../../../PPTXFormat/Limit/LineEndType.h \
../../../PPTXFormat/Limit/Material.h \
../../../PPTXFormat/Limit/OnOff.h \
../../../PPTXFormat/Limit/Orient.h \
../../../PPTXFormat/Limit/ParaBuildType.h \
../../../PPTXFormat/Limit/PathFillMode.h \
../../../PPTXFormat/Limit/PattFillVal.h \
../../../PPTXFormat/Limit/PenAlign.h \
../../../PPTXFormat/Limit/PlaceholderSize.h \
../../../PPTXFormat/Limit/PlaceholderType.h \
../../../PPTXFormat/Limit/PresetShadowVal.h \
../../../PPTXFormat/Limit/PrstClrVal.h \
../../../PPTXFormat/Limit/PrstDashVal.h \
../../../PPTXFormat/Limit/RectAlign.h \
../../../PPTXFormat/Limit/SchemeClrVal.h \
../../../PPTXFormat/Limit/ShapeType.h \
../../../PPTXFormat/Limit/SideDirectionVal.h \
../../../PPTXFormat/Limit/SlideLayoutType.h \
../../../PPTXFormat/Limit/SlideSize.h \
../../../PPTXFormat/Limit/SplitterBarState.h \
../../../PPTXFormat/Limit/SysClrVal.h \
../../../PPTXFormat/Limit/TextAlign.h \
../../../PPTXFormat/Limit/TextAnchor.h \
../../../PPTXFormat/Limit/TextAutonumberScheme.h \
../../../PPTXFormat/Limit/TextCaps.h \
../../../PPTXFormat/Limit/TextShapeType.h \
../../../PPTXFormat/Limit/TextStrike.h \
../../../PPTXFormat/Limit/TextTabAlignType.h \
../../../PPTXFormat/Limit/TextUnderline.h \
../../../PPTXFormat/Limit/TextVerticalType.h \
../../../PPTXFormat/Limit/TextWrap.h \
../../../PPTXFormat/Limit/TLAccumulate.h \
../../../PPTXFormat/Limit/TLAdditive.h \
../../../PPTXFormat/Limit/TLCalcMode.h \
../../../PPTXFormat/Limit/TLChartSubElement.h \
../../../PPTXFormat/Limit/TLColorDirection.h \
../../../PPTXFormat/Limit/TLColorSpace.h \
../../../PPTXFormat/Limit/TLCommandType.h \
../../../PPTXFormat/Limit/TLMasterRelation.h \
../../../PPTXFormat/Limit/TLNextAc.h \
../../../PPTXFormat/Limit/TLNodeFillType.h \
../../../PPTXFormat/Limit/TLNodeType.h \
../../../PPTXFormat/Limit/TLOrigin.h \
../../../PPTXFormat/Limit/TLOverride.h \
../../../PPTXFormat/Limit/TLPathEditMode.h \
../../../PPTXFormat/Limit/TLPresetClass.h \
../../../PPTXFormat/Limit/TLPrevAc.h \
../../../PPTXFormat/Limit/TLRestart.h \
../../../PPTXFormat/Limit/TLRuntimeTrigger.h \
../../../PPTXFormat/Limit/TLSyncBehavior.h \
../../../PPTXFormat/Limit/TLTransform.h \
../../../PPTXFormat/Limit/TLTransition.h \
../../../PPTXFormat/Limit/TLTriggerEvent.h \
../../../PPTXFormat/Limit/TLValueType.h \
../../../PPTXFormat/Limit/TransitionSpeed.h \
../../../PPTXFormat/Limit/VariantType.h \
../../../PPTXFormat/Limit/VertOverflow.h \
../../../PPTXFormat/Logic/Bullets/BuAutoNum.h \
../../../PPTXFormat/Logic/Bullets/BuBlip.h \
../../../PPTXFormat/Logic/Bullets/BuChar.h \
../../../PPTXFormat/Logic/Bullets/BuClr.h \
../../../PPTXFormat/Logic/Bullets/BuClrTx.h \
../../../PPTXFormat/Logic/Bullets/BuFontTx.h \
../../../PPTXFormat/Logic/Bullets/Bullet.h \
../../../PPTXFormat/Logic/Bullets/BulletColor.h \
../../../PPTXFormat/Logic/Bullets/BulletSize.h \
../../../PPTXFormat/Logic/Bullets/BulletTypeface.h \
../../../PPTXFormat/Logic/Bullets/BuNone.h \
../../../PPTXFormat/Logic/Bullets/BuSzPct.h \
../../../PPTXFormat/Logic/Bullets/BuSzPts.h \
../../../PPTXFormat/Logic/Bullets/BuSzTx.h \
../../../PPTXFormat/Logic/Colors/ColorBase.h \
../../../PPTXFormat/Logic/Colors/ColorModifier.h \
../../../PPTXFormat/Logic/Colors/PrstClr.h \
../../../PPTXFormat/Logic/Colors/SchemeClr.h \
../../../PPTXFormat/Logic/Colors/SrgbClr.h \
../../../PPTXFormat/Logic/Colors/SysClr.h \
../../../PPTXFormat/Logic/Effects/AlphaBiLevel.h \
../../../PPTXFormat/Logic/Effects/AlphaCeiling.h \
../../../PPTXFormat/Logic/Effects/AlphaFloor.h \
../../../PPTXFormat/Logic/Effects/AlphaInv.h \
../../../PPTXFormat/Logic/Effects/AlphaMod.h \
../../../PPTXFormat/Logic/Effects/AlphaModFix.h \
../../../PPTXFormat/Logic/Effects/AlphaOutset.h \
../../../PPTXFormat/Logic/Effects/AlphaRepl.h \
../../../PPTXFormat/Logic/Effects/BiLevel.h \
../../../PPTXFormat/Logic/Effects/Blend.h \
../../../PPTXFormat/Logic/Effects/Blur.h \
../../../PPTXFormat/Logic/Effects/ClrChange.h \
../../../PPTXFormat/Logic/Effects/ClrRepl.h \
../../../PPTXFormat/Logic/Effects/Duotone.h \
../../../PPTXFormat/Logic/Effects/EffectElement.h \
../../../PPTXFormat/Logic/Effects/FillEffect.h \
../../../PPTXFormat/Logic/Effects/FillOverlay.h \
../../../PPTXFormat/Logic/Effects/Glow.h \
../../../PPTXFormat/Logic/Effects/Grayscl.h \
../../../PPTXFormat/Logic/Effects/HslEffect.h \
../../../PPTXFormat/Logic/Effects/InnerShdw.h \
../../../PPTXFormat/Logic/Effects/LumEffect.h \
../../../PPTXFormat/Logic/Effects/OuterShdw.h \
../../../PPTXFormat/Logic/Effects/PrstShdw.h \
../../../PPTXFormat/Logic/Effects/Reflection.h \
../../../PPTXFormat/Logic/Effects/RelOff.h \
../../../PPTXFormat/Logic/Effects/SoftEdge.h \
../../../PPTXFormat/Logic/Effects/TintEffect.h \
../../../PPTXFormat/Logic/Effects/XfrmEffect.h \
../../../PPTXFormat/Logic/Fills/Blip.h \
../../../PPTXFormat/Logic/Fills/BlipFill.h \
../../../PPTXFormat/Logic/Fills/GradFill.h \
../../../PPTXFormat/Logic/Fills/NoFill.h \
../../../PPTXFormat/Logic/Fills/PattFill.h \
../../../PPTXFormat/Logic/Fills/SolidFill.h \
../../../PPTXFormat/Logic/Fills/Stretch.h \
../../../PPTXFormat/Logic/Fills/Tile.h \
../../../PPTXFormat/Logic/Media/AudioCD.h \
../../../PPTXFormat/Logic/Media/MediaFile.h \
../../../PPTXFormat/Logic/Media/WavAudioFile.h \
../../../PPTXFormat/Logic/Path2D/ArcTo.h \
../../../PPTXFormat/Logic/Path2D/Close.h \
../../../PPTXFormat/Logic/Path2D/CubicBezTo.h \
../../../PPTXFormat/Logic/Path2D/LineTo.h \
../../../PPTXFormat/Logic/Path2D/MoveTo.h \
../../../PPTXFormat/Logic/Path2D/PathBase.h \
../../../PPTXFormat/Logic/Path2D/QuadBezTo.h \
../../../PPTXFormat/Logic/Runs/Br.h \
../../../PPTXFormat/Logic/Runs/Fld.h \
../../../PPTXFormat/Logic/Runs/Run.h \
../../../PPTXFormat/Logic/Runs/RunBase.h \
../../../PPTXFormat/Logic/Table/Table.h \
../../../PPTXFormat/Logic/Table/TableCell.h \
../../../PPTXFormat/Logic/Table/TableCellProperties.h \
../../../PPTXFormat/Logic/Table/TableCol.h \
../../../PPTXFormat/Logic/Table/TableProperties.h \
../../../PPTXFormat/Logic/Table/TableRow.h \
../../../PPTXFormat/Logic/Timing/Anim.h \
../../../PPTXFormat/Logic/Timing/AnimClr.h \
../../../PPTXFormat/Logic/Timing/AnimEffect.h \
../../../PPTXFormat/Logic/Timing/AnimMotion.h \
../../../PPTXFormat/Logic/Timing/AnimRot.h \
../../../PPTXFormat/Logic/Timing/AnimScale.h \
../../../PPTXFormat/Logic/Timing/AnimVariant.h \
../../../PPTXFormat/Logic/Timing/AttrName.h \
../../../PPTXFormat/Logic/Timing/AttrNameLst.h \
../../../PPTXFormat/Logic/Timing/Audio.h \
../../../PPTXFormat/Logic/Timing/BldDgm.h \
../../../PPTXFormat/Logic/Timing/BldGraphic.h \
../../../PPTXFormat/Logic/Timing/BldLst.h \
../../../PPTXFormat/Logic/Timing/BldOleChart.h \
../../../PPTXFormat/Logic/Timing/BldP.h \
../../../PPTXFormat/Logic/Timing/BldSub.h \
../../../PPTXFormat/Logic/Timing/BuildNodeBase.h \
../../../PPTXFormat/Logic/Timing/CBhvr.h \
../../../PPTXFormat/Logic/Timing/Cmd.h \
../../../PPTXFormat/Logic/Timing/CMediaNode.h \
../../../PPTXFormat/Logic/Timing/Cond.h \
../../../PPTXFormat/Logic/Timing/CondLst.h \
../../../PPTXFormat/Logic/Timing/CTn.h \
../../../PPTXFormat/Logic/Timing/Excl.h \
../../../PPTXFormat/Logic/Timing/GraphicEl.h \
../../../PPTXFormat/Logic/Timing/Iterate.h \
../../../PPTXFormat/Logic/Timing/Par.h \
../../../PPTXFormat/Logic/Timing/Seq.h \
../../../PPTXFormat/Logic/Timing/Set.h \
../../../PPTXFormat/Logic/Timing/SpTgt.h \
../../../PPTXFormat/Logic/Timing/Tav.h \
../../../PPTXFormat/Logic/Timing/TavLst.h \
../../../PPTXFormat/Logic/Timing/TgtEl.h \
../../../PPTXFormat/Logic/Timing/TimeNodeBase.h \
../../../PPTXFormat/Logic/Timing/Timing.h \
../../../PPTXFormat/Logic/Timing/Tmpl.h \
../../../PPTXFormat/Logic/Timing/TmplLst.h \
../../../PPTXFormat/Logic/Timing/TnLst.h \
../../../PPTXFormat/Logic/Timing/TxEl.h \
../../../PPTXFormat/Logic/Timing/Video.h \
../../../PPTXFormat/Logic/Transitions/CornerDirectionTransition.h \
../../../PPTXFormat/Logic/Transitions/EightDirectionTransition.h \
../../../PPTXFormat/Logic/Transitions/EmptyTransition.h \
../../../PPTXFormat/Logic/Transitions/OptionalBlackTransition.h \
../../../PPTXFormat/Logic/Transitions/OrientationTransition.h \
../../../PPTXFormat/Logic/Transitions/SideDirectionTransition.h \
../../../PPTXFormat/Logic/Transitions/SndAc.h \
../../../PPTXFormat/Logic/Transitions/SplitTransition.h \
../../../PPTXFormat/Logic/Transitions/StSnd.h \
../../../PPTXFormat/Logic/Transitions/Transition.h \
../../../PPTXFormat/Logic/Transitions/TransitionBase.h \
../../../PPTXFormat/Logic/Transitions/WheelTransition.h \
../../../PPTXFormat/Logic/Transitions/ZoomTransition.h \
../../../PPTXFormat/Logic/Ah.h \
../../../PPTXFormat/Logic/AhBase.h \
../../../PPTXFormat/Logic/AhPolar.h \
../../../PPTXFormat/Logic/AhXY.h \
../../../PPTXFormat/Logic/Backdrop.h \
../../../PPTXFormat/Logic/Bevel.h \
../../../PPTXFormat/Logic/Bg.h \
../../../PPTXFormat/Logic/BgPr.h \
../../../PPTXFormat/Logic/BodyPr.h \
../../../PPTXFormat/Logic/Camera.h \
../../../PPTXFormat/Logic/Cell3D.h \
../../../PPTXFormat/Logic/ClrMap.h \
../../../PPTXFormat/Logic/ClrMapOvr.h \
../../../PPTXFormat/Logic/CNvCxnSpPr.h \
../../../PPTXFormat/Logic/CNvGraphicFramePr.h \
../../../PPTXFormat/Logic/CNvGrpSpPr.h \
../../../PPTXFormat/Logic/CNvPicPr.h \
../../../PPTXFormat/Logic/CNvPr.h \
../../../PPTXFormat/Logic/CNvSpPr.h \
../../../PPTXFormat/Logic/ContentPart.h \
../../../PPTXFormat/Logic/CSld.h \
../../../PPTXFormat/Logic/CustGeom.h \
../../../PPTXFormat/Logic/Cxn.h \
../../../PPTXFormat/Logic/CxnSp.h \
../../../PPTXFormat/Logic/DefaultShapeDefinition.h \
../../../PPTXFormat/Logic/EffectDag.h \
../../../PPTXFormat/Logic/EffectLst.h \
../../../PPTXFormat/Logic/EffectProperties.h \
../../../PPTXFormat/Logic/EffectStyle.h \
../../../PPTXFormat/Logic/ExtP.h \
../../../PPTXFormat/Logic/FillStyle.h \
../../../PPTXFormat/Logic/FontCollection.h \
../../../PPTXFormat/Logic/FontRef.h \
../../../PPTXFormat/Logic/Gd.h \
../../../PPTXFormat/Logic/Geometry.h \
../../../PPTXFormat/Logic/GraphicFrame.h \
../../../PPTXFormat/Logic/GrpSpPr.h \
../../../PPTXFormat/Logic/Gs.h \
../../../PPTXFormat/Logic/HeadingVariant.h \
../../../PPTXFormat/Logic/Hf.h \
../../../PPTXFormat/Logic/Hyperlink.h \
../../../PPTXFormat/Logic/LightRig.h \
../../../PPTXFormat/Logic/Lin.h \
../../../PPTXFormat/Logic/LineEnd.h \
../../../PPTXFormat/Logic/LineJoin.h \
../../../PPTXFormat/Logic/LineStyle.h \
../../../PPTXFormat/Logic/Ln.h \
../../../PPTXFormat/Logic/NvCxnSpPr.h \
../../../PPTXFormat/Logic/NvGraphicFramePr.h \
../../../PPTXFormat/Logic/NvGrpSpPr.h \
../../../PPTXFormat/Logic/NvPicPr.h \
../../../PPTXFormat/Logic/NvPr.h \
../../../PPTXFormat/Logic/NvSpPr.h \
../../../PPTXFormat/Logic/Paragraph.h \
../../../PPTXFormat/Logic/PartTitle.h \
../../../PPTXFormat/Logic/Path.h \
../../../PPTXFormat/Logic/Path2D.h \
../../../PPTXFormat/Logic/Ph.h \
../../../PPTXFormat/Logic/Pic.h \
../../../PPTXFormat/Logic/PrstDash.h \
../../../PPTXFormat/Logic/PrstGeom.h \
../../../PPTXFormat/Logic/PrstTxWarp.h \
../../../PPTXFormat/Logic/Rect.h \
../../../PPTXFormat/Logic/Rot.h \
../../../PPTXFormat/Logic/RunElem.h \
../../../PPTXFormat/Logic/RunProperties.h \
../../../PPTXFormat/Logic/Scene3d.h \
../../../PPTXFormat/Logic/Shape.h \
../../../PPTXFormat/Logic/ShapeProperties.h \
../../../PPTXFormat/Logic/ShapeStyle.h \
../../../PPTXFormat/Logic/ShapeTextProperties.h \
../../../PPTXFormat/Logic/SmartArt.h \
../../../PPTXFormat/Logic/Sp3d.h \
../../../PPTXFormat/Logic/SpPr.h \
../../../PPTXFormat/Logic/SpTree.h \
../../../PPTXFormat/Logic/SpTreeElem.h \
../../../PPTXFormat/Logic/StyleRef.h \
../../../PPTXFormat/Logic/SupplementalFont.h \
../../../PPTXFormat/Logic/Tab.h \
../../../PPTXFormat/Logic/TableBgStyle.h \
../../../PPTXFormat/Logic/TablePartStyle.h \
../../../PPTXFormat/Logic/TableStyle.h \
../../../PPTXFormat/Logic/TcBdr.h \
../../../PPTXFormat/Logic/TcStyle.h \
../../../PPTXFormat/Logic/TcTxStyle.h \
../../../PPTXFormat/Logic/TextFit.h \
../../../PPTXFormat/Logic/TextFont.h \
../../../PPTXFormat/Logic/TextListStyle.h \
../../../PPTXFormat/Logic/TextParagraphPr.h \
../../../PPTXFormat/Logic/TextSpacing.h \
../../../PPTXFormat/Logic/Timing.h \
../../../PPTXFormat/Logic/TxBody.h \
../../../PPTXFormat/Logic/TxStyles.h \
../../../PPTXFormat/Logic/UniColor.h \
../../../PPTXFormat/Logic/UniEffect.h \
../../../PPTXFormat/Logic/UniFill.h \
../../../PPTXFormat/Logic/UniMedia.h \
../../../PPTXFormat/Logic/UniPath2D.h \
../../../PPTXFormat/Logic/Xfrm.h \
../../../PPTXFormat/Logic/XmlId.h \
../../../PPTXFormat/Presentation/EmbeddedFont.h \
../../../PPTXFormat/Presentation/EmbeddedFontDataId.h \
../../../PPTXFormat/Presentation/Kinsoku.h \
../../../PPTXFormat/Presentation/NotesSz.h \
../../../PPTXFormat/Presentation/PhotoAlbum.h \
../../../PPTXFormat/Presentation/SldSz.h \
../../../PPTXFormat/Theme/ClrScheme.h \
../../../PPTXFormat/Theme/ExtraClrScheme.h \
../../../PPTXFormat/Theme/FmtScheme.h \
../../../PPTXFormat/Theme/FontScheme.h \
../../../PPTXFormat/Theme/ThemeElements.h \
../../../PPTXFormat/ViewProps/CSldViewPr.h \
../../../PPTXFormat/ViewProps/CViewPr.h \
../../../PPTXFormat/ViewProps/GridSpacing.h \
../../../PPTXFormat/ViewProps/Guide.h \
../../../PPTXFormat/ViewProps/NormalViewPr.h \
../../../PPTXFormat/ViewProps/NotesTextViewPr.h \
../../../PPTXFormat/ViewProps/NotesViewPr.h \
../../../PPTXFormat/ViewProps/Origin.h \
../../../PPTXFormat/ViewProps/OutlineViewPr.h \
../../../PPTXFormat/ViewProps/Ratio.h \
../../../PPTXFormat/ViewProps/Restored.h \
../../../PPTXFormat/ViewProps/Scale.h \
../../../PPTXFormat/ViewProps/Sld.h \
../../../PPTXFormat/ViewProps/SlideViewPr.h \
../../../PPTXFormat/ViewProps/SorterViewPr.h \
../../../PPTXFormat/App.h \
../../../PPTXFormat/CommentAuthors.h \
../../../PPTXFormat/Comments.h \
../../../PPTXFormat/Core.h \
../../../PPTXFormat/FileContainer.h \
../../../PPTXFormat/FileFactory.h \
../../../PPTXFormat/FileMap.h \
../../../PPTXFormat/Folder.h \
../../../PPTXFormat/HandoutMaster.h \
../../../PPTXFormat/NotesMaster.h \
../../../PPTXFormat/NotesSlide.h \
../../../PPTXFormat/PPTX.h \
../../../PPTXFormat/PPTXEvent.h \
../../../PPTXFormat/Presentation.h \
../../../PPTXFormat/PresProps.h \
../../../PPTXFormat/Slide.h \
../../../PPTXFormat/SlideLayout.h \
../../../PPTXFormat/SlideMaster.h \
../../../PPTXFormat/TableStyles.h \
../../../PPTXFormat/Theme.h \
../../../PPTXFormat/ViewProps.h \
../../../PPTXFormat/WrapperFile.h \
../../../PPTXFormat/WrapperWritingElement.h \
../../../PPTXFormat/DocxFormat/Drawing/LegacyDiagramText.h \
../../../PPTXFormat/DocxFormat/Drawing/VmlDrawing.h \
../../../PPTXFormat/Logic/Controls.h \
../../../Editor/BinaryFileReaderWriter.h \
../../../Editor/BinReaderWriterDefines.h \
../../../Editor/BinWriters.h \
../../../Editor/CalculatorCRC32.h \
../../../Editor/Converter.h \
../../../Editor/FontCutter.h \
../../../Editor/FontPicker.h \
../../../Editor/imagemanager.h \
../../../Editor/PPTXWriter.h \
../../../Editor/WMFToImageConverter.h \
../../../Editor/XmlStringWriter.h \
../../../Editor/PresentationDrawingsDef.h \
../../../Editor/DefaultNotesMaster.h \
../../../Editor/DefaultNotesTheme.h \
../../Settings.h \
../../../../Common/DocxFormat/Source/Base/Nullable.h \
../../../../Common/DocxFormat/Source/XML/xmlutils.h \
../../../../HtmlRenderer/include/ASCSVGWriter.h \
../../../../Common/FileDownloader/FileDownloader.h
win32 {
SOURCES += \
../../../../Common/FileDownloader/FileDownloader_win.cpp
}
linux-g++ | linux-g++-64 | linux-g++-32 {
SOURCES += \
../../../../Common/FileDownloader/FileDownloader_curl.cpp
}
mac {
OBJECTIVE_SOURCES += \
../../../../Common/FileDownloader/FileDownloader_mac.mm
}
unix {
target.path = /usr/lib
INSTALLS += target
}
#-------------------------------------------------
#
# Project created by QtCreator 2014-10-10T14:24:04
#
#-------------------------------------------------
QT -= core gui
TARGET = PPTXFormatLib
TEMPLATE = lib
CONFIG += staticlib
CONFIG += c++11
win32 {
#todo accentbordercallout90type, вернуть inline оптимизацию Ob2
QMAKE_CXXFLAGS_RELEASE += -Ob0
QMAKE_CXXFLAGS_RELEASE -= -Zc:strictStrings
} else {
QMAKE_CXXFLAGS += -std=c++11 -Wall -Wno-ignored-qualifiers
}
############### destination path ###############
DESTINATION_SDK_PATH = $$PWD/../../../../SDK/lib
# WINDOWS
win32:contains(QMAKE_TARGET.arch, x86_64):{
CONFIG(debug, debug|release) {
DESTDIR = $$DESTINATION_SDK_PATH/win_64/DEBUG
} else {
DESTDIR = $$DESTINATION_SDK_PATH/win_64
}
}
win32:!contains(QMAKE_TARGET.arch, x86_64):{
CONFIG(debug, debug|release) {
DESTDIR = $$DESTINATION_SDK_PATH/win_32/DEBUG
} else {
DESTDIR = $$DESTINATION_SDK_PATH/win_32
}
}
linux-g++ | linux-g++-64 | linux-g++-32:contains(QMAKE_HOST.arch, x86_64):{
DESTDIR = $$DESTINATION_SDK_PATH/linux_64
}
linux-g++ | linux-g++-64 | linux-g++-32:!contains(QMAKE_HOST.arch, x86_64):{
DESTDIR = $$DESTINATION_SDK_PATH/linux_32
}
mac {
DESTDIR = $$DESTINATION_SDK_PATH/mac_64
}
############### destination path ###############
DEFINES += UNICODE \
_UNICODE \
_USE_LIBXML2_READER_ \
_USE_XMLLITE_READER_ \
USE_LITE_READER \
PPTX_DEF\
PPT_DEF\
ENABLE_PPT_TO_PPTX_CONVERT \
AVS_USE_CONVERT_PPTX_TOCUSTOM_VML \
NODOCX \
#DISABLE_FILE_DOWNLOADER \
CXIMAGE_DONT_DECLARE_TCHAR \
BUILD_CONFIG_FULL_VERSION \
DONT_WRITE_EMBEDDED_FONTS \
CXIMAGE_DONT_DECLARE_TCHAR
#################### WINDOWS #####################
win32 {
DEFINES += \
LIBXML_READER_ENABLED
INCLUDEPATH += ../../../../ASCOfficeUtils/ZLIB/zlib-1.2.3
INCLUDEPATH += ../../../../Common/DocxFormat/Source/XML/libxml2/XML/include
}
#################### WINDOWS #####################
#################### LINUX ########################
linux-g++ | linux-g++-64 | linux-g++-32 {
DEFINES += \
LINUX \
_LINUX \
_LINUX_QT \
LIBXML_READER_ENABLED
INCLUDEPATH += /usr/include/libxml2/libxml
}
mac {
DEFINES += \
LINUX \
_LINUX \
_LINUX_QT \
LIBXML_READER_ENABLED \
_MAC \
MAC
}
#################### LINUX ########################
INCLUDEPATH += \
../../../../DesktopEditor/freetype-2.5.2/include \
../../../../Common/ASCDocxFormat/Source/Utility \
../../../../Common/ASCDocxFormat/Source/XML \
../../../../Common/ASCDocxFormat/Source \
../../../../Common/DocxFormat/Source/XML/libxml2/XML/include
SOURCES += pptxformatlib.cpp \
../../../ASCOfficeDrawingConverter.cpp \
../../../ASCOfficePPTXFileRealization.cpp \
../../../../Common/DocxFormat/Source/XML/stringcommon.cpp \
../../../PPTXFormat/DocxFormat/IFileContainer.cpp \
../../../PPTXFormat/Logic/Colors/SchemeClr.cpp \
../../../PPTXFormat/Logic/Fills/Blip.cpp \
../../../PPTXFormat/Logic/Table/TableCell.cpp \
../../../PPTXFormat/Logic/Timing/BuildNodeBase.cpp \
../../../PPTXFormat/Logic/Timing/TimeNodeBase.cpp \
../../../PPTXFormat/Logic/Transitions/TransitionBase.cpp \
../../../PPTXFormat/Logic/Bg.cpp \
../../../PPTXFormat/Logic/CNvGrpSpPr.cpp \
../../../PPTXFormat/Logic/ContentPart.cpp \
../../../PPTXFormat/Logic/CxnSp.cpp \
../../../PPTXFormat/Logic/EffectDag.cpp \
../../../PPTXFormat/Logic/EffectLst.cpp \
../../../PPTXFormat/Logic/EffectProperties.cpp \
../../../PPTXFormat/Logic/EffectStyle.cpp \
../../../PPTXFormat/Logic/Geometry.cpp \
../../../PPTXFormat/Logic/GraphicFrame.cpp \
../../../PPTXFormat/Logic/GrpSpPr.cpp \
../../../PPTXFormat/Logic/Hyperlink.cpp \
../../../PPTXFormat/Logic/NvGraphicFramePr.cpp \
../../../PPTXFormat/Logic/NvGrpSpPr.cpp \
../../../PPTXFormat/Logic/Pic.cpp \
../../../PPTXFormat/Logic/Shape.cpp \
../../../PPTXFormat/Logic/ShapeProperties.cpp \
../../../PPTXFormat/Logic/ShapeTextProperties.cpp \
../../../PPTXFormat/Logic/SmartArt.cpp \
../../../PPTXFormat/Logic/SpPr.cpp \
../../../PPTXFormat/Logic/SpTree.cpp \
../../../PPTXFormat/Logic/SpTreeElem.cpp \
#../../../PPTXFormat/Logic/Timing.cpp \
../../../PPTXFormat/Logic/TxBody.cpp \
../../../PPTXFormat/Logic/UniColor.cpp \
../../../PPTXFormat/Logic/UniEffect.cpp \
../../../PPTXFormat/FileContainer.cpp \
../../../PPTXFormat/FileFactory.cpp \
../../../PPTXFormat/FileMap.cpp \
../../../PPTXFormat/Folder.cpp \
../../../Editor/BinaryFileReaderWriter.cpp \
../../../Editor/FontPicker.cpp \
../../../Editor/Drawing/Layout.cpp \
../../../Editor/Drawing/TextAttributesEx.cpp \
../../../Editor/Drawing/Elements.cpp \
../../../PPTXFormat/Logic/Controls.cpp \
../../../../HtmlRenderer/src/ASCSVGWriter.cpp
HEADERS += pptxformatlib.h \
../../../ASCOfficeDrawingConverter.h \
../../../ASCOfficePPTXFile.h \
../../../../Common/DocxFormat/Source/XML/stringcommon.h \
../../../PPTXFormat/DocxFormat/ContentTypes/Default.h \
../../../PPTXFormat/DocxFormat/ContentTypes/DefaultTable.h \
../../../PPTXFormat/DocxFormat/ContentTypes/ExtensionTable.h \
../../../PPTXFormat/DocxFormat/ContentTypes/File.h \
../../../PPTXFormat/DocxFormat/ContentTypes/Override.h \
../../../PPTXFormat/DocxFormat/ContentTypes/OverrideTable.h \
../../../PPTXFormat/DocxFormat/External/External.h \
../../../PPTXFormat/DocxFormat/External/ExternalAudio.h \
../../../PPTXFormat/DocxFormat/External/ExternalImage.h \
../../../PPTXFormat/DocxFormat/External/ExternalVideo.h \
../../../PPTXFormat/DocxFormat/External/HyperLink.h \
../../../PPTXFormat/DocxFormat/Media/Audio.h \
../../../PPTXFormat/DocxFormat/Media/Image.h \
../../../PPTXFormat/DocxFormat/Media/Media.h \
../../../PPTXFormat/DocxFormat/Media/OleObject.h \
../../../PPTXFormat/DocxFormat/Media/Video.h \
../../../PPTXFormat/DocxFormat/Rels/File.h \
../../../PPTXFormat/DocxFormat/Rels/RelationShip.h \
../../../PPTXFormat/DocxFormat/Rels/RelationTable.h \
../../../PPTXFormat/DocxFormat/DateTime.h \
../../../PPTXFormat/DocxFormat/File.h \
../../../PPTXFormat/DocxFormat/FileType.h \
../../../PPTXFormat/DocxFormat/FileTypes.h \
../../../PPTXFormat/DocxFormat/IFileBuilder.h \
../../../PPTXFormat/DocxFormat/IFileContainer.h \
../../../PPTXFormat/DocxFormat/NamespaceOwn.h \
../../../PPTXFormat/DocxFormat/Namespaces.h \
../../../PPTXFormat/DocxFormat/RId.h \
../../../PPTXFormat/DocxFormat/UnknowTypeFile.h \
../../../PPTXFormat/DocxFormat/WritingElement.h \
../../../PPTXFormat/DocxFormat/WritingVector.h \
../../../PPTXFormat/Limit/AlbumLayout.h \
../../../PPTXFormat/Limit/AnimationDgmBuild.h \
../../../PPTXFormat/Limit/BaseLimit.h \
../../../PPTXFormat/Limit/BevelType.h \
../../../PPTXFormat/Limit/BlendMode.h \
../../../PPTXFormat/Limit/BlipCompression.h \
../../../PPTXFormat/Limit/BWMode.h \
../../../PPTXFormat/Limit/CameraType.h \
../../../PPTXFormat/Limit/ChartBuild.h \
../../../PPTXFormat/Limit/ChartBuildType.h \
../../../PPTXFormat/Limit/ColorSchemeIndex.h \
../../../PPTXFormat/Limit/CompoundLine.h \
../../../PPTXFormat/Limit/Conformance.h \
../../../PPTXFormat/Limit/ContentStatus.h \
../../../PPTXFormat/Limit/CornerDirectionVal.h \
../../../PPTXFormat/Limit/DgmBuild.h \
../../../PPTXFormat/Limit/DgmBuildType.h \
../../../PPTXFormat/Limit/EffectContainerType.h \
../../../PPTXFormat/Limit/EightDirectionVal.h \
../../../PPTXFormat/Limit/FillPath.h \
../../../PPTXFormat/Limit/Flip.h \
../../../PPTXFormat/Limit/FontAlign.h \
../../../PPTXFormat/Limit/FontStyleIndex.h \
../../../PPTXFormat/Limit/FrameShape.h \
../../../PPTXFormat/Limit/HorzOverflow.h \
../../../PPTXFormat/Limit/InOutDirectionVal.h \
../../../PPTXFormat/Limit/IterateType.h \
../../../PPTXFormat/Limit/LastView.h \
../../../PPTXFormat/Limit/LightRigType.h \
../../../PPTXFormat/Limit/LineCap.h \
../../../PPTXFormat/Limit/LineEndSize.h \
../../../PPTXFormat/Limit/LineEndType.h \
../../../PPTXFormat/Limit/Material.h \
../../../PPTXFormat/Limit/OnOff.h \
../../../PPTXFormat/Limit/Orient.h \
../../../PPTXFormat/Limit/ParaBuildType.h \
../../../PPTXFormat/Limit/PathFillMode.h \
../../../PPTXFormat/Limit/PattFillVal.h \
../../../PPTXFormat/Limit/PenAlign.h \
../../../PPTXFormat/Limit/PlaceholderSize.h \
../../../PPTXFormat/Limit/PlaceholderType.h \
../../../PPTXFormat/Limit/PresetShadowVal.h \
../../../PPTXFormat/Limit/PrstClrVal.h \
../../../PPTXFormat/Limit/PrstDashVal.h \
../../../PPTXFormat/Limit/RectAlign.h \
../../../PPTXFormat/Limit/SchemeClrVal.h \
../../../PPTXFormat/Limit/ShapeType.h \
../../../PPTXFormat/Limit/SideDirectionVal.h \
../../../PPTXFormat/Limit/SlideLayoutType.h \
../../../PPTXFormat/Limit/SlideSize.h \
../../../PPTXFormat/Limit/SplitterBarState.h \
../../../PPTXFormat/Limit/SysClrVal.h \
../../../PPTXFormat/Limit/TextAlign.h \
../../../PPTXFormat/Limit/TextAnchor.h \
../../../PPTXFormat/Limit/TextAutonumberScheme.h \
../../../PPTXFormat/Limit/TextCaps.h \
../../../PPTXFormat/Limit/TextShapeType.h \
../../../PPTXFormat/Limit/TextStrike.h \
../../../PPTXFormat/Limit/TextTabAlignType.h \
../../../PPTXFormat/Limit/TextUnderline.h \
../../../PPTXFormat/Limit/TextVerticalType.h \
../../../PPTXFormat/Limit/TextWrap.h \
../../../PPTXFormat/Limit/TLAccumulate.h \
../../../PPTXFormat/Limit/TLAdditive.h \
../../../PPTXFormat/Limit/TLCalcMode.h \
../../../PPTXFormat/Limit/TLChartSubElement.h \
../../../PPTXFormat/Limit/TLColorDirection.h \
../../../PPTXFormat/Limit/TLColorSpace.h \
../../../PPTXFormat/Limit/TLCommandType.h \
../../../PPTXFormat/Limit/TLMasterRelation.h \
../../../PPTXFormat/Limit/TLNextAc.h \
../../../PPTXFormat/Limit/TLNodeFillType.h \
../../../PPTXFormat/Limit/TLNodeType.h \
../../../PPTXFormat/Limit/TLOrigin.h \
../../../PPTXFormat/Limit/TLOverride.h \
../../../PPTXFormat/Limit/TLPathEditMode.h \
../../../PPTXFormat/Limit/TLPresetClass.h \
../../../PPTXFormat/Limit/TLPrevAc.h \
../../../PPTXFormat/Limit/TLRestart.h \
../../../PPTXFormat/Limit/TLRuntimeTrigger.h \
../../../PPTXFormat/Limit/TLSyncBehavior.h \
../../../PPTXFormat/Limit/TLTransform.h \
../../../PPTXFormat/Limit/TLTransition.h \
../../../PPTXFormat/Limit/TLTriggerEvent.h \
../../../PPTXFormat/Limit/TLValueType.h \
../../../PPTXFormat/Limit/TransitionSpeed.h \
../../../PPTXFormat/Limit/VariantType.h \
../../../PPTXFormat/Limit/VertOverflow.h \
../../../PPTXFormat/Logic/Bullets/BuAutoNum.h \
../../../PPTXFormat/Logic/Bullets/BuBlip.h \
../../../PPTXFormat/Logic/Bullets/BuChar.h \
../../../PPTXFormat/Logic/Bullets/BuClr.h \
../../../PPTXFormat/Logic/Bullets/BuClrTx.h \
../../../PPTXFormat/Logic/Bullets/BuFontTx.h \
../../../PPTXFormat/Logic/Bullets/Bullet.h \
../../../PPTXFormat/Logic/Bullets/BulletColor.h \
../../../PPTXFormat/Logic/Bullets/BulletSize.h \
../../../PPTXFormat/Logic/Bullets/BulletTypeface.h \
../../../PPTXFormat/Logic/Bullets/BuNone.h \
../../../PPTXFormat/Logic/Bullets/BuSzPct.h \
../../../PPTXFormat/Logic/Bullets/BuSzPts.h \
../../../PPTXFormat/Logic/Bullets/BuSzTx.h \
../../../PPTXFormat/Logic/Colors/ColorBase.h \
../../../PPTXFormat/Logic/Colors/ColorModifier.h \
../../../PPTXFormat/Logic/Colors/PrstClr.h \
../../../PPTXFormat/Logic/Colors/SchemeClr.h \
../../../PPTXFormat/Logic/Colors/SrgbClr.h \
../../../PPTXFormat/Logic/Colors/SysClr.h \
../../../PPTXFormat/Logic/Effects/AlphaBiLevel.h \
../../../PPTXFormat/Logic/Effects/AlphaCeiling.h \
../../../PPTXFormat/Logic/Effects/AlphaFloor.h \
../../../PPTXFormat/Logic/Effects/AlphaInv.h \
../../../PPTXFormat/Logic/Effects/AlphaMod.h \
../../../PPTXFormat/Logic/Effects/AlphaModFix.h \
../../../PPTXFormat/Logic/Effects/AlphaOutset.h \
../../../PPTXFormat/Logic/Effects/AlphaRepl.h \
../../../PPTXFormat/Logic/Effects/BiLevel.h \
../../../PPTXFormat/Logic/Effects/Blend.h \
../../../PPTXFormat/Logic/Effects/Blur.h \
../../../PPTXFormat/Logic/Effects/ClrChange.h \
../../../PPTXFormat/Logic/Effects/ClrRepl.h \
../../../PPTXFormat/Logic/Effects/Duotone.h \
../../../PPTXFormat/Logic/Effects/EffectElement.h \
../../../PPTXFormat/Logic/Effects/FillEffect.h \
../../../PPTXFormat/Logic/Effects/FillOverlay.h \
../../../PPTXFormat/Logic/Effects/Glow.h \
../../../PPTXFormat/Logic/Effects/Grayscl.h \
../../../PPTXFormat/Logic/Effects/HslEffect.h \
../../../PPTXFormat/Logic/Effects/InnerShdw.h \
../../../PPTXFormat/Logic/Effects/LumEffect.h \
../../../PPTXFormat/Logic/Effects/OuterShdw.h \
../../../PPTXFormat/Logic/Effects/PrstShdw.h \
../../../PPTXFormat/Logic/Effects/Reflection.h \
../../../PPTXFormat/Logic/Effects/RelOff.h \
../../../PPTXFormat/Logic/Effects/SoftEdge.h \
../../../PPTXFormat/Logic/Effects/TintEffect.h \
../../../PPTXFormat/Logic/Effects/XfrmEffect.h \
../../../PPTXFormat/Logic/Fills/Blip.h \
../../../PPTXFormat/Logic/Fills/BlipFill.h \
../../../PPTXFormat/Logic/Fills/GradFill.h \
../../../PPTXFormat/Logic/Fills/NoFill.h \
../../../PPTXFormat/Logic/Fills/PattFill.h \
../../../PPTXFormat/Logic/Fills/SolidFill.h \
../../../PPTXFormat/Logic/Fills/Stretch.h \
../../../PPTXFormat/Logic/Fills/Tile.h \
../../../PPTXFormat/Logic/Media/AudioCD.h \
../../../PPTXFormat/Logic/Media/MediaFile.h \
../../../PPTXFormat/Logic/Media/WavAudioFile.h \
../../../PPTXFormat/Logic/Path2D/ArcTo.h \
../../../PPTXFormat/Logic/Path2D/Close.h \
../../../PPTXFormat/Logic/Path2D/CubicBezTo.h \
../../../PPTXFormat/Logic/Path2D/LineTo.h \
../../../PPTXFormat/Logic/Path2D/MoveTo.h \
../../../PPTXFormat/Logic/Path2D/PathBase.h \
../../../PPTXFormat/Logic/Path2D/QuadBezTo.h \
../../../PPTXFormat/Logic/Runs/Br.h \
../../../PPTXFormat/Logic/Runs/Fld.h \
../../../PPTXFormat/Logic/Runs/Run.h \
../../../PPTXFormat/Logic/Runs/RunBase.h \
../../../PPTXFormat/Logic/Table/Table.h \
../../../PPTXFormat/Logic/Table/TableCell.h \
../../../PPTXFormat/Logic/Table/TableCellProperties.h \
../../../PPTXFormat/Logic/Table/TableCol.h \
../../../PPTXFormat/Logic/Table/TableProperties.h \
../../../PPTXFormat/Logic/Table/TableRow.h \
../../../PPTXFormat/Logic/Timing/Anim.h \
../../../PPTXFormat/Logic/Timing/AnimClr.h \
../../../PPTXFormat/Logic/Timing/AnimEffect.h \
../../../PPTXFormat/Logic/Timing/AnimMotion.h \
../../../PPTXFormat/Logic/Timing/AnimRot.h \
../../../PPTXFormat/Logic/Timing/AnimScale.h \
../../../PPTXFormat/Logic/Timing/AnimVariant.h \
../../../PPTXFormat/Logic/Timing/AttrName.h \
../../../PPTXFormat/Logic/Timing/AttrNameLst.h \
../../../PPTXFormat/Logic/Timing/Audio.h \
../../../PPTXFormat/Logic/Timing/BldDgm.h \
../../../PPTXFormat/Logic/Timing/BldGraphic.h \
../../../PPTXFormat/Logic/Timing/BldLst.h \
../../../PPTXFormat/Logic/Timing/BldOleChart.h \
../../../PPTXFormat/Logic/Timing/BldP.h \
../../../PPTXFormat/Logic/Timing/BldSub.h \
../../../PPTXFormat/Logic/Timing/BuildNodeBase.h \
../../../PPTXFormat/Logic/Timing/CBhvr.h \
../../../PPTXFormat/Logic/Timing/Cmd.h \
../../../PPTXFormat/Logic/Timing/CMediaNode.h \
../../../PPTXFormat/Logic/Timing/Cond.h \
../../../PPTXFormat/Logic/Timing/CondLst.h \
../../../PPTXFormat/Logic/Timing/CTn.h \
../../../PPTXFormat/Logic/Timing/Excl.h \
../../../PPTXFormat/Logic/Timing/GraphicEl.h \
../../../PPTXFormat/Logic/Timing/Iterate.h \
../../../PPTXFormat/Logic/Timing/Par.h \
../../../PPTXFormat/Logic/Timing/Seq.h \
../../../PPTXFormat/Logic/Timing/Set.h \
../../../PPTXFormat/Logic/Timing/SpTgt.h \
../../../PPTXFormat/Logic/Timing/Tav.h \
../../../PPTXFormat/Logic/Timing/TavLst.h \
../../../PPTXFormat/Logic/Timing/TgtEl.h \
../../../PPTXFormat/Logic/Timing/TimeNodeBase.h \
../../../PPTXFormat/Logic/Timing/Timing.h \
../../../PPTXFormat/Logic/Timing/Tmpl.h \
../../../PPTXFormat/Logic/Timing/TmplLst.h \
../../../PPTXFormat/Logic/Timing/TnLst.h \
../../../PPTXFormat/Logic/Timing/TxEl.h \
../../../PPTXFormat/Logic/Timing/Video.h \
../../../PPTXFormat/Logic/Transitions/CornerDirectionTransition.h \
../../../PPTXFormat/Logic/Transitions/EightDirectionTransition.h \
../../../PPTXFormat/Logic/Transitions/EmptyTransition.h \
../../../PPTXFormat/Logic/Transitions/OptionalBlackTransition.h \
../../../PPTXFormat/Logic/Transitions/OrientationTransition.h \
../../../PPTXFormat/Logic/Transitions/SideDirectionTransition.h \
../../../PPTXFormat/Logic/Transitions/SndAc.h \
../../../PPTXFormat/Logic/Transitions/SplitTransition.h \
../../../PPTXFormat/Logic/Transitions/StSnd.h \
../../../PPTXFormat/Logic/Transitions/Transition.h \
../../../PPTXFormat/Logic/Transitions/TransitionBase.h \
../../../PPTXFormat/Logic/Transitions/WheelTransition.h \
../../../PPTXFormat/Logic/Transitions/ZoomTransition.h \
../../../PPTXFormat/Logic/Ah.h \
../../../PPTXFormat/Logic/AhBase.h \
../../../PPTXFormat/Logic/AhPolar.h \
../../../PPTXFormat/Logic/AhXY.h \
../../../PPTXFormat/Logic/Backdrop.h \
../../../PPTXFormat/Logic/Bevel.h \
../../../PPTXFormat/Logic/Bg.h \
../../../PPTXFormat/Logic/BgPr.h \
../../../PPTXFormat/Logic/BodyPr.h \
../../../PPTXFormat/Logic/Camera.h \
../../../PPTXFormat/Logic/Cell3D.h \
../../../PPTXFormat/Logic/ClrMap.h \
../../../PPTXFormat/Logic/ClrMapOvr.h \
../../../PPTXFormat/Logic/CNvCxnSpPr.h \
../../../PPTXFormat/Logic/CNvGraphicFramePr.h \
../../../PPTXFormat/Logic/CNvGrpSpPr.h \
../../../PPTXFormat/Logic/CNvPicPr.h \
../../../PPTXFormat/Logic/CNvPr.h \
../../../PPTXFormat/Logic/CNvSpPr.h \
../../../PPTXFormat/Logic/ContentPart.h \
../../../PPTXFormat/Logic/CSld.h \
../../../PPTXFormat/Logic/CustGeom.h \
../../../PPTXFormat/Logic/Cxn.h \
../../../PPTXFormat/Logic/CxnSp.h \
../../../PPTXFormat/Logic/DefaultShapeDefinition.h \
../../../PPTXFormat/Logic/EffectDag.h \
../../../PPTXFormat/Logic/EffectLst.h \
../../../PPTXFormat/Logic/EffectProperties.h \
../../../PPTXFormat/Logic/EffectStyle.h \
../../../PPTXFormat/Logic/ExtP.h \
../../../PPTXFormat/Logic/FillStyle.h \
../../../PPTXFormat/Logic/FontCollection.h \
../../../PPTXFormat/Logic/FontRef.h \
../../../PPTXFormat/Logic/Gd.h \
../../../PPTXFormat/Logic/Geometry.h \
../../../PPTXFormat/Logic/GraphicFrame.h \
../../../PPTXFormat/Logic/GrpSpPr.h \
../../../PPTXFormat/Logic/Gs.h \
../../../PPTXFormat/Logic/HeadingVariant.h \
../../../PPTXFormat/Logic/Hf.h \
../../../PPTXFormat/Logic/Hyperlink.h \
../../../PPTXFormat/Logic/LightRig.h \
../../../PPTXFormat/Logic/Lin.h \
../../../PPTXFormat/Logic/LineEnd.h \
../../../PPTXFormat/Logic/LineJoin.h \
../../../PPTXFormat/Logic/LineStyle.h \
../../../PPTXFormat/Logic/Ln.h \
../../../PPTXFormat/Logic/NvCxnSpPr.h \
../../../PPTXFormat/Logic/NvGraphicFramePr.h \
../../../PPTXFormat/Logic/NvGrpSpPr.h \
../../../PPTXFormat/Logic/NvPicPr.h \
../../../PPTXFormat/Logic/NvPr.h \
../../../PPTXFormat/Logic/NvSpPr.h \
../../../PPTXFormat/Logic/Paragraph.h \
../../../PPTXFormat/Logic/PartTitle.h \
../../../PPTXFormat/Logic/Path.h \
../../../PPTXFormat/Logic/Path2D.h \
../../../PPTXFormat/Logic/Ph.h \
../../../PPTXFormat/Logic/Pic.h \
../../../PPTXFormat/Logic/PrstDash.h \
../../../PPTXFormat/Logic/PrstGeom.h \
../../../PPTXFormat/Logic/PrstTxWarp.h \
../../../PPTXFormat/Logic/Rect.h \
../../../PPTXFormat/Logic/Rot.h \
../../../PPTXFormat/Logic/RunElem.h \
../../../PPTXFormat/Logic/RunProperties.h \
../../../PPTXFormat/Logic/Scene3d.h \
../../../PPTXFormat/Logic/Shape.h \
../../../PPTXFormat/Logic/ShapeProperties.h \
../../../PPTXFormat/Logic/ShapeStyle.h \
../../../PPTXFormat/Logic/ShapeTextProperties.h \
../../../PPTXFormat/Logic/SmartArt.h \
../../../PPTXFormat/Logic/Sp3d.h \
../../../PPTXFormat/Logic/SpPr.h \
../../../PPTXFormat/Logic/SpTree.h \
../../../PPTXFormat/Logic/SpTreeElem.h \
../../../PPTXFormat/Logic/StyleRef.h \
../../../PPTXFormat/Logic/SupplementalFont.h \
../../../PPTXFormat/Logic/Tab.h \
../../../PPTXFormat/Logic/TableBgStyle.h \
../../../PPTXFormat/Logic/TablePartStyle.h \
../../../PPTXFormat/Logic/TableStyle.h \
../../../PPTXFormat/Logic/TcBdr.h \
../../../PPTXFormat/Logic/TcStyle.h \
../../../PPTXFormat/Logic/TcTxStyle.h \
../../../PPTXFormat/Logic/TextFit.h \
../../../PPTXFormat/Logic/TextFont.h \
../../../PPTXFormat/Logic/TextListStyle.h \
../../../PPTXFormat/Logic/TextParagraphPr.h \
../../../PPTXFormat/Logic/TextSpacing.h \
../../../PPTXFormat/Logic/Timing.h \
../../../PPTXFormat/Logic/TxBody.h \
../../../PPTXFormat/Logic/TxStyles.h \
../../../PPTXFormat/Logic/UniColor.h \
../../../PPTXFormat/Logic/UniEffect.h \
../../../PPTXFormat/Logic/UniFill.h \
../../../PPTXFormat/Logic/UniMedia.h \
../../../PPTXFormat/Logic/UniPath2D.h \
../../../PPTXFormat/Logic/Xfrm.h \
../../../PPTXFormat/Logic/XmlId.h \
../../../PPTXFormat/Presentation/EmbeddedFont.h \
../../../PPTXFormat/Presentation/EmbeddedFontDataId.h \
../../../PPTXFormat/Presentation/Kinsoku.h \
../../../PPTXFormat/Presentation/NotesSz.h \
../../../PPTXFormat/Presentation/PhotoAlbum.h \
../../../PPTXFormat/Presentation/SldSz.h \
../../../PPTXFormat/Theme/ClrScheme.h \
../../../PPTXFormat/Theme/ExtraClrScheme.h \
../../../PPTXFormat/Theme/FmtScheme.h \
../../../PPTXFormat/Theme/FontScheme.h \
../../../PPTXFormat/Theme/ThemeElements.h \
../../../PPTXFormat/ViewProps/CSldViewPr.h \
../../../PPTXFormat/ViewProps/CViewPr.h \
../../../PPTXFormat/ViewProps/GridSpacing.h \
../../../PPTXFormat/ViewProps/Guide.h \
../../../PPTXFormat/ViewProps/NormalViewPr.h \
../../../PPTXFormat/ViewProps/NotesTextViewPr.h \
../../../PPTXFormat/ViewProps/NotesViewPr.h \
../../../PPTXFormat/ViewProps/Origin.h \
../../../PPTXFormat/ViewProps/OutlineViewPr.h \
../../../PPTXFormat/ViewProps/Ratio.h \
../../../PPTXFormat/ViewProps/Restored.h \
../../../PPTXFormat/ViewProps/Scale.h \
../../../PPTXFormat/ViewProps/Sld.h \
../../../PPTXFormat/ViewProps/SlideViewPr.h \
../../../PPTXFormat/ViewProps/SorterViewPr.h \
../../../PPTXFormat/App.h \
../../../PPTXFormat/CommentAuthors.h \
../../../PPTXFormat/Comments.h \
../../../PPTXFormat/Core.h \
../../../PPTXFormat/FileContainer.h \
../../../PPTXFormat/FileFactory.h \
../../../PPTXFormat/FileMap.h \
../../../PPTXFormat/Folder.h \
../../../PPTXFormat/HandoutMaster.h \
../../../PPTXFormat/NotesMaster.h \
../../../PPTXFormat/NotesSlide.h \
../../../PPTXFormat/PPTX.h \
../../../PPTXFormat/PPTXEvent.h \
../../../PPTXFormat/Presentation.h \
../../../PPTXFormat/PresProps.h \
../../../PPTXFormat/Slide.h \
../../../PPTXFormat/SlideLayout.h \
../../../PPTXFormat/SlideMaster.h \
../../../PPTXFormat/TableStyles.h \
../../../PPTXFormat/Theme.h \
../../../PPTXFormat/ViewProps.h \
../../../PPTXFormat/WrapperFile.h \
../../../PPTXFormat/WrapperWritingElement.h \
../../../PPTXFormat/DocxFormat/Drawing/LegacyDiagramText.h \
../../../PPTXFormat/DocxFormat/Drawing/VmlDrawing.h \
../../../PPTXFormat/Logic/Controls.h \
../../../Editor/BinaryFileReaderWriter.h \
../../../Editor/BinReaderWriterDefines.h \
../../../Editor/BinWriters.h \
../../../Editor/CalculatorCRC32.h \
../../../Editor/Converter.h \
../../../Editor/FontCutter.h \
../../../Editor/FontPicker.h \
../../../Editor/imagemanager.h \
../../../Editor/PPTXWriter.h \
../../../Editor/WMFToImageConverter.h \
../../../Editor/XmlStringWriter.h \
../../../Editor/PresentationDrawingsDef.h \
../../../Editor/DefaultNotesMaster.h \
../../../Editor/DefaultNotesTheme.h \
../../Settings.h \
../../../../Common/DocxFormat/Source/Base/Nullable.h \
../../../../Common/DocxFormat/Source/XML/xmlutils.h \
../../../../HtmlRenderer/include/ASCSVGWriter.h \
../../../../Common/FileDownloader/FileDownloader.h
win32 {
SOURCES += \
../../../../Common/FileDownloader/FileDownloader_win.cpp
}
linux-g++ | linux-g++-64 | linux-g++-32 {
SOURCES += \
../../../../Common/FileDownloader/FileDownloader_curl.cpp
}
mac {
OBJECTIVE_SOURCES += \
../../../../Common/FileDownloader/FileDownloader_mac.mm
}
unix {
target.path = /usr/lib
INSTALLS += target
}
Common/DocxFormat/Source/DocxFormat/Logic/AlternateContent.cpp
View file @ 6c8b05b3
#include "AlternateContent.h"
#include "AlternateContent.h"
#include "Run.h"
namespace OOX
......@@ -36,13 +36,9 @@ namespace OOX
for (unsigned int i = 0; i < altRun.m_arrItems.size(); ++i)
m_arrChoiceItems.push_back(altRun.m_arrItems[i]);
for (unsigned int i = 0; i < altRun.m_arrSpreadsheetItems.size(); ++i)
m_arrSpreadsheetChoiceItems.push_back(altRun.m_arrSpreadsheetItems[i]);
// RemoveAll altRun
//без RemoveAll они очистятся вместе с altRun
altRun.m_arrItems.clear();
altRun.m_arrSpreadsheetItems.clear();
}
else if ( _T("mc:Fallback") == sName )
{
......@@ -50,13 +46,9 @@ namespace OOX
for (unsigned int i = 0; i < altRun.m_arrItems.size(); ++i)
m_arrFallbackItems.push_back(altRun.m_arrItems[i]);
for (unsigned int i = 0; i < altRun.m_arrSpreadsheetItems.size(); ++i)
m_arrSpreadsheetFallbackItems.push_back(altRun.m_arrSpreadsheetItems[i]);
// RemoveAll altRun
//без RemoveAll они очистятся вместе с altRun
altRun.m_arrItems.clear();
altRun.m_arrSpreadsheetItems.clear();
}
}
}
......
Common/DocxFormat/Source/DocxFormat/Logic/Run.h
View file @ 6c8b05b3
#pragma once
#pragma once
#ifndef OOX_LOGIC_RUN_INCLUDE_H_
#define OOX_LOGIC_RUN_INCLUDE_H_
......@@ -61,13 +61,6 @@ namespace OOX
m_oRsidRPr.reset();
m_oRunProperty = NULL;
for (unsigned int nIndex = 0; nIndex < m_arrSpreadsheetItems.size(); nIndex++ )
{
if ( m_arrItems[nIndex] )delete m_arrSpreadsheetItems[nIndex];
m_arrSpreadsheetItems[nIndex] = NULL;
}
m_arrSpreadsheetItems.clear();
for (unsigned int nIndex = 0; nIndex < m_arrItems.size(); nIndex++ )
{
if ( m_arrItems[nIndex] )delete m_arrItems[nIndex];
......@@ -188,7 +181,6 @@ namespace OOX
{
CWCharWrapper sName = oReader.GetName();
WritingElement *pItem = NULL;
OOX::Spreadsheet::WritingElement *pSpreadsheetItem = NULL;
if ( _T("mc:AlternateContent") == sName )
pItem = new CAlternateContent( oReader );
......@@ -263,8 +255,6 @@ namespace OOX
if ( pItem )
m_arrItems.push_back( pItem );
if ( pSpreadsheetItem )
m_arrSpreadsheetItems.push_back( pSpreadsheetItem );
}
}
virtual CString toXML() const
......@@ -288,15 +278,6 @@ namespace OOX
sResult += m_arrItems[nIndex]->toXML();
}
}
for (unsigned int nIndex = 0; nIndex < m_arrSpreadsheetItems.size(); nIndex++ )
{
if ( m_arrSpreadsheetItems[nIndex] )
{
if (m_arrItems[nIndex]->getType() == OOX::Spreadsheet::et_rPr) continue;
sResult += m_arrSpreadsheetItems[nIndex]->toXML();
}
}
sResult += _T("</w:r>");
......@@ -344,10 +325,8 @@ namespace OOX
nullable<SimpleTypes::CLongHexNumber<> > m_oRsidRPr;
// Childs
std::vector<OOX::Spreadsheet::WritingElement *> m_arrSpreadsheetItems;
OOX::Logic::CRunProperty *m_oRunProperty; // m_arrItems... - /
// Drawing::Run -
OOX::Logic::CRunProperty *m_oRunProperty; // копия того что в m_arrItems... - для быстрого доступа/анализа
// по идее нужно сделать как в Drawing::Run - то есть единственные подобъекты вынести отдельно
};
} // namespace Logic
} // namespace OOX
......
Common/DocxFormat/Source/DocxFormat/Math/oMathContent.cpp
View file @ 6c8b05b3
......@@ -295,114 +295,122 @@ namespace OOX
{
CString sResult = _T("<m:r>");
if ( m_oAnnotationRef.IsInit() )
sResult += m_oAnnotationRef->toXML();
sResult += toXMLInner();
sResult += _T("</m:r>");
if ( m_oBr.IsInit() )
sResult += m_oBr->toXML();
return sResult;
}
CString CMRun::toXMLInner() const
{
CString sResult;
if ( m_oCommentReference.IsInit() )
sResult += m_oCommentReference->toXML();
if ( m_oAnnotationRef.IsInit() )
sResult += m_oAnnotationRef->toXML();
if ( m_oContentPart.IsInit() )
sResult += m_oContentPart->toXML();
if ( m_oBr.IsInit() )
sResult += m_oBr->toXML();
if ( m_oContinuationSeparator.IsInit() )
sResult += m_oContinuationSeparator->toXML();
if ( m_oCommentReference.IsInit() )
sResult += m_oCommentReference->toXML();
if ( m_oCr.IsInit() )
sResult += m_oCr->toXML();
if ( m_oContentPart.IsInit() )
sResult += m_oContentPart->toXML();
if ( m_oDayLong.IsInit() )
sResult += m_oDayLong->toXML();
if ( m_oContinuationSeparator.IsInit() )
sResult += m_oContinuationSeparator->toXML();
if ( m_oDayShort.IsInit() )
sResult += m_oDayShort->toXML();
if ( m_oCr.IsInit() )
sResult += m_oCr->toXML();
if ( m_oDelInstrText.IsInit() )
sResult += m_oDelInstrText->toXML();
if ( m_oDayLong.IsInit() )
sResult += m_oDayLong->toXML();
if ( m_oDelText.IsInit() )
sResult += m_oDelText->toXML();
if ( m_oDayShort.IsInit() )
sResult += m_oDayShort->toXML();
if ( m_oDrawing.IsInit() )
sResult += m_oDrawing->toXML();
if ( m_oDelInstrText.IsInit() )
sResult += m_oDelInstrText->toXML();
if ( m_oEndnoteRef.IsInit() )
sResult += m_oEndnoteRef->toXML();
if ( m_oDelText.IsInit() )
sResult += m_oDelText->toXML();
if ( m_oEndnoteReference.IsInit() )
sResult += m_oEndnoteReference->toXML();
if ( m_oDrawing.IsInit() )
sResult += m_oDrawing->toXML();
if ( m_oFldChar.IsInit() )
sResult += m_oFldChar->toXML();
if ( m_oEndnoteRef.IsInit() )
sResult += m_oEndnoteRef->toXML();
if ( m_oFootnoteRef.IsInit() )
sResult += m_oFootnoteRef->toXML();
if ( m_oEndnoteReference.IsInit() )
sResult += m_oEndnoteReference->toXML();
if ( m_oFootnoteReference.IsInit() )
sResult += m_oFootnoteReference->toXML();
if ( m_oFldChar.IsInit() )
sResult += m_oFldChar->toXML();
if ( m_oInstrText.IsInit() )
sResult += m_oInstrText->toXML();
if ( m_oFootnoteRef.IsInit() )
sResult += m_oFootnoteRef->toXML();
if ( m_oLastRenderedPageBreak.IsInit() )
sResult += m_oLastRenderedPageBreak->toXML();
if ( m_oFootnoteReference.IsInit() )
sResult += m_oFootnoteReference->toXML();
if ( m_oMonthLong.IsInit() )
sResult += m_oMonthLong->toXML();
if ( m_oInstrText.IsInit() )
sResult += m_oInstrText->toXML();
if ( m_oMonthShort.IsInit() )
sResult += m_oMonthShort->toXML();
if ( m_oLastRenderedPageBreak.IsInit() )
sResult += m_oLastRenderedPageBreak->toXML();
if ( m_oNoBreakHyphen.IsInit() )
sResult += m_oNoBreakHyphen->toXML();
if ( m_oMonthLong.IsInit() )
sResult += m_oMonthLong->toXML();
if ( m_oObject.IsInit() )
sResult += m_oObject->toXML();
if ( m_oMonthShort.IsInit() )
sResult += m_oMonthShort->toXML();
if ( m_oPgNum.IsInit() )
sResult += m_oPgNum->toXML();
if ( m_oNoBreakHyphen.IsInit() )
sResult += m_oNoBreakHyphen->toXML();
if ( m_oPtab.IsInit() )
sResult += m_oPtab->toXML();
if ( m_oObject.IsInit() )
sResult += m_oObject->toXML();
if ( m_oMRPr.IsInit() )
sResult += m_oMRPr->toXML();
if ( m_oPgNum.IsInit() )
sResult += m_oPgNum->toXML();
if ( m_oRPr.IsInit() )
sResult += m_oRPr->toXML();
if ( m_oPtab.IsInit() )
sResult += m_oPtab->toXML();
if ( m_oRuby.IsInit() )
sResult += m_oRuby->toXML();
if ( m_oMRPr.IsInit() )
sResult += m_oMRPr->toXML();
if ( m_oSeparator.IsInit() )
sResult += m_oSeparator->toXML();
if ( m_oRPr.IsInit() )
sResult += m_oRPr->toXML();
if ( m_oSoftHyphen.IsInit() )
sResult += m_oSoftHyphen->toXML();
if ( m_oRuby.IsInit() )
sResult += m_oRuby->toXML();
if ( m_oSym.IsInit() )
sResult += m_oSym->toXML();
if ( m_oSeparator.IsInit() )
sResult += m_oSeparator->toXML();
if ( m_oMText.IsInit() )
sResult += m_oMText->toXML();
if ( m_oSoftHyphen.IsInit() )
sResult += m_oSoftHyphen->toXML();
if ( m_oText.IsInit() )
sResult += m_oText->toXML();
if ( m_oSym.IsInit() )
sResult += m_oSym->toXML();
if ( m_oTab.IsInit() )
sResult += m_oTab->toXML();
if ( m_oMText.IsInit() )
sResult += m_oMText->toXML();
if ( m_oYearLong.IsInit() )
sResult += m_oYearLong->toXML();
if ( m_oText.IsInit() )
sResult += m_oText->toXML();
if ( m_oYearShort.IsInit() )
sResult += m_oYearShort->toXML();
sResult += _T("</m:r>");
if ( m_oTab.IsInit() )
sResult += m_oTab->toXML();
return sResult;
}
if ( m_oYearLong.IsInit() )
sResult += m_oYearLong->toXML();
if ( m_oYearShort.IsInit() )
sResult += m_oYearShort->toXML();
return sResult;
}
}
}
\ No newline at end of file
Common/DocxFormat/Source/DocxFormat/Math/oMathContent.h
View file @ 6c8b05b3
......@@ -580,8 +580,8 @@ namespace OOX
public:
//Childs
nullable<OOX::Logic::CRunProperty> m_oRPr;
nullable<OOX::Logic::CIns> m_oIns;
nullable<OOX::Logic::CDel> m_oDel;
nullable<OOX::Logic::CRPrChange> m_oIns;
nullable<OOX::Logic::CRPrChange> m_oDel;
};
//--------------------------------------------------------------------------------
// CDelimiterPr 22.1.2.31 (Delimiter Properties)
......@@ -2242,6 +2242,8 @@ namespace OOX
//--------------------------------------------------------------------------------
class CMText;
class CMRPr;
class CMDel;
class CMIns;
class CMRun : public WritingElement
{
public:
......@@ -2281,6 +2283,8 @@ namespace OOX
m_oDayLong = oReader;
else if ( _T("w:dayShort") == sName )
m_oDayShort = oReader;
else if ( _T("w:del") == sName )
m_oDel = oReader;
else if ( _T("w:delInstrText") == sName )
m_oDelInstrText = oReader;
else if ( _T("w:delText") == sName )
......@@ -2297,6 +2301,8 @@ namespace OOX
m_oFootnoteRef = oReader;
else if ( _T("w:footnoteReference") == sName )
m_oFootnoteReference = oReader;
else if ( _T("w:ins") == sName )
m_oIns = oReader;
else if ( _T("w:instrText") == sName )
m_oInstrText = oReader;
else if ( _T("w:lastRenderedPageBreak") == sName )
......@@ -2338,6 +2344,7 @@ namespace OOX
}
}
virtual CString toXML() const;
virtual CString toXMLInner() const;
virtual EElementType getType() const
{
......@@ -2353,6 +2360,7 @@ namespace OOX
nullable<OOX::Logic::CCr> m_oCr;
nullable<OOX::Logic::CDayLong> m_oDayLong;
nullable<OOX::Logic::CDayShort> m_oDayShort;
nullable<OOX::Logic::CMDel> m_oDel;
nullable<OOX::Logic::CDelInstrText> m_oDelInstrText;
nullable<OOX::Logic::CDelText> m_oDelText;
nullable<OOX::Logic::CDrawing> m_oDrawing;
......@@ -2361,6 +2369,7 @@ namespace OOX
nullable<OOX::Logic::CFldChar> m_oFldChar;
nullable<OOX::Logic::CFootnoteRef> m_oFootnoteRef;
nullable<OOX::Logic::CFootnoteReference> m_oFootnoteReference;
nullable<OOX::Logic::CMIns> m_oIns;
nullable<OOX::Logic::CInstrText> m_oInstrText;
nullable<OOX::Logic::CLastRenderedPageBreak> m_oLastRenderedPageBreak;
nullable<OOX::Logic::CMonthLong> m_oMonthLong;
......@@ -2380,7 +2389,184 @@ namespace OOX
nullable<OOX::Logic::CTab> m_oTab;
nullable<OOX::Logic::CYearLong> m_oYearLong;
nullable<OOX::Logic::CYearShort> m_oYearShort;
};
};
class CMDel : public WritingElement
{
public:
WritingElement_AdditionConstructors(CMDel)
CMDel()
{
}
virtual ~CMDel()
{
}
public:
virtual void fromXML(XmlUtils::CXmlNode& oNode)
{
}
virtual void fromXML(XmlUtils::CXmlLiteReader& oReader)
{
ReadAttributes(oReader);
m_oRun = oReader;
}
virtual CString toXML() const
{
CString sResult;
sResult += "<w:del";
if ( m_sAuthor.IsInit() )
{
sResult += " w:author=\"";
sResult += XmlUtils::EncodeXmlString(m_sAuthor->GetString());
sResult += "\" ";
}
if ( m_oDate.IsInit() )
{
sResult += " w:date=\"";
sResult += XmlUtils::EncodeXmlString(m_oDate->ToString());
sResult += "\" ";
}
if ( m_oId.IsInit() )
{
sResult += " w:id=\"";
sResult += m_oId->ToString();
sResult += "\" ";
}
if ( m_sUserId.IsInit() )
{
sResult += " oouserid=\"";
sResult += XmlUtils::EncodeXmlString(m_sUserId->GetString());
sResult += "\" ";
}
sResult += ">";
if(m_oRun.IsInit())
{
sResult += m_oRun->toXMLInner();
}
sResult += "</w:del>";
return sResult;
}
virtual EElementType getType() const
{
return et_w_ins;
}
private:
void ReadAttributes(XmlUtils::CXmlLiteReader& oReader)
{
// Читаем атрибуты
WritingElement_ReadAttributes_Start( oReader )
WritingElement_ReadAttributes_Read_if ( oReader, _T("w:author"), m_sAuthor )
WritingElement_ReadAttributes_Read_else_if( oReader, _T("w:date"), m_oDate )
WritingElement_ReadAttributes_Read_else_if( oReader, _T("w:id"), m_oId )
WritingElement_ReadAttributes_Read_else_if( oReader, _T("oouserid"), m_sUserId )
WritingElement_ReadAttributes_End( oReader )
}
public:
nullable<CString > m_sAuthor;
nullable<SimpleTypes::CDateTime > m_oDate;
nullable<SimpleTypes::CDecimalNumber<> > m_oId;
nullable<CString > m_sUserId;
// Childs
nullable<CMRun> m_oRun;
};
class CMIns : public WritingElement
{
public:
WritingElement_AdditionConstructors(CMIns)
CMIns()
{
}
virtual ~CMIns()
{
}
public:
virtual void fromXML(XmlUtils::CXmlNode& oNode)
{
}
virtual void fromXML(XmlUtils::CXmlLiteReader& oReader)
{
ReadAttributes(oReader);
m_oRun = oReader;
}
virtual CString toXML() const
{
CString sResult;
sResult += "<w:ins";
if ( m_sAuthor.IsInit() )
{
sResult += " w:author=\"";
sResult += XmlUtils::EncodeXmlString(m_sAuthor->GetString());
sResult += "\" ";
}
if ( m_oDate.IsInit() )
{
sResult += " w:date=\"";
sResult += XmlUtils::EncodeXmlString(m_oDate->ToString());
sResult += "\" ";
}
if ( m_oId.IsInit() )
{
sResult += " w:id=\"";
sResult += m_oId->ToString();
sResult += "\" ";
}
if ( m_sUserId.IsInit() )
{
sResult += " oouserid=\"";
sResult += XmlUtils::EncodeXmlString(m_sUserId->GetString());
sResult += "\" ";
}
sResult += ">";
if(m_oRun.IsInit())
{
sResult += m_oRun->toXMLInner();
}
sResult += "</w:ins>";
return sResult;
}
virtual EElementType getType() const
{
return et_w_ins;
}
private:
void ReadAttributes(XmlUtils::CXmlLiteReader& oReader)
{
// Читаем атрибуты
WritingElement_ReadAttributes_Start( oReader )
WritingElement_ReadAttributes_Read_if ( oReader, _T("w:author"), m_sAuthor )
WritingElement_ReadAttributes_Read_else_if( oReader, _T("w:date"), m_oDate )
WritingElement_ReadAttributes_Read_else_if( oReader, _T("w:id"), m_oId )
WritingElement_ReadAttributes_Read_else_if( oReader, _T("oouserid"), m_sUserId )
WritingElement_ReadAttributes_End( oReader )
}
public:
nullable<CString > m_sAuthor;
nullable<SimpleTypes::CDateTime > m_oDate;
nullable<SimpleTypes::CDecimalNumber<> > m_oId;
nullable<CString > m_sUserId;
// Childs
nullable<CMRun> m_oRun;
};
//--------------------------------------------------------------------------------
// CRad 22.1.2.88 (Radical Object)
//--------------------------------------------------------------------------------
......
Common/DocxFormat/Source/DocxFormat/WritingElement.h
View file @ 6c8b05b3
#pragma once
#pragma once
//#include "NamespaceOwn.h"
#include "../XML/xmlutils.h"
......@@ -44,7 +44,7 @@ namespace OOX
if ( oValue.IsInit() )\
sResult += oValue->toXML();
// 3 define CXmlLiteReader
// Следующие 3 define используются для чтения аттрибутов через CXmlLiteReader
#define WritingElement_ReadAttributes_Start(Reader) \
if ( Reader.GetAttributesCount() <= 0 )\
return;\
......
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