Commit e8d8b2e5 authored by ElenaSubbotina's avatar ElenaSubbotina

.

parent adb84b0f
......@@ -21,9 +21,6 @@ include($$PWD/../../../Common/3dParty/boost/boost.pri)
DEFINES += UNICODE \
_UNICODE \
PPTX_DEF \
PPT_DEF \
ENABLE_PPT_TO_PPTX_CONVERT \
_USE_LIBXML2_READER_ \
LIBXML_READER_ENABLED \
USE_LITE_READER \
......
......@@ -48,7 +48,7 @@
#include "./PPTXFormat/LegacyDiagramText.h"
#include "./Editor/Drawing/Elements.h"
#include "./Editor/Drawing/Shapes/BaseShape/PPTXShape/pptx2pptshapeconverter.h"
#include "./Editor/Drawing/Shapes/BaseShape/PPTXShape/Pptx2PptShapeConverter.h"
#include "../DesktopEditor/common/Directory.h"
......
......@@ -37,7 +37,7 @@
#include "../Common/DocxFormat/Source/Base/Base.h"
#include "../Common/DocxFormat/Source/Base/Nullable.h"
#include "./Editor/Drawing/Shapes/BaseShape/PPTShape/PPTShapeEnum.h"
#include "./Editor/Drawing/Shapes/BaseShape/PPTShape/PptShapeEnum.h"
#include <vector>
#include <map>
......
......@@ -37,7 +37,7 @@
#include "../../../Common/FileDownloader/FileDownloader.h"
#endif
#include "Shapes/BaseShape/PPTShape/ppt2pptxshapeconverter.h"
#include "Shapes/BaseShape/PPTShape/Ppt2PptxShapeConverter.h"
namespace PPTX2EditorAdvanced
{
......
......@@ -33,8 +33,8 @@
#include "BaseShape.h"
#include "PPTXShape/PPTXShape.h"
#include "PPTShape/PPTShape.h"
#include "PPTXShape/PptxShape.h"
#include "PPTShape/PptShape.h"
NSPresentationEditor::CBaseShape* NSPresentationEditor::CBaseShape::CreateByType(NSPresentationEditor::NSBaseShape::ClassType ClassType, int ShapeType)
......@@ -67,4 +67,4 @@ bool NSPresentationEditor::CBaseShape::SetType(NSPresentationEditor::NSBaseShape
}
return false;
}
\ No newline at end of file
}
......@@ -30,7 +30,7 @@
*
*/
#pragma once
#include "../PPTShape.h"
#include "../PptShape.h"
// 51
class CAccentBorderCallout2Type : public CPPTShape
......@@ -73,4 +73,4 @@ public:
oHandle3.position = _T("#4,#5");
m_arHandles.push_back(oHandle3);
}
};
\ No newline at end of file
};
......@@ -30,7 +30,7 @@
*
*/
#pragma once
#include "../PPTShape.h"
#include "../PptShape.h"
// 44
class CAccentCallout1Type : public CPPTShape
......
......@@ -30,7 +30,7 @@
*
*/
#pragma once
#include "../PPTShape.h"
#include "../PptShape.h"
// 45
class CAccentCallout2Type : public CPPTShape
......
......@@ -30,7 +30,7 @@
*
*/
#pragma once
#include "../PPTShape.h"
#include "../PptShape.h"
// 46
class CAccentCallout3Type : public CPPTShape
......
......@@ -30,7 +30,7 @@
*
*/
#pragma once
#include "../PPTShape.h"
#include "../PptShape.h"
// 179
class CAccentCallout90Type : public CPPTShape
......
......@@ -30,7 +30,7 @@
*
*/
#pragma once
#include "../PPTShape.h"
#include "../PptShape.h"
// 194
class CActionButtonBackType : public CPPTShape
......
......@@ -30,7 +30,7 @@
*
*/
#pragma once
#include "../PPTShape.h"
#include "../PptShape.h"
// 196
class CActionButtonBeginType : public CPPTShape
......
......@@ -30,7 +30,7 @@
*
*/
#pragma once
#include "../PPTShape.h"
#include "../PptShape.h"
// 189
class CActionButtonBlankType : public CPPTShape
......
......@@ -30,7 +30,7 @@
*
*/
#pragma once
#include "../PPTShape.h"
#include "../PptShape.h"
// 198
class CActionButtonDocType : public CPPTShape
......
......@@ -30,7 +30,7 @@
*
*/
#pragma once
#include "../PPTShape.h"
#include "../PptShape.h"
// 195
class CActionButtonEndType : public CPPTShape
......
......@@ -30,7 +30,7 @@
*
*/
#pragma once
#include "../PPTShape.h"
#include "../PptShape.h"
// 191
class CActionButtonHelpType : public CPPTShape
......
......@@ -30,7 +30,7 @@
*
*/
#pragma once
#include "../PPTShape.h"
#include "../PptShape.h"
// 190
class CActionButtonHomeType : public CPPTShape
......
......@@ -30,7 +30,7 @@
*
*/
#pragma once
#include "../PPTShape.h"
#include "../PptShape.h"
// 192
class CActionButtonInfoType : public CPPTShape
......
......@@ -30,7 +30,7 @@
*
*/
#pragma once
#include "../PPTShape.h"
#include "../PptShape.h"
// 200
class CActionButtonMovieType : public CPPTShape
......
......@@ -30,7 +30,7 @@
*
*/
#pragma once
#include "../PPTShape.h"
#include "../PptShape.h"
// 193
class CActionButtonNextType : public CPPTShape
......
......@@ -30,7 +30,7 @@
*
*/
#pragma once
#include "../PPTShape.h"
#include "../PptShape.h"
// 197
class CActionButtonReturnType : public CPPTShape
......
......@@ -30,7 +30,7 @@
*
*/
#pragma once
#include "../PPTShape.h"
#include "../PptShape.h"
// 199
class CActionButtonSoundType : public CPPTShape
......
......@@ -30,7 +30,7 @@
*
*/
#pragma once
#include "../PPTShape.h"
#include "../PptShape.h"
// 91
class CBentArrowType : public CPPTShape
......
......@@ -30,7 +30,7 @@
*
*/
#pragma once
#include "../PPTShape.h"
#include "../PptShape.h"
// 34
class CBentConnectorType : public CPPTShape
......
......@@ -30,7 +30,7 @@
*
*/
#pragma once
#include "../PPTShape.h"
#include "../PptShape.h"
// 90
class CBentUpArrowType : public CPPTShape
......
......@@ -30,7 +30,7 @@
*
*/
#pragma once
#include "../PPTShape.h"
#include "../PptShape.h"
// 84
class CBevelType : public CPPTShape
......
......@@ -30,7 +30,7 @@
*
*/
#pragma once
#include "../PPTShape.h"
#include "../PptShape.h"
// 95
class CBlockArcType : public CPPTShape
......
......@@ -30,7 +30,7 @@
*
*/
#pragma once
#include "../PPTShape.h"
#include "../PptShape.h"
// 47
class CBorderCallout1Type : public CPPTShape
......
......@@ -30,7 +30,7 @@
*
*/
#pragma once
#include "../PPTShape.h"
#include "../PptShape.h"
// 48
class CBorderCallout2Type : public CPPTShape
......
......@@ -30,7 +30,7 @@
*
*/
#pragma once
#include "../PPTShape.h"
#include "../PptShape.h"
// 49
class CBorderCallout3Type : public CPPTShape
......
......@@ -30,7 +30,7 @@
*
*/
#pragma once
#include "../PPTShape.h"
#include "../PptShape.h"
// 180
class CBorderCallout90Type : public CPPTShape
......
......@@ -30,7 +30,7 @@
*
*/
#pragma once
#include "../PPTShape.h"
#include "../PptShape.h"
// 186
class CBracePairType : public CPPTShape
......
......@@ -30,7 +30,7 @@
*
*/
#pragma once
#include "../PPTShape.h"
#include "../PptShape.h"
// 185
class CBracketPairType : public CPPTShape
......
......@@ -30,7 +30,7 @@
*
*/
#pragma once
#include "../PPTShape.h"
#include "../PptShape.h"
// 41
class CCallout1Type : public CPPTShape
......
......@@ -30,7 +30,7 @@
*
*/
#pragma once
#include "../PPTShape.h"
#include "../PptShape.h"
// 42
class CCallout2Type : public CPPTShape
......
......@@ -30,7 +30,7 @@
*
*/
#pragma once
#include "../PPTShape.h"
#include "../PptShape.h"
// 43
class CCallout3Type : public CPPTShape
......
......@@ -30,7 +30,7 @@
*
*/
#pragma once
#include "../PPTShape.h"
#include "../PptShape.h"
// 178
class CCallout90Type : public CPPTShape
......
......@@ -30,7 +30,7 @@
*
*/
#pragma once
#include "../PPTShape.h"
#include "../PptShape.h"
// 22
class CCanType : public CPPTShape
......
......@@ -30,7 +30,7 @@
*
*/
#pragma once
#include "../PPTShape.h"
#include "../PptShape.h"
// 55
class CChevronType : public CPPTShape
......
......@@ -30,7 +30,7 @@
*
*/
#pragma once
#include "../PPTShape.h"
#include "../PptShape.h"
// 99
class CCircularArrowType : public CPPTShape
......
......@@ -30,7 +30,7 @@
*
*/
#pragma once
#include "../PPTShape.h"
#include "../PptShape.h"
// 106
class CCloudCalloutType : public CPPTShape
......
......@@ -30,7 +30,7 @@
*
*/
#pragma once
#include "../PPTShape.h"
#include "../PptShape.h"
// 16
class CCubeType : public CPPTShape
......
......@@ -30,7 +30,7 @@
*
*/
#pragma once
#include "../PPTShape.h"
#include "../PptShape.h"
// 38
class CCurvedConnectorType : public CPPTShape
......
......@@ -30,7 +30,7 @@
*
*/
#pragma once
#include "../PPTShape.h"
#include "../PptShape.h"
// 105
class CCurvedDownArrowType : public CPPTShape
......
......@@ -30,7 +30,7 @@
*
*/
#pragma once
#include "../PPTShape.h"
#include "../PptShape.h"
// 103
class CCurvedLeftArrowType : public CPPTShape
......
......@@ -30,7 +30,7 @@
*
*/
#pragma once
#include "../PPTShape.h"
#include "../PptShape.h"
// 102
class CCurvedRightArrowType : public CPPTShape
......
......@@ -30,7 +30,7 @@
*
*/
#pragma once
#include "../PPTShape.h"
#include "../PptShape.h"
//104
class CCurvedUpArrowType : public CPPTShape
......
......@@ -30,7 +30,7 @@
*
*/
#pragma once
#include "../PPTShape.h"
#include "../PptShape.h"
// 4
class CDiamondType : public CPPTShape
......
......@@ -30,7 +30,7 @@
*
*/
#pragma once
#include "../PPTShape.h"
#include "../PptShape.h"
// 23
class CDonutType : public CPPTShape
......
......@@ -30,7 +30,7 @@
*
*/
#pragma once
#include "../PPTShape.h"
#include "../PptShape.h"
// 80
class CDownArrowCalloutType : public CPPTShape
......
......@@ -30,7 +30,7 @@
*
*/
#pragma once
#include "../PPTShape.h"
#include "../PptShape.h"
// 67
class CDownArrowType : public CPPTShape
......
......@@ -30,7 +30,7 @@
*
*/
#pragma once
#include "../PPTShape.h"
#include "../PptShape.h"
// 108
class CEllipceRibbon2Type : public CPPTShape
......
......@@ -30,7 +30,7 @@
*
*/
#pragma once
#include "../PPTShape.h"
#include "../PptShape.h"
// 107
class CEllipceRibbonType : public CPPTShape
......
......@@ -30,7 +30,7 @@
*
*/
#pragma once
#include "../PPTShape.h"
#include "../PptShape.h"
// 3
class CEllipseType : public CPPTShape
......
......@@ -30,7 +30,7 @@
*
*/
#pragma once
#include "../PPTShape.h"
#include "../PptShape.h"
// 176
class CFlowChartAlternateProcessType : public CPPTShape
......
......@@ -30,7 +30,7 @@
*
*/
#pragma once
#include "../PPTShape.h"
#include "../PptShape.h"
// 125
class CFlowChartCollateType : public CPPTShape
......
......@@ -30,7 +30,7 @@
*
*/
#pragma once
#include "../PPTShape.h"
#include "../PptShape.h"
// 120
class CFlowChartConnectorType : public CPPTShape
......
......@@ -30,7 +30,7 @@
*
*/
#pragma once
#include "../PPTShape.h"
#include "../PptShape.h"
// 110
class CFlowChartDecisionType : public CPPTShape
......
......@@ -30,7 +30,7 @@
*
*/
#pragma once
#include "../PPTShape.h"
#include "../PptShape.h"
// 135
class CFlowChartDelayType : public CPPTShape
......
......@@ -30,7 +30,7 @@
*
*/
#pragma once
#include "../PPTShape.h"
#include "../PptShape.h"
// 134
class CFlowChartDisplayType : public CPPTShape
......
......@@ -30,7 +30,7 @@
*
*/
#pragma once
#include "../PPTShape.h"
#include "../PptShape.h"
//114
class CFlowChartDocumentType : public CPPTShape
......
......@@ -30,7 +30,7 @@
*
*/
#pragma once
#include "../PPTShape.h"
#include "../PptShape.h"
// 127
class CFlowChartExtractType : public CPPTShape
......
......@@ -30,7 +30,7 @@
*
*/
#pragma once
#include "../PPTShape.h"
#include "../PptShape.h"
// 111
class CFlowChartInputOutputType : public CPPTShape
......
......@@ -30,7 +30,7 @@
*
*/
#pragma once
#include "../PPTShape.h"
#include "../PptShape.h"
// 113
class CFlowChartInternalStorageType : public CPPTShape
......
......@@ -30,7 +30,7 @@
*
*/
#pragma once
#include "../PPTShape.h"
#include "../PptShape.h"
// 132
class CFlowChartMagneticDiskType : public CPPTShape
......
......@@ -30,7 +30,7 @@
*
*/
#pragma once
#include "../PPTShape.h"
#include "../PptShape.h"
// 133
class CFlowChartMagneticDrumType : public CPPTShape
......
......@@ -30,7 +30,7 @@
*
*/
#pragma once
#include "../PPTShape.h"
#include "../PptShape.h"
// 131
class CFlowChartMagneticTapeType : public CPPTShape
......
......@@ -30,7 +30,7 @@
*
*/
#pragma once
#include "../PPTShape.h"
#include "../PptShape.h"
// 118
class CFlowChartManualInputType : public CPPTShape
......
......@@ -30,7 +30,7 @@
*
*/
#pragma once
#include "../PPTShape.h"
#include "../PptShape.h"
// 119
class CFlowChartManualOperationType : public CPPTShape
......
......@@ -30,7 +30,7 @@
*
*/
#pragma once
#include "../PPTShape.h"
#include "../PptShape.h"
// 128
class CFlowChartMergeType : public CPPTShape
......
......@@ -30,7 +30,7 @@
*
*/
#pragma once
#include "../PPTShape.h"
#include "../PptShape.h"
// 115
class CFlowChartMultidocumentType : public CPPTShape
......
......@@ -30,7 +30,7 @@
*
*/
#pragma once
#include "../PPTShape.h"
#include "../PptShape.h"
// 177
class CFlowChartOffpageConnectorType : public CPPTShape
......
......@@ -30,7 +30,7 @@
*
*/
#pragma once
#include "../PPTShape.h"
#include "../PptShape.h"
// 130
class CFlowChartOnlineStorageType : public CPPTShape
......
......@@ -30,7 +30,7 @@
*
*/
#pragma once
#include "../PPTShape.h"
#include "../PptShape.h"
// 124
class CFlowChartOrType : public CPPTShape
......
......@@ -30,7 +30,7 @@
*
*/
#pragma once
#include "../PPTShape.h"
#include "../PptShape.h"
// 112
class CFlowChartPredefinedProcessType : public CPPTShape
......
......@@ -30,7 +30,7 @@
*
*/
#pragma once
#include "../PPTShape.h"
#include "../PptShape.h"
// 117
class CFlowChartPreparationType : public CPPTShape
......
......@@ -30,7 +30,7 @@
*
*/
#pragma once
#include "../PPTShape.h"
#include "../PptShape.h"
// 109
class CFlowChartProcessType : public CPPTShape
......
......@@ -30,7 +30,7 @@
*
*/
#pragma once
#include "../PPTShape.h"
#include "../PptShape.h"
// 121
class CFlowChartPunchedCardType : public CPPTShape
......
......@@ -30,7 +30,7 @@
*
*/
#pragma once
#include "../PPTShape.h"
#include "../PptShape.h"
// 122
class CFlowChartPunchedTapeType : public CPPTShape
......
......@@ -30,7 +30,7 @@
*
*/
#pragma once
#include "../PPTShape.h"
#include "../PptShape.h"
// 126
class CFlowChartSortType : public CPPTShape
......
......@@ -30,7 +30,7 @@
*
*/
#pragma once
#include "../PPTShape.h"
#include "../PptShape.h"
// 123
class CFlowChartSummingJunctionType : public CPPTShape
......
......@@ -30,7 +30,7 @@
*
*/
#pragma once
#include "../PPTShape.h"
#include "../PptShape.h"
// 116
class CFlowChartTerminatorType : public CPPTShape
......
......@@ -30,7 +30,7 @@
*
*/
#pragma once
#include "../PPTShape.h"
#include "../PptShape.h"
// 65
class CFoldedCornerType : public CPPTShape
......
......@@ -30,7 +30,7 @@
*
*/
#pragma once
#include "../PPTShape.h"
#include "../PptShape.h"
// 74
class CHeartType : public CPPTShape
......
......@@ -30,7 +30,7 @@
*
*/
#pragma once
#include "../PPTShape.h"
#include "../PptShape.h"
// 9
class CHexagonType : public CPPTShape
......
......@@ -30,7 +30,7 @@
*
*/
#pragma once
#include "../PPTShape.h"
#include "../PptShape.h"
// 15
class CHomePlateType : public CPPTShape
......
......@@ -30,7 +30,7 @@
*
*/
#pragma once
#include "../PPTShape.h"
#include "../PptShape.h"
// 98
class CHorizontalScrollType : public CPPTShape
......
......@@ -30,7 +30,7 @@
*
*/
#pragma once
#include "../PPTShape.h"
#include "../PptShape.h"
// 71
class CIrregularSealOneType : public CPPTShape
......
......@@ -30,7 +30,7 @@
*
*/
#pragma once
#include "../PPTShape.h"
#include "../PptShape.h"
// 72
class CIrregularSealTwo : public CPPTShape
......
......@@ -30,7 +30,7 @@
*
*/
#pragma once
#include "../PPTShape.h"
#include "../PptShape.h"
// 5
class CIsoscelesTriangleType : public CPPTShape
......
......@@ -30,7 +30,7 @@
*
*/
#pragma once
#include "../PPTShape.h"
#include "../PptShape.h"
// 77
class CLeftArrowCalloutType : public CPPTShape
......
......@@ -30,7 +30,7 @@
*
*/
#pragma once
#include "../PPTShape.h"
#include "../PptShape.h"
// 66
class CLeftArrowType : public CPPTShape
......
......@@ -30,7 +30,7 @@
*
*/
#pragma once
#include "../PPTShape.h"
#include "../PptShape.h"
// 87
class CLeftBraceType : public CPPTShape
......
......@@ -30,7 +30,7 @@
*
*/
#pragma once
#include "../PPTShape.h"
#include "../PptShape.h"
// 85
class CLeftBracketType : public CPPTShape
......
......@@ -30,7 +30,7 @@
*
*/
#pragma once
#include "../PPTShape.h"
#include "../PptShape.h"
// 81
class CLeftRightArrowCalloutType : public CPPTShape
......
......@@ -30,7 +30,7 @@
*
*/
#pragma once
#include "../PPTShape.h"
#include "../PptShape.h"
// 69
class CLeftRightArrowType : public CPPTShape
......
......@@ -30,7 +30,7 @@
*
*/
#pragma once
#include "../PPTShape.h"
#include "../PptShape.h"
// 182
class CLeftRightUpArrow : public CPPTShape
......
......@@ -30,7 +30,7 @@
*
*/
#pragma once
#include "../PPTShape.h"
#include "../PptShape.h"
// 89
class CLeftUpArrowType : public CPPTShape
......
......@@ -30,7 +30,7 @@
*
*/
#pragma once
#include "../PPTShape.h"
#include "../PptShape.h"
// 73
class CLightningBoltType : public CPPTShape
......
......@@ -30,7 +30,7 @@
*
*/
#pragma once
#include "../PPTShape.h"
#include "../PptShape.h"
// 20
class CLineType : public CPPTShape
......
This diff is collapsed.
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