diff --git a/MsBinaryFile/Common/ODraw/CustomShape.cpp b/MsBinaryFile/Common/ODraw/CustomShape.cpp index 8a4becd948..5735fb13be 100644 --- a/MsBinaryFile/Common/ODraw/CustomShape.cpp +++ b/MsBinaryFile/Common/ODraw/CustomShape.cpp @@ -45,6 +45,8 @@ using namespace ODRAW; +namespace NSCustomShapesConvert +{ CCustomShape::CCustomShape() : CBaseShape() { m_eType = oox::msosptNotPrimitive; @@ -144,245 +146,246 @@ CCustomShape* CCustomShape::CreateByType(oox::MSOSPT type) CCustomShape* pShape = NULL; switch (type) { - // msosptNotchedCircularArrow 0x00000064 A value that SHOULD NOT be used. - // msosptHostControl 0x000000C9 A value that SHOULD NOT be used. + // msosptNotchedCircularArrow 0x00000064 A value that SHOULD NOT be used. + // msosptHostControl 0x000000C9 A value that SHOULD NOT be used. - case sptNotchedCircularArrow: - case sptHostControl: - case 0: { pShape = new CRectangleType(); break; } + case sptNotchedCircularArrow: + case sptHostControl: + case 0: { pShape = new CRectangleType(); break; } //CREATE_BY_SPT(sptMin, CLineType) CREATE_BY_SPT(sptAccentBorderCallout90, CAccentBorderCallout90Type) - CREATE_BY_SPT(sptAccentBorderCallout1, CAccentBorderCallout1Type) - CREATE_BY_SPT(sptAccentBorderCallout2, CAccentBorderCallout2Type) - CREATE_BY_SPT(sptAccentBorderCallout3, CAccentBorderCallout3Type) + CREATE_BY_SPT(sptAccentBorderCallout1, CAccentBorderCallout1Type) + CREATE_BY_SPT(sptAccentBorderCallout2, CAccentBorderCallout2Type) + CREATE_BY_SPT(sptAccentBorderCallout3, CAccentBorderCallout3Type) - CREATE_BY_SPT(sptAccentCallout90, CAccentCallout90Type) - CREATE_BY_SPT(sptAccentCallout1, CAccentCallout1Type) - CREATE_BY_SPT(sptAccentCallout2, CAccentCallout2Type) - CREATE_BY_SPT(sptAccentCallout3, CAccentCallout3Type) + CREATE_BY_SPT(sptAccentCallout90, CAccentCallout90Type) + CREATE_BY_SPT(sptAccentCallout1, CAccentCallout1Type) + CREATE_BY_SPT(sptAccentCallout2, CAccentCallout2Type) + CREATE_BY_SPT(sptAccentCallout3, CAccentCallout3Type) - CREATE_BY_SPT(sptBorderCallout90, CBorderCallout90Type) - CREATE_BY_SPT(sptBorderCallout1, CBorderCallout1Type) - CREATE_BY_SPT(sptBorderCallout2, CBorderCallout2Type) - CREATE_BY_SPT(sptBorderCallout3, CBorderCallout3Type) + CREATE_BY_SPT(sptBorderCallout90, CBorderCallout90Type) + CREATE_BY_SPT(sptBorderCallout1, CBorderCallout1Type) + CREATE_BY_SPT(sptBorderCallout2, CBorderCallout2Type) + CREATE_BY_SPT(sptBorderCallout3, CBorderCallout3Type) - CREATE_BY_SPT(sptCallout90, CCallout90Type) - CREATE_BY_SPT(sptCallout1, CCallout1Type) - CREATE_BY_SPT(sptCallout2, CCallout2Type) - CREATE_BY_SPT(sptCallout3, CCallout3Type) + CREATE_BY_SPT(sptCallout90, CCallout90Type) + CREATE_BY_SPT(sptCallout1, CCallout1Type) + CREATE_BY_SPT(sptCallout2, CCallout2Type) + CREATE_BY_SPT(sptCallout3, CCallout3Type) - CREATE_BY_SPT(sptActionButtonBlank, CActionButtonBlankType) - CREATE_BY_SPT(sptActionButtonHome, CActionButtonHomeType) - CREATE_BY_SPT(sptActionButtonHelp, CActionButtonHelpType) - CREATE_BY_SPT(sptActionButtonInformation, CActionButtonInfoType) - CREATE_BY_SPT(sptActionButtonBackPrevious, CActionButtonBackType) - CREATE_BY_SPT(sptActionButtonForwardNext, CActionButtonNextType) - CREATE_BY_SPT(sptActionButtonBeginning, CActionButtonBeginType) - CREATE_BY_SPT(sptActionButtonEnd, CActionButtonEndType) - CREATE_BY_SPT(sptActionButtonReturn, CActionButtonReturnType) - CREATE_BY_SPT(sptActionButtonDocument, CActionButtonDocType) - CREATE_BY_SPT(sptActionButtonSound, CActionButtonSoundType) - CREATE_BY_SPT(sptActionButtonMovie, CActionButtonMovieType) + CREATE_BY_SPT(sptActionButtonBlank, CActionButtonBlankType) + CREATE_BY_SPT(sptActionButtonHome, CActionButtonHomeType) + CREATE_BY_SPT(sptActionButtonHelp, CActionButtonHelpType) + CREATE_BY_SPT(sptActionButtonInformation, CActionButtonInfoType) + CREATE_BY_SPT(sptActionButtonBackPrevious, CActionButtonBackType) + CREATE_BY_SPT(sptActionButtonForwardNext, CActionButtonNextType) + CREATE_BY_SPT(sptActionButtonBeginning, CActionButtonBeginType) + CREATE_BY_SPT(sptActionButtonEnd, CActionButtonEndType) + CREATE_BY_SPT(sptActionButtonReturn, CActionButtonReturnType) + CREATE_BY_SPT(sptActionButtonDocument, CActionButtonDocType) + CREATE_BY_SPT(sptActionButtonSound, CActionButtonSoundType) + CREATE_BY_SPT(sptActionButtonMovie, CActionButtonMovieType) - CREATE_BY_SPT(sptArc, CArcType) - CREATE_BY_SPT(sptLine, CLineType) + CREATE_BY_SPT(sptArc, CArcType) + CREATE_BY_SPT(sptLine, CLineType) - CREATE_BY_SPT(sptBentArrow, CBentArrowType) - CREATE_BY_SPT(sptBentUpArrow, CBentUpArrowType) - CREATE_BY_SPT(sptBevel, CBevelType) - CREATE_BY_SPT(sptBlockArc, CBlockArcType) - CREATE_BY_SPT(sptBracePair, CBracePairType) - CREATE_BY_SPT(sptBracketPair, CBracketPairType) + CREATE_BY_SPT(sptBentArrow, CBentArrowType) + CREATE_BY_SPT(sptBentUpArrow, CBentUpArrowType) + CREATE_BY_SPT(sptBevel, CBevelType) + CREATE_BY_SPT(sptBlockArc, CBlockArcType) + CREATE_BY_SPT(sptBracePair, CBracePairType) + CREATE_BY_SPT(sptBracketPair, CBracketPairType) - CREATE_BY_SPT(sptCan, CCanType) - CREATE_BY_SPT(sptChevron, CChevronType) - CREATE_BY_SPT(sptCircularArrow, CCircularArrowType) - CREATE_BY_SPT(sptCloudCallout, CCloudCalloutType) - CREATE_BY_SPT(sptCube, CCubeType) - CREATE_BY_SPT(sptCurvedDownArrow, CCurvedDownArrowType) - CREATE_BY_SPT(sptCurvedLeftArrow, CCurvedLeftArrowType) - CREATE_BY_SPT(sptCurvedRightArrow, CCurvedRightArrowType) - CREATE_BY_SPT(sptCurvedUpArrow, CCurvedUpArrowType) + CREATE_BY_SPT(sptCan, CCanType) + CREATE_BY_SPT(sptChevron, CChevronType) + CREATE_BY_SPT(sptCircularArrow, CCircularArrowType) + CREATE_BY_SPT(sptCloudCallout, CCloudCalloutType) + CREATE_BY_SPT(sptCube, CCubeType) + CREATE_BY_SPT(sptCurvedDownArrow, CCurvedDownArrowType) + CREATE_BY_SPT(sptCurvedLeftArrow, CCurvedLeftArrowType) + CREATE_BY_SPT(sptCurvedRightArrow, CCurvedRightArrowType) + CREATE_BY_SPT(sptCurvedUpArrow, CCurvedUpArrowType) - CREATE_BY_SPT(sptDiamond, CDiamondType) - CREATE_BY_SPT(sptDonut, CDonutType) - CREATE_BY_SPT(sptDownArrowCallout, CDownArrowCalloutType) - CREATE_BY_SPT(sptDownArrow, CDownArrowType) + CREATE_BY_SPT(sptDiamond, CDiamondType) + CREATE_BY_SPT(sptDonut, CDonutType) + CREATE_BY_SPT(sptDownArrowCallout, CDownArrowCalloutType) + CREATE_BY_SPT(sptDownArrow, CDownArrowType) - CREATE_BY_SPT(sptEllipse, CEllipseType) - CREATE_BY_SPT(sptEllipseRibbon, CEllipceRibbonType) - CREATE_BY_SPT(sptEllipseRibbon2, CEllipceRibbon2Type) + CREATE_BY_SPT(sptEllipse, CEllipseType) + CREATE_BY_SPT(sptEllipseRibbon, CEllipceRibbonType) + CREATE_BY_SPT(sptEllipseRibbon2, CEllipceRibbon2Type) - CREATE_BY_SPT(sptFlowChartAlternateProcess, CFlowChartAlternateProcessType) - CREATE_BY_SPT(sptFlowChartCollate, CFlowChartCollateType) - CREATE_BY_SPT(sptFlowChartConnector, CFlowChartConnectorType) - CREATE_BY_SPT(sptFlowChartDecision, CFlowChartDecisionType) - CREATE_BY_SPT(sptFlowChartDisplay, CFlowChartDisplayType) - CREATE_BY_SPT(sptFlowChartDelay, CFlowChartDelayType) - CREATE_BY_SPT(sptFlowChartDocument, CFlowChartDocumentType) - CREATE_BY_SPT(sptFlowChartExtract, CFlowChartExtractType) - CREATE_BY_SPT(sptFlowChartInputOutput, CFlowChartInputOutputType) - CREATE_BY_SPT(sptFlowChartInternalStorage, CFlowChartInternalStorageType) - CREATE_BY_SPT(sptFlowChartMagneticDisk, CFlowChartMagneticDiskType) - CREATE_BY_SPT(sptFlowChartMagneticDrum, CFlowChartMagneticDrumType) - CREATE_BY_SPT(sptFlowChartMagneticTape, CFlowChartMagneticTapeType) - CREATE_BY_SPT(sptFlowChartManualInput, CFlowChartManualInputType) - CREATE_BY_SPT(sptFlowChartManualOperation, CFlowChartManualOperationType) - CREATE_BY_SPT(sptFlowChartMerge, CFlowChartMergeType) - CREATE_BY_SPT(sptFlowChartMultidocument, CFlowChartMultidocumentType) - CREATE_BY_SPT(sptFlowChartOffpageConnector, CFlowChartOffpageConnectorType) - CREATE_BY_SPT(sptFlowChartOnlineStorage, CFlowChartOnlineStorageType) - CREATE_BY_SPT(sptFlowChartOr, CFlowChartOrType) - CREATE_BY_SPT(sptFlowChartPredefinedProcess, CFlowChartPredefinedProcessType) - CREATE_BY_SPT(sptFlowChartPreparation, CFlowChartPreparationType) - CREATE_BY_SPT(sptFlowChartProcess, CFlowChartProcessType) - CREATE_BY_SPT(sptFlowChartPunchedCard, CFlowChartPunchedCardType) - CREATE_BY_SPT(sptFlowChartPunchedTape, CFlowChartPunchedTapeType) - CREATE_BY_SPT(sptFlowChartSort, CFlowChartSortType) - CREATE_BY_SPT(sptFlowChartSummingJunction, CFlowChartSummingJunctionType) - CREATE_BY_SPT(sptFlowChartTerminator, CFlowChartTerminatorType) - CREATE_BY_SPT(sptFoldedCorner, CFoldedCornerType) + CREATE_BY_SPT(sptFlowChartAlternateProcess, CFlowChartAlternateProcessType) + CREATE_BY_SPT(sptFlowChartCollate, CFlowChartCollateType) + CREATE_BY_SPT(sptFlowChartConnector, CFlowChartConnectorType) + CREATE_BY_SPT(sptFlowChartDecision, CFlowChartDecisionType) + CREATE_BY_SPT(sptFlowChartDisplay, CFlowChartDisplayType) + CREATE_BY_SPT(sptFlowChartDelay, CFlowChartDelayType) + CREATE_BY_SPT(sptFlowChartDocument, CFlowChartDocumentType) + CREATE_BY_SPT(sptFlowChartExtract, CFlowChartExtractType) + CREATE_BY_SPT(sptFlowChartInputOutput, CFlowChartInputOutputType) + CREATE_BY_SPT(sptFlowChartInternalStorage, CFlowChartInternalStorageType) + CREATE_BY_SPT(sptFlowChartMagneticDisk, CFlowChartMagneticDiskType) + CREATE_BY_SPT(sptFlowChartMagneticDrum, CFlowChartMagneticDrumType) + CREATE_BY_SPT(sptFlowChartMagneticTape, CFlowChartMagneticTapeType) + CREATE_BY_SPT(sptFlowChartManualInput, CFlowChartManualInputType) + CREATE_BY_SPT(sptFlowChartManualOperation, CFlowChartManualOperationType) + CREATE_BY_SPT(sptFlowChartMerge, CFlowChartMergeType) + CREATE_BY_SPT(sptFlowChartMultidocument, CFlowChartMultidocumentType) + CREATE_BY_SPT(sptFlowChartOffpageConnector, CFlowChartOffpageConnectorType) + CREATE_BY_SPT(sptFlowChartOnlineStorage, CFlowChartOnlineStorageType) + CREATE_BY_SPT(sptFlowChartOr, CFlowChartOrType) + CREATE_BY_SPT(sptFlowChartPredefinedProcess, CFlowChartPredefinedProcessType) + CREATE_BY_SPT(sptFlowChartPreparation, CFlowChartPreparationType) + CREATE_BY_SPT(sptFlowChartProcess, CFlowChartProcessType) + CREATE_BY_SPT(sptFlowChartPunchedCard, CFlowChartPunchedCardType) + CREATE_BY_SPT(sptFlowChartPunchedTape, CFlowChartPunchedTapeType) + CREATE_BY_SPT(sptFlowChartSort, CFlowChartSortType) + CREATE_BY_SPT(sptFlowChartSummingJunction, CFlowChartSummingJunctionType) + CREATE_BY_SPT(sptFlowChartTerminator, CFlowChartTerminatorType) + CREATE_BY_SPT(sptFoldedCorner, CFoldedCornerType) - CREATE_BY_SPT(sptHeart, CHeartType) - CREATE_BY_SPT(sptHexagon, CHexagonType) - CREATE_BY_SPT(sptHomePlate, CHomePlateType) + CREATE_BY_SPT(sptHeart, CHeartType) + CREATE_BY_SPT(sptHexagon, CHexagonType) + CREATE_BY_SPT(sptHomePlate, CHomePlateType) - CREATE_BY_SPT(sptIrregularSeal1, CIrregularSealOneType) - CREATE_BY_SPT(sptIrregularSeal2, CIrregularSealTwo) - CREATE_BY_SPT(sptIsocelesTriangle, CIsoscelesTriangleType) + CREATE_BY_SPT(sptIrregularSeal1, CIrregularSealOneType) + CREATE_BY_SPT(sptIrregularSeal2, CIrregularSealTwo) + CREATE_BY_SPT(sptIsocelesTriangle, CIsoscelesTriangleType) - CREATE_BY_SPT(sptLeftArrowCallout, CLeftArrowCalloutType) - CREATE_BY_SPT(sptLeftArrow, CLeftArrowType) - CREATE_BY_SPT(sptLeftBrace, CLeftBraceType) - CREATE_BY_SPT(sptLeftBracket, CLeftBracketType) - CREATE_BY_SPT(sptLeftRightArrowCallout, CLeftRightArrowCalloutType) - CREATE_BY_SPT(sptLeftRightArrow, CLeftRightArrowType) - CREATE_BY_SPT(sptLeftRightUpArrow, CLeftRightUpArrow) - CREATE_BY_SPT(sptLeftUpArrow, CLeftUpArrowType) - CREATE_BY_SPT(sptLightningBolt, CLightningBoltType) + CREATE_BY_SPT(sptLeftArrowCallout, CLeftArrowCalloutType) + CREATE_BY_SPT(sptLeftArrow, CLeftArrowType) + CREATE_BY_SPT(sptLeftBrace, CLeftBraceType) + CREATE_BY_SPT(sptLeftBracket, CLeftBracketType) + CREATE_BY_SPT(sptLeftRightArrowCallout, CLeftRightArrowCalloutType) + CREATE_BY_SPT(sptLeftRightArrow, CLeftRightArrowType) + CREATE_BY_SPT(sptLeftRightUpArrow, CLeftRightUpArrow) + CREATE_BY_SPT(sptLeftUpArrow, CLeftUpArrowType) + CREATE_BY_SPT(sptLightningBolt, CLightningBoltType) - CREATE_BY_SPT(sptMoon, CMoonType) + CREATE_BY_SPT(sptMoon, CMoonType) - CREATE_BY_SPT(sptNoSmoking, CNoSmokingType) - CREATE_BY_SPT(sptNotchedRightArrow, CNotchedRightArrowType) + CREATE_BY_SPT(sptNoSmoking, CNoSmokingType) + CREATE_BY_SPT(sptNotchedRightArrow, CNotchedRightArrowType) - CREATE_BY_SPT(sptOctagon, COctagonType) + CREATE_BY_SPT(sptOctagon, COctagonType) - CREATE_BY_SPT(sptParallelogram, CParallelogramType) - CREATE_BY_SPT(sptPentagon, CPentagonType) - CREATE_BY_SPT(sptPlaque, CPlaqueType) - CREATE_BY_SPT(sptPlus, CPlusType) + CREATE_BY_SPT(sptParallelogram, CParallelogramType) + CREATE_BY_SPT(sptPentagon, CPentagonType) + CREATE_BY_SPT(sptPlaque, CPlaqueType) + CREATE_BY_SPT(sptPlus, CPlusType) - CREATE_BY_SPT(sptQuadArrowCallout, CQuadArrowCalloutType) - CREATE_BY_SPT(sptQuadArrow, CQuadArrowType) + CREATE_BY_SPT(sptQuadArrowCallout, CQuadArrowCalloutType) + CREATE_BY_SPT(sptQuadArrow, CQuadArrowType) - CREATE_BY_SPT(sptRectangle, CRectangleType) - CREATE_BY_SPT(sptRibbon, CRibbonDownType) - CREATE_BY_SPT(sptRibbon2, CRibbonUpType) - CREATE_BY_SPT(sptRightArrowCallout, CRightArrowCalloutType) - CREATE_BY_SPT(sptArrow, CRightArrowType) - CREATE_BY_SPT(sptRightBrace, CRightBracetype) - CREATE_BY_SPT(sptRightBracket, CRightBracketType) - CREATE_BY_SPT(sptRightTriangle, CRightTriangleType) - CREATE_BY_SPT(sptRoundRectangle, CRoundedRectangleType) + CREATE_BY_SPT(sptRectangle, CRectangleType) + CREATE_BY_SPT(sptRibbon, CRibbonDownType) + CREATE_BY_SPT(sptRibbon2, CRibbonUpType) + CREATE_BY_SPT(sptRightArrowCallout, CRightArrowCalloutType) + CREATE_BY_SPT(sptArrow, CRightArrowType) + CREATE_BY_SPT(sptRightBrace, CRightBracetype) + CREATE_BY_SPT(sptRightBracket, CRightBracketType) + CREATE_BY_SPT(sptRightTriangle, CRightTriangleType) + CREATE_BY_SPT(sptRoundRectangle, CRoundedRectangleType) - CREATE_BY_SPT(sptSeal16, CSeal16Type) - CREATE_BY_SPT(sptSeal24, CSeal24Type) - CREATE_BY_SPT(sptSeal32, CSeal32Type) - CREATE_BY_SPT(sptSeal4, CSeal4Type) - CREATE_BY_SPT(sptSeal8, CSeal8Type) - CREATE_BY_SPT(sptSmileyFace, CSmileyFaceType) - CREATE_BY_SPT(sptStar, CStarType) - CREATE_BY_SPT(sptStraightConnector1, CStraightConnectorType) - CREATE_BY_SPT(sptStripedRightArrow, CStripedRightArrowType) - CREATE_BY_SPT(sptSun, CSunType) + CREATE_BY_SPT(sptSeal16, CSeal16Type) + CREATE_BY_SPT(sptSeal24, CSeal24Type) + CREATE_BY_SPT(sptSeal32, CSeal32Type) + CREATE_BY_SPT(sptSeal4, CSeal4Type) + CREATE_BY_SPT(sptSeal8, CSeal8Type) + CREATE_BY_SPT(sptSmileyFace, CSmileyFaceType) + CREATE_BY_SPT(sptStar, CStarType) + CREATE_BY_SPT(sptStraightConnector1, CStraightConnectorType) + CREATE_BY_SPT(sptStripedRightArrow, CStripedRightArrowType) + CREATE_BY_SPT(sptSun, CSunType) - CREATE_BY_SPT(sptTextBox, CTextboxType) - CREATE_BY_SPT(sptTrapezoid, CTrapezoidType) + CREATE_BY_SPT(sptTextBox, CTextboxType) + CREATE_BY_SPT(sptTrapezoid, CTrapezoidType) - CREATE_BY_SPT(sptUpArrowCallout, CUpArrowCalloutType) - CREATE_BY_SPT(sptUpArrow, CUpArrowType) - CREATE_BY_SPT(sptUpDownArrowCallout, CUpDownArrowCalloutType) - CREATE_BY_SPT(sptUpDownArrow, CUpDownArrowType) - CREATE_BY_SPT(sptUturnArrow, CUturnArrowType) + CREATE_BY_SPT(sptUpArrowCallout, CUpArrowCalloutType) + CREATE_BY_SPT(sptUpArrow, CUpArrowType) + CREATE_BY_SPT(sptUpDownArrowCallout, CUpDownArrowCalloutType) + CREATE_BY_SPT(sptUpDownArrow, CUpDownArrowType) + CREATE_BY_SPT(sptUturnArrow, CUturnArrowType) - CREATE_BY_SPT(sptVerticalScroll, CVerticalScrollType) - CREATE_BY_SPT(sptHorizontalScroll, CHorizontalScrollType) + CREATE_BY_SPT(sptVerticalScroll, CVerticalScrollType) + CREATE_BY_SPT(sptHorizontalScroll, CHorizontalScrollType) - CREATE_BY_SPT(sptWedgeEllipseCallout, CWedgeEllipseCalloutType) - CREATE_BY_SPT(sptWedgeRectCallout, CWedgeRectCalloutType) - CREATE_BY_SPT(sptWedgeRRectCallout, CWedgeRoundedRectCalloutType) + CREATE_BY_SPT(sptWedgeEllipseCallout, CWedgeEllipseCalloutType) + CREATE_BY_SPT(sptWedgeRectCallout, CWedgeRectCalloutType) + CREATE_BY_SPT(sptWedgeRRectCallout, CWedgeRoundedRectCalloutType) - CREATE_BY_SPT(sptWave, CWaveType) - CREATE_BY_SPT(sptDoubleWave, CWaveDoubleType) + CREATE_BY_SPT(sptWave, CWaveType) + CREATE_BY_SPT(sptDoubleWave, CWaveDoubleType) - case sptBentConnector2: + case sptBentConnector2: case sptBentConnector3: - case sptBentConnector4: - case sptBentConnector5: + case sptBentConnector4: + case sptBentConnector5: { - pShape = new CBentConnectorType(); - break; - } - case sptCurvedConnector2: - case sptCurvedConnector3: - case sptCurvedConnector4: - case sptCurvedConnector5: - { - pShape = new CCurvedConnectorType(); - break; - } + pShape = new CBentConnectorType(); + break; + } + case sptCurvedConnector2: + case sptCurvedConnector3: + case sptCurvedConnector4: + case sptCurvedConnector5: + { + pShape = new CCurvedConnectorType(); + break; + } - case sptTextPlainText: - case sptTextStop: - case sptTextTriangle: - case sptTextTriangleInverted: - case sptTextChevron: - case sptTextChevronInverted: - case sptTextRingInside: - case sptTextRingOutside: - case sptTextArchUpCurve: - case sptTextArchDownCurve: - case sptTextCircleCurve: - case sptTextButtonCurve: - case sptTextArchUpPour: - case sptTextArchDownPour: - case sptTextCirclePour: - case sptTextButtonPour: - case sptTextCurveUp: - case sptTextCurveDown: - case sptTextCascadeUp: - case sptTextCascadeDown: - case sptTextWave1: - case sptTextWave2: - case sptTextWave3: - case sptTextWave4: - case sptTextInflate: - case sptTextDeflate: - case sptTextInflateBottom: - case sptTextDeflateBottom: - case sptTextInflateTop: - case sptTextDeflateTop: - case sptTextDeflateInflate: - case sptTextDeflateInflateDeflate: - case sptTextFadeRight: - case sptTextFadeLeft: - case sptTextFadeUp: - case sptTextFadeDown: - case sptTextSlantUp: - case sptTextSlantDown: - case sptTextCanUp: - case sptTextCanDown: - { - pShape = new CTextboxType(); - } + case sptTextPlainText: + case sptTextStop: + case sptTextTriangle: + case sptTextTriangleInverted: + case sptTextChevron: + case sptTextChevronInverted: + case sptTextRingInside: + case sptTextRingOutside: + case sptTextArchUpCurve: + case sptTextArchDownCurve: + case sptTextCircleCurve: + case sptTextButtonCurve: + case sptTextArchUpPour: + case sptTextArchDownPour: + case sptTextCirclePour: + case sptTextButtonPour: + case sptTextCurveUp: + case sptTextCurveDown: + case sptTextCascadeUp: + case sptTextCascadeDown: + case sptTextWave1: + case sptTextWave2: + case sptTextWave3: + case sptTextWave4: + case sptTextInflate: + case sptTextDeflate: + case sptTextInflateBottom: + case sptTextDeflateBottom: + case sptTextInflateTop: + case sptTextDeflateTop: + case sptTextDeflateInflate: + case sptTextDeflateInflateDeflate: + case sptTextFadeRight: + case sptTextFadeLeft: + case sptTextFadeUp: + case sptTextFadeDown: + case sptTextSlantUp: + case sptTextSlantDown: + case sptTextCanUp: + case sptTextCanDown: + { + pShape = new CTextboxType(); + } - default: break; -}; + default: break; + }; -if (NULL != pShape) -pShape->m_eType = type; + if (NULL != pShape) + pShape->m_eType = type; -return pShape; + return pShape; +} } diff --git a/MsBinaryFile/Common/ODraw/CustomShape.h b/MsBinaryFile/Common/ODraw/CustomShape.h index 83eb100674..5fe5ff6d23 100644 --- a/MsBinaryFile/Common/ODraw/CustomShape.h +++ b/MsBinaryFile/Common/ODraw/CustomShape.h @@ -36,34 +36,37 @@ #include "../../XlsFile/Converter/ShapeType.h" #include "../../Common/Vml/PPTShape/Enums.h" -class CCustomShape : public NSCustomShapesConvert::CBaseShape +namespace NSCustomShapesConvert { -public: - oox::MSOSPT m_eType; - NSCustomShapesConvert::CFormulasManager m_oManager; + class CCustomShape : public NSCustomShapesConvert::CBaseShape + { + public: + oox::MSOSPT m_eType; + NSCustomShapesConvert::CFormulasManager m_oManager; - NSCustomShapesConvert::CCustomVML m_oCustomVML; + NSCustomShapesConvert::CCustomVML m_oCustomVML; - std::wstring m_strPathLimoX; - std::wstring m_strPathLimoY; + std::wstring m_strPathLimoX; + std::wstring m_strPathLimoY; - std::vector m_arStringTextRects; + std::vector m_arStringTextRects; - CCustomShape(); - ~CCustomShape(); + CCustomShape(); + ~CCustomShape(); - virtual void AddGuide(const std::wstring& strGuide); + virtual void AddGuide(const std::wstring& strGuide); - virtual bool LoadAdjustHandlesList(const std::wstring& xml); - virtual bool LoadConnectorsList(const std::wstring& xml); - virtual bool LoadTextRect(const std::wstring& xml); - virtual bool LoadPathList(const std::wstring& xml); + virtual bool LoadAdjustHandlesList(const std::wstring& xml); + virtual bool LoadConnectorsList(const std::wstring& xml); + virtual bool LoadTextRect(const std::wstring& xml); + virtual bool LoadPathList(const std::wstring& xml); - virtual bool SetAdjustment(long index, long value); - virtual void ReCalculate(); + virtual bool SetAdjustment(long index, long value); + virtual void ReCalculate(); - static CCustomShape* CreateByType(oox::MSOSPT type); + static CCustomShape* CreateByType(oox::MSOSPT type); - virtual bool SetProperties(CBaseShape* Shape); - bool SetShapeType(oox::MSOSPT type); -}; + virtual bool SetProperties(CBaseShape* Shape); + bool SetShapeType(oox::MSOSPT type); + }; +} diff --git a/MsBinaryFile/Common/ODraw/PresetShapesHeader.h b/MsBinaryFile/Common/ODraw/PresetShapesHeader.h index fe72c179bb..6ace0f012b 100644 --- a/MsBinaryFile/Common/ODraw/PresetShapesHeader.h +++ b/MsBinaryFile/Common/ODraw/PresetShapesHeader.h @@ -31,170 +31,170 @@ */ #pragma once -#include "../Vml/PPTShape/PPTAutoShapes/accentbordercallout90type.h" -#include "../Vml/PPTShape/PPTAutoShapes/accentbordercallout1type.h" -#include "../Vml/PPTShape/PPTAutoShapes/AccentBorderCallout2Type.h" -#include "../Vml/PPTShape/PPTAutoShapes/accentbordercallout3type.h" +#include "./oldAutoShapes/accentbordercallout90type.h" +#include "./oldAutoShapes/accentbordercallout1type.h" +#include "./oldAutoShapes/AccentBorderCallout2Type.h" +#include "./oldAutoShapes/accentbordercallout3type.h" -#include "../Vml/PPTShape/PPTAutoShapes/AccentCallout90Type.h" -#include "../Vml/PPTShape/PPTAutoShapes/AccentCallout1Type.h" -#include "../Vml/PPTShape/PPTAutoShapes/AccentCallout2Type.h" -#include "../Vml/PPTShape/PPTAutoShapes/AccentCallout3Type.h" +#include "./oldAutoShapes/AccentCallout90Type.h" +#include "./oldAutoShapes/AccentCallout1Type.h" +#include "./oldAutoShapes/AccentCallout2Type.h" +#include "./oldAutoShapes/AccentCallout3Type.h" -#include "../Vml/PPTShape/PPTAutoShapes/BorderCallout90Type.h" -#include "../Vml/PPTShape/PPTAutoShapes/BorderCallout1Type.h" -#include "../Vml/PPTShape/PPTAutoShapes/BorderCallout2Type.h" -#include "../Vml/PPTShape/PPTAutoShapes/BorderCallout3Type.h" +#include "./oldAutoShapes/BorderCallout90Type.h" +#include "./oldAutoShapes/BorderCallout1Type.h" +#include "./oldAutoShapes/BorderCallout2Type.h" +#include "./oldAutoShapes/BorderCallout3Type.h" -#include "../Vml/PPTShape/PPTAutoShapes/Callout90Type.h" -#include "../Vml/PPTShape/PPTAutoShapes/Callout1Type.h" -#include "../Vml/PPTShape/PPTAutoShapes/Callout2Type.h" -#include "../Vml/PPTShape/PPTAutoShapes/Callout3Type.h" +#include "./oldAutoShapes/Callout90Type.h" +#include "./oldAutoShapes/Callout1Type.h" +#include "./oldAutoShapes/Callout2Type.h" +#include "./oldAutoShapes/Callout3Type.h" -#include "../Vml/PPTShape/PPTAutoShapes/BentConnector.h" -#include "../Vml/PPTShape/PPTAutoShapes/CurvedConnector.h" +#include "./oldAutoShapes/BentConnector.h" +#include "./oldAutoShapes/CurvedConnector.h" -#include "../Vml/PPTShape/PPTAutoShapes/ActionButtonBlank.h" -#include "../Vml/PPTShape/PPTAutoShapes/ActionButtonHome.h" -#include "../Vml/PPTShape/PPTAutoShapes/ActionButtonHelp.h" -#include "../Vml/PPTShape/PPTAutoShapes/ActionButtonInfo.h" -#include "../Vml/PPTShape/PPTAutoShapes/ActionButtonBack.h" -#include "../Vml/PPTShape/PPTAutoShapes/ActionButtonNext.h" -#include "../Vml/PPTShape/PPTAutoShapes/ActionButtonBeginning.h" -#include "../Vml/PPTShape/PPTAutoShapes/ActionButtonEnd.h" -#include "../Vml/PPTShape/PPTAutoShapes/ActionButtonReturn.h" -#include "../Vml/PPTShape/PPTAutoShapes/ActionButtonDocument.h" -#include "../Vml/PPTShape/PPTAutoShapes/ActionButtonSound.h" -#include "../Vml/PPTShape/PPTAutoShapes/ActionButtonMovie.h" +#include "./oldAutoShapes/ActionButtonBlank.h" +#include "./oldAutoShapes/ActionButtonHome.h" +#include "./oldAutoShapes/ActionButtonHelp.h" +#include "./oldAutoShapes/ActionButtonInfo.h" +#include "./oldAutoShapes/ActionButtonBack.h" +#include "./oldAutoShapes/ActionButtonNext.h" +#include "./oldAutoShapes/ActionButtonBeginning.h" +#include "./oldAutoShapes/ActionButtonEnd.h" +#include "./oldAutoShapes/ActionButtonReturn.h" +#include "./oldAutoShapes/ActionButtonDocument.h" +#include "./oldAutoShapes/ActionButtonSound.h" +#include "./oldAutoShapes/ActionButtonMovie.h" -#include "../Vml/PPTShape/PPTAutoShapes/arctype.h" -#include "../Vml/PPTShape/PPTAutoShapes/LineType.h" +#include "./oldAutoShapes/arctype.h" +#include "./oldAutoShapes/LineType.h" -#include "../Vml/PPTShape/PPTAutoShapes/BentArrowType.h" -#include "../Vml/PPTShape/PPTAutoShapes/BentUpArrowType.h" -#include "../Vml/PPTShape/PPTAutoShapes/BevelType.h" -#include "../Vml/PPTShape/PPTAutoShapes/BlockArcType.h" -#include "../Vml/PPTShape/PPTAutoShapes/BracePairType.h" -#include "../Vml/PPTShape/PPTAutoShapes/BracketPairType.h" +#include "./oldAutoShapes/BentArrowType.h" +#include "./oldAutoShapes/BentUpArrowType.h" +#include "./oldAutoShapes/BevelType.h" +#include "./oldAutoShapes/BlockArcType.h" +#include "./oldAutoShapes/BracePairType.h" +#include "./oldAutoShapes/BracketPairType.h" -#include "../Vml/PPTShape/PPTAutoShapes/CanType.h" -#include "../Vml/PPTShape/PPTAutoShapes/ChevronType.h" -#include "../Vml/PPTShape/PPTAutoShapes/CircularArrowType.h" -#include "../Vml/PPTShape/PPTAutoShapes/CloudCalloutType.h" -#include "../Vml/PPTShape/PPTAutoShapes/CubeType.h" -#include "../Vml/PPTShape/PPTAutoShapes/CurvedDownArrowType.h" -#include "../Vml/PPTShape/PPTAutoShapes/CurvedLeftArrowType.h" -#include "../Vml/PPTShape/PPTAutoShapes/CurvedRightArrowType.h" -#include "../Vml/PPTShape/PPTAutoShapes/CurvedUpArrowType.h" +#include "./oldAutoShapes/CanType.h" +#include "./oldAutoShapes/ChevronType.h" +#include "./oldAutoShapes/CircularArrowType.h" +#include "./oldAutoShapes/CloudCalloutType.h" +#include "./oldAutoShapes/CubeType.h" +#include "./oldAutoShapes/CurvedDownArrowType.h" +#include "./oldAutoShapes/CurvedLeftArrowType.h" +#include "./oldAutoShapes/CurvedRightArrowType.h" +#include "./oldAutoShapes/CurvedUpArrowType.h" -#include "../Vml/PPTShape/PPTAutoShapes/DiamondType.h" -#include "../Vml/PPTShape/PPTAutoShapes/DonutType.h" -#include "../Vml/PPTShape/PPTAutoShapes/DownArrowCalloutType.h" -#include "../Vml/PPTShape/PPTAutoShapes/DownArrowType.h" +#include "./oldAutoShapes/DiamondType.h" +#include "./oldAutoShapes/DonutType.h" +#include "./oldAutoShapes/DownArrowCalloutType.h" +#include "./oldAutoShapes/DownArrowType.h" -#include "../Vml/PPTShape/PPTAutoShapes/EllipseType.h" -#include "../Vml/PPTShape/PPTAutoShapes/EllipseRibbon2Type.h" -#include "../Vml/PPTShape/PPTAutoShapes/EllipseRibbonType.h" +#include "./oldAutoShapes/EllipseType.h" +#include "./oldAutoShapes/EllipseRibbon2Type.h" +#include "./oldAutoShapes/EllipseRibbonType.h" -#include "../Vml/PPTShape/PPTAutoShapes/FlowChartAlternateProcessType.h" -#include "../Vml/PPTShape/PPTAutoShapes/FlowChartCollateType.h" -#include "../Vml/PPTShape/PPTAutoShapes/FlowChartConnectorType.h" -#include "../Vml/PPTShape/PPTAutoShapes/FlowChartDecisionType.h" -#include "../Vml/PPTShape/PPTAutoShapes/FlowChartDelayType.h" -#include "../Vml/PPTShape/PPTAutoShapes/FlowChartDisplayType.h" -#include "../Vml/PPTShape/PPTAutoShapes/FlowChartDocumentType.h" -#include "../Vml/PPTShape/PPTAutoShapes/FlowChartExtractType.h" -#include "../Vml/PPTShape/PPTAutoShapes/FlowChartInputOutputType.h" -#include "../Vml/PPTShape/PPTAutoShapes/FlowChartInternalStorageType.h" -#include "../Vml/PPTShape/PPTAutoShapes/FlowChartMagneticDiskType.h" -#include "../Vml/PPTShape/PPTAutoShapes/FlowChartMagneticDrumType.h" -#include "../Vml/PPTShape/PPTAutoShapes/FlowChartMagneticTapeType.h" -#include "../Vml/PPTShape/PPTAutoShapes/FlowChartManualInputType.h" -#include "../Vml/PPTShape/PPTAutoShapes/FlowChartManualOperationType.h" -#include "../Vml/PPTShape/PPTAutoShapes/FlowChartMergeType.h" -#include "../Vml/PPTShape/PPTAutoShapes/FlowChartMultidocumentType.h" -#include "../Vml/PPTShape/PPTAutoShapes/FlowChartOffpageConnectorType.h" -#include "../Vml/PPTShape/PPTAutoShapes/FlowChartOnlineStorageType.h" -#include "../Vml/PPTShape/PPTAutoShapes/FlowChartOrType.h" -#include "../Vml/PPTShape/PPTAutoShapes/FlowChartPredefinedProcessType.h" -#include "../Vml/PPTShape/PPTAutoShapes/FlowChartPreparationType.h" -#include "../Vml/PPTShape/PPTAutoShapes/FlowChartProcessType.h" -#include "../Vml/PPTShape/PPTAutoShapes/FlowChartPunchedCardType.h" -#include "../Vml/PPTShape/PPTAutoShapes/FlowChartPunchedTapeType.h" -#include "../Vml/PPTShape/PPTAutoShapes/FlowChartSortType.h" -#include "../Vml/PPTShape/PPTAutoShapes/FlowChartSummingJunctionType.h" -#include "../Vml/PPTShape/PPTAutoShapes/FlowChartTerminatorType.h" -#include "../Vml/PPTShape/PPTAutoShapes/FoldedCornerType.h" +#include "./oldAutoShapes/FlowChartAlternateProcessType.h" +#include "./oldAutoShapes/FlowChartCollateType.h" +#include "./oldAutoShapes/FlowChartConnectorType.h" +#include "./oldAutoShapes/FlowChartDecisionType.h" +#include "./oldAutoShapes/FlowChartDelayType.h" +#include "./oldAutoShapes/FlowChartDisplayType.h" +#include "./oldAutoShapes/FlowChartDocumentType.h" +#include "./oldAutoShapes/FlowChartExtractType.h" +#include "./oldAutoShapes/FlowChartInputOutputType.h" +#include "./oldAutoShapes/FlowChartInternalStorageType.h" +#include "./oldAutoShapes/FlowChartMagneticDiskType.h" +#include "./oldAutoShapes/FlowChartMagneticDrumType.h" +#include "./oldAutoShapes/FlowChartMagneticTapeType.h" +#include "./oldAutoShapes/FlowChartManualInputType.h" +#include "./oldAutoShapes/FlowChartManualOperationType.h" +#include "./oldAutoShapes/FlowChartMergeType.h" +#include "./oldAutoShapes/FlowChartMultidocumentType.h" +#include "./oldAutoShapes/FlowChartOffpageConnectorType.h" +#include "./oldAutoShapes/FlowChartOnlineStorageType.h" +#include "./oldAutoShapes/FlowChartOrType.h" +#include "./oldAutoShapes/FlowChartPredefinedProcessType.h" +#include "./oldAutoShapes/FlowChartPreparationType.h" +#include "./oldAutoShapes/FlowChartProcessType.h" +#include "./oldAutoShapes/FlowChartPunchedCardType.h" +#include "./oldAutoShapes/FlowChartPunchedTapeType.h" +#include "./oldAutoShapes/FlowChartSortType.h" +#include "./oldAutoShapes/FlowChartSummingJunctionType.h" +#include "./oldAutoShapes/FlowChartTerminatorType.h" +#include "./oldAutoShapes/FoldedCornerType.h" -#include "../Vml/PPTShape/PPTAutoShapes/HeartType.h" -#include "../Vml/PPTShape/PPTAutoShapes/HexagonType.h" -#include "../Vml/PPTShape/PPTAutoShapes/HomePlateType.h" +#include "./oldAutoShapes/HeartType.h" +#include "./oldAutoShapes/HexagonType.h" +#include "./oldAutoShapes/HomePlateType.h" -#include "../Vml/PPTShape/PPTAutoShapes/IrregularSealOneType.h" -#include "../Vml/PPTShape/PPTAutoShapes/IrregularSealTwo.h" -#include "../Vml/PPTShape/PPTAutoShapes/IsoscelesTriangleType.h" +#include "./oldAutoShapes/IrregularSealOneType.h" +#include "./oldAutoShapes/IrregularSealTwo.h" +#include "./oldAutoShapes/IsoscelesTriangleType.h" -#include "../Vml/PPTShape/PPTAutoShapes/LeftArrowCalloutType.h" -#include "../Vml/PPTShape/PPTAutoShapes/LeftArrowType.h" -#include "../Vml/PPTShape/PPTAutoShapes/LeftBraceType.h" -#include "../Vml/PPTShape/PPTAutoShapes/LeftBracketType.h" -#include "../Vml/PPTShape/PPTAutoShapes/LeftRightArrowCalloutType.h" -#include "../Vml/PPTShape/PPTAutoShapes/LeftRightArrowType.h" -#include "../Vml/PPTShape/PPTAutoShapes/LeftRightUpArrow.h" -#include "../Vml/PPTShape/PPTAutoShapes/LeftUpArrowType.h" -#include "../Vml/PPTShape/PPTAutoShapes/LightningBoltType.h" +#include "./oldAutoShapes/LeftArrowCalloutType.h" +#include "./oldAutoShapes/LeftArrowType.h" +#include "./oldAutoShapes/LeftBraceType.h" +#include "./oldAutoShapes/LeftBracketType.h" +#include "./oldAutoShapes/LeftRightArrowCalloutType.h" +#include "./oldAutoShapes/LeftRightArrowType.h" +#include "./oldAutoShapes/LeftRightUpArrow.h" +#include "./oldAutoShapes/LeftUpArrowType.h" +#include "./oldAutoShapes/LightningBoltType.h" -#include "../Vml/PPTShape/PPTAutoShapes/MoonType.h" +#include "./oldAutoShapes/MoonType.h" -#include "../Vml/PPTShape/PPTAutoShapes/NoSmokingType.h" -#include "../Vml/PPTShape/PPTAutoShapes/NotchedRightArrowType.h" +#include "./oldAutoShapes/NoSmokingType.h" +#include "./oldAutoShapes/NotchedRightArrowType.h" -#include "../Vml/PPTShape/PPTAutoShapes/OctagonType.h" +#include "./oldAutoShapes/OctagonType.h" -#include "../Vml/PPTShape/PPTAutoShapes/ParallelogramType.h" -#include "../Vml/PPTShape/PPTAutoShapes/PentagonType.h" -#include "../Vml/PPTShape/PPTAutoShapes/PlaqueType.h" -#include "../Vml/PPTShape/PPTAutoShapes/PlusType.h" +#include "./oldAutoShapes/ParallelogramType.h" +#include "./oldAutoShapes/PentagonType.h" +#include "./oldAutoShapes/PlaqueType.h" +#include "./oldAutoShapes/PlusType.h" -#include "../Vml/PPTShape/PPTAutoShapes/QuadArrowCalloutType.h" -#include "../Vml/PPTShape/PPTAutoShapes/QuadArrowType.h" +#include "./oldAutoShapes/QuadArrowCalloutType.h" +#include "./oldAutoShapes/QuadArrowType.h" -#include "../Vml/PPTShape/PPTAutoShapes/RectangleType.h" -#include "../Vml/PPTShape/PPTAutoShapes/RibbonDownType.h" -#include "../Vml/PPTShape/PPTAutoShapes/RibbonUpType.h" -#include "../Vml/PPTShape/PPTAutoShapes/RightArrowCalloutType.h" -#include "../Vml/PPTShape/PPTAutoShapes/RightArrowType.h" -#include "../Vml/PPTShape/PPTAutoShapes/RightBracetype.h" -#include "../Vml/PPTShape/PPTAutoShapes/RightBracketType.h" -#include "../Vml/PPTShape/PPTAutoShapes/RightTriangleType.h" -#include "../Vml/PPTShape/PPTAutoShapes/RoundedRectangleType.h" +#include "./oldAutoShapes/RectangleType.h" +#include "./oldAutoShapes/RibbonDownType.h" +#include "./oldAutoShapes/RibbonUpType.h" +#include "./oldAutoShapes/RightArrowCalloutType.h" +#include "./oldAutoShapes/RightArrowType.h" +#include "./oldAutoShapes/RightBracetype.h" +#include "./oldAutoShapes/RightBracketType.h" +#include "./oldAutoShapes/RightTriangleType.h" +#include "./oldAutoShapes/RoundedRectangleType.h" -#include "../Vml/PPTShape/PPTAutoShapes/Seal16Type.h" -#include "../Vml/PPTShape/PPTAutoShapes/Seal24Type.h" -#include "../Vml/PPTShape/PPTAutoShapes/Seal32Type.h" -#include "../Vml/PPTShape/PPTAutoShapes/Seal4Type.h" -#include "../Vml/PPTShape/PPTAutoShapes/Seal8Type.h" -#include "../Vml/PPTShape/PPTAutoShapes/SmileyFaceType.h" -#include "../Vml/PPTShape/PPTAutoShapes/Startype.h" -#include "../Vml/PPTShape/PPTAutoShapes/StraightConnectorType.h" -#include "../Vml/PPTShape/PPTAutoShapes/StripedRightArrowType.h" -#include "../Vml/PPTShape/PPTAutoShapes/SunType.h" +#include "./oldAutoShapes/Seal16Type.h" +#include "./oldAutoShapes/Seal24Type.h" +#include "./oldAutoShapes/Seal32Type.h" +#include "./oldAutoShapes/Seal4Type.h" +#include "./oldAutoShapes/Seal8Type.h" +#include "./oldAutoShapes/SmileyFaceType.h" +#include "./oldAutoShapes/Startype.h" +#include "./oldAutoShapes/StraightConnectorType.h" +#include "./oldAutoShapes/StripedRightArrowType.h" +#include "./oldAutoShapes/SunType.h" -#include "../Vml/PPTShape/PPTAutoShapes/TextboxType.h" -#include "../Vml/PPTShape/PPTAutoShapes/TrapezoidType.h" +#include "./oldAutoShapes/TextboxType.h" +#include "./oldAutoShapes/TrapezoidType.h" -#include "../Vml/PPTShape/PPTAutoShapes/UpArrowCalloutType.h" -#include "../Vml/PPTShape/PPTAutoShapes/UpArrowType.h" -#include "../Vml/PPTShape/PPTAutoShapes/UpDownArrowCalloutType.h" -#include "../Vml/PPTShape/PPTAutoShapes/UpDownArrowType.h" -#include "../Vml/PPTShape/PPTAutoShapes/UturnArrowType.h" +#include "./oldAutoShapes/UpArrowCalloutType.h" +#include "./oldAutoShapes/UpArrowType.h" +#include "./oldAutoShapes/UpDownArrowCalloutType.h" +#include "./oldAutoShapes/UpDownArrowType.h" +#include "./oldAutoShapes/UturnArrowType.h" -#include "../Vml/PPTShape/PPTAutoShapes/VerticalScrollType.h" -#include "../Vml/PPTShape/PPTAutoShapes/HorisontalScrollType.h" +#include "./oldAutoShapes/VerticalScrollType.h" +#include "./oldAutoShapes/HorisontalScrollType.h" -#include "../Vml/PPTShape/PPTAutoShapes/WedgeEllipseCalloutType.h" -#include "../Vml/PPTShape/PPTAutoShapes/WedgeRectCalloutType.h" -#include "../Vml/PPTShape/PPTAutoShapes/WedgeRoundedRectCalloutType.h" +#include "./oldAutoShapes/WedgeEllipseCalloutType.h" +#include "./oldAutoShapes/WedgeRectCalloutType.h" +#include "./oldAutoShapes/WedgeRoundedRectCalloutType.h" -#include "../Vml/PPTShape/PPTAutoShapes/WaveType.h" -#include "../Vml/PPTShape/PPTAutoShapes/WaveDoubleType.h" +#include "./oldAutoShapes/WaveType.h" +#include "./oldAutoShapes/WaveDoubleType.h" diff --git a/MsBinaryFile/Common/ODraw/oldAutoShapes/AccentBorderCallout2Type.h b/MsBinaryFile/Common/ODraw/oldAutoShapes/AccentBorderCallout2Type.h new file mode 100644 index 0000000000..2b723a1ca0 --- /dev/null +++ b/MsBinaryFile/Common/ODraw/oldAutoShapes/AccentBorderCallout2Type.h @@ -0,0 +1,79 @@ +/* + * (c) Copyright Ascensio System SIA 2010-2019 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect + * that Ascensio System SIA expressly excludes the warranty of non-infringement + * of any third-party rights. + * + * This program is distributed WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * + */ +#pragma once +#include "../CustomShape.h" + +// 51 +namespace NSCustomShapesConvert +{ + +class CAccentBorderCallout2Type : public CCustomShape +{ +public: + CAccentBorderCallout2Type() + { + m_bConcentricFill = true; + m_eJoin = ODRAW::lineJoinMiter; + //Encaps: Flat + + m_strPath = _T("m@0@1l@2@3@4@5nfem@4,l@4,21600nfem,l21600,r,21600l,21600xe"); + + AddGuide(_T("val #0")); + AddGuide(_T("val #1")); + AddGuide(_T("val #2")); + AddGuide(_T("val #3")); + AddGuide(_T("val #4")); + AddGuide(_T("val #5")); + + m_arAdjustments.push_back(-10080); + m_arAdjustments.push_back(24300); + m_arAdjustments.push_back(-3600); + m_arAdjustments.push_back(4050); + m_arAdjustments.push_back(-1800); + m_arAdjustments.push_back(4050); + + LoadConnectorsList(_T("@0,@1;10800,0;10800,21600;0,10800;21600,10800")); + + CHandle_ oHandle1; + oHandle1.position = _T("#0,#1"); + m_arHandles.push_back(oHandle1); + + CHandle_ oHandle2; + oHandle2.position = _T("#2,#3"); + m_arHandles.push_back(oHandle2); + + CHandle_ oHandle3; + oHandle3.position = _T("#4,#5"); + m_arHandles.push_back(oHandle3); + } +}; +} diff --git a/MsBinaryFile/Common/ODraw/oldAutoShapes/AccentCallout1Type.h b/MsBinaryFile/Common/ODraw/oldAutoShapes/AccentCallout1Type.h new file mode 100644 index 0000000000..2763bc20b6 --- /dev/null +++ b/MsBinaryFile/Common/ODraw/oldAutoShapes/AccentCallout1Type.h @@ -0,0 +1,71 @@ +/* + * (c) Copyright Ascensio System SIA 2010-2019 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect + * that Ascensio System SIA expressly excludes the warranty of non-infringement + * of any third-party rights. + * + * This program is distributed WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * + */ +#pragma once +#include "../CustomShape.h" + +// 44 +namespace NSCustomShapesConvert +{ + +class CAccentCallout1Type : public CCustomShape +{ +public: + CAccentCallout1Type() + { + m_bConcentricFill = true; + m_eJoin = ODRAW::lineJoinMiter; + //Encaps: Flat + + m_strPath = _T("m@0@1l@2@3nfem@2,l@2,21600nfem,l21600,r,21600l,21600nsxe"); + + AddGuide(_T("val #0")); + AddGuide(_T("val #1")); + AddGuide(_T("val #2")); + AddGuide(_T("val #3")); + + m_arAdjustments.push_back(-8280); + m_arAdjustments.push_back(24300); + m_arAdjustments.push_back(-1800); + m_arAdjustments.push_back(4050); + + LoadConnectorsList(_T("@0,@1;10800,0;10800,21600;0,10800;21600,10800")); + + CHandle_ oHandle1; + oHandle1.position = _T("#0,#1"); + m_arHandles.push_back(oHandle1); + + CHandle_ oHandle2; + oHandle2.position = _T("#2,#3"); + m_arHandles.push_back(oHandle2); + } +}; +} \ No newline at end of file diff --git a/MsBinaryFile/Common/ODraw/oldAutoShapes/AccentCallout2Type.h b/MsBinaryFile/Common/ODraw/oldAutoShapes/AccentCallout2Type.h new file mode 100644 index 0000000000..40359ab03c --- /dev/null +++ b/MsBinaryFile/Common/ODraw/oldAutoShapes/AccentCallout2Type.h @@ -0,0 +1,79 @@ +/* + * (c) Copyright Ascensio System SIA 2010-2019 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect + * that Ascensio System SIA expressly excludes the warranty of non-infringement + * of any third-party rights. + * + * This program is distributed WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * + */ +#pragma once +#include "../CustomShape.h" + +// 45 +namespace NSCustomShapesConvert +{ + +class CAccentCallout2Type : public CCustomShape +{ +public: + CAccentCallout2Type() + { + m_bConcentricFill = true; + m_eJoin = ODRAW::lineJoinMiter; + //Encaps: Flat + + m_strPath = _T("m@0@1l@2@3@4@5nfem@4,l@4,21600nfem,l21600,r,21600l,21600nsxe"); + + AddGuide(_T("val #0")); + AddGuide(_T("val #1")); + AddGuide(_T("val #2")); + AddGuide(_T("val #3")); + AddGuide(_T("val #4")); + AddGuide(_T("val #5")); + + m_arAdjustments.push_back(-10080); + m_arAdjustments.push_back(24300); + m_arAdjustments.push_back(-3600); + m_arAdjustments.push_back(4050); + m_arAdjustments.push_back(-1800); + m_arAdjustments.push_back(4050); + + LoadConnectorsList(_T("@0,@1;10800,0;10800,21600;0,10800;21600,10800")); + + CHandle_ oHandle1; + oHandle1.position = _T("#0,#1"); + m_arHandles.push_back(oHandle1); + + CHandle_ oHandle2; + oHandle2.position = _T("#2,#3"); + m_arHandles.push_back(oHandle2); + + CHandle_ oHandle3; + oHandle3.position = _T("#4,#5"); + m_arHandles.push_back(oHandle3); + } +}; +} \ No newline at end of file diff --git a/MsBinaryFile/Common/ODraw/oldAutoShapes/AccentCallout3Type.h b/MsBinaryFile/Common/ODraw/oldAutoShapes/AccentCallout3Type.h new file mode 100644 index 0000000000..2711f4f26f --- /dev/null +++ b/MsBinaryFile/Common/ODraw/oldAutoShapes/AccentCallout3Type.h @@ -0,0 +1,87 @@ +/* + * (c) Copyright Ascensio System SIA 2010-2019 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect + * that Ascensio System SIA expressly excludes the warranty of non-infringement + * of any third-party rights. + * + * This program is distributed WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * + */ +#pragma once +#include "../CustomShape.h" + +// 46 +namespace NSCustomShapesConvert +{ + +class CAccentCallout3Type : public CCustomShape +{ +public: + CAccentCallout3Type() + { + m_bConcentricFill = true; + m_eJoin = ODRAW::lineJoinMiter; + //Encaps: Flat + + m_strPath = _T("m@0@1l@2@3@4@5@6@7nfem@6,l@6,21600nfem,l21600,r,21600l,21600nsxe"); + + AddGuide(_T("val #0")); + AddGuide(_T("val #1")); + AddGuide(_T("val #2")); + AddGuide(_T("val #3")); + AddGuide(_T("val #4")); + AddGuide(_T("val #5")); + AddGuide(_T("val #6")); + AddGuide(_T("val #7")); + + m_arAdjustments.push_back(23400); + m_arAdjustments.push_back(24400); + m_arAdjustments.push_back(25200); + m_arAdjustments.push_back(21600); + m_arAdjustments.push_back(25200); + m_arAdjustments.push_back(4050); + m_arAdjustments.push_back(23400); + m_arAdjustments.push_back(4050); + + LoadConnectorsList(_T("@0,@1;10800,0;10800,21600;0,10800;21600,10800")); + + CHandle_ oHandle1; + oHandle1.position = _T("#0,#1"); + m_arHandles.push_back(oHandle1); + + CHandle_ oHandle2; + oHandle2.position = _T("#2,#3"); + m_arHandles.push_back(oHandle2); + + CHandle_ oHandle3; + oHandle3.position = _T("#4,#5"); + m_arHandles.push_back(oHandle3); + + CHandle_ oHandle4; + oHandle4.position = _T("#6,#7"); + m_arHandles.push_back(oHandle4); + } +}; +} diff --git a/MsBinaryFile/Common/ODraw/oldAutoShapes/AccentCallout90Type.h b/MsBinaryFile/Common/ODraw/oldAutoShapes/AccentCallout90Type.h new file mode 100644 index 0000000000..f8737a5a5d --- /dev/null +++ b/MsBinaryFile/Common/ODraw/oldAutoShapes/AccentCallout90Type.h @@ -0,0 +1,70 @@ +/* + * (c) Copyright Ascensio System SIA 2010-2019 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect + * that Ascensio System SIA expressly excludes the warranty of non-infringement + * of any third-party rights. + * + * This program is distributed WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * + */ +#pragma once +#include "../CustomShape.h" + +// 179 +namespace NSCustomShapesConvert +{ +class CAccentCallout90Type : public CCustomShape +{ +public: + CAccentCallout90Type() + { + m_bConcentricFill = true; + m_eJoin = ODRAW::lineJoinMiter; + //Encaps: Flat + + m_strPath = _T("m@0@1l@2@3nfem,l21600,r,21600l,21600nsxe"); + + AddGuide(_T("val #0")); + AddGuide(_T("val #1")); + AddGuide(_T("val #2")); + AddGuide(_T("val #3")); + + m_arAdjustments.push_back(-1800); + m_arAdjustments.push_back(24300); + m_arAdjustments.push_back(-1800); + m_arAdjustments.push_back(4050); + + LoadConnectorsList(_T("@0,@1;10800,0;10800,21600;0,10800;21600,10800")); + + CHandle_ oHandle1; + oHandle1.position = _T("#0,#1"); + m_arHandles.push_back(oHandle1); + + CHandle_ oHandle2; + oHandle2.position = _T("#2,#3"); + m_arHandles.push_back(oHandle2); + } +}; +} diff --git a/MsBinaryFile/Common/ODraw/oldAutoShapes/ActionButtonBack.h b/MsBinaryFile/Common/ODraw/oldAutoShapes/ActionButtonBack.h new file mode 100644 index 0000000000..99dc0b5d50 --- /dev/null +++ b/MsBinaryFile/Common/ODraw/oldAutoShapes/ActionButtonBack.h @@ -0,0 +1,82 @@ +/* + * (c) Copyright Ascensio System SIA 2010-2019 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect + * that Ascensio System SIA expressly excludes the warranty of non-infringement + * of any third-party rights. + * + * This program is distributed WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * + */ +#pragma once +#include "../CustomShape.h" + +// 194 +namespace NSCustomShapesConvert +{ + +class CActionButtonBackType : public CCustomShape +{ +public: + CActionButtonBackType() + { + m_bConcentricFill = true; + m_eJoin = ODRAW::lineJoinMiter; + + m_strPath = _T("m,l,21600r21600,l21600,xem@0@0nfl@0@2@1@2@1@0xem,nfl@0@0em,21600nfl@0@2em21600,21600nfl@1@2em21600,nfl@1@0em@12@9nfl@11@4@12@10xe"); + + AddGuide(_T("val #0")); + AddGuide(_T("sum width 0 #0")); + AddGuide(_T("sum height 0 #0")); + AddGuide(_T("prod width 1 2")); + AddGuide(_T("prod height 1 2")); + AddGuide(_T("prod #0 1 2")); + AddGuide(_T("prod #0 3 2")); + AddGuide(_T("sum @1 @5 0")); + AddGuide(_T("sum @2 @5 0")); + AddGuide(_T("sum @0 @4 8100")); + AddGuide(_T("sum @2 8100 @4")); + AddGuide(_T("sum @0 @3 8100")); + AddGuide(_T("sum @1 8100 @3")); + AddGuide(_T("sum @4 @5 0")); + AddGuide(_T("sum @9 @5 0")); + AddGuide(_T("sum @10 @5 0")); + AddGuide(_T("sum @11 @5 0")); + AddGuide(_T("sum @12 @5 0")); + + m_arAdjustments.push_back(1350); + LoadConnectorsList(_T("0,@4;@0,@4;@3,21600;@3,@2;21600,@4;@1,@4;@3,0;@3,@0")); + LoadTextRect(_T("@0,@0,@1,@2")); + + CHandle_ oHandle1; + oHandle1.position = _T("#0,topLeft"); + oHandle1.switchHandle = _T("true"); + oHandle1.xrange = _T("0,5400"); + m_arHandles.push_back(oHandle1); + + m_lLimoX = 10800; + m_lLimoY = 10800; + } +}; +} diff --git a/MsBinaryFile/Common/ODraw/oldAutoShapes/ActionButtonBeginning.h b/MsBinaryFile/Common/ODraw/oldAutoShapes/ActionButtonBeginning.h new file mode 100644 index 0000000000..69ea94a516 --- /dev/null +++ b/MsBinaryFile/Common/ODraw/oldAutoShapes/ActionButtonBeginning.h @@ -0,0 +1,89 @@ +/* + * (c) Copyright Ascensio System SIA 2010-2019 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect + * that Ascensio System SIA expressly excludes the warranty of non-infringement + * of any third-party rights. + * + * This program is distributed WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * + */ +#pragma once +#include "../CustomShape.h" + +// 196 +namespace NSCustomShapesConvert +{ + +class CActionButtonBeginType : public CCustomShape +{ +public: + CActionButtonBeginType() + { + m_bConcentricFill = true; + m_eJoin = ODRAW::lineJoinMiter; + + m_strPath = _T("m,l,21600r21600,l21600,xem@0@0nfl@0@2@1@2@1@0xem,nfl@0@0em,21600nfl@0@2em21600,21600nfl@1@2em21600,nfl@1@0em@12@9l@17@4@12@10xem@11@9l@16@9@16@10@11@10xe"); + + AddGuide(_T("val #0")); + AddGuide(_T("sum width 0 #0")); + AddGuide(_T("sum height 0 #0")); + AddGuide(_T("prod width 1 2")); + AddGuide(_T("prod height 1 2")); + AddGuide(_T("prod #0 1 2")); + AddGuide(_T("prod #0 3 2")); + AddGuide(_T("sum @1 @5 0")); + AddGuide(_T("sum @2 @5 0")); + AddGuide(_T("sum @0 @4 8100")); + AddGuide(_T("sum @2 8100 @4")); + AddGuide(_T("sum @0 @3 8100")); + AddGuide(_T("sum @1 8100 @3")); + AddGuide(_T("sum @10 0 @9")); + AddGuide(_T("prod @13 1 8")); + AddGuide(_T("prod @13 1 4")); + AddGuide(_T("sum @11 @14 0")); + AddGuide(_T("sum @11 @15 0")); + AddGuide(_T("sum @4 @5 0")); + AddGuide(_T("sum @9 @5 0")); + AddGuide(_T("sum @10 @5 0")); + AddGuide(_T("sum @11 @5 0")); + AddGuide(_T("sum @12 @5 0")); + AddGuide(_T("sum @16 @5 0")); + AddGuide(_T("sum @17 @5 0")); + + m_arAdjustments.push_back(1350); + LoadConnectorsList(_T("0,@4;@0,@4;@3,21600;@3,@2;21600,@4;@1,@4;@3,0;@3,@0")); + LoadTextRect(_T("@0,@0,@1,@2")); + + CHandle_ oHandle1; + oHandle1.position = _T("#0,topLeft"); + oHandle1.switchHandle = _T("true"); + oHandle1.xrange = _T("0,5400"); + m_arHandles.push_back(oHandle1); + + m_lLimoX = 10800; + m_lLimoY = 10800; + } +}; +} diff --git a/MsBinaryFile/Common/ODraw/oldAutoShapes/ActionButtonBlank.h b/MsBinaryFile/Common/ODraw/oldAutoShapes/ActionButtonBlank.h new file mode 100644 index 0000000000..4d732c55d8 --- /dev/null +++ b/MsBinaryFile/Common/ODraw/oldAutoShapes/ActionButtonBlank.h @@ -0,0 +1,73 @@ +/* + * (c) Copyright Ascensio System SIA 2010-2019 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect + * that Ascensio System SIA expressly excludes the warranty of non-infringement + * of any third-party rights. + * + * This program is distributed WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * + */ +#pragma once +#include "../CustomShape.h" + +// 189 +namespace NSCustomShapesConvert +{ + +class CActionButtonBlankType : public CCustomShape +{ +public: + CActionButtonBlankType() + { + m_bConcentricFill = true; + m_eJoin = ODRAW::lineJoinMiter; + + m_strPath = _T("m,l,21600r21600,l21600,xem@0@0nfl@0@2@1@2@1@0xem,nfl@0@0em,21600nfl@0@2em21600,21600nfl@1@2em21600,nfl@1@0e"); + + AddGuide(_T("val #0")); + AddGuide(_T("sum width 0 #0")); + AddGuide(_T("sum height 0 #0")); + AddGuide(_T("prod width 1 2")); + AddGuide(_T("prod height 1 2")); + AddGuide(_T("prod #0 1 2")); + AddGuide(_T("prod #0 3 2")); + AddGuide(_T("sum @1 @5 0")); + AddGuide(_T("sum @2 @5 0")); + + m_arAdjustments.push_back(1350); + LoadConnectorsList(_T("0,@4;@0,@4;@3,21600;@3,@2;21600,@4;@1,@4;@3,0;@3,@0")); + LoadTextRect(_T("@0,@0,@1,@2")); + + CHandle_ oHandle1; + oHandle1.position = _T("#0,topLeft"); + oHandle1.switchHandle = _T("true"); + oHandle1.xrange = _T("0,5400"); + m_arHandles.push_back(oHandle1); + + m_lLimoX = 10800; + m_lLimoY = 10800; + } +}; +} diff --git a/MsBinaryFile/Common/ODraw/oldAutoShapes/ActionButtonDocument.h b/MsBinaryFile/Common/ODraw/oldAutoShapes/ActionButtonDocument.h new file mode 100644 index 0000000000..6a7506d2fd --- /dev/null +++ b/MsBinaryFile/Common/ODraw/oldAutoShapes/ActionButtonDocument.h @@ -0,0 +1,86 @@ +/* + * (c) Copyright Ascensio System SIA 2010-2019 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect + * that Ascensio System SIA expressly excludes the warranty of non-infringement + * of any third-party rights. + * + * This program is distributed WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * + */ +#pragma once +#include "../CustomShape.h" + +// 198 +namespace NSCustomShapesConvert +{ + +class CActionButtonDocType : public CCustomShape +{ +public: + CActionButtonDocType() + { + m_bConcentricFill = true; + m_eJoin = ODRAW::lineJoinMiter; + + m_strPath = _T("m,l,21600r21600,l21600,xem@0@0nfl@0@2@1@2@1@0xem,nfl@0@0em,21600nfl@0@2em21600,21600nfl@1@2em21600,nfl@1@0em@12@9nfl@12@10@13@10@13@14@15@9xem@15@9nfl@15@14@13@14e"); + + AddGuide(_T("val #0")); + AddGuide(_T("sum width 0 #0")); + AddGuide(_T("sum height 0 #0")); + AddGuide(_T("prod width 1 2")); + AddGuide(_T("prod height 1 2")); + AddGuide(_T("prod #0 1 2")); + AddGuide(_T("prod #0 3 2")); + AddGuide(_T("sum @1 @5 0")); + AddGuide(_T("sum @2 @5 0")); + AddGuide(_T("sum @0 @4 8100")); + AddGuide(_T("sum @2 8100 @4")); + AddGuide(_T("prod #0 3 4")); + AddGuide(_T("sum @3 @11 6075")); + AddGuide(_T("sum @3 6075 @11")); + AddGuide(_T("sum @4 @5 4050")); + AddGuide(_T("sum @13 @5 4050")); + AddGuide(_T("sum @9 @5 0")); + AddGuide(_T("sum @10 @5 0")); + AddGuide(_T("sum @12 @5 0")); + AddGuide(_T("sum @13 @5 0")); + AddGuide(_T("sum @14 @5 0")); + AddGuide(_T("sum @15 @5 0")); + + m_arAdjustments.push_back(1350); + LoadConnectorsList(_T("0,@4;@0,@4;@3,21600;@3,@2;21600,@4;@1,@4;@3,0;@3,@0")); + LoadTextRect(_T("@0,@0,@1,@2")); + + CHandle_ oHandle1; + oHandle1.position = _T("#0,topLeft"); + oHandle1.switchHandle = _T("true"); + oHandle1.xrange = _T("0,5400"); + m_arHandles.push_back(oHandle1); + + m_lLimoX = 10800; + m_lLimoY = 10800; + } +}; +} diff --git a/MsBinaryFile/Common/ODraw/oldAutoShapes/ActionButtonEnd.h b/MsBinaryFile/Common/ODraw/oldAutoShapes/ActionButtonEnd.h new file mode 100644 index 0000000000..f69f280339 --- /dev/null +++ b/MsBinaryFile/Common/ODraw/oldAutoShapes/ActionButtonEnd.h @@ -0,0 +1,89 @@ +/* + * (c) Copyright Ascensio System SIA 2010-2019 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect + * that Ascensio System SIA expressly excludes the warranty of non-infringement + * of any third-party rights. + * + * This program is distributed WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * + */ +#pragma once +#include "../CustomShape.h" + +// 195 +namespace NSCustomShapesConvert +{ + +class CActionButtonEndType : public CCustomShape +{ +public: + CActionButtonEndType() + { + m_bConcentricFill = true; + m_eJoin = ODRAW::lineJoinMiter; + + m_strPath = _T("m,l,21600r21600,l21600,xem@0@0nfl@0@2@1@2@1@0xem,nfl@0@0em,21600nfl@0@2em21600,21600nfl@1@2em21600,nfl@1@0em@11@9l@16@4@11@10xem@17@9l@12@9@12@10@17@10xe"); + + AddGuide(_T("val #0")); + AddGuide(_T("sum width 0 #0")); + AddGuide(_T("sum height 0 #0")); + AddGuide(_T("prod width 1 2")); + AddGuide(_T("prod height 1 2")); + AddGuide(_T("prod #0 1 2")); + AddGuide(_T("prod #0 3 2")); + AddGuide(_T("sum @1 @5 0")); + AddGuide(_T("sum @2 @5 0")); + AddGuide(_T("sum @0 @4 8100")); + AddGuide(_T("sum @2 8100 @4")); + AddGuide(_T("sum @0 @3 8100")); + AddGuide(_T("sum @1 8100 @3")); + AddGuide(_T("sum @10 0 @9")); + AddGuide(_T("prod @13 3 4")); + AddGuide(_T("prod @13 7 8")); + AddGuide(_T("sum @11 @14 0")); + AddGuide(_T("sum @11 @15 0")); + AddGuide(_T("sum @4 @5 0")); + AddGuide(_T("sum @9 @5 0")); + AddGuide(_T("sum @10 @5 0")); + AddGuide(_T("sum @11 @5 0")); + AddGuide(_T("sum @12 @5 0")); + AddGuide(_T("sum @16 @5 0")); + AddGuide(_T("sum @17 @5 0")); + + m_arAdjustments.push_back(1350); + LoadConnectorsList(_T("0,@4;@0,@4;@3,21600;@3,@2;21600,@4;@1,@4;@3,0;@3,@0")); + LoadTextRect(_T("@0,@0,@1,@2")); + + CHandle_ oHandle1; + oHandle1.position = _T("#0,topLeft"); + oHandle1.switchHandle = _T("true"); + oHandle1.xrange = _T("0,5400"); + m_arHandles.push_back(oHandle1); + + m_lLimoX = 10800; + m_lLimoY = 10800; + } +}; +} diff --git a/MsBinaryFile/Common/ODraw/oldAutoShapes/ActionButtonHelp.h b/MsBinaryFile/Common/ODraw/oldAutoShapes/ActionButtonHelp.h new file mode 100644 index 0000000000..fbdc9921bd --- /dev/null +++ b/MsBinaryFile/Common/ODraw/oldAutoShapes/ActionButtonHelp.h @@ -0,0 +1,126 @@ +/* + * (c) Copyright Ascensio System SIA 2010-2019 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect + * that Ascensio System SIA expressly excludes the warranty of non-infringement + * of any third-party rights. + * + * This program is distributed WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * + */ +#pragma once +#include "../CustomShape.h" + +// 191 +namespace NSCustomShapesConvert +{ + +class CActionButtonHelpType : public CCustomShape +{ +public: + CActionButtonHelpType() + { + m_bConcentricFill = true; + m_eJoin = ODRAW::lineJoinMiter; + + m_strPath = _T("m,l,21600r21600,l21600,xem@0@0nfl@0@2@1@2@1@0xem,nfl@0@0em,21600nfl@0@2em21600,21600nfl@1@2em21600,nfl@1@0em@33@27nfqy@3@9@40@27@39@4@37@29l@37@30@36@30@36@29qy@37@28@39@27@3@26@34@27xem@3@31nfqx@35@32@3@10@38@32@3@31xe"); + + AddGuide(_T("val #0")); + AddGuide(_T("sum width 0 #0")); + AddGuide(_T("sum height 0 #0")); + AddGuide(_T("prod width 1 2")); + AddGuide(_T("prod height 1 2")); + AddGuide(_T("prod #0 1 2")); + AddGuide(_T("prod #0 3 2")); + AddGuide(_T("sum @1 @5 0")); + AddGuide(_T("sum @2 @5 0")); + AddGuide(_T("sum @0 @4 8100")); + AddGuide(_T("sum @2 8100 @4")); + AddGuide(_T("sum @0 @3 8100")); + AddGuide(_T("sum @1 8100 @3")); + AddGuide(_T("sum @10 0 @9")); + AddGuide(_T("prod @13 1 7")); + AddGuide(_T("prod @13 3 14")); + AddGuide(_T("prod @13 2 7")); + AddGuide(_T("prod @13 5 14")); + AddGuide(_T("prod @13 11 28")); + AddGuide(_T("prod @13 3 7")); + AddGuide(_T("prod @13 4 7")); + AddGuide(_T("prod @13 17 28")); + AddGuide(_T("prod @13 9 14")); + AddGuide(_T("prod @13 21 28")); + AddGuide(_T("prod @13 11 14")); + AddGuide(_T("prod @13 25 28")); + AddGuide(_T("sum @9 @14 0")); + AddGuide(_T("sum @9 @16 0")); + AddGuide(_T("sum @9 @18 0")); + AddGuide(_T("sum @9 @21 0")); + AddGuide(_T("sum @9 @23 0")); + AddGuide(_T("sum @9 @24 0")); + AddGuide(_T("sum @9 @25 0")); + AddGuide(_T("sum @11 @15 0")); + AddGuide(_T("sum @11 @17 0")); + AddGuide(_T("sum @11 @18 0")); + AddGuide(_T("sum @11 @19 0")); + AddGuide(_T("sum @11 @20 0")); + AddGuide(_T("sum @11 @21 0")); + AddGuide(_T("sum @11 @22 0")); + AddGuide(_T("sum @11 @24 0")); + AddGuide(_T("sum @3 @5 0")); + AddGuide(_T("sum @4 @5 0")); + AddGuide(_T("sum @9 @5 0")); + AddGuide(_T("sum @10 @5 0")); + AddGuide(_T("sum @11 @5 0")); + AddGuide(_T("sum @12 @5 0")); + AddGuide(_T("sum @26 @5 0")); + AddGuide(_T("sum @27 @5 0")); + AddGuide(_T("sum @28 @5 0")); + AddGuide(_T("sum @29 @5 0")); + AddGuide(_T("sum @30 @5 0")); + AddGuide(_T("sum @31 @5 0")); + AddGuide(_T("sum @32 @5 0")); + AddGuide(_T("sum @33 @5 0")); + AddGuide(_T("sum @34 @5 0")); + AddGuide(_T("sum @35 @5 0")); + AddGuide(_T("sum @36 @5 0")); + AddGuide(_T("sum @37 @5 0")); + AddGuide(_T("sum @38 @5 0")); + AddGuide(_T("sum @39 @5 0")); + AddGuide(_T("sum @40 @5 0")); + + m_arAdjustments.push_back(1350); + LoadConnectorsList(_T("0,@4;@0,@4;@3,21600;@3,@2;21600,@4;@1,@4;@3,0;@3,@0")); + LoadTextRect(_T("@0,@0,@1,@2")); + + CHandle_ oHandle1; + oHandle1.position = _T("#0,topLeft"); + oHandle1.switchHandle = _T("true"); + oHandle1.xrange = _T("0,5400"); + m_arHandles.push_back(oHandle1); + + m_lLimoX = 10800; + m_lLimoY = 10800; + } +}; +} diff --git a/MsBinaryFile/Common/ODraw/oldAutoShapes/ActionButtonHome.h b/MsBinaryFile/Common/ODraw/oldAutoShapes/ActionButtonHome.h new file mode 100644 index 0000000000..94a37433ed --- /dev/null +++ b/MsBinaryFile/Common/ODraw/oldAutoShapes/ActionButtonHome.h @@ -0,0 +1,114 @@ +/* + * (c) Copyright Ascensio System SIA 2010-2019 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect + * that Ascensio System SIA expressly excludes the warranty of non-infringement + * of any third-party rights. + * + * This program is distributed WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * + */ +#pragma once +#include "../CustomShape.h" + +// 190 +namespace NSCustomShapesConvert +{ + +class CActionButtonHomeType : public CCustomShape +{ +public: + CActionButtonHomeType() + { + m_bConcentricFill = true; + m_eJoin = ODRAW::lineJoinMiter; + + m_strPath = _T("m,l,21600r21600,l21600,xem@0@0nfl@0@2@1@2@1@0xem,nfl@0@0em,21600nfl@0@2em21600,21600nfl@1@2em21600,nfl@1@0em@3@9nfl@11@4@28@4@28@10@33@10@33@4@12@4@32@26@32@24@31@24@31@25xem@31@25nfl@32@26em@28@4nfl@33@4em@29@10nfl@29@27@30@27@30@10e"); + + AddGuide(_T("val #0")); + AddGuide(_T("sum width 0 #0")); + AddGuide(_T("sum height 0 #0")); + AddGuide(_T("prod width 1 2")); + AddGuide(_T("prod height 1 2")); + AddGuide(_T("prod #0 1 2")); + AddGuide(_T("prod #0 3 2")); + AddGuide(_T("sum @1 @5 0")); + AddGuide(_T("sum @2 @5 0")); + AddGuide(_T("sum @0 @4 8100")); + AddGuide(_T("sum @2 8100 @4")); + AddGuide(_T("sum @0 @3 8100")); + AddGuide(_T("sum @1 8100 @3")); + AddGuide(_T("sum @10 0 @9")); + AddGuide(_T("prod @13 1 16")); + AddGuide(_T("prod @13 1 8")); + AddGuide(_T("prod @13 3 16")); + AddGuide(_T("prod @13 5 16")); + AddGuide(_T("prod @13 7 16")); + AddGuide(_T("prod @13 9 16")); + AddGuide(_T("prod @13 11 16")); + AddGuide(_T("prod @13 3 4")); + AddGuide(_T("prod @13 13 16")); + AddGuide(_T("prod @13 7 8")); + AddGuide(_T("sum @9 @14 0")); + AddGuide(_T("sum @9 @16 0")); + AddGuide(_T("sum @9 @17 0")); + AddGuide(_T("sum @9 @21 0")); + AddGuide(_T("sum @11 @15 0")); + AddGuide(_T("sum @11 @18 0")); + AddGuide(_T("sum @11 @19 0")); + AddGuide(_T("sum @11 @20 0")); + AddGuide(_T("sum @11 @22 0")); + AddGuide(_T("sum @11 @23 0")); + AddGuide(_T("sum @3 @5 0")); + AddGuide(_T("sum @4 @5 0")); + AddGuide(_T("sum @9 @5 0")); + AddGuide(_T("sum @10 @5 0")); + AddGuide(_T("sum @11 @5 0")); + AddGuide(_T("sum @12 @5 0")); + AddGuide(_T("sum @24 @5 0")); + AddGuide(_T("sum @25 @5 0")); + AddGuide(_T("sum @26 @5 0")); + AddGuide(_T("sum @27 @5 0")); + AddGuide(_T("sum @28 @5 0")); + AddGuide(_T("sum @29 @5 0")); + AddGuide(_T("sum @30 @5 0")); + AddGuide(_T("sum @31 @5 0")); + AddGuide(_T("sum @32 @5 0")); + AddGuide(_T("sum @33 @5 0")); + + m_arAdjustments.push_back(1350); + LoadConnectorsList(_T("0,@4;@0,@4;@3,21600;@3,@2;21600,@4;@1,@4;@3,0;@3,@0")); + LoadTextRect(_T("@0,@0,@1,@2")); + + CHandle_ oHandle1; + oHandle1.position = _T("#0,topLeft"); + oHandle1.switchHandle = _T("true"); + oHandle1.xrange = _T("0,5400"); + m_arHandles.push_back(oHandle1); + + m_lLimoX = 10800; + m_lLimoY = 10800; + } +}; +} diff --git a/MsBinaryFile/Common/ODraw/oldAutoShapes/ActionButtonInfo.h b/MsBinaryFile/Common/ODraw/oldAutoShapes/ActionButtonInfo.h new file mode 100644 index 0000000000..faa23dccfe --- /dev/null +++ b/MsBinaryFile/Common/ODraw/oldAutoShapes/ActionButtonInfo.h @@ -0,0 +1,120 @@ +/* + * (c) Copyright Ascensio System SIA 2010-2019 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect + * that Ascensio System SIA expressly excludes the warranty of non-infringement + * of any third-party rights. + * + * This program is distributed WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * + */ +#pragma once +#include "../CustomShape.h" + +// 192 +namespace NSCustomShapesConvert +{ +class CActionButtonInfoType : public CCustomShape +{ +public: + CActionButtonInfoType() + { + m_bConcentricFill = true; + m_eJoin = ODRAW::lineJoinMiter; + + m_strPath = _T("m,l,21600r21600,l21600,xem@0@0nfl@0@2@1@2@1@0xem,nfl@0@0em,21600nfl@0@2em21600,21600nfl@1@2em21600,nfl@1@0em@3@9nfqx@11@4@3@10@12@4@3@9xem@3@25nfqx@33@26@3@27@36@26@3@25xem@32@28nfl@32@29@34@29@34@30@32@30@32@31@37@31@37@30@35@30@35@28xe"); + + AddGuide(_T("val #0")); + AddGuide(_T("sum width 0 #0")); + AddGuide(_T("sum height 0 #0")); + AddGuide(_T("prod width 1 2")); + AddGuide(_T("prod height 1 2")); + AddGuide(_T("prod #0 1 2")); + AddGuide(_T("prod #0 3 2")); + AddGuide(_T("sum @1 @5 0")); + AddGuide(_T("sum @2 @5 0")); + AddGuide(_T("sum @0 @4 8100")); + AddGuide(_T("sum @2 8100 @4")); + AddGuide(_T("sum @0 @3 8100")); + AddGuide(_T("sum @1 8100 @3")); + AddGuide(_T("sum @10 0 @9")); + AddGuide(_T("prod @13 1 32")); + AddGuide(_T("prod @13 5 32")); + AddGuide(_T("prod @13 9 32")); + AddGuide(_T("prod @13 5 16")); + AddGuide(_T("prod @13 3 8")); + AddGuide(_T("prod @13 13 32")); + AddGuide(_T("prod @13 19 32")); + AddGuide(_T("prod @13 5 8")); + AddGuide(_T("prod @13 11 16")); + AddGuide(_T("prod @13 13 16")); + AddGuide(_T("prod @13 7 8")); + AddGuide(_T("sum @9 @14 0")); + AddGuide(_T("sum @9 @15 0")); + AddGuide(_T("sum @9 @16 0")); + AddGuide(_T("sum @9 @17 0")); + AddGuide(_T("sum @9 @18 0")); + AddGuide(_T("sum @9 @23 0")); + AddGuide(_T("sum @9 @24 0")); + AddGuide(_T("sum @11 @17 0")); + AddGuide(_T("sum @11 @18 0")); + AddGuide(_T("sum @11 @19 0")); + AddGuide(_T("sum @11 @20 0")); + AddGuide(_T("sum @11 @21 0")); + AddGuide(_T("sum @11 @22 0")); + AddGuide(_T("sum @3 @5 0")); + AddGuide(_T("sum @4 @5 0")); + AddGuide(_T("sum @9 @5 0")); + AddGuide(_T("sum @10 @5 0")); + AddGuide(_T("sum @11 @5 0")); + AddGuide(_T("sum @12 @5 0")); + AddGuide(_T("sum @25 @5 0")); + AddGuide(_T("sum @26 @5 0")); + AddGuide(_T("sum @27 @5 0")); + AddGuide(_T("sum @28 @5 0")); + AddGuide(_T("sum @29 @5 0")); + AddGuide(_T("sum @30 @5 0")); + AddGuide(_T("sum @31 @5 0")); + AddGuide(_T("sum @32 @5 0")); + AddGuide(_T("sum @33 @5 0")); + AddGuide(_T("sum @34 @5 0")); + AddGuide(_T("sum @35 @5 0")); + AddGuide(_T("sum @36 @5 0")); + AddGuide(_T("sum @37 @5 0")); + + m_arAdjustments.push_back(1350); + LoadConnectorsList(_T("0,@4;@0,@4;@3,21600;@3,@2;21600,@4;@1,@4;@3,0;@3,@0")); + LoadTextRect(_T("@0,@0,@1,@2")); + + CHandle_ oHandle1; + oHandle1.position = _T("#0,topLeft"); + oHandle1.switchHandle = _T("true"); + oHandle1.xrange = _T("0,5400"); + m_arHandles.push_back(oHandle1); + + m_lLimoX = 10800; + m_lLimoY = 10800; + } +}; +} diff --git a/MsBinaryFile/Common/ODraw/oldAutoShapes/ActionButtonMovie.h b/MsBinaryFile/Common/ODraw/oldAutoShapes/ActionButtonMovie.h new file mode 100644 index 0000000000..5bd95cb2d7 --- /dev/null +++ b/MsBinaryFile/Common/ODraw/oldAutoShapes/ActionButtonMovie.h @@ -0,0 +1,134 @@ +/* + * (c) Copyright Ascensio System SIA 2010-2019 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect + * that Ascensio System SIA expressly excludes the warranty of non-infringement + * of any third-party rights. + * + * This program is distributed WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * + */ +#pragma once +#include "../CustomShape.h" + +// 200 +namespace NSCustomShapesConvert +{ +class CActionButtonMovieType : public CCustomShape +{ +public: + CActionButtonMovieType() + { + m_bConcentricFill = true; + m_eJoin = ODRAW::lineJoinMiter; + + m_strPath = _T("m,l,21600r21600,l21600,xem@0@0nfl@0@2@1@2@1@0xem,nfl@0@0em,21600nfl@0@2em21600,21600nfl@1@2em21600,nfl@1@0em@11@39nfl@11@44@31@44@32@43@33@43@33@47@35@47@35@45@36@45@38@46@12@46@12@41@38@41@37@42@35@42@35@41@34@40@32@40@31@39xe"); + + AddGuide(_T("val #0")); + AddGuide(_T("sum width 0 #0")); + AddGuide(_T("sum height 0 #0")); + AddGuide(_T("prod width 1 2")); + AddGuide(_T("prod height 1 2")); + AddGuide(_T("prod #0 1 2")); + AddGuide(_T("prod #0 3 2")); + AddGuide(_T("sum @1 @5 0")); + AddGuide(_T("sum @2 @5 0")); + AddGuide(_T("sum @0 @4 8100")); + AddGuide(_T("sum @2 8100 @4")); + AddGuide(_T("sum @0 @3 8100")); + AddGuide(_T("sum @1 8100 @3")); + AddGuide(_T("sum @10 0 @9")); + AddGuide(_T("prod @13 1455 21600")); + AddGuide(_T("prod @13 1905 21600")); + AddGuide(_T("prod @13 2325 21600")); + AddGuide(_T("prod @13 16155 21600")); + AddGuide(_T("prod @13 17010 21600")); + AddGuide(_T("prod @13 19335 21600")); + AddGuide(_T("prod @13 19725 21600")); + AddGuide(_T("prod @13 20595 21600")); + AddGuide(_T("prod @13 5280 21600")); + AddGuide(_T("prod @13 5730 21600")); + AddGuide(_T("prod @13 6630 21600")); + AddGuide(_T("prod @13 7492 21600")); + AddGuide(_T("prod @13 9067 21600")); + AddGuide(_T("prod @13 9555 21600")); + AddGuide(_T("prod @13 13342 21600")); + AddGuide(_T("prod @13 14580 21600")); + AddGuide(_T("prod @13 15592 21600")); + AddGuide(_T("sum @11 @14 0")); + AddGuide(_T("sum @11 @15 0")); + AddGuide(_T("sum @11 @16 0")); + AddGuide(_T("sum @11 @17 0")); + AddGuide(_T("sum @11 @18 0")); + AddGuide(_T("sum @11 @19 0")); + AddGuide(_T("sum @11 @20 0")); + AddGuide(_T("sum @11 @21 0")); + AddGuide(_T("sum @9 @22 0")); + AddGuide(_T("sum @9 @23 0")); + AddGuide(_T("sum @9 @24 0")); + AddGuide(_T("sum @9 @25 0")); + AddGuide(_T("sum @9 @26 0")); + AddGuide(_T("sum @9 @27 0")); + AddGuide(_T("sum @9 @28 0")); + AddGuide(_T("sum @9 @29 0")); + AddGuide(_T("sum @9 @30 0")); + AddGuide(_T("sum @9 @31 0")); + AddGuide(_T("sum @4 @5 0")); + AddGuide(_T("sum @9 @5 0")); + AddGuide(_T("sum @10 @5 0")); + AddGuide(_T("sum @11 @5 0")); + AddGuide(_T("sum @12 @5 0")); + AddGuide(_T("sum @31 @5 0")); + AddGuide(_T("sum @32 @5 0")); + AddGuide(_T("sum @33 @5 0")); + AddGuide(_T("sum @34 @5 0")); + AddGuide(_T("sum @35 @5 0")); + AddGuide(_T("sum @36 @5 0")); + AddGuide(_T("sum @37 @5 0")); + AddGuide(_T("sum @38 @5 0")); + AddGuide(_T("sum @39 @5 0")); + AddGuide(_T("sum @40 @5 0")); + AddGuide(_T("sum @41 @5 0")); + AddGuide(_T("sum @42 @5 0")); + AddGuide(_T("sum @43 @5 0")); + AddGuide(_T("sum @44 @5 0")); + AddGuide(_T("sum @45 @5 0")); + AddGuide(_T("sum @46 @5 0")); + AddGuide(_T("sum @47 @5 0")); + + m_arAdjustments.push_back(1350); + LoadConnectorsList(_T("0,@4;@0,@4;@3,21600;@3,@2;21600,@4;@1,@4;@3,0;@3,@0")); + LoadTextRect(_T("@0,@0,@1,@2")); + + CHandle_ oHandle1; + oHandle1.position = _T("#0,topLeft"); + oHandle1.switchHandle = _T("true"); + oHandle1.xrange = _T("0,5400"); + m_arHandles.push_back(oHandle1); + + m_lLimoX = 10800; + m_lLimoY = 10800; + } +}; +} diff --git a/MsBinaryFile/Common/ODraw/oldAutoShapes/ActionButtonNext.h b/MsBinaryFile/Common/ODraw/oldAutoShapes/ActionButtonNext.h new file mode 100644 index 0000000000..411ff2bac7 --- /dev/null +++ b/MsBinaryFile/Common/ODraw/oldAutoShapes/ActionButtonNext.h @@ -0,0 +1,81 @@ +/* + * (c) Copyright Ascensio System SIA 2010-2019 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect + * that Ascensio System SIA expressly excludes the warranty of non-infringement + * of any third-party rights. + * + * This program is distributed WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * + */ +#pragma once +#include "../CustomShape.h" + +// 193 +namespace NSCustomShapesConvert +{ +class CActionButtonNextType : public CCustomShape +{ +public: + CActionButtonNextType() + { + m_bConcentricFill = true; + m_eJoin = ODRAW::lineJoinMiter; + + m_strPath = _T("m,l,21600r21600,l21600,xem@0@0nfl@0@2@1@2@1@0xem,nfl@0@0em,21600nfl@0@2em21600,21600nfl@1@2em21600,nfl@1@0em@11@9nfl@12@4@11@10xe"); + + AddGuide(_T("val #0")); + AddGuide(_T("sum width 0 #0")); + AddGuide(_T("sum height 0 #0")); + AddGuide(_T("prod width 1 2")); + AddGuide(_T("prod height 1 2")); + AddGuide(_T("prod #0 1 2")); + AddGuide(_T("prod #0 3 2")); + AddGuide(_T("sum @1 @5 0")); + AddGuide(_T("sum @2 @5 0")); + AddGuide(_T("sum @0 @4 8100")); + AddGuide(_T("sum @2 8100 @4")); + AddGuide(_T("sum @0 @3 8100")); + AddGuide(_T("sum @1 8100 @3")); + AddGuide(_T("sum @4 @5 0")); + AddGuide(_T("sum @9 @5 0")); + AddGuide(_T("sum @10 @5 0")); + AddGuide(_T("sum @11 @5 0")); + AddGuide(_T("sum @12 @5 0")); + + m_arAdjustments.push_back(1350); + LoadConnectorsList(_T("0,@4;@0,@4;@3,21600;@3,@2;21600,@4;@1,@4;@3,0;@3,@0")); + LoadTextRect(_T("@0,@0,@1,@2")); + + CHandle_ oHandle1; + oHandle1.position = _T("#0,topLeft"); + oHandle1.switchHandle = _T("true"); + oHandle1.xrange = _T("0,5400"); + m_arHandles.push_back(oHandle1); + + m_lLimoX = 10800; + m_lLimoY = 10800; + } +}; +} diff --git a/MsBinaryFile/Common/ODraw/oldAutoShapes/ActionButtonReturn.h b/MsBinaryFile/Common/ODraw/oldAutoShapes/ActionButtonReturn.h new file mode 100644 index 0000000000..1ae46caba4 --- /dev/null +++ b/MsBinaryFile/Common/ODraw/oldAutoShapes/ActionButtonReturn.h @@ -0,0 +1,103 @@ +/* + * (c) Copyright Ascensio System SIA 2010-2019 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect + * that Ascensio System SIA expressly excludes the warranty of non-infringement + * of any third-party rights. + * + * This program is distributed WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * + */ +#pragma once +#include "../CustomShape.h" + +// 197 +namespace NSCustomShapesConvert +{ +class CActionButtonReturnType : public CCustomShape +{ +public: + CActionButtonReturnType() + { + m_bConcentricFill = true; + m_eJoin = ODRAW::lineJoinMiter; + + m_strPath = _T("m,l,21600r21600,l21600,xem@0@0nfl@0@2@1@2@1@0xem,nfl@0@0em,21600nfl@0@2em21600,21600nfl@1@2em21600,nfl@1@0em@12@21nfl@23@9@3@21@24@21@24@20qy@3@19l@25@19qx@26@20l@26@21@11@21@11@20qy@25@10l@3@10qx@22@20l@22@21xe"); + + AddGuide(_T("val #0")); + AddGuide(_T("sum width 0 #0")); + AddGuide(_T("sum height 0 #0")); + AddGuide(_T("prod width 1 2")); + AddGuide(_T("prod height 1 2")); + AddGuide(_T("prod #0 1 2")); + AddGuide(_T("prod #0 3 2")); + AddGuide(_T("sum @1 @5 0")); + AddGuide(_T("sum @2 @5 0")); + AddGuide(_T("sum @0 @4 8100")); + AddGuide(_T("sum @2 8100 @4")); + AddGuide(_T("sum @0 @3 8100")); + AddGuide(_T("sum @1 8100 @3")); + AddGuide(_T("sum @10 0 @9")); + AddGuide(_T("prod @13 7 8")); + AddGuide(_T("prod @13 3 4")); + AddGuide(_T("prod @13 5 8")); + AddGuide(_T("prod @13 3 8")); + AddGuide(_T("prod @13 1 4")); + AddGuide(_T("sum @9 @15 0")); + AddGuide(_T("sum @9 @16 0")); + AddGuide(_T("sum @9 @18 0")); + AddGuide(_T("sum @11 @14 0")); + AddGuide(_T("sum @11 @15 0")); + AddGuide(_T("sum @11 @16 0")); + AddGuide(_T("sum @11 @17 0")); + AddGuide(_T("sum @11 @18 0")); + AddGuide(_T("sum @3 @5 0")); + AddGuide(_T("sum @9 @5 0")); + AddGuide(_T("sum @10 @5 0")); + AddGuide(_T("sum @11 @5 0")); + AddGuide(_T("sum @12 @5 0")); + AddGuide(_T("sum @19 @5 0")); + AddGuide(_T("sum @20 @5 0")); + AddGuide(_T("sum @21 @5 0")); + AddGuide(_T("sum @22 @5 0")); + AddGuide(_T("sum @23 @5 0")); + AddGuide(_T("sum @24 @5 0")); + AddGuide(_T("sum @25 @5 0")); + AddGuide(_T("sum @26 @5 0")); + + m_arAdjustments.push_back(1350); + LoadConnectorsList(_T("0,@4;@0,@4;@3,21600;@3,@2;21600,@4;@1,@4;@3,0;@3,@0")); + LoadTextRect(_T("@0,@0,@1,@2")); + + CHandle_ oHandle1; + oHandle1.position = _T("#0,topLeft"); + oHandle1.switchHandle = _T("true"); + oHandle1.xrange = _T("0,5400"); + m_arHandles.push_back(oHandle1); + + m_lLimoX = 10800; + m_lLimoY = 10800; + } +}; +} diff --git a/MsBinaryFile/Common/ODraw/oldAutoShapes/ActionButtonSound.h b/MsBinaryFile/Common/ODraw/oldAutoShapes/ActionButtonSound.h new file mode 100644 index 0000000000..fc55343a49 --- /dev/null +++ b/MsBinaryFile/Common/ODraw/oldAutoShapes/ActionButtonSound.h @@ -0,0 +1,102 @@ +/* + * (c) Copyright Ascensio System SIA 2010-2019 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect + * that Ascensio System SIA expressly excludes the warranty of non-infringement + * of any third-party rights. + * + * This program is distributed WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * + */ +#pragma once +#include "../CustomShape.h" + +// 199 +namespace NSCustomShapesConvert +{ +class CActionButtonSoundType : public CCustomShape +{ +public: + CActionButtonSoundType() + { + m_bConcentricFill = true; + m_eJoin = ODRAW::lineJoinMiter; + + m_strPath = _T("m,l,21600r21600,l21600,xem@0@0nfl@0@2@1@2@1@0xem,nfl@0@0em,21600nfl@0@2em21600,21600nfl@1@2em21600,nfl@1@0em@11@21nfl@11@22@24@22@25@10@25@9@24@21xem@26@21nfl@12@20em@26@4nfl@12@4em@26@22nfl@12@23e"); + + AddGuide(_T("val #0")); + AddGuide(_T("sum width 0 #0")); + AddGuide(_T("sum height 0 #0")); + AddGuide(_T("prod width 1 2")); + AddGuide(_T("prod height 1 2")); + AddGuide(_T("prod #0 1 2")); + AddGuide(_T("prod #0 3 2")); + AddGuide(_T("sum @1 @5 0")); + AddGuide(_T("sum @2 @5 0")); + AddGuide(_T("sum @0 @4 8100")); + AddGuide(_T("sum @2 8100 @4")); + AddGuide(_T("sum @0 @3 8100")); + AddGuide(_T("sum @1 8100 @3")); + AddGuide(_T("sum @10 0 @9")); + AddGuide(_T("prod @13 1 8")); + AddGuide(_T("prod @13 5 16")); + AddGuide(_T("prod @13 5 8")); + AddGuide(_T("prod @13 11 16")); + AddGuide(_T("prod @13 3 4")); + AddGuide(_T("prod @13 7 8")); + AddGuide(_T("sum @9 @14 0")); + AddGuide(_T("sum @9 @15 0")); + AddGuide(_T("sum @9 @17 0")); + AddGuide(_T("sum @9 @19 0")); + AddGuide(_T("sum @11 @15 0")); + AddGuide(_T("sum @11 @16 0")); + AddGuide(_T("sum @11 @18 0")); + AddGuide(_T("sum @4 @5 0")); + AddGuide(_T("sum @9 @5 0")); + AddGuide(_T("sum @10 @5 0")); + AddGuide(_T("sum @11 @5 0")); + AddGuide(_T("sum @12 @5 0")); + AddGuide(_T("sum @20 @5 0")); + AddGuide(_T("sum @21 @5 0")); + AddGuide(_T("sum @22 @5 0")); + AddGuide(_T("sum @23 @5 0")); + AddGuide(_T("sum @24 @5 0")); + AddGuide(_T("sum @25 @5 0")); + AddGuide(_T("sum @26 @5 0")); + + m_arAdjustments.push_back(1350); + LoadConnectorsList(_T("0,@4;@0,@4;@3,21600;@3,@2;21600,@4;@1,@4;@3,0;@3,@0")); + LoadTextRect(_T("@0,@0,@1,@2")); + + CHandle_ oHandle1; + oHandle1.position = _T("#0,topLeft"); + oHandle1.switchHandle = _T("true"); + oHandle1.xrange = _T("0,5400"); + m_arHandles.push_back(oHandle1); + + m_lLimoX = 10800; + m_lLimoY = 10800; + } +}; +} diff --git a/MsBinaryFile/Common/ODraw/oldAutoShapes/BentArrowType.h b/MsBinaryFile/Common/ODraw/oldAutoShapes/BentArrowType.h new file mode 100644 index 0000000000..a16de7a94b --- /dev/null +++ b/MsBinaryFile/Common/ODraw/oldAutoShapes/BentArrowType.h @@ -0,0 +1,75 @@ +/* + * (c) Copyright Ascensio System SIA 2010-2019 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect + * that Ascensio System SIA expressly excludes the warranty of non-infringement + * of any third-party rights. + * + * This program is distributed WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * + */ +#pragma once +#include "../CustomShape.h" + +// 91 +namespace NSCustomShapesConvert +{ +class CBentArrowType : public CCustomShape +{ +public: + CBentArrowType() + { + m_bConcentricFill = false; + m_eJoin = ODRAW::lineJoinMiter; + m_strPath = _T("m21600,6079l@0,0@0@1,12427@1qx,12158l,21600@4,21600@4,12158qy12427@2l@0@2@0,12158xe"); + + AddGuide(_T("val #0")); + AddGuide(_T("val #1")); + AddGuide(_T("sum 12158 0 #1")); + AddGuide(_T("sum @2 0 #1")); + AddGuide(_T("prod @3 32768 32059")); + AddGuide(_T("prod @4 1 2")); + AddGuide(_T("sum 21600 0 #0")); + AddGuide(_T("prod @6 #1 6079")); + AddGuide(_T("sum @7 #0 0")); + + m_arAdjustments.push_back(18000); + m_arAdjustments.push_back(3000); + + LoadConnectorsList(_T("@0,0;@0,12158;@5,21600;21600,6079")); + m_arConnectorAngles.push_back(270); + m_arConnectorAngles.push_back(90); + m_arConnectorAngles.push_back(90); + m_arConnectorAngles.push_back(0); + + LoadTextRect(_T("12427,@1,@8,@2;0,12158,@4,21600")); + + CHandle_ oHandle1; + oHandle1.position = _T("#0,#1"); + oHandle1.xrange = _T("12427,21600"); + oHandle1.yrange = _T("0,6079"); + m_arHandles.push_back(oHandle1); + } +}; +} diff --git a/MsBinaryFile/Common/ODraw/oldAutoShapes/BentConnector.h b/MsBinaryFile/Common/ODraw/oldAutoShapes/BentConnector.h new file mode 100644 index 0000000000..dc99ff6e9d --- /dev/null +++ b/MsBinaryFile/Common/ODraw/oldAutoShapes/BentConnector.h @@ -0,0 +1,57 @@ +/* + * (c) Copyright Ascensio System SIA 2010-2019 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect + * that Ascensio System SIA expressly excludes the warranty of non-infringement + * of any third-party rights. + * + * This program is distributed WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * + */ +#pragma once +#include "../CustomShape.h" + +// 34 +namespace NSCustomShapesConvert +{ +class CBentConnectorType : public CCustomShape +{ +public: + CBentConnectorType() + { + m_bConcentricFill = true; + m_eJoin = ODRAW::lineJoinRound; + + //m_strPathLimoX = _T("m0,0l@0,0r0,21600l21600,21600nfe"); + //m_strPathLimoY = _T("m0,0l,@0r21600,0l21600,21600nfe"); + + m_strPath = _T("m,l@0,0@0,21600,21600,21600e");//m_strPathLimoX; + + AddGuide(_T("val #0")); + m_arAdjustments.push_back(10800); + + LoadConnectorsList(_T("0,0;21600,21600")); + } +}; +} \ No newline at end of file diff --git a/MsBinaryFile/Common/ODraw/oldAutoShapes/BentUpArrowType.h b/MsBinaryFile/Common/ODraw/oldAutoShapes/BentUpArrowType.h new file mode 100644 index 0000000000..773854c528 --- /dev/null +++ b/MsBinaryFile/Common/ODraw/oldAutoShapes/BentUpArrowType.h @@ -0,0 +1,92 @@ +/* + * (c) Copyright Ascensio System SIA 2010-2019 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect + * that Ascensio System SIA expressly excludes the warranty of non-infringement + * of any third-party rights. + * + * This program is distributed WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * + */ +#pragma once +#include "../CustomShape.h" + +// 90 +namespace NSCustomShapesConvert +{ +class CBentUpArrowType : public CCustomShape +{ +public: + CBentUpArrowType() + { + m_bConcentricFill = false; + m_eJoin = ODRAW::lineJoinMiter; + m_strPath = _T("m@4,l@0@2@5@2@5@12,0@12,,21600@1,21600@1@2,21600@2xe"); + + AddGuide(_T("val #0")); + AddGuide(_T("val #1")); + AddGuide(_T("val #2")); + AddGuide(_T("prod #0 1 2")); + AddGuide(_T("sum @3 10800 0")); + AddGuide(_T("sum 21600 #0 #1")); + AddGuide(_T("sum #1 #2 0")); + AddGuide(_T("prod @6 1 2")); + AddGuide(_T("prod #1 2 1")); + AddGuide(_T("sum @8 0 21600")); + AddGuide(_T("prod 21600 @0 @1")); + AddGuide(_T("prod 21600 @4 @1")); + AddGuide(_T("prod 21600 @5 @1")); + AddGuide(_T("prod 21600 @7 @1")); + AddGuide(_T("prod #1 1 2")); + AddGuide(_T("sum @5 0 @4")); + AddGuide(_T("sum @0 0 @4")); + AddGuide(_T("prod @2 @15 @16")); + + m_arAdjustments.push_back(9257); + m_arAdjustments.push_back(18514); + m_arAdjustments.push_back(7200); + + LoadConnectorsList(_T("@4,0;@0,@2;0,@11;@14,21600;@1,@13;21600,@2")); + m_arConnectorAngles.push_back(270); + m_arConnectorAngles.push_back(180); + m_arConnectorAngles.push_back(180); + m_arConnectorAngles.push_back(90); + m_arConnectorAngles.push_back(0); + m_arConnectorAngles.push_back(0); + + LoadTextRect(_T("0,@12,@1,21600;@5,@17,@1,21600")); + + CHandle_ oHandle1; + oHandle1.position = _T("#0,topLeft"); + oHandle1.xrange = _T("@2,@9"); + m_arHandles.push_back(oHandle1); + + CHandle_ oHandle2; + oHandle2.position = _T("#1,#2"); + oHandle2.xrange = _T("@4,21600"); + oHandle2.yrange = _T("0,@0"); + m_arHandles.push_back(oHandle2); + } +}; +} diff --git a/MsBinaryFile/Common/ODraw/oldAutoShapes/BevelType.h b/MsBinaryFile/Common/ODraw/oldAutoShapes/BevelType.h new file mode 100644 index 0000000000..a7e00a98cc --- /dev/null +++ b/MsBinaryFile/Common/ODraw/oldAutoShapes/BevelType.h @@ -0,0 +1,77 @@ +/* + * (c) Copyright Ascensio System SIA 2010-2019 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect + * that Ascensio System SIA expressly excludes the warranty of non-infringement + * of any third-party rights. + * + * This program is distributed WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * + */ +#pragma once +#include "../CustomShape.h" + +// 84 +namespace NSCustomShapesConvert +{ +class CBevelType : public CCustomShape +{ +public: + CBevelType() + { + m_bConcentricFill = true; + m_eJoin = ODRAW::lineJoinMiter; + m_strPath = _T("m,l,21600r21600,l21600,xem@0@0nfl@0@2@1@2@1@0xem,nfl@0@0em,21600nfl@0@2em21600,21600nfl@1@2em21600,nfl@1@0e"); + + AddGuide(_T("val #0")); + AddGuide(_T("sum width 0 #0")); + AddGuide(_T("sum height 0 #0")); + AddGuide(_T("prod width 1 2")); + AddGuide(_T("prod height 1 2")); + AddGuide(_T("prod #0 1 2")); + AddGuide(_T("prod #0 3 2")); + AddGuide(_T("sum @1 @5 0")); + AddGuide(_T("sum @2 @5 0")); + + m_arAdjustments.push_back(2700); + + LoadConnectorsList(_T("0,@4;@0,@4;@3,21600;@3,@2;21600,@4;@1,@4;@3,0;@3,@0")); + m_arConnectorAngles.push_back(270); + m_arConnectorAngles.push_back(90); + m_arConnectorAngles.push_back(90); + m_arConnectorAngles.push_back(0); + + LoadTextRect(_T("@0,@0,@1,@2")); + + CHandle_ oHandle1; + oHandle1.position = _T("#0,topLeft"); + oHandle1.switchHandle = _T("true"); + oHandle1.xrange = _T("0,10800"); + m_arHandles.push_back(oHandle1); + + m_lLimoX = 10800; + m_lLimoY = 10800; + } +}; +} diff --git a/MsBinaryFile/Common/ODraw/oldAutoShapes/BlockArcType.h b/MsBinaryFile/Common/ODraw/oldAutoShapes/BlockArcType.h new file mode 100644 index 0000000000..c15f0220cc --- /dev/null +++ b/MsBinaryFile/Common/ODraw/oldAutoShapes/BlockArcType.h @@ -0,0 +1,107 @@ +/* + * (c) Copyright Ascensio System SIA 2010-2019 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect + * that Ascensio System SIA expressly excludes the warranty of non-infringement + * of any third-party rights. + * + * This program is distributed WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * + */ +#pragma once +#include "../CustomShape.h" + +// 95 +namespace NSCustomShapesConvert +{ +class CBlockArcType : public CCustomShape +{ +public: + CBlockArcType() + { + m_bConcentricFill = false; + m_eJoin = ODRAW::lineJoinMiter; + m_strPath = _T("al10800,10800@0@0@2@14,10800,10800,10800,10800@3@15xe"); + + AddGuide(_T("val #1")); + AddGuide(_T("val #0")); + AddGuide(_T("sum 0 0 #0")); + AddGuide(_T("sumangle #0 0 180")); + AddGuide(_T("sumangle #0 0 90")); + AddGuide(_T("prod @4 2 1")); + AddGuide(_T("sumangle #0 90 0")); + AddGuide(_T("prod @6 2 1")); + AddGuide(_T("abs #0")); + AddGuide(_T("sumangle @8 0 90")); + AddGuide(_T("if @9 @7 @5")); + AddGuide(_T("sumangle @10 0 360")); + AddGuide(_T("if @10 @11 @10")); + AddGuide(_T("sumangle @12 0 360")); + AddGuide(_T("if @12 @13 @12")); + AddGuide(_T("sum 0 0 @14")); + AddGuide(_T("val 10800")); + AddGuide(_T("sum 10800 0 #1")); + AddGuide(_T("prod #1 1 2")); + AddGuide(_T("sum @18 5400 0")); + AddGuide(_T("cos @19 #0")); + AddGuide(_T("sin @19 #0")); + AddGuide(_T("sum @20 10800 0")); + AddGuide(_T("sum @21 10800 0")); + AddGuide(_T("sum 10800 0 @20")); + AddGuide(_T("sum #1 10800 0")); + AddGuide(_T("if @9 @17 @25")); + AddGuide(_T("if @9 0 21600")); + AddGuide(_T("cos 10800 #0")); + AddGuide(_T("sin 10800 #0")); + AddGuide(_T("sin #1 #0")); + AddGuide(_T("sum @28 10800 0")); + AddGuide(_T("sum @29 10800 0")); + AddGuide(_T("sum @30 10800 0")); + AddGuide(_T("if @4 0 @31")); + AddGuide(_T("if #0 @34 0")); + AddGuide(_T("if @6 @35 @31")); + AddGuide(_T("sum 21600 0 @36")); + AddGuide(_T("if @4 0 @33")); + AddGuide(_T("if #0 @38 @32")); + AddGuide(_T("if @6 @39 0")); + AddGuide(_T("if @4 @32 21600")); + AddGuide(_T("if @6 @41 @33")); + + m_arAdjustments.push_back(11796480); + m_arAdjustments.push_back(5400); + + LoadConnectorsList(_T("10800,@27;@22,@23;10800,@26;@24,@23")); + + LoadTextRect(_T("@36,@40,@37,@42")); + + CHandle_ oHandle1; + oHandle1.position = _T("#1,#0"); + oHandle1.polar = _T("10800,10800"); + oHandle1.radiusrange = _T("0,10800"); + oHandle1.switchHandle = _T("true"); + oHandle1.xrange = _T("0,10800"); + m_arHandles.push_back(oHandle1); + } +}; +} diff --git a/MsBinaryFile/Common/ODraw/oldAutoShapes/BorderCallout1Type.h b/MsBinaryFile/Common/ODraw/oldAutoShapes/BorderCallout1Type.h new file mode 100644 index 0000000000..4e6a0de18b --- /dev/null +++ b/MsBinaryFile/Common/ODraw/oldAutoShapes/BorderCallout1Type.h @@ -0,0 +1,70 @@ +/* + * (c) Copyright Ascensio System SIA 2010-2019 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect + * that Ascensio System SIA expressly excludes the warranty of non-infringement + * of any third-party rights. + * + * This program is distributed WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * + */ +#pragma once +#include "../CustomShape.h" + +// 47 +namespace NSCustomShapesConvert +{ +class CBorderCallout1Type : public CCustomShape +{ +public: + CBorderCallout1Type() + { + m_bConcentricFill = true; + m_eJoin = ODRAW::lineJoinMiter; + //Encaps: Flat + + m_strPath = _T("m@0@1l@2@3nfem,l21600,r,21600l,21600xe"); + + AddGuide(_T("val #0")); + AddGuide(_T("val #1")); + AddGuide(_T("val #2")); + AddGuide(_T("val #3")); + + m_arAdjustments.push_back(-8280); + m_arAdjustments.push_back(24300); + m_arAdjustments.push_back(-1800); + m_arAdjustments.push_back(4050); + + LoadConnectorsList(_T("@0,@1;10800,0;10800,21600;0,10800;21600,10800")); + + CHandle_ oHandle1; + oHandle1.position = _T("#0,#1"); + m_arHandles.push_back(oHandle1); + + CHandle_ oHandle2; + oHandle2.position = _T("#2,#3"); + m_arHandles.push_back(oHandle2); + } +}; +} diff --git a/MsBinaryFile/Common/ODraw/oldAutoShapes/BorderCallout2Type.h b/MsBinaryFile/Common/ODraw/oldAutoShapes/BorderCallout2Type.h new file mode 100644 index 0000000000..0d5fa6406c --- /dev/null +++ b/MsBinaryFile/Common/ODraw/oldAutoShapes/BorderCallout2Type.h @@ -0,0 +1,78 @@ +/* + * (c) Copyright Ascensio System SIA 2010-2019 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect + * that Ascensio System SIA expressly excludes the warranty of non-infringement + * of any third-party rights. + * + * This program is distributed WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * + */ +#pragma once +#include "../CustomShape.h" + +// 48 +namespace NSCustomShapesConvert +{ +class CBorderCallout2Type : public CCustomShape +{ +public: + CBorderCallout2Type() + { + m_bConcentricFill = true; + m_eJoin = ODRAW::lineJoinMiter; + //Encaps: Flat + + m_strPath = _T("m@0@1l@2@3@4@5nfem,l21600,r,21600l,21600xe"); + + AddGuide(_T("val #0")); + AddGuide(_T("val #1")); + AddGuide(_T("val #2")); + AddGuide(_T("val #3")); + AddGuide(_T("val #4")); + AddGuide(_T("val #5")); + + m_arAdjustments.push_back(-10080); + m_arAdjustments.push_back(24300); + m_arAdjustments.push_back(-3600); + m_arAdjustments.push_back(4050); + m_arAdjustments.push_back(-1800); + m_arAdjustments.push_back(4050); + + LoadConnectorsList(_T("@0,@1;10800,0;10800,21600;0,10800;21600,10800")); + + CHandle_ oHandle1; + oHandle1.position = _T("#0,#1"); + m_arHandles.push_back(oHandle1); + + CHandle_ oHandle2; + oHandle2.position = _T("#2,#3"); + m_arHandles.push_back(oHandle2); + + CHandle_ oHandle3; + oHandle3.position = _T("#4,#5"); + m_arHandles.push_back(oHandle3); + } +}; +} diff --git a/MsBinaryFile/Common/ODraw/oldAutoShapes/BorderCallout3Type.h b/MsBinaryFile/Common/ODraw/oldAutoShapes/BorderCallout3Type.h new file mode 100644 index 0000000000..d0e5b24aab --- /dev/null +++ b/MsBinaryFile/Common/ODraw/oldAutoShapes/BorderCallout3Type.h @@ -0,0 +1,86 @@ +/* + * (c) Copyright Ascensio System SIA 2010-2019 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect + * that Ascensio System SIA expressly excludes the warranty of non-infringement + * of any third-party rights. + * + * This program is distributed WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * + */ +#pragma once +#include "../CustomShape.h" + +// 49 +namespace NSCustomShapesConvert +{ +class CBorderCallout3Type : public CCustomShape +{ +public: + CBorderCallout3Type() + { + m_bConcentricFill = true; + m_eJoin = ODRAW::lineJoinMiter; + //Encaps: Flat + + m_strPath = _T("m@0@1l@2@3@4@5@6@7nfem,l21600,r,21600l,21600xe"); + + AddGuide(_T("val #0")); + AddGuide(_T("val #1")); + AddGuide(_T("val #2")); + AddGuide(_T("val #3")); + AddGuide(_T("val #4")); + AddGuide(_T("val #5")); + AddGuide(_T("val #6")); + AddGuide(_T("val #7")); + + m_arAdjustments.push_back(23400); + m_arAdjustments.push_back(24400); + m_arAdjustments.push_back(25200); + m_arAdjustments.push_back(21600); + m_arAdjustments.push_back(25200); + m_arAdjustments.push_back(4050); + m_arAdjustments.push_back(23400); + m_arAdjustments.push_back(4050); + + LoadConnectorsList(_T("@0,@1;10800,0;10800,21600;0,10800;21600,10800")); + + CHandle_ oHandle1; + oHandle1.position = _T("#0,#1"); + m_arHandles.push_back(oHandle1); + + CHandle_ oHandle2; + oHandle2.position = _T("#2,#3"); + m_arHandles.push_back(oHandle2); + + CHandle_ oHandle3; + oHandle3.position = _T("#4,#5"); + m_arHandles.push_back(oHandle3); + + CHandle_ oHandle4; + oHandle4.position = _T("#6,#7"); + m_arHandles.push_back(oHandle4); + } +}; +} diff --git a/MsBinaryFile/Common/ODraw/oldAutoShapes/BorderCallout90Type.h b/MsBinaryFile/Common/ODraw/oldAutoShapes/BorderCallout90Type.h new file mode 100644 index 0000000000..4fbe3c021f --- /dev/null +++ b/MsBinaryFile/Common/ODraw/oldAutoShapes/BorderCallout90Type.h @@ -0,0 +1,70 @@ +/* + * (c) Copyright Ascensio System SIA 2010-2019 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect + * that Ascensio System SIA expressly excludes the warranty of non-infringement + * of any third-party rights. + * + * This program is distributed WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * + */ +#pragma once +#include "../CustomShape.h" + +// 180 +namespace NSCustomShapesConvert +{ +class CBorderCallout90Type : public CCustomShape +{ +public: + CBorderCallout90Type() + { + m_bConcentricFill = true; + m_eJoin = ODRAW::lineJoinMiter; + //Encaps: Flat + + m_strPath = _T("m@0@1l@2@3nfem,l21600,r,21600l,21600xe"); + + AddGuide(_T("val #0")); + AddGuide(_T("val #1")); + AddGuide(_T("val #2")); + AddGuide(_T("val #3")); + + m_arAdjustments.push_back(-1800); + m_arAdjustments.push_back(24300); + m_arAdjustments.push_back(-1800); + m_arAdjustments.push_back(4050); + + LoadConnectorsList(_T("@0,@1;10800,0;10800,21600;0,10800;21600,10800")); + + CHandle_ oHandle1; + oHandle1.position = _T("#0,#1"); + m_arHandles.push_back(oHandle1); + + CHandle_ oHandle2; + oHandle2.position = _T("#2,#3"); + m_arHandles.push_back(oHandle2); + } +}; +} diff --git a/MsBinaryFile/Common/ODraw/oldAutoShapes/BracePairType.h b/MsBinaryFile/Common/ODraw/oldAutoShapes/BracePairType.h new file mode 100644 index 0000000000..2b516d7bf7 --- /dev/null +++ b/MsBinaryFile/Common/ODraw/oldAutoShapes/BracePairType.h @@ -0,0 +1,80 @@ +/* + * (c) Copyright Ascensio System SIA 2010-2019 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect + * that Ascensio System SIA expressly excludes the warranty of non-infringement + * of any third-party rights. + * + * This program is distributed WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * + */ +#pragma once +#include "../CustomShape.h" + +// 186 +namespace NSCustomShapesConvert +{ +class CBracePairType : public CCustomShape +{ +public: + CBracePairType() + { + m_bConcentricFill = false; + m_eJoin = ODRAW::lineJoinMiter; + //Encaps: Flat + + m_strPath = _T("m@9,nfqx@0@0l@0@7qy0@4@0@8l@0@6qy@9,21600em@10,nfqx@5@0l@5@7qy21600@4@5@8l@5@6qy@10,21600em@9,nsqx@0@0l@0@7qy0@4@0@8l@0@6qy@9,21600l@10,21600qx@5@6l@5@8qy21600@4@5@7l@5@0qy@10,xe"); + + AddGuide(_T("val #0")); + AddGuide(_T("val width")); + AddGuide(_T("val height")); + AddGuide(_T("prod width 1 2")); + AddGuide(_T("prod height 1 2")); + AddGuide(_T("sum width 0 #0")); + AddGuide(_T("sum height 0 #0")); + AddGuide(_T("sum @4 0 #0")); + AddGuide(_T("sum @4 #0 0")); + AddGuide(_T("prod #0 2 1")); + AddGuide(_T("sum width 0 @9")); + AddGuide(_T("prod #0 9598 32768")); + AddGuide(_T("sum height 0 @11")); + AddGuide(_T("sum @11 #0 0")); + AddGuide(_T("sum width 0 @13")); + + m_arAdjustments.push_back(1800); + + LoadConnectorsList(_T("@3,0;0,@4;@3,@2;@1,@4")); + LoadTextRect(_T("@13,@11,@14,@12")); + + CHandle_ oHandle1; + oHandle1.position = _T("topLeft,#0"); + oHandle1.switchHandle = _T("true"); + oHandle1.yrange = _T("0,5400"); + m_arHandles.push_back(oHandle1); + + m_lLimoX = 10800; + m_lLimoY = 10800; + } +}; +} diff --git a/MsBinaryFile/Common/ODraw/oldAutoShapes/BracketPairType.h b/MsBinaryFile/Common/ODraw/oldAutoShapes/BracketPairType.h new file mode 100644 index 0000000000..a7b38267d4 --- /dev/null +++ b/MsBinaryFile/Common/ODraw/oldAutoShapes/BracketPairType.h @@ -0,0 +1,75 @@ +/* + * (c) Copyright Ascensio System SIA 2010-2019 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect + * that Ascensio System SIA expressly excludes the warranty of non-infringement + * of any third-party rights. + * + * This program is distributed WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * + */ +#pragma once +#include "../CustomShape.h" + +// 185 +namespace NSCustomShapesConvert +{ +class CBracketPairType : public CCustomShape +{ +public: + CBracketPairType() + { + m_bConcentricFill = true; + m_eJoin = ODRAW::lineJoinRound; + //Encaps: Flat + + m_strPath = _T("m@0,nfqx0@0l0@2qy@0,21600em@1,nfqx21600@0l21600@2qy@1,21600em@0,nsqx0@0l0@2qy@0,21600l@1,21600qx21600@2l21600@0qy@1,xe"); + + AddGuide(_T("val #0")); + AddGuide(_T("sum width 0 #0")); + AddGuide(_T("sum height 0 #0")); + AddGuide(_T("prod @0 2929 10000")); + AddGuide(_T("sum width 0 @3")); + AddGuide(_T("sum height 0 @3")); + AddGuide(_T("val width")); + AddGuide(_T("val height")); + AddGuide(_T("prod width 1 2")); + AddGuide(_T("prod height 1 2")); + + m_arAdjustments.push_back(3600); + + LoadConnectorsList(_T("@8,0;0,@9;@8,@7;@6,@9")); + LoadTextRect(_T("@3,@3,@4,@5")); + + CHandle_ oHandle1; + oHandle1.position = _T("#0,topLeft"); + oHandle1.switchHandle = _T("true"); + oHandle1.xrange = _T("0,10800"); + m_arHandles.push_back(oHandle1); + + m_lLimoX = 10800; + m_lLimoY = 10800; + } +}; +} diff --git a/MsBinaryFile/Common/ODraw/oldAutoShapes/Callout1Type.h b/MsBinaryFile/Common/ODraw/oldAutoShapes/Callout1Type.h new file mode 100644 index 0000000000..31e794f927 --- /dev/null +++ b/MsBinaryFile/Common/ODraw/oldAutoShapes/Callout1Type.h @@ -0,0 +1,70 @@ +/* + * (c) Copyright Ascensio System SIA 2010-2019 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect + * that Ascensio System SIA expressly excludes the warranty of non-infringement + * of any third-party rights. + * + * This program is distributed WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * + */ +#pragma once +#include "../CustomShape.h" + +// 41 +namespace NSCustomShapesConvert +{ +class CCallout1Type : public CCustomShape +{ +public: + CCallout1Type() + { + m_bConcentricFill = true; + m_eJoin = ODRAW::lineJoinMiter; + //Encaps: Flat + + m_strPath = _T("m@0@1l@2@3nfem,l21600,r,21600l,21600nsxe"); + + AddGuide(_T("val #0")); + AddGuide(_T("val #1")); + AddGuide(_T("val #2")); + AddGuide(_T("val #3")); + + m_arAdjustments.push_back(8280); + m_arAdjustments.push_back(24300); + m_arAdjustments.push_back(-1800); + m_arAdjustments.push_back(4050); + + LoadConnectorsList(_T("@0,@1;10800,0;10800,21600;0,10800;21600,10800")); + + CHandle_ oHandle1; + oHandle1.position = _T("#0,#1"); + m_arHandles.push_back(oHandle1); + + CHandle_ oHandle2; + oHandle2.position = _T("#2,#3"); + m_arHandles.push_back(oHandle2); + } +}; +} diff --git a/MsBinaryFile/Common/ODraw/oldAutoShapes/Callout2Type.h b/MsBinaryFile/Common/ODraw/oldAutoShapes/Callout2Type.h new file mode 100644 index 0000000000..d49cc287b8 --- /dev/null +++ b/MsBinaryFile/Common/ODraw/oldAutoShapes/Callout2Type.h @@ -0,0 +1,78 @@ +/* + * (c) Copyright Ascensio System SIA 2010-2019 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect + * that Ascensio System SIA expressly excludes the warranty of non-infringement + * of any third-party rights. + * + * This program is distributed WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * + */ +#pragma once +#include "../CustomShape.h" + +// 42 +namespace NSCustomShapesConvert +{ +class CCallout2Type : public CCustomShape +{ +public: + CCallout2Type() + { + m_bConcentricFill = true; + m_eJoin = ODRAW::lineJoinMiter; + //Encaps: Flat + + m_strPath = _T("m@0@1l@2@3@4@5nfem,l21600,r,21600l,21600nsxe"); + + AddGuide(_T("val #0")); + AddGuide(_T("val #1")); + AddGuide(_T("val #2")); + AddGuide(_T("val #3")); + AddGuide(_T("val #4")); + AddGuide(_T("val #5")); + + m_arAdjustments.push_back(-10080); + m_arAdjustments.push_back(24300); + m_arAdjustments.push_back(-3600); + m_arAdjustments.push_back(4050); + m_arAdjustments.push_back(-1800); + m_arAdjustments.push_back(4050); + + LoadConnectorsList(_T("@0,@1;10800,0;10800,21600;0,10800;21600,10800")); + + CHandle_ oHandle1; + oHandle1.position = _T("#0,#1"); + m_arHandles.push_back(oHandle1); + + CHandle_ oHandle2; + oHandle2.position = _T("#2,#3"); + m_arHandles.push_back(oHandle2); + + CHandle_ oHandle3; + oHandle3.position = _T("#4,#5"); + m_arHandles.push_back(oHandle3); + } +}; +} diff --git a/MsBinaryFile/Common/ODraw/oldAutoShapes/Callout3Type.h b/MsBinaryFile/Common/ODraw/oldAutoShapes/Callout3Type.h new file mode 100644 index 0000000000..005e6d4351 --- /dev/null +++ b/MsBinaryFile/Common/ODraw/oldAutoShapes/Callout3Type.h @@ -0,0 +1,86 @@ +/* + * (c) Copyright Ascensio System SIA 2010-2019 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect + * that Ascensio System SIA expressly excludes the warranty of non-infringement + * of any third-party rights. + * + * This program is distributed WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * + */ +#pragma once +#include "../CustomShape.h" + +// 43 +namespace NSCustomShapesConvert +{ +class CCallout3Type : public CCustomShape +{ +public: + CCallout3Type() + { + m_bConcentricFill = true; + m_eJoin = ODRAW::lineJoinMiter; + //Encaps: Flat + + m_strPath = _T("m@0@1l@2@3@4@5@6@7nfem,l21600,r,21600l,21600nsxe"); + + AddGuide(_T("val #0")); + AddGuide(_T("val #1")); + AddGuide(_T("val #2")); + AddGuide(_T("val #3")); + AddGuide(_T("val #4")); + AddGuide(_T("val #5")); + AddGuide(_T("val #6")); + AddGuide(_T("val #7")); + + m_arAdjustments.push_back(23400); + m_arAdjustments.push_back(24400); + m_arAdjustments.push_back(25200); + m_arAdjustments.push_back(21600); + m_arAdjustments.push_back(25200); + m_arAdjustments.push_back(4050); + m_arAdjustments.push_back(23400); + m_arAdjustments.push_back(4050); + + LoadConnectorsList(_T("@0,@1;10800,0;10800,21600;0,10800;21600,10800")); + + CHandle_ oHandle1; + oHandle1.position = _T("#0,#1"); + m_arHandles.push_back(oHandle1); + + CHandle_ oHandle2; + oHandle2.position = _T("#2,#3"); + m_arHandles.push_back(oHandle2); + + CHandle_ oHandle3; + oHandle3.position = _T("#4,#5"); + m_arHandles.push_back(oHandle3); + + CHandle_ oHandle4; + oHandle4.position = _T("#6,#7"); + m_arHandles.push_back(oHandle4); + } +}; +} diff --git a/MsBinaryFile/Common/ODraw/oldAutoShapes/Callout90Type.h b/MsBinaryFile/Common/ODraw/oldAutoShapes/Callout90Type.h new file mode 100644 index 0000000000..7c1009b537 --- /dev/null +++ b/MsBinaryFile/Common/ODraw/oldAutoShapes/Callout90Type.h @@ -0,0 +1,70 @@ +/* + * (c) Copyright Ascensio System SIA 2010-2019 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect + * that Ascensio System SIA expressly excludes the warranty of non-infringement + * of any third-party rights. + * + * This program is distributed WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * + */ +#pragma once +#include "../CustomShape.h" + +// 178 +namespace NSCustomShapesConvert +{ +class CCallout90Type : public CCustomShape +{ +public: + CCallout90Type() + { + m_bConcentricFill = true; + m_eJoin = ODRAW::lineJoinMiter; + //Encaps: Flat + + m_strPath = _T("m@0@1l@2@3nfem,l21600,r,21600l,21600nsxe"); + + AddGuide(_T("val #0")); + AddGuide(_T("val #1")); + AddGuide(_T("val #2")); + AddGuide(_T("val #3")); + + m_arAdjustments.push_back(-1800); + m_arAdjustments.push_back(24300); + m_arAdjustments.push_back(-1800); + m_arAdjustments.push_back(4050); + + LoadConnectorsList(_T("@0,@1;10800,0;10800,21600;0,10800;21600,10800")); + + CHandle_ oHandle1; + oHandle1.position = _T("#0,#1"); + m_arHandles.push_back(oHandle1); + + CHandle_ oHandle2; + oHandle2.position = _T("#2,#3"); + m_arHandles.push_back(oHandle2); + } +}; +} diff --git a/MsBinaryFile/Common/ODraw/oldAutoShapes/CanType.h b/MsBinaryFile/Common/ODraw/oldAutoShapes/CanType.h new file mode 100644 index 0000000000..689cd21a6a --- /dev/null +++ b/MsBinaryFile/Common/ODraw/oldAutoShapes/CanType.h @@ -0,0 +1,68 @@ +/* + * (c) Copyright Ascensio System SIA 2010-2019 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect + * that Ascensio System SIA expressly excludes the warranty of non-infringement + * of any third-party rights. + * + * This program is distributed WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * + */ +#pragma once +#include "../CustomShape.h" + +// 22 +namespace NSCustomShapesConvert +{ +class CCanType : public CCustomShape +{ +public: + CCanType() + { + m_bConcentricFill = true; + m_eJoin = ODRAW::lineJoinRound; + m_strPath = _T("m10800,qx0@1l0@2qy10800,21600,21600@2l21600@1qy10800,xem0@1qy10800@0,21600@1nfe"); + + AddGuide(_T("val #0")); + AddGuide(_T("prod #0 1 2")); + AddGuide(_T("sum height 0 @1")); + + m_arAdjustments.push_back(5400); + + LoadConnectorsList(_T("10800,@0;10800,0;0,10800;10800,21600;21600,10800")); + m_arConnectorAngles.push_back(270); + m_arConnectorAngles.push_back(270); + m_arConnectorAngles.push_back(180); + m_arConnectorAngles.push_back(90); + m_arConnectorAngles.push_back(0); + + LoadTextRect(_T("0,@0,21600,@2")); + + CHandle_ oHandle1; + oHandle1.position = _T("center,#0"); + oHandle1.yrange = _T("0,10800"); + m_arHandles.push_back(oHandle1); + } +}; +} diff --git a/MsBinaryFile/Common/ODraw/oldAutoShapes/ChevronType.h b/MsBinaryFile/Common/ODraw/oldAutoShapes/ChevronType.h new file mode 100644 index 0000000000..f123f61ab0 --- /dev/null +++ b/MsBinaryFile/Common/ODraw/oldAutoShapes/ChevronType.h @@ -0,0 +1,68 @@ +/* + * (c) Copyright Ascensio System SIA 2010-2019 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect + * that Ascensio System SIA expressly excludes the warranty of non-infringement + * of any third-party rights. + * + * This program is distributed WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * + */ +#pragma once +#include "../CustomShape.h" + +// 55 +namespace NSCustomShapesConvert +{ +class CChevronType : public CCustomShape +{ +public: + CChevronType() + { + m_bConcentricFill = false; + m_eJoin = ODRAW::lineJoinMiter; + m_strPath = _T("m@0,l,0@1,10800,,21600@0,21600,21600,10800xe"); + + AddGuide(_T("val #0")); + AddGuide(_T("sum 21600 0 @0")); + AddGuide(_T("prod #0 1 2")); + + m_arAdjustments.push_back(16200); + LoadConnectorsList(_T("@2,0;@1,10800;@2,21600;21600,10800")); + + m_arConnectorAngles.push_back(270); + m_arConnectorAngles.push_back(180); + m_arConnectorAngles.push_back(90); + m_arConnectorAngles.push_back(0); + + LoadTextRect(_T("0,0,10800,21600;0,0,16200,21600;0,0,21600,21600")); + + CHandle_ oHandle1; + oHandle1.position = _T("#0,topLeft"); + oHandle1.xrange = _T("0,21600"); + m_arHandles.push_back(oHandle1); + } +}; + +} diff --git a/MsBinaryFile/Common/ODraw/oldAutoShapes/CircularArrowType.h b/MsBinaryFile/Common/ODraw/oldAutoShapes/CircularArrowType.h new file mode 100644 index 0000000000..c60a61e724 --- /dev/null +++ b/MsBinaryFile/Common/ODraw/oldAutoShapes/CircularArrowType.h @@ -0,0 +1,117 @@ +/* + * (c) Copyright Ascensio System SIA 2010-2019 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect + * that Ascensio System SIA expressly excludes the warranty of non-infringement + * of any third-party rights. + * + * This program is distributed WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * + */ +#pragma once +#include "../CustomShape.h" + +// 99 +namespace NSCustomShapesConvert +{ +class CCircularArrowType : public CCustomShape +{ +public: + CCircularArrowType() + { + m_bConcentricFill = false; + m_eJoin = ODRAW::lineJoinMiter; + m_strPath = _T("al10800,10800@8@8@4@6,10800,10800,10800,10800@9@7l@30@31@17@18@24@25@15@16@32@33xe"); + + AddGuide(_T("val #1")); + AddGuide(_T("val #0")); + AddGuide(_T("sum #1 0 #0")); + AddGuide(_T("val 10800")); + AddGuide(_T("sum 0 0 #1")); + AddGuide(_T("sumangle @2 360 0")); + AddGuide(_T("if @2 @2 @5")); + AddGuide(_T("sum 0 0 @6")); + AddGuide(_T("val #2")); + AddGuide(_T("sum 0 0 #0")); + AddGuide(_T("sum #2 0 2700")); + AddGuide(_T("cos @10 #1")); + AddGuide(_T("sin @10 #1")); + AddGuide(_T("cos 13500 #1")); + AddGuide(_T("sin 13500 #1")); + AddGuide(_T("sum @11 10800 0")); + AddGuide(_T("sum @12 10800 0")); + AddGuide(_T("sum @13 10800 0")); + AddGuide(_T("sum @14 10800 0")); + AddGuide(_T("prod #2 1 2 ")); + AddGuide(_T("sum @19 5400 0")); + AddGuide(_T("cos @20 #1")); + AddGuide(_T("sin @20 #1")); + AddGuide(_T("sum @21 10800 0")); + AddGuide(_T("sum @12 @23 @22")); + AddGuide(_T("sum @22 @23 @11")); + AddGuide(_T("cos 10800 #1")); + AddGuide(_T("sin 10800 #1")); + AddGuide(_T("cos #2 #1")); + AddGuide(_T("sin #2 #1")); + AddGuide(_T("sum @26 10800 0")); + AddGuide(_T("sum @27 10800 0")); + AddGuide(_T("sum @28 10800 0")); + AddGuide(_T("sum @29 10800 0")); + AddGuide(_T("sum @19 5400 0 ")); + AddGuide(_T("cos @34 #0")); + AddGuide(_T("sin @34 #0")); + AddGuide(_T("mid #0 #1")); + AddGuide(_T("sumangle @37 180 0")); + AddGuide(_T("if @2 @37 @38")); + AddGuide(_T("cos 10800 @39")); + AddGuide(_T("sin 10800 @39")); + AddGuide(_T("cos #2 @39")); + AddGuide(_T("sin #2 @39")); + AddGuide(_T("sum @40 10800 0")); + AddGuide(_T("sum @41 10800 0")); + AddGuide(_T("sum @42 10800 0")); + AddGuide(_T("sum @43 10800 0")); + AddGuide(_T("sum @35 10800 0")); + AddGuide(_T("sum @36 10800 0")); + + m_arAdjustments.push_back(-11796480); + m_arAdjustments.push_back(0); + m_arAdjustments.push_back(5400); + + LoadConnectorsList(_T("@44,@45;@48,@49;@46,@47;@17,@18;@24,@25;@15,@16")); + LoadTextRect(_T("3163,3163,18437,18437")); + + CHandle_ oHandle1; + oHandle1.position = _T("@3,#0"); + oHandle1.polar = _T("10800,10800"); + m_arHandles.push_back(oHandle1); + + CHandle_ oHandle2; + oHandle2.position = _T("#2,#1"); + oHandle2.polar = _T("10800,10800"); + oHandle2.radiusrange = _T("0,10800"); + m_arHandles.push_back(oHandle2); + } +}; +} \ No newline at end of file diff --git a/MsBinaryFile/Common/ODraw/oldAutoShapes/CloudCalloutType.h b/MsBinaryFile/Common/ODraw/oldAutoShapes/CloudCalloutType.h new file mode 100644 index 0000000000..9bae8a5b78 --- /dev/null +++ b/MsBinaryFile/Common/ODraw/oldAutoShapes/CloudCalloutType.h @@ -0,0 +1,101 @@ +/* + * (c) Copyright Ascensio System SIA 2010-2019 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect + * that Ascensio System SIA expressly excludes the warranty of non-infringement + * of any third-party rights. + * + * This program is distributed WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * + */ +#pragma once +#include "../CustomShape.h" + + +// 106 +namespace NSCustomShapesConvert +{ +class CCloudCalloutType : public CCustomShape +{ +public: + CCloudCalloutType() + { + m_bConcentricFill = false; + m_eJoin = ODRAW::lineJoinRound; + + m_strPath = _T("ar,7165,4345,13110,1950,7185,1080,12690,475,11732,4835,17650,1080,12690,2910,17640,2387,9757,10107,20300,2910,17640,8235,19545,7660,12382,14412,21597,8235,19545,14280,18330,12910,11080,18695,18947,14280,18330,18690,15045,14822,5862,21597,15082,18690,15045,20895,7665,15772,2592,21105,9865,20895,7665,19140,2715,14330,,19187,6595,19140,2715,14910,1170,10992,,15357,5945,14910,1170,11250,1665,6692,650,12025,7917,11250,1665,7005,2580,1912,1972,8665,11162,7005,2580,1950,7185xear,7165,4345,13110,1080,12690,2340,13080nfear475,11732,4835,17650,2910,17640,3465,17445nfear7660,12382,14412,21597,7905,18675,8235,19545nfear7660,12382,14412,21597,14280,18330,14400,17370nfear12910,11080,18695,18947,18690,15045,17070,11475nfear15772,2592,21105,9865,20175,9015,20895,7665nfear14330,,19187,6595,19200,3345,19140,2715nfear14330,,19187,6595,14910,1170,14550,1980nfear10992,,15357,5945,11250,1665,11040,2340nfear1912,1972,8665,11162,7650,3270,7005,2580nfear1912,1972,8665,11162,1950,7185,2070,7890nfem@23@37qx@35@24@23@36@34@24@23@37xem@16@33qx@31@17@16@32@30@17@16@33xem@38@29qx@27@39@38@28@26@39@38@29xe"); + + AddGuide(_T("sum #0 0 10800")); + AddGuide(_T("sum #1 0 10800")); + AddGuide(_T("cosatan2 10800 @0 @1")); + AddGuide(_T("sinatan2 10800 @0 @1")); + AddGuide(_T("sum @2 10800 0")); + AddGuide(_T("sum @3 10800 0")); + AddGuide(_T("sum @4 0 #0")); + AddGuide(_T("sum @5 0 #1")); + AddGuide(_T("mod @6 @7 0")); + AddGuide(_T("prod 600 11 1")); + AddGuide(_T("sum @8 0 @9")); + AddGuide(_T("prod @10 1 3")); + AddGuide(_T("prod 600 3 1")); + AddGuide(_T("sum @11 @12 0")); + AddGuide(_T("prod @13 @6 @8")); + AddGuide(_T("prod @13 @7 @8")); + AddGuide(_T("sum @14 #0 0")); + AddGuide(_T("sum @15 #1 0")); + AddGuide(_T("prod 600 8 1")); + AddGuide(_T("prod @11 2 1")); + AddGuide(_T("sum @18 @19 0")); + AddGuide(_T("prod @20 @6 @8")); + AddGuide(_T("prod @20 @7 @8")); + AddGuide(_T("sum @21 #0 0")); + AddGuide(_T("sum @22 #1 0")); + AddGuide(_T("prod 600 2 1")); + AddGuide(_T("sum #0 600 0")); + AddGuide(_T("sum #0 0 600")); + AddGuide(_T("sum #1 600 0")); + AddGuide(_T("sum #1 0 600")); + AddGuide(_T("sum @16 @25 0")); + AddGuide(_T("sum @16 0 @25")); + AddGuide(_T("sum @17 @25 0")); + AddGuide(_T("sum @17 0 @25")); + AddGuide(_T("sum @23 @12 0")); + AddGuide(_T("sum @23 0 @12")); + AddGuide(_T("sum @24 @12 0")); + AddGuide(_T("sum @24 0 @12")); + AddGuide(_T("val #0")); + AddGuide(_T("val #1")); + + m_arAdjustments.push_back(1350); + m_arAdjustments.push_back(25920); + + LoadConnectorsList(_T("67,10800;10800,21577;21582,10800;10800,1235;@38,@39")); + LoadTextRect(_T("2977,3262,17087,17337")); + + CHandle_ oHandle1; + oHandle1.position = _T("#0,#1"); + m_arHandles.push_back(oHandle1); + } +}; +} diff --git a/MsBinaryFile/Common/ODraw/oldAutoShapes/CubeType.h b/MsBinaryFile/Common/ODraw/oldAutoShapes/CubeType.h new file mode 100644 index 0000000000..61a6f73067 --- /dev/null +++ b/MsBinaryFile/Common/ODraw/oldAutoShapes/CubeType.h @@ -0,0 +1,79 @@ +/* + * (c) Copyright Ascensio System SIA 2010-2019 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect + * that Ascensio System SIA expressly excludes the warranty of non-infringement + * of any third-party rights. + * + * This program is distributed WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * + */ +#pragma once +#include "../CustomShape.h" + +// 16 +namespace NSCustomShapesConvert +{ +class CCubeType : public CCustomShape +{ +public: + CCubeType() + { + m_bConcentricFill = true; + m_eJoin = ODRAW::lineJoinMiter; + + m_strPath = _T("m@0,l0@0,,21600@1,21600,21600@2,21600,xem0@0nfl@1@0,21600,em@1@0nfl@1,21600e"); + + AddGuide(_T("val #0")); + AddGuide(_T("sum width 0 #0")); + AddGuide(_T("sum height 0 #0")); + AddGuide(_T("mid height #0")); + AddGuide(_T("prod @1 1 2")); + AddGuide(_T("prod @2 1 2")); + AddGuide(_T("mid width #0")); + + m_arAdjustments.push_back(5400); + + LoadConnectorsList(_T("@6,0;@4,@0;0,@3;@4,21600;@1,@3;21600,@5")); + + m_arConnectorAngles.push_back(270); + m_arConnectorAngles.push_back(270); + m_arConnectorAngles.push_back(180); + m_arConnectorAngles.push_back(90); + m_arConnectorAngles.push_back(0); + m_arConnectorAngles.push_back(0); + + LoadTextRect(_T("0,@0,@1,21600")); + + CHandle_ oHandle1; + oHandle1.position = _T("topLeft,#0"); + oHandle1.switchHandle = _T("true"); + oHandle1.yrange = _T("0,21600"); + m_arHandles.push_back(oHandle1); + + m_lLimoX = 10800; + m_lLimoY = 10800; + } +}; +} diff --git a/MsBinaryFile/Common/ODraw/oldAutoShapes/CurvedConnector.h b/MsBinaryFile/Common/ODraw/oldAutoShapes/CurvedConnector.h new file mode 100644 index 0000000000..6ee666a4d6 --- /dev/null +++ b/MsBinaryFile/Common/ODraw/oldAutoShapes/CurvedConnector.h @@ -0,0 +1,61 @@ +/* + * (c) Copyright Ascensio System SIA 2010-2019 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect + * that Ascensio System SIA expressly excludes the warranty of non-infringement + * of any third-party rights. + * + * This program is distributed WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * + */ +#pragma once +#include "../CustomShape.h" + +// 38 +namespace NSCustomShapesConvert +{ +class CCurvedConnectorType : public CCustomShape +{ +public: + CCurvedConnectorType() + { + m_bConcentricFill = true; + m_eJoin = ODRAW::lineJoinRound; + + //m_strPathLimoX = _T("m0,0qx@0,10800qy21600,21600nfe"); + //m_strPathLimoY = _T("m0,0qy@0,10800qx21600,21600nfe"); + + m_strPath = _T("m,c@0,0@1,5400@1,10800@1,16200@2,21600,21600,21600e");//m_strPathLimoX; + + AddGuide(_T("mid #0 0")); + AddGuide(_T("val #0")); + AddGuide(_T("mid #0 21600")); + + //AddGuide(_T("val #0")); + m_arAdjustments.push_back(10800); + + LoadConnectorsList(_T("0,0;21600,21600")); + } +}; +} \ No newline at end of file diff --git a/MsBinaryFile/Common/ODraw/oldAutoShapes/CurvedDownArrowType.h b/MsBinaryFile/Common/ODraw/oldAutoShapes/CurvedDownArrowType.h new file mode 100644 index 0000000000..fb4987ba78 --- /dev/null +++ b/MsBinaryFile/Common/ODraw/oldAutoShapes/CurvedDownArrowType.h @@ -0,0 +1,127 @@ +/* + * (c) Copyright Ascensio System SIA 2010-2019 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect + * that Ascensio System SIA expressly excludes the warranty of non-infringement + * of any third-party rights. + * + * This program is distributed WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * + */ +#pragma once +#include "../CustomShape.h" + +// 105 +namespace NSCustomShapesConvert +{ +class CCurvedDownArrowType : public CCustomShape +{ +public: + CCurvedDownArrowType() + { + m_bConcentricFill = false; + m_eJoin = ODRAW::lineJoinMiter; + m_strPath = _T("wr,0@3@23,0@22@4,0@15,0@1@23@7,0@13@2l@14@2@8@22@12@2at,0@3@23@11@2@17@26@15,0@1@23@17@26@15@22xewr,0@3@23@4,0@17@26nfe"); + + AddGuide(_T("val #0")); + AddGuide(_T("val #1")); + AddGuide(_T("val #2")); + AddGuide(_T("sum #0 width #1")); + AddGuide(_T("prod @3 1 2")); + AddGuide(_T("sum #1 #1 width")); + AddGuide(_T("sum @5 #1 #0")); + AddGuide(_T("prod @6 1 2")); + AddGuide(_T("mid width #0")); + AddGuide(_T("sum height 0 #2")); + AddGuide(_T("ellipse @9 height @4")); + AddGuide(_T("sum @4 @10 0")); + AddGuide(_T("sum @11 #1 width")); + AddGuide(_T("sum @7 @10 0")); + AddGuide(_T("sum @12 width #0")); + AddGuide(_T("sum @5 0 #0")); + AddGuide(_T("prod @15 1 2")); + AddGuide(_T("mid @4 @7")); + AddGuide(_T("sum #0 #1 width")); + AddGuide(_T("prod @18 1 2")); + AddGuide(_T("sum @17 0 @19")); + AddGuide(_T("val width")); + AddGuide(_T("val height")); + AddGuide(_T("prod height 2 1")); + AddGuide(_T("sum @17 0 @4")); + AddGuide(_T("ellipse @24 @4 height")); + AddGuide(_T("sum height 0 @25")); + AddGuide(_T("sum @8 128 0")); + AddGuide(_T("prod @5 1 2")); + AddGuide(_T("sum @5 0 128")); + AddGuide(_T("sum #0 @17 @12")); + AddGuide(_T("ellipse @20 @4 height")); + AddGuide(_T("sum width 0 #0")); + AddGuide(_T("prod @32 1 2")); + AddGuide(_T("prod height height 1")); + AddGuide(_T("prod @9 @9 1")); + AddGuide(_T("sum @34 0 @35")); + AddGuide(_T("sqrt @36")); + AddGuide(_T("sum @37 height 0")); + AddGuide(_T("prod width height @38")); + AddGuide(_T("sum @39 64 0")); + AddGuide(_T("prod #0 1 2")); + AddGuide(_T("ellipse @33 @41 height")); + AddGuide(_T("sum height 0 @42")); + AddGuide(_T("sum @43 64 0")); + AddGuide(_T("prod @4 1 2")); + AddGuide(_T("sum #1 0 @45")); + AddGuide(_T("prod height 4390 32768")); + AddGuide(_T("prod height 28378 32768")); + + m_arAdjustments.push_back(12960); + m_arAdjustments.push_back(19440); + m_arAdjustments.push_back(14400); + + LoadConnectorsList(_T("@17,0;@16,@22;@12,@2;@8,@22;@14,@2")); + + m_arConnectorAngles.push_back(270); + m_arConnectorAngles.push_back(90); + m_arConnectorAngles.push_back(90); + m_arConnectorAngles.push_back(90); + m_arConnectorAngles.push_back(0); + + LoadTextRect(_T("@45,@47,@46,@48")); + + CHandle_ oHandle1; + oHandle1.position = _T("#0,bottomRight"); + oHandle1.xrange = _T("@40,@29"); + m_arHandles.push_back(oHandle1); + + CHandle_ oHandle2; + oHandle1.position = _T("#1,bottomRight"); + oHandle1.xrange = _T("@27,@21"); + m_arHandles.push_back(oHandle2); + + CHandle_ oHandle3; + oHandle3.position = _T("bottomRight,#2"); + oHandle3.yrange = _T("@44,@22"); + m_arHandles.push_back(oHandle3); + } +}; +} diff --git a/MsBinaryFile/Common/ODraw/oldAutoShapes/CurvedLeftArrowType.h b/MsBinaryFile/Common/ODraw/oldAutoShapes/CurvedLeftArrowType.h new file mode 100644 index 0000000000..6abc50b089 --- /dev/null +++ b/MsBinaryFile/Common/ODraw/oldAutoShapes/CurvedLeftArrowType.h @@ -0,0 +1,123 @@ +/* + * (c) Copyright Ascensio System SIA 2010-2019 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect + * that Ascensio System SIA expressly excludes the warranty of non-infringement + * of any third-party rights. + * + * This program is distributed WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * + */ +#pragma once +#include "../CustomShape.h" + +// 103 +namespace NSCustomShapesConvert +{ +class CCurvedLeftArrowType : public CCustomShape +{ +public: + CCurvedLeftArrowType() + { + m_bConcentricFill = false; + m_eJoin = ODRAW::lineJoinMiter; + m_strPath = _T("wr@22,0@21@3,,0@21@4@22@14@21@1@21@7@2@12l@2@13,0@8@2@11at@22,0@21@3@2@10@24@16@22@14@21@1@24@16,0@14xear@22@14@21@1@21@7@24@16nfe"); + + AddGuide(_T("val #0")); + AddGuide(_T("val #1")); + AddGuide(_T("val #2")); + AddGuide(_T("sum #0 width #1")); + AddGuide(_T("prod @3 1 2")); + AddGuide(_T("sum #1 #1 width")); + AddGuide(_T("sum @5 #1 #0")); + AddGuide(_T("prod @6 1 2")); + AddGuide(_T("mid width #0")); + AddGuide(_T("ellipse #2 height @4")); + AddGuide(_T("sum @4 @9 0")); + AddGuide(_T("sum @10 #1 width")); + AddGuide(_T("sum @7 @9 0")); + AddGuide(_T("sum @11 width #0")); + AddGuide(_T("sum @5 0 #0")); + AddGuide(_T("prod @14 1 2")); + AddGuide(_T("mid @4 @7")); + AddGuide(_T("sum #0 #1 width")); + AddGuide(_T("prod @17 1 2")); + AddGuide(_T("sum @16 0 @18")); + AddGuide(_T("val width")); + AddGuide(_T("val height")); + AddGuide(_T("sum 0 0 height")); + AddGuide(_T("sum @16 0 @4")); + AddGuide(_T("ellipse @23 @4 height")); + AddGuide(_T("sum @8 128 0")); + AddGuide(_T("prod @5 1 2")); + AddGuide(_T("sum @5 0 128")); + AddGuide(_T("sum #0 @16 @11")); + AddGuide(_T("sum width 0 #0")); + AddGuide(_T("prod @29 1 2")); + AddGuide(_T("prod height height 1")); + AddGuide(_T("prod #2 #2 1")); + AddGuide(_T("sum @31 0 @32")); + AddGuide(_T("sqrt @33")); + AddGuide(_T("sum @34 height 0")); + AddGuide(_T("prod width height @35")); + AddGuide(_T("sum @36 64 0")); + AddGuide(_T("prod #0 1 2")); + AddGuide(_T("ellipse @30 @38 height")); + AddGuide(_T("sum @39 0 64")); + AddGuide(_T("prod @4 1 2")); + AddGuide(_T("sum #1 0 @41")); + AddGuide(_T("prod height 4390 32768")); + AddGuide(_T("prod height 28378 32768")); + + m_arAdjustments.push_back(12960); + m_arAdjustments.push_back(19440); + m_arAdjustments.push_back(7200); + + LoadConnectorsList(_T("0,@15;@2,@11;0,@8;@2,@13;@21,@16")); + + m_arConnectorAngles.push_back(180); + m_arConnectorAngles.push_back(180); + m_arConnectorAngles.push_back(180); + m_arConnectorAngles.push_back(90); + m_arConnectorAngles.push_back(0); + + LoadTextRect(_T("@43,@41,@44,@42")); + + CHandle_ oHandle1; + oHandle1.position = _T("topLeft,#0"); + oHandle1.yrange = _T("@37,@27"); + m_arHandles.push_back(oHandle1); + + CHandle_ oHandle2; + oHandle1.position = _T("topLeft,#1"); + oHandle1.yrange = _T("@25,@20"); + m_arHandles.push_back(oHandle2); + + CHandle_ oHandle3; + oHandle3.position = _T("#2,bottomRight"); + oHandle3.xrange = _T("0,@40"); + m_arHandles.push_back(oHandle3); + } +}; +} diff --git a/MsBinaryFile/Common/ODraw/oldAutoShapes/CurvedRightArrowType.h b/MsBinaryFile/Common/ODraw/oldAutoShapes/CurvedRightArrowType.h new file mode 100644 index 0000000000..aae198d146 --- /dev/null +++ b/MsBinaryFile/Common/ODraw/oldAutoShapes/CurvedRightArrowType.h @@ -0,0 +1,127 @@ +/* + * (c) Copyright Ascensio System SIA 2010-2019 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect + * that Ascensio System SIA expressly excludes the warranty of non-infringement + * of any third-party rights. + * + * This program is distributed WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * + */ +#pragma once +#include "../CustomShape.h" + +// 102 +namespace NSCustomShapesConvert +{ +class CCurvedRightArrowType : public CCustomShape +{ +public: + CCurvedRightArrowType() + { + m_bConcentricFill = false; + m_eJoin = ODRAW::lineJoinMiter; + m_strPath = _T("ar,0@23@3@22,,0@4,0@15@23@1,0@7@2@13l@2@14@22@8@2@12wa,0@23@3@2@11@26@17,0@15@23@1@26@17@22@15xear,0@23@3,0@4@26@17nfe"); + + AddGuide(_T("val #0")); + AddGuide(_T("val #1")); + AddGuide(_T("val #2")); + AddGuide(_T("sum #0 width #1")); + AddGuide(_T("prod @3 1 2")); + AddGuide(_T("sum #1 #1 width")); + AddGuide(_T("sum @5 #1 #0")); + AddGuide(_T("prod @6 1 2")); + AddGuide(_T("mid width #0")); + AddGuide(_T("sum height 0 #2")); + AddGuide(_T("ellipse @9 height @4")); + AddGuide(_T("sum @4 @10 0")); + AddGuide(_T("sum @11 #1 width")); + AddGuide(_T("sum @7 @10 0")); + AddGuide(_T("sum @12 width #0")); + AddGuide(_T("sum @5 0 #0")); + AddGuide(_T("prod @15 1 2")); + AddGuide(_T("mid @4 @7")); + AddGuide(_T("sum #0 #1 width")); + AddGuide(_T("prod @18 1 2")); + AddGuide(_T("sum @17 0 @19")); + AddGuide(_T("val width")); + AddGuide(_T("val height")); + AddGuide(_T("prod height 2 1")); + AddGuide(_T("sum @17 0 @4")); + AddGuide(_T("ellipse @24 @4 height")); + AddGuide(_T("sum height 0 @25")); + AddGuide(_T("sum @8 128 0")); + AddGuide(_T("prod @5 1 2")); + AddGuide(_T("sum @5 0 128")); + AddGuide(_T("sum #0 @17 @12")); + AddGuide(_T("ellipse @20 @4 height")); + AddGuide(_T("sum width 0 #0")); + AddGuide(_T("prod @32 1 2")); + AddGuide(_T("prod height height 1")); + AddGuide(_T("prod @9 @9 1")); + AddGuide(_T("sum @34 0 @35")); + AddGuide(_T("sqrt @36")); + AddGuide(_T("sum @37 height 0")); + AddGuide(_T("prod width height @38")); + AddGuide(_T("sum @39 64 0")); + AddGuide(_T("prod #0 1 2")); + AddGuide(_T("ellipse @33 @41 height")); + AddGuide(_T("sum height 0 @42")); + AddGuide(_T("sum @43 64 0")); + AddGuide(_T("prod @4 1 2")); + AddGuide(_T("sum #1 0 @45")); + AddGuide(_T("prod height 4390 32768")); + AddGuide(_T("prod height 28378 32768")); + + m_arAdjustments.push_back(12960); + m_arAdjustments.push_back(19440); + m_arAdjustments.push_back(14400); + + LoadConnectorsList(_T("0,@17;@2,@14;@22,@8;@2,@12;@22,@16")); + + m_arConnectorAngles.push_back(180); + m_arConnectorAngles.push_back(90); + m_arConnectorAngles.push_back(0); + m_arConnectorAngles.push_back(0); + m_arConnectorAngles.push_back(0); + + LoadTextRect(_T("@47,@45,@48,@46")); + + CHandle_ oHandle1; + oHandle1.position = _T("bottomRight,#0"); + oHandle1.yrange = _T("@40,@29"); + m_arHandles.push_back(oHandle1); + + CHandle_ oHandle2; + oHandle1.position = _T("bottomRight,#1"); + oHandle1.yrange = _T("@27,@21"); + m_arHandles.push_back(oHandle2); + + CHandle_ oHandle3; + oHandle3.position = _T("#2,bottomRight"); + oHandle3.xrange = _T("@44,@22"); + m_arHandles.push_back(oHandle3); + } +}; +} diff --git a/MsBinaryFile/Common/ODraw/oldAutoShapes/CurvedUpArrowType.h b/MsBinaryFile/Common/ODraw/oldAutoShapes/CurvedUpArrowType.h new file mode 100644 index 0000000000..ee3370a7e7 --- /dev/null +++ b/MsBinaryFile/Common/ODraw/oldAutoShapes/CurvedUpArrowType.h @@ -0,0 +1,123 @@ +/* + * (c) Copyright Ascensio System SIA 2010-2019 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect + * that Ascensio System SIA expressly excludes the warranty of non-infringement + * of any third-party rights. + * + * This program is distributed WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * + */ +#pragma once +#include "../CustomShape.h" + +//104 +namespace NSCustomShapesConvert +{ +class CCurvedUpArrowType : public CCustomShape +{ +public: + CCurvedUpArrowType() + { + m_bConcentricFill = false; + m_eJoin = ODRAW::lineJoinMiter; + m_strPath = _T("ar0@22@3@21,,0@4@21@14@22@1@21@7@21@12@2l@13@2@8,0@11@2wa0@22@3@21@10@2@16@24@14@22@1@21@16@24@14,xewr@14@22@1@21@7@21@16@24nfe"); + + AddGuide(_T("val #0")); + AddGuide(_T("val #1")); + AddGuide(_T("val #2")); + AddGuide(_T("sum #0 width #1")); + AddGuide(_T("prod @3 1 2")); + AddGuide(_T("sum #1 #1 width")); + AddGuide(_T("sum @5 #1 #0")); + AddGuide(_T("prod @6 1 2")); + AddGuide(_T("mid width #0")); + AddGuide(_T("ellipse #2 height @4")); + AddGuide(_T("sum @4 @9 0")); + AddGuide(_T("sum @10 #1 width")); + AddGuide(_T("sum @7 @9 0")); + AddGuide(_T("sum @11 width #0")); + AddGuide(_T("sum @5 0 #0")); + AddGuide(_T("prod @14 1 2")); + AddGuide(_T("mid @4 @7")); + AddGuide(_T("sum #0 #1 width")); + AddGuide(_T("prod @17 1 2")); + AddGuide(_T("sum @16 0 @18")); + AddGuide(_T("val width")); + AddGuide(_T("val height")); + AddGuide(_T("sum 0 0 height")); + AddGuide(_T("sum @16 0 @4")); + AddGuide(_T("ellipse @23 @4 height")); + AddGuide(_T("sum @8 128 0")); + AddGuide(_T("prod @5 1 2")); + AddGuide(_T("sum @5 0 128")); + AddGuide(_T("sum #0 @16 @11")); + AddGuide(_T("sum width 0 #0")); + AddGuide(_T("prod @29 1 2")); + AddGuide(_T("prod height height 1")); + AddGuide(_T("prod #2 #2 1")); + AddGuide(_T("sum @31 0 @32")); + AddGuide(_T("sqrt @33")); + AddGuide(_T("sum @34 height 0")); + AddGuide(_T("prod width height @35")); + AddGuide(_T("sum @36 64 0")); + AddGuide(_T("prod #0 1 2")); + AddGuide(_T("ellipse @30 @38 height")); + AddGuide(_T("sum @39 0 64")); + AddGuide(_T("prod @4 1 2")); + AddGuide(_T("sum #1 0 @41")); + AddGuide(_T("prod height 4390 32768")); + AddGuide(_T("prod height 28378 32768")); + + m_arAdjustments.push_back(12960); + m_arAdjustments.push_back(19440); + m_arAdjustments.push_back(7200); + + LoadConnectorsList(_T("@8,0;@11,@2;@15,0;@16,@21;@13,@2")); + + m_arConnectorAngles.push_back(270); + m_arConnectorAngles.push_back(270); + m_arConnectorAngles.push_back(270); + m_arConnectorAngles.push_back(90); + m_arConnectorAngles.push_back(0); + + LoadTextRect(_T("@41,@43,@42,@44")); + + CHandle_ oHandle1; + oHandle1.position = _T("#0,topLeft"); + oHandle1.xrange = _T("@37,@27"); + m_arHandles.push_back(oHandle1); + + CHandle_ oHandle2; + oHandle1.position = _T("#1,topLeft"); + oHandle1.xrange = _T("@25,@20"); + m_arHandles.push_back(oHandle2); + + CHandle_ oHandle3; + oHandle3.position = _T("bottomRight,#2"); + oHandle3.yrange = _T("0,@40"); + m_arHandles.push_back(oHandle3); + } +}; +} diff --git a/MsBinaryFile/Common/ODraw/oldAutoShapes/DiamondType.h b/MsBinaryFile/Common/ODraw/oldAutoShapes/DiamondType.h new file mode 100644 index 0000000000..134b2f8ef2 --- /dev/null +++ b/MsBinaryFile/Common/ODraw/oldAutoShapes/DiamondType.h @@ -0,0 +1,53 @@ +/* + * (c) Copyright Ascensio System SIA 2010-2019 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect + * that Ascensio System SIA expressly excludes the warranty of non-infringement + * of any third-party rights. + * + * This program is distributed WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * + */ +#pragma once +#include "../CustomShape.h" + +// 4 +namespace NSCustomShapesConvert +{ +class CDiamondType : public CCustomShape +{ +public: + CDiamondType() + { + m_bConcentricFill = true; + + m_eJoin = ODRAW::lineJoinMiter; + m_strPath = _T("m10800,l,10800,10800,21600,21600,10800xe"); + + LoadConnectorsList(_T("Rectangle")); + LoadTextRect(_T("5400,5400,16200,16200")); + + } +}; +} diff --git a/MsBinaryFile/Common/ODraw/oldAutoShapes/DonutType.h b/MsBinaryFile/Common/ODraw/oldAutoShapes/DonutType.h new file mode 100644 index 0000000000..0546279172 --- /dev/null +++ b/MsBinaryFile/Common/ODraw/oldAutoShapes/DonutType.h @@ -0,0 +1,64 @@ +/* + * (c) Copyright Ascensio System SIA 2010-2019 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect + * that Ascensio System SIA expressly excludes the warranty of non-infringement + * of any third-party rights. + * + * This program is distributed WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * + */ +#pragma once +#include "../CustomShape.h" + +// 23 +namespace NSCustomShapesConvert +{ +class CDonutType : public CCustomShape +{ +public: + CDonutType() + { + m_bConcentricFill = false; + m_eJoin = ODRAW::lineJoinRound; + m_strPath = _T("m,10800qy10800,,21600,10800,10800,21600,,10800xm@0,10800qy10800@2@1,10800,10800@0@0,10800xe"); + + AddGuide(_T("val #0")); + AddGuide(_T("sum width 0 #0")); + AddGuide(_T("sum height 0 #0")); + AddGuide(_T("prod @0 2929 10000")); + AddGuide(_T("sum width 0 @3")); + AddGuide(_T("sum height 0 @3")); + + m_arAdjustments.push_back(5400); + LoadConnectorsList(_T("10800,0;3163,3163;0,10800;3163,18437;10800,21600;18437,18437;21600,10800;18437,3163")); + LoadTextRect(_T("3163,3163,18437,18437")); + + CHandle_ oHandle1; + oHandle1.position = _T("#0,center"); + oHandle1.xrange = _T("0,10800"); + m_arHandles.push_back(oHandle1); + } +}; +} diff --git a/MsBinaryFile/Common/ODraw/oldAutoShapes/DownArrowCalloutType.h b/MsBinaryFile/Common/ODraw/oldAutoShapes/DownArrowCalloutType.h new file mode 100644 index 0000000000..25f75d363d --- /dev/null +++ b/MsBinaryFile/Common/ODraw/oldAutoShapes/DownArrowCalloutType.h @@ -0,0 +1,89 @@ +/* + * (c) Copyright Ascensio System SIA 2010-2019 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect + * that Ascensio System SIA expressly excludes the warranty of non-infringement + * of any third-party rights. + * + * This program is distributed WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * + */ +#pragma once +#include "../CustomShape.h" + +// 80 +namespace NSCustomShapesConvert +{ +class CDownArrowCalloutType : public CCustomShape +{ +public: + CDownArrowCalloutType() + { + m_bConcentricFill = false; + m_eJoin = ODRAW::lineJoinMiter; + m_strPath = _T("m,l21600,,21600@0@5@0@5@2@4@2,10800,21600@1@2@3@2@3@0,0@0xe"); + + AddGuide(_T("val #0")); + AddGuide(_T("val #1")); + AddGuide(_T("val #2")); + AddGuide(_T("val #3")); + AddGuide(_T("sum 21600 0 #1")); + AddGuide(_T("sum 21600 0 #3")); + AddGuide(_T("prod #0 1 2")); + + m_arAdjustments.push_back(14400); + m_arAdjustments.push_back(5400); + m_arAdjustments.push_back(18000); + m_arAdjustments.push_back(8100); + + LoadConnectorsList(_T("10800,0;0,@6;10800,21600;21600,@6")); + + m_arConnectorAngles.push_back(270); + m_arConnectorAngles.push_back(180); + m_arConnectorAngles.push_back(90); + m_arConnectorAngles.push_back(0); + + LoadTextRect(_T("0,0,21600,@0")); + + CHandle_ oHandle1; + oHandle1.position = _T("topLeft,#0"); + oHandle1.yrange = _T("0,@2"); + m_arHandles.push_back(oHandle1); + + CHandle_ oHandle2; + oHandle2.position = _T("#1,bottomRight"); + oHandle2.xrange = _T("0,@3"); + m_arHandles.push_back(oHandle2); + + CHandle_ oHandle3; + oHandle3.position = _T("#3,#2"); + oHandle3.xrange = _T("@1,10800"); + oHandle3.yrange = _T("@0,21600"); + m_arHandles.push_back(oHandle3); + + + } +}; +} + diff --git a/MsBinaryFile/Common/ODraw/oldAutoShapes/DownArrowType.h b/MsBinaryFile/Common/ODraw/oldAutoShapes/DownArrowType.h new file mode 100644 index 0000000000..51930bd961 --- /dev/null +++ b/MsBinaryFile/Common/ODraw/oldAutoShapes/DownArrowType.h @@ -0,0 +1,75 @@ +/* + * (c) Copyright Ascensio System SIA 2010-2019 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect + * that Ascensio System SIA expressly excludes the warranty of non-infringement + * of any third-party rights. + * + * This program is distributed WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * + */ +#pragma once +#include "../CustomShape.h" + +// 67 +namespace NSCustomShapesConvert +{ +class CDownArrowType : public CCustomShape +{ +public: + CDownArrowType() + { + m_bConcentricFill = false; + m_eJoin = ODRAW::lineJoinMiter; + + m_strPath = _T("m0@0l@1@0@1,0@2,0@2@0,21600@0,10800,21600xe"); + + AddGuide(_T("val #0")); + AddGuide(_T("val #1")); + AddGuide(_T("sum height 0 #1")); + AddGuide(_T("sum 10800 0 #1")); + AddGuide(_T("sum width 0 #0")); + AddGuide(_T("prod @4 @3 10800")); + AddGuide(_T("sum width 0 @5")); + + m_arAdjustments.push_back(16200); + m_arAdjustments.push_back(5400); + + LoadConnectorsList(_T("10800,0;0,@0;10800,21600;21600,@0")); + + m_arConnectorAngles.push_back(270); + m_arConnectorAngles.push_back(180); + m_arConnectorAngles.push_back(90); + m_arConnectorAngles.push_back(0); + + LoadTextRect(_T("@1,0,@2,@6")); + + CHandle_ oHandle1; + oHandle1.position = _T("#1,#0"); + oHandle1.xrange = _T("0,10800"); + oHandle1.yrange = _T("0,21600"); + m_arHandles.push_back(oHandle1); + } +}; +} diff --git a/MsBinaryFile/Common/ODraw/oldAutoShapes/EllipseRibbon2Type.h b/MsBinaryFile/Common/ODraw/oldAutoShapes/EllipseRibbon2Type.h new file mode 100644 index 0000000000..92c494d315 --- /dev/null +++ b/MsBinaryFile/Common/ODraw/oldAutoShapes/EllipseRibbon2Type.h @@ -0,0 +1,122 @@ +/* + * (c) Copyright Ascensio System SIA 2010-2019 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect + * that Ascensio System SIA expressly excludes the warranty of non-infringement + * of any third-party rights. + * + * This program is distributed WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * + */ +#pragma once +#include "../CustomShape.h" + +// 108 +namespace NSCustomShapesConvert +{ +class CEllipceRibbon2Type : public CCustomShape +{ +public: + CEllipceRibbon2Type() + { + m_bConcentricFill = false; + m_eJoin = ODRAW::lineJoinMiter; + //Encaps: Flat + + m_strPath = _T("wr@9@34@8@35,0@24@0@23@9,0@8@11@0@22@19@22@9@34@8@35@19@23@3@24l@7@36@3@4at@9@31@8@32@3@4@18@30@9@1@8@33@18@28@17@28@9@31@8@32@17@30,0@4l@5@36xear@9@1@8@33@17@28@0@29nfl@17@30ewr@9@1@8@33@18@28@19@29nfl@18@30em@0@23nfl@0@29em@19@23nfl@19@29e"); + + AddGuide(_T("val #0")); + AddGuide(_T("val #1")); + AddGuide(_T("val #2")); + AddGuide(_T("val width")); + AddGuide(_T("val height")); + AddGuide(_T("prod width 1 8")); + AddGuide(_T("prod width 1 2")); + AddGuide(_T("prod width 7 8")); + AddGuide(_T("prod width 3 2")); + AddGuide(_T("sum 0 0 @6")); + AddGuide(_T("prod #2 30573 4096")); + AddGuide(_T("prod @10 2 1")); + AddGuide(_T("sum @10 height #2")); + AddGuide(_T("sum @10 #1 0")); + AddGuide(_T("prod #1 1 2")); + AddGuide(_T("sum @10 @14 0")); + AddGuide(_T("sum @12 0 #1")); + AddGuide(_T("sum #0 @5 0")); + AddGuide(_T("sum width 0 @17")); + AddGuide(_T("sum width 0 #0")); + AddGuide(_T("sum @6 0 #0")); + AddGuide(_T("ellipse @20 width @10")); + AddGuide(_T("sum @10 0 @21")); + AddGuide(_T("sum @22 @16 @10")); + AddGuide(_T("sum #2 @16 @10")); + AddGuide(_T("prod @10 2391 32768")); + AddGuide(_T("sum @6 0 @17")); + AddGuide(_T("ellipse @26 width @10")); + AddGuide(_T("sum @10 #1 @27")); + AddGuide(_T("sum @22 #1 0")); + AddGuide(_T("sum @12 0 @27")); + AddGuide(_T("sum height 0 #2")); + AddGuide(_T("sum @10 @12 0")); + AddGuide(_T("sum @32 @10 @16")); + AddGuide(_T("sum @31 @10 @13")); + AddGuide(_T("sum @32 @10 @13")); + AddGuide(_T("sum @25 @12 @15")); + AddGuide(_T("sum @16 0 @15")); + AddGuide(_T("prod @37 2 3")); + AddGuide(_T("sum @1 @38 0")); + AddGuide(_T("sum #2 @38 0")); + AddGuide(_T("max @40 675")); + AddGuide(_T("prod width 3 8")); + AddGuide(_T("sum @42 0 4")); + + m_arAdjustments.push_back(5400); + m_arAdjustments.push_back(16200); + m_arAdjustments.push_back(2700); + + LoadConnectorsList(_T("@6,0;@5,@36;@6,@1;@7,@36")); + LoadTextRect(_T("@0,@22,@19,@1")); + + m_arConnectorAngles.push_back(270); + m_arConnectorAngles.push_back(180); + m_arConnectorAngles.push_back(90); + m_arConnectorAngles.push_back(0); + + CHandle_ oHandle1; + oHandle1.position = _T("topLeft,#0"); + oHandle1.xrange = _T("@5,@43"); + m_arHandles.push_back(oHandle1); + + CHandle_ oHandle2; + oHandle2.position = _T("center,#1"); + oHandle2.yrange = _T("@39,@31"); + m_arHandles.push_back(oHandle2); + + CHandle_ oHandle3; + oHandle3.position = _T("topLeft,#2"); + oHandle3.yrange = _T("@41,@24 "); + m_arHandles.push_back(oHandle3); + } +}; +} diff --git a/MsBinaryFile/Common/ODraw/oldAutoShapes/EllipseRibbonType.h b/MsBinaryFile/Common/ODraw/oldAutoShapes/EllipseRibbonType.h new file mode 100644 index 0000000000..ba66e5e0aa --- /dev/null +++ b/MsBinaryFile/Common/ODraw/oldAutoShapes/EllipseRibbonType.h @@ -0,0 +1,126 @@ +/* + * (c) Copyright Ascensio System SIA 2010-2019 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect + * that Ascensio System SIA expressly excludes the warranty of non-infringement + * of any third-party rights. + * + * This program is distributed WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * + */ +#pragma once +#include "../CustomShape.h" + +// 107 +namespace NSCustomShapesConvert +{ +class CEllipceRibbonType : public CCustomShape +{ +public: + CEllipceRibbonType() + { + m_bConcentricFill = false; + m_eJoin = ODRAW::lineJoinMiter; + //Encaps: Flat + + m_strPath = _T("ar@9@38@8@37,0@27@0@26@9@13@8@4@0@25@22@25@9@38@8@37@22@26@3@27l@7@40@3,wa@9@35@8@10@3,0@21@33@9@36@8@1@21@31@20@31@9@35@8@10@20@33,,l@5@40xewr@9@36@8@1@20@31@0@32nfl@20@33ear@9@36@8@1@21@31@22@32nfl@21@33em@0@26nfl@0@32em@22@26nfl@22@32e"); + + AddGuide(_T("val #0")); + AddGuide(_T("val #1")); + AddGuide(_T("val #2")); + AddGuide(_T("val width")); + AddGuide(_T("val height")); + AddGuide(_T("prod width 1 8")); + AddGuide(_T("prod width 1 2")); + AddGuide(_T("prod width 7 8")); + AddGuide(_T("prod width 3 2")); + AddGuide(_T("sum 0 0 @6")); + AddGuide(_T("sum height 0 #2")); + AddGuide(_T("prod @10 30573 4096")); + AddGuide(_T("prod @11 2 1")); + AddGuide(_T("sum height 0 @12")); + AddGuide(_T("sum @11 #2 0")); + AddGuide(_T("sum @11 height #1")); + AddGuide(_T("sum height 0 #1")); + AddGuide(_T("prod @16 1 2")); + AddGuide(_T("sum @11 @17 0")); + AddGuide(_T("sum @14 #1 height")); + AddGuide(_T("sum #0 @5 0")); + AddGuide(_T("sum width 0 @20")); + AddGuide(_T("sum width 0 #0")); + AddGuide(_T("sum @6 0 #0")); + AddGuide(_T("ellipse @23 width @11")); + AddGuide(_T("sum @24 height @11")); + AddGuide(_T("sum @25 @11 @19")); + AddGuide(_T("sum #2 @11 @19")); + AddGuide(_T("prod @11 2391 32768")); + AddGuide(_T("sum @6 0 @20")); + AddGuide(_T("ellipse @29 width @11")); + AddGuide(_T("sum #1 @30 @11")); + AddGuide(_T("sum @25 #1 height")); + AddGuide(_T("sum height @30 @14")); + AddGuide(_T("sum @11 @14 0")); + AddGuide(_T("sum height 0 @34")); + AddGuide(_T("sum @35 @19 @11")); + AddGuide(_T("sum @10 @15 @11")); + AddGuide(_T("sum @35 @15 @11")); + AddGuide(_T("sum @28 @14 @18")); + AddGuide(_T("sum height 0 @39")); + AddGuide(_T("sum @19 0 @18")); + AddGuide(_T("prod @41 2 3")); + AddGuide(_T("sum #1 0 @42")); + AddGuide(_T("sum #2 0 @42")); + AddGuide(_T("min @44 20925")); + AddGuide(_T("prod width 3 8")); + AddGuide(_T("sum @46 0 4")); + + m_arAdjustments.push_back(5400); + m_arAdjustments.push_back(5400); + m_arAdjustments.push_back(18900); + + LoadConnectorsList(_T("@6,0;@5,@36;@6,@1;@7,@36")); + LoadTextRect(_T("@0,@22,@19,@1")); + + m_arConnectorAngles.push_back(270); + m_arConnectorAngles.push_back(180); + m_arConnectorAngles.push_back(90); + m_arConnectorAngles.push_back(0); + + CHandle_ oHandle1; + oHandle1.position = _T("#0,bottomRight"); + oHandle1.xrange = _T("@5,@47"); + m_arHandles.push_back(oHandle1); + + CHandle_ oHandle2; + oHandle2.position = _T("center,#1"); + oHandle2.yrange = _T("@10,@43"); + m_arHandles.push_back(oHandle2); + + CHandle_ oHandle3; + oHandle3.position = _T("topLeft,#2"); + oHandle3.yrange = _T("@27,@45"); + m_arHandles.push_back(oHandle3); + } +}; +} diff --git a/MsBinaryFile/Common/ODraw/oldAutoShapes/EllipseType.h b/MsBinaryFile/Common/ODraw/oldAutoShapes/EllipseType.h new file mode 100644 index 0000000000..fcae53196c --- /dev/null +++ b/MsBinaryFile/Common/ODraw/oldAutoShapes/EllipseType.h @@ -0,0 +1,50 @@ +/* + * (c) Copyright Ascensio System SIA 2010-2019 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect + * that Ascensio System SIA expressly excludes the warranty of non-infringement + * of any third-party rights. + * + * This program is distributed WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * + */ +#pragma once +#include "../CustomShape.h" + +// 3 +namespace NSCustomShapesConvert +{ +class CEllipseType : public CCustomShape +{ +public: + CEllipseType() + + { + m_bConcentricFill = true; + m_eJoin = ODRAW::lineJoinMiter; + m_strPath = _T("m,10800qy10800,,21600,10800,10800,21600,,10800xe"); + LoadTextRect(_T("3233,3233,18367,18367")); + } +}; +} \ No newline at end of file diff --git a/MsBinaryFile/Common/ODraw/oldAutoShapes/FlowChartAlternateProcessType.h b/MsBinaryFile/Common/ODraw/oldAutoShapes/FlowChartAlternateProcessType.h new file mode 100644 index 0000000000..e88a660269 --- /dev/null +++ b/MsBinaryFile/Common/ODraw/oldAutoShapes/FlowChartAlternateProcessType.h @@ -0,0 +1,69 @@ +/* + * (c) Copyright Ascensio System SIA 2010-2019 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect + * that Ascensio System SIA expressly excludes the warranty of non-infringement + * of any third-party rights. + * + * This program is distributed WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * + */ +#pragma once +#include "../CustomShape.h" + +// 176 +namespace NSCustomShapesConvert +{ +class CFlowChartAlternateProcessType : public CCustomShape +{ +public: + CFlowChartAlternateProcessType() + + { + m_bConcentricFill = true; + m_eJoin = ODRAW::lineJoinMiter; + + m_strPath = _T("m@0,qx0@0l0@2qy@0,21600l@1,21600qx21600@2l21600@0qy@1,xe"); + + AddGuide(_T("val #0")); + AddGuide(_T("sum width 0 #0")); + AddGuide(_T("sum height 0 #0")); + AddGuide(_T("prod @0 2929 10000")); + AddGuide(_T("sum width 0 @3")); + AddGuide(_T("sum height 0 @3")); + AddGuide(_T("val width")); + AddGuide(_T("val height")); + AddGuide(_T("prod width 1 2")); + AddGuide(_T("prod height 1 2")); + + m_arAdjustments.push_back(2700); + + LoadConnectorsList(_T("@8,0;0,@9;@8,@7;@6,@9")); + LoadTextRect(_T("@3,@3,@4,@5")); + + m_lLimoX = 10800; + m_lLimoY = 10800; + } +}; +} \ No newline at end of file diff --git a/MsBinaryFile/Common/ODraw/oldAutoShapes/FlowChartCollateType.h b/MsBinaryFile/Common/ODraw/oldAutoShapes/FlowChartCollateType.h new file mode 100644 index 0000000000..35fc59c044 --- /dev/null +++ b/MsBinaryFile/Common/ODraw/oldAutoShapes/FlowChartCollateType.h @@ -0,0 +1,52 @@ +/* + * (c) Copyright Ascensio System SIA 2010-2019 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect + * that Ascensio System SIA expressly excludes the warranty of non-infringement + * of any third-party rights. + * + * This program is distributed WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * + */ +#pragma once +#include "../CustomShape.h" + +// 125 +namespace NSCustomShapesConvert +{ +class CFlowChartCollateType : public CCustomShape +{ +public: + CFlowChartCollateType() + + { + m_bConcentricFill = true; + m_eJoin = ODRAW::lineJoinMiter; + m_strPath = _T("m21600,21600l,21600,21600,,,xe"); + LoadConnectorsList(_T("10800,0;10800,10800;10800,21600")); + LoadTextRect(_T("5400,5400,16200,16200")); + } +}; + +} diff --git a/MsBinaryFile/Common/ODraw/oldAutoShapes/FlowChartConnectorType.h b/MsBinaryFile/Common/ODraw/oldAutoShapes/FlowChartConnectorType.h new file mode 100644 index 0000000000..fa5761fb29 --- /dev/null +++ b/MsBinaryFile/Common/ODraw/oldAutoShapes/FlowChartConnectorType.h @@ -0,0 +1,54 @@ +/* + * (c) Copyright Ascensio System SIA 2010-2019 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect + * that Ascensio System SIA expressly excludes the warranty of non-infringement + * of any third-party rights. + * + * This program is distributed WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * + */ +#pragma once +#include "../CustomShape.h" + +// 120 +namespace NSCustomShapesConvert +{ +class CFlowChartConnectorType : public CCustomShape +{ +public: + CFlowChartConnectorType() + + { + m_bConcentricFill = true; + + m_eJoin = ODRAW::lineJoinRound; + + m_strPath = _T("m10800,qx,10800,10800,21600,21600,10800,10800,xe"); + + LoadConnectorsList(_T("10800,0;3163,3163;0,10800;3163,18437;10800,21600;18437,18437;21600,10800;18437,3163")); + LoadTextRect(_T("3163,3163,18437,18437")); + } +}; +} diff --git a/MsBinaryFile/Common/ODraw/oldAutoShapes/FlowChartDecisionType.h b/MsBinaryFile/Common/ODraw/oldAutoShapes/FlowChartDecisionType.h new file mode 100644 index 0000000000..7dc1eb97c1 --- /dev/null +++ b/MsBinaryFile/Common/ODraw/oldAutoShapes/FlowChartDecisionType.h @@ -0,0 +1,54 @@ +/* + * (c) Copyright Ascensio System SIA 2010-2019 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect + * that Ascensio System SIA expressly excludes the warranty of non-infringement + * of any third-party rights. + * + * This program is distributed WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * + */ +#pragma once +#include "../CustomShape.h" + +// 110 +namespace NSCustomShapesConvert +{ +class CFlowChartDecisionType : public CCustomShape +{ +public: + CFlowChartDecisionType() + + { + m_bConcentricFill = true; + + m_eJoin = ODRAW::lineJoinMiter; + + m_strPath = _T("m10800,l,10800,10800,21600,21600,10800xe"); + + LoadConnectorsList(_T("Rectangle")); + LoadTextRect(_T("5400,5400,16200,16200")); + } +}; +} \ No newline at end of file diff --git a/MsBinaryFile/Common/ODraw/oldAutoShapes/FlowChartDelayType.h b/MsBinaryFile/Common/ODraw/oldAutoShapes/FlowChartDelayType.h new file mode 100644 index 0000000000..c7a0c82bef --- /dev/null +++ b/MsBinaryFile/Common/ODraw/oldAutoShapes/FlowChartDelayType.h @@ -0,0 +1,52 @@ +/* + * (c) Copyright Ascensio System SIA 2010-2019 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect + * that Ascensio System SIA expressly excludes the warranty of non-infringement + * of any third-party rights. + * + * This program is distributed WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * + */ +#pragma once +#include "../CustomShape.h" + +// 135 +namespace NSCustomShapesConvert +{ +class CFlowChartDelayType : public CCustomShape +{ +public: + CFlowChartDelayType() + + { + m_bConcentricFill = true; + m_eJoin = ODRAW::lineJoinMiter; + m_strPath = _T("m10800,qx21600,10800,10800,21600l,21600,,xe"); + LoadConnectorsList(_T("Rectangle")); + LoadTextRect(_T("0,3163,18437,18437")); + } +}; +} + diff --git a/MsBinaryFile/Common/ODraw/oldAutoShapes/FlowChartDisplayType.h b/MsBinaryFile/Common/ODraw/oldAutoShapes/FlowChartDisplayType.h new file mode 100644 index 0000000000..4de9b590ec --- /dev/null +++ b/MsBinaryFile/Common/ODraw/oldAutoShapes/FlowChartDisplayType.h @@ -0,0 +1,52 @@ +/* + * (c) Copyright Ascensio System SIA 2010-2019 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect + * that Ascensio System SIA expressly excludes the warranty of non-infringement + * of any third-party rights. + * + * This program is distributed WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * + */ +#pragma once +#include "../CustomShape.h" + +// 134 +namespace NSCustomShapesConvert +{ +class CFlowChartDisplayType : public CCustomShape +{ +public: + CFlowChartDisplayType() + + { + m_bConcentricFill = true; + m_eJoin = ODRAW::lineJoinMiter; + m_strPath = _T("m17955,v862,282,1877,1410,2477,3045c21035,5357,21372,7895,21597,10827v-225,2763,-562,5300,-1165,7613c19832,20132,18817,21260,17955,21597r-14388,l,10827,3567,xe"); + LoadConnectorsList(_T("Rectangle")); + LoadTextRect(_T("3567,0,17955,21600")); + } +}; +} + diff --git a/MsBinaryFile/Common/ODraw/oldAutoShapes/FlowChartDocumentType.h b/MsBinaryFile/Common/ODraw/oldAutoShapes/FlowChartDocumentType.h new file mode 100644 index 0000000000..541271c18e --- /dev/null +++ b/MsBinaryFile/Common/ODraw/oldAutoShapes/FlowChartDocumentType.h @@ -0,0 +1,53 @@ +/* + * (c) Copyright Ascensio System SIA 2010-2019 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect + * that Ascensio System SIA expressly excludes the warranty of non-infringement + * of any third-party rights. + * + * This program is distributed WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * + */ +#pragma once +#include "../CustomShape.h" + +//114 +namespace NSCustomShapesConvert +{ +class CFlowChartDocumentType : public CCustomShape +{ +public: + CFlowChartDocumentType() + + { + m_bConcentricFill = false; + m_eJoin = ODRAW::lineJoinMiter; + + m_strPath = _T("m,20172v945,400,1887,628,2795,913c3587,21312,4342,21370,5060,21597v2037,,2567,-227,3095,-285c8722,21197,9325,20970,9855,20800v490,-228,945,-400,1472,-740c11817,19887,12347,19660,12875,19375v567,-228,1095,-513,1700,-740c15177,18462,15782,18122,16537,17950v718,-113,1398,-398,2228,-513c19635,17437,20577,17322,21597,17322l21597,,,xe"); + + LoadConnectorsList(_T("10800,0;0,10800;10800,20400;21600,10800")); + LoadTextRect(_T("0,0,21600,17322")); + } +}; +} \ No newline at end of file diff --git a/MsBinaryFile/Common/ODraw/oldAutoShapes/FlowChartExtractType.h b/MsBinaryFile/Common/ODraw/oldAutoShapes/FlowChartExtractType.h new file mode 100644 index 0000000000..00c910351c --- /dev/null +++ b/MsBinaryFile/Common/ODraw/oldAutoShapes/FlowChartExtractType.h @@ -0,0 +1,51 @@ +/* + * (c) Copyright Ascensio System SIA 2010-2019 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect + * that Ascensio System SIA expressly excludes the warranty of non-infringement + * of any third-party rights. + * + * This program is distributed WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * + */ +#pragma once +#include "../CustomShape.h" + +// 127 +namespace NSCustomShapesConvert +{ +class CFlowChartExtractType : public CCustomShape +{ +public: + CFlowChartExtractType() + + { + m_bConcentricFill = true; + m_eJoin = ODRAW::lineJoinMiter; + m_strPath = _T("m10800,l21600,21600,,21600xe"); + LoadConnectorsList(_T("10800,0;5400,10800;10800,21600;16200,10800")); + LoadTextRect(_T("5400,10800,16200,21600")); + } +}; +} \ No newline at end of file diff --git a/MsBinaryFile/Common/ODraw/oldAutoShapes/FlowChartInputOutputType.h b/MsBinaryFile/Common/ODraw/oldAutoShapes/FlowChartInputOutputType.h new file mode 100644 index 0000000000..e66dc0b98c --- /dev/null +++ b/MsBinaryFile/Common/ODraw/oldAutoShapes/FlowChartInputOutputType.h @@ -0,0 +1,54 @@ +/* + * (c) Copyright Ascensio System SIA 2010-2019 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect + * that Ascensio System SIA expressly excludes the warranty of non-infringement + * of any third-party rights. + * + * This program is distributed WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * + */ +#pragma once +#include "../CustomShape.h" + +// 111 +namespace NSCustomShapesConvert +{ +class CFlowChartInputOutputType : public CCustomShape +{ +public: + CFlowChartInputOutputType() + + { + m_bConcentricFill = true; + + m_eJoin = ODRAW::lineJoinMiter; + + m_strPath = _T("m4321,l21600,,17204,21600,,21600xe"); + + LoadConnectorsList(_T("2961,0;10800,0;2161,10800;8602,21600;10800,21600;19402,10800")); + LoadTextRect(_T("4321,0,17204,21600")); + } +}; +} diff --git a/MsBinaryFile/Common/ODraw/oldAutoShapes/FlowChartInternalStorageType.h b/MsBinaryFile/Common/ODraw/oldAutoShapes/FlowChartInternalStorageType.h new file mode 100644 index 0000000000..61307ee9e6 --- /dev/null +++ b/MsBinaryFile/Common/ODraw/oldAutoShapes/FlowChartInternalStorageType.h @@ -0,0 +1,54 @@ +/* + * (c) Copyright Ascensio System SIA 2010-2019 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect + * that Ascensio System SIA expressly excludes the warranty of non-infringement + * of any third-party rights. + * + * This program is distributed WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * + */ +#pragma once +#include "../CustomShape.h" + +// 113 +namespace NSCustomShapesConvert +{ +class CFlowChartInternalStorageType : public CCustomShape +{ +public: + CFlowChartInternalStorageType() + + { + m_bConcentricFill = true; + + m_eJoin = ODRAW::lineJoinMiter; + + m_strPath = _T("m,l,21600r21600,l21600,xem4236,nfl4236,21600em,4236nfl21600,4236e"); + + LoadConnectorsList(_T("Rectangle")); + LoadTextRect(_T("4236,4236,21600,21600")); + } +}; +} \ No newline at end of file diff --git a/MsBinaryFile/Common/ODraw/oldAutoShapes/FlowChartMagneticDiskType.h b/MsBinaryFile/Common/ODraw/oldAutoShapes/FlowChartMagneticDiskType.h new file mode 100644 index 0000000000..a06c886035 --- /dev/null +++ b/MsBinaryFile/Common/ODraw/oldAutoShapes/FlowChartMagneticDiskType.h @@ -0,0 +1,59 @@ +/* + * (c) Copyright Ascensio System SIA 2010-2019 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect + * that Ascensio System SIA expressly excludes the warranty of non-infringement + * of any third-party rights. + * + * This program is distributed WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * + */ +#pragma once +#include "../CustomShape.h" + +// 132 +namespace NSCustomShapesConvert +{ +class CFlowChartMagneticDiskType : public CCustomShape +{ +public: + CFlowChartMagneticDiskType() + + { + m_bConcentricFill = true; + m_eJoin = ODRAW::lineJoinMiter; + m_strPath = _T("m10800,qx,3391l,18209qy10800,21600,21600,18209l21600,3391qy10800,xem,3391nfqy10800,6782,21600,3391e"); + LoadConnectorsList(_T("10800,6782;10800,0;0,10800;10800,21600;21600,10800")); + + m_arConnectorAngles.push_back(270); + m_arConnectorAngles.push_back(270); + m_arConnectorAngles.push_back(180); + m_arConnectorAngles.push_back(90); + m_arConnectorAngles.push_back(0); + + LoadTextRect(_T("0,6782,21600,18209")); + } +}; +} + diff --git a/MsBinaryFile/Common/ODraw/oldAutoShapes/FlowChartMagneticDrumType.h b/MsBinaryFile/Common/ODraw/oldAutoShapes/FlowChartMagneticDrumType.h new file mode 100644 index 0000000000..5234cc0e8e --- /dev/null +++ b/MsBinaryFile/Common/ODraw/oldAutoShapes/FlowChartMagneticDrumType.h @@ -0,0 +1,60 @@ +/* + * (c) Copyright Ascensio System SIA 2010-2019 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect + * that Ascensio System SIA expressly excludes the warranty of non-infringement + * of any third-party rights. + * + * This program is distributed WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * + */ +#pragma once +#include "../CustomShape.h" + +// 133 +namespace NSCustomShapesConvert +{ +class CFlowChartMagneticDrumType : public CCustomShape +{ +public: + CFlowChartMagneticDrumType() + + { + m_bConcentricFill = true; + m_eJoin = ODRAW::lineJoinMiter; + m_strPath = _T("m21600,10800qy18019,21600l3581,21600qx,10800,3581,l18019,qx21600,10800xem18019,21600nfqx14438,10800,18019,e"); + LoadConnectorsList(_T("10800,0;0,10800;10800,21600;14438,10800;21600,10800")); + + m_arConnectorAngles.push_back(270); + m_arConnectorAngles.push_back(180); + m_arConnectorAngles.push_back(90); + m_arConnectorAngles.push_back(0); + m_arConnectorAngles.push_back(0); + + LoadTextRect(_T("3581,0,14438,21600")); + } +}; +} + + diff --git a/MsBinaryFile/Common/ODraw/oldAutoShapes/FlowChartMagneticTapeType.h b/MsBinaryFile/Common/ODraw/oldAutoShapes/FlowChartMagneticTapeType.h new file mode 100644 index 0000000000..e13852f406 --- /dev/null +++ b/MsBinaryFile/Common/ODraw/oldAutoShapes/FlowChartMagneticTapeType.h @@ -0,0 +1,53 @@ +/* + * (c) Copyright Ascensio System SIA 2010-2019 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect + * that Ascensio System SIA expressly excludes the warranty of non-infringement + * of any third-party rights. + * + * This program is distributed WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * + */ +#pragma once +#include "../CustomShape.h" + +// 131 +namespace NSCustomShapesConvert +{ +class CFlowChartMagneticTapeType : public CCustomShape +{ +public: + CFlowChartMagneticTapeType() + + { + m_bConcentricFill = true; + m_eJoin = ODRAW::lineJoinMiter; + m_strPath = _T("ar,,21600,21600,18685,18165,10677,21597l20990,21597r,-3432xe"); + LoadConnectorsList(_T("Rectangle")); + LoadTextRect(_T("3163,3163,18437,18437")); + } +}; +} + + diff --git a/MsBinaryFile/Common/ODraw/oldAutoShapes/FlowChartManualInputType.h b/MsBinaryFile/Common/ODraw/oldAutoShapes/FlowChartManualInputType.h new file mode 100644 index 0000000000..c619b57156 --- /dev/null +++ b/MsBinaryFile/Common/ODraw/oldAutoShapes/FlowChartManualInputType.h @@ -0,0 +1,54 @@ +/* + * (c) Copyright Ascensio System SIA 2010-2019 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect + * that Ascensio System SIA expressly excludes the warranty of non-infringement + * of any third-party rights. + * + * This program is distributed WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * + */ +#pragma once +#include "../CustomShape.h" + +// 118 +namespace NSCustomShapesConvert +{ +class CFlowChartManualInputType : public CCustomShape +{ +public: + CFlowChartManualInputType() + + { + m_bConcentricFill = true; + m_eJoin = ODRAW::lineJoinMiter; + + m_strPath = _T("m,4292l21600,r,21600l,21600xe"); + + LoadConnectorsList(_T("10800,2146;0,10800;10800,21600;21600,10800")); + LoadTextRect(_T("0,4291,21600,21600")); + + } +}; +} \ No newline at end of file diff --git a/MsBinaryFile/Common/ODraw/oldAutoShapes/FlowChartManualOperationType.h b/MsBinaryFile/Common/ODraw/oldAutoShapes/FlowChartManualOperationType.h new file mode 100644 index 0000000000..8005c2de04 --- /dev/null +++ b/MsBinaryFile/Common/ODraw/oldAutoShapes/FlowChartManualOperationType.h @@ -0,0 +1,53 @@ +/* + * (c) Copyright Ascensio System SIA 2010-2019 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect + * that Ascensio System SIA expressly excludes the warranty of non-infringement + * of any third-party rights. + * + * This program is distributed WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * + */ +#pragma once +#include "../CustomShape.h" + +// 119 +namespace NSCustomShapesConvert +{ +class CFlowChartManualOperationType : public CCustomShape +{ +public: + CFlowChartManualOperationType() + + { + m_bConcentricFill = true; + m_eJoin = ODRAW::lineJoinMiter; + + m_strPath = _T("m,l21600,,17240,21600r-12880,xe"); + + LoadConnectorsList(_T("10800,0;2180,10800;10800,21600;19420,10800")); + LoadTextRect(_T("4321,0,17204,21600")); + } +}; +} \ No newline at end of file diff --git a/MsBinaryFile/Common/ODraw/oldAutoShapes/FlowChartMergeType.h b/MsBinaryFile/Common/ODraw/oldAutoShapes/FlowChartMergeType.h new file mode 100644 index 0000000000..677587be6f --- /dev/null +++ b/MsBinaryFile/Common/ODraw/oldAutoShapes/FlowChartMergeType.h @@ -0,0 +1,53 @@ +/* + * (c) Copyright Ascensio System SIA 2010-2019 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect + * that Ascensio System SIA expressly excludes the warranty of non-infringement + * of any third-party rights. + * + * This program is distributed WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * + */ +#pragma once +#include "../CustomShape.h" + +// 128 +namespace NSCustomShapesConvert +{ +class CFlowChartMergeType : public CCustomShape +{ +public: + CFlowChartMergeType() + + { + m_bConcentricFill = true; + m_eJoin = ODRAW::lineJoinMiter; + m_strPath = _T("m,l21600,,10800,21600xe"); + LoadConnectorsList(_T("10800,0;5400,10800;10800,21600;16200,10800")); + LoadTextRect(_T("5400,0,16200,10800")); + } +}; +} + + diff --git a/MsBinaryFile/Common/ODraw/oldAutoShapes/FlowChartMultidocumentType.h b/MsBinaryFile/Common/ODraw/oldAutoShapes/FlowChartMultidocumentType.h new file mode 100644 index 0000000000..f7fa7800cd --- /dev/null +++ b/MsBinaryFile/Common/ODraw/oldAutoShapes/FlowChartMultidocumentType.h @@ -0,0 +1,53 @@ +/* + * (c) Copyright Ascensio System SIA 2010-2019 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect + * that Ascensio System SIA expressly excludes the warranty of non-infringement + * of any third-party rights. + * + * This program is distributed WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * + */ +#pragma once +#include "../CustomShape.h" + +// 115 +namespace NSCustomShapesConvert +{ +class CFlowChartMultidocumentType : public CCustomShape +{ +public: + CFlowChartMultidocumentType() + + { + m_bConcentricFill = false; + m_eJoin = ODRAW::lineJoinMiter; + + m_strPath = _T("m,20465v810,317,1620,452,2397,725c3077,21325,3790,21417,4405,21597v1620,,2202,-180,2657,-272c7580,21280,8002,21010,8455,20917v422,-135,810,-405,1327,-542c10205,20150,10657,19967,11080,19742v517,-182,970,-407,1425,-590c13087,19017,13605,18745,14255,18610v615,-180,1262,-318,1942,-408c16975,18202,17785,18022,18595,18022r,-1670l19192,16252r808,l20000,14467r722,-75l21597,14392,21597,,2972,r,1815l1532,1815r,1860l,3675,,20465xem1532,3675nfl18595,3675r,12677em2972,1815nfl20000,1815r,12652e"); + + LoadConnectorsList(_T("10800,0;0,10800;10800,19890;21600,10800")); + LoadTextRect(_T("0,3675,18595,18022")); + } +}; +} \ No newline at end of file diff --git a/MsBinaryFile/Common/ODraw/oldAutoShapes/FlowChartOffpageConnectorType.h b/MsBinaryFile/Common/ODraw/oldAutoShapes/FlowChartOffpageConnectorType.h new file mode 100644 index 0000000000..670d1def8b --- /dev/null +++ b/MsBinaryFile/Common/ODraw/oldAutoShapes/FlowChartOffpageConnectorType.h @@ -0,0 +1,52 @@ +/* + * (c) Copyright Ascensio System SIA 2010-2019 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect + * that Ascensio System SIA expressly excludes the warranty of non-infringement + * of any third-party rights. + * + * This program is distributed WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * + */ +#pragma once +#include "../CustomShape.h" + +// 177 +namespace NSCustomShapesConvert +{ +class CFlowChartOffpageConnectorType : public CCustomShape +{ +public: + CFlowChartOffpageConnectorType() + + { + m_bConcentricFill = true; + m_eJoin = ODRAW::lineJoinMiter; + m_strPath = _T("m,l21600,r,17255l10800,21600,,17255xe"); + LoadConnectorsList(_T("Rectangle")); + LoadTextRect(_T("0,0,21600,17255")); + } +}; + +} \ No newline at end of file diff --git a/MsBinaryFile/Common/ODraw/oldAutoShapes/FlowChartOnlineStorageType.h b/MsBinaryFile/Common/ODraw/oldAutoShapes/FlowChartOnlineStorageType.h new file mode 100644 index 0000000000..d31d896271 --- /dev/null +++ b/MsBinaryFile/Common/ODraw/oldAutoShapes/FlowChartOnlineStorageType.h @@ -0,0 +1,52 @@ +/* + * (c) Copyright Ascensio System SIA 2010-2019 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect + * that Ascensio System SIA expressly excludes the warranty of non-infringement + * of any third-party rights. + * + * This program is distributed WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * + */ +#pragma once +#include "../CustomShape.h" + +// 130 +namespace NSCustomShapesConvert +{ +class CFlowChartOnlineStorageType : public CCustomShape +{ +public: + CFlowChartOnlineStorageType() + + { + m_bConcentricFill = true; + m_eJoin = ODRAW::lineJoinMiter; + m_strPath = _T("m3600,21597c2662,21202,1837,20075,1087,18440,487,16240,75,13590,,10770,75,8007,487,5412,1087,3045,1837,1465,2662,337,3600,l21597,v-937,337,-1687,1465,-2512,3045c18485,5412,18072,8007,17997,10770v75,2820,488,5470,1088,7670c19910,20075,20660,21202,21597,21597xe"); + LoadConnectorsList(_T("10800,0;0,10800;10800,21600;17997,10800")); + LoadTextRect(_T("3600,0,17997,21600")); + } +}; +} + diff --git a/MsBinaryFile/Common/ODraw/oldAutoShapes/FlowChartOrType.h b/MsBinaryFile/Common/ODraw/oldAutoShapes/FlowChartOrType.h new file mode 100644 index 0000000000..26aec947af --- /dev/null +++ b/MsBinaryFile/Common/ODraw/oldAutoShapes/FlowChartOrType.h @@ -0,0 +1,53 @@ +/* + * (c) Copyright Ascensio System SIA 2010-2019 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect + * that Ascensio System SIA expressly excludes the warranty of non-infringement + * of any third-party rights. + * + * This program is distributed WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * + */ +#pragma once +#include "../CustomShape.h" + +// 124 +namespace NSCustomShapesConvert +{ +class CFlowChartOrType : public CCustomShape +{ +public: + CFlowChartOrType() + + { + m_bConcentricFill = true; + m_eJoin = ODRAW::lineJoinMiter; + m_strPath = _T("m10800,qx,10800,10800,21600,21600,10800,10800,xem,10800nfl21600,10800em10800,nfl10800,21600e"); + LoadConnectorsList(_T("10800,0;3163,3163;0,10800;3163,18437;10800,21600;18437,18437;21600,10800;18437,3163")); + LoadTextRect(_T("3163,3163,18437,18437")); + } +}; + + +} \ No newline at end of file diff --git a/MsBinaryFile/Common/ODraw/oldAutoShapes/FlowChartPredefinedProcessType.h b/MsBinaryFile/Common/ODraw/oldAutoShapes/FlowChartPredefinedProcessType.h new file mode 100644 index 0000000000..0f97e6be1c --- /dev/null +++ b/MsBinaryFile/Common/ODraw/oldAutoShapes/FlowChartPredefinedProcessType.h @@ -0,0 +1,53 @@ +/* + * (c) Copyright Ascensio System SIA 2010-2019 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect + * that Ascensio System SIA expressly excludes the warranty of non-infringement + * of any third-party rights. + * + * This program is distributed WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * + */ +#pragma once +#include "../CustomShape.h" + +// 112 +namespace NSCustomShapesConvert +{ +class CFlowChartPredefinedProcessType : public CCustomShape +{ +public: + CFlowChartPredefinedProcessType() + + { + m_bConcentricFill = true; + m_eJoin = ODRAW::lineJoinMiter; + + m_strPath = _T("m,l,21600r21600,l21600,xem2610,nfl2610,21600em18990,nfl18990,21600e"); + + LoadConnectorsList(_T("Rectangle")); + LoadTextRect(_T("2610,0,18990,21600")); + } +}; +} \ No newline at end of file diff --git a/MsBinaryFile/Common/ODraw/oldAutoShapes/FlowChartPreparationType.h b/MsBinaryFile/Common/ODraw/oldAutoShapes/FlowChartPreparationType.h new file mode 100644 index 0000000000..92e63654cd --- /dev/null +++ b/MsBinaryFile/Common/ODraw/oldAutoShapes/FlowChartPreparationType.h @@ -0,0 +1,53 @@ +/* + * (c) Copyright Ascensio System SIA 2010-2019 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect + * that Ascensio System SIA expressly excludes the warranty of non-infringement + * of any third-party rights. + * + * This program is distributed WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * + */ +#pragma once +#include "../CustomShape.h" + +// 117 +namespace NSCustomShapesConvert +{ +class CFlowChartPreparationType : public CCustomShape +{ +public: + CFlowChartPreparationType() + + { + m_bConcentricFill = true; + m_eJoin = ODRAW::lineJoinMiter; + + m_strPath = _T("m4353,l17214,r4386,10800l17214,21600r-12861,l,10800xe"); + + LoadConnectorsList(_T("Rectangle")); + LoadTextRect(_T("4353,0,17214,21600")); + } +}; +} \ No newline at end of file diff --git a/MsBinaryFile/Common/ODraw/oldAutoShapes/FlowChartProcessType.h b/MsBinaryFile/Common/ODraw/oldAutoShapes/FlowChartProcessType.h new file mode 100644 index 0000000000..931584a8ba --- /dev/null +++ b/MsBinaryFile/Common/ODraw/oldAutoShapes/FlowChartProcessType.h @@ -0,0 +1,51 @@ +/* + * (c) Copyright Ascensio System SIA 2010-2019 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect + * that Ascensio System SIA expressly excludes the warranty of non-infringement + * of any third-party rights. + * + * This program is distributed WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * + */ +#pragma once +#include "../CustomShape.h" + +// 109 +namespace NSCustomShapesConvert +{ +class CFlowChartProcessType : public CCustomShape +{ +public: + CFlowChartProcessType() + + { + m_bConcentricFill = true; + m_eJoin = ODRAW::lineJoinMiter; + + m_strPath = _T("m,l,21600r21600,l21600,xe"); + LoadConnectorsList(_T("Rectangle")); + } +}; +} \ No newline at end of file diff --git a/MsBinaryFile/Common/ODraw/oldAutoShapes/FlowChartPunchedCardType.h b/MsBinaryFile/Common/ODraw/oldAutoShapes/FlowChartPunchedCardType.h new file mode 100644 index 0000000000..504c81863e --- /dev/null +++ b/MsBinaryFile/Common/ODraw/oldAutoShapes/FlowChartPunchedCardType.h @@ -0,0 +1,52 @@ +/* + * (c) Copyright Ascensio System SIA 2010-2019 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect + * that Ascensio System SIA expressly excludes the warranty of non-infringement + * of any third-party rights. + * + * This program is distributed WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * + */ +#pragma once +#include "../CustomShape.h" + +// 121 +namespace NSCustomShapesConvert +{ +class CFlowChartPunchedCardType : public CCustomShape +{ +public: + CFlowChartPunchedCardType() + + { + m_bConcentricFill = true; + m_eJoin = ODRAW::lineJoinMiter; + m_strPath = _T("m4321,l21600,r,21600l,21600,,4338xe"); + LoadConnectorsList(_T("Rectangle")); + LoadTextRect(_T("0,4321,21600,21600")); + } +}; + +} diff --git a/MsBinaryFile/Common/ODraw/oldAutoShapes/FlowChartPunchedTapeType.h b/MsBinaryFile/Common/ODraw/oldAutoShapes/FlowChartPunchedTapeType.h new file mode 100644 index 0000000000..62c4c533f5 --- /dev/null +++ b/MsBinaryFile/Common/ODraw/oldAutoShapes/FlowChartPunchedTapeType.h @@ -0,0 +1,52 @@ +/* + * (c) Copyright Ascensio System SIA 2010-2019 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect + * that Ascensio System SIA expressly excludes the warranty of non-infringement + * of any third-party rights. + * + * This program is distributed WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * + */ +#pragma once +#include "../CustomShape.h" + +// 122 +namespace NSCustomShapesConvert +{ +class CFlowChartPunchedTapeType : public CCustomShape +{ +public: + CFlowChartPunchedTapeType() + + { + m_bConcentricFill = false; + m_eJoin = ODRAW::lineJoinMiter; + m_strPath = _T("m21597,19450v-225,-558,-750,-1073,-1650,-1545c18897,17605,17585,17347,16197,17260v-1500,87,-2700,345,-3787,645c11472,18377,10910,18892,10800,19450v-188,515,-750,1075,-1613,1460c8100,21210,6825,21425,5400,21597,3937,21425,2700,21210,1612,20910,675,20525,150,19965,,19450l,2147v150,558,675,1073,1612,1460c2700,3950,3937,4165,5400,4337,6825,4165,8100,3950,9187,3607v863,-387,1425,-902,1613,-1460c10910,1632,11472,1072,12410,600,13497,300,14697,85,16197,v1388,85,2700,300,3750,600c20847,1072,21372,1632,21597,2147xe"); + LoadConnectorsList(_T("10800,2147;0,10800;10800,19450;21600,10800")); + LoadTextRect(_T("0,4337,21600,17260")); + } +}; +} + diff --git a/MsBinaryFile/Common/ODraw/oldAutoShapes/FlowChartSortType.h b/MsBinaryFile/Common/ODraw/oldAutoShapes/FlowChartSortType.h new file mode 100644 index 0000000000..b20437407f --- /dev/null +++ b/MsBinaryFile/Common/ODraw/oldAutoShapes/FlowChartSortType.h @@ -0,0 +1,52 @@ +/* + * (c) Copyright Ascensio System SIA 2010-2019 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect + * that Ascensio System SIA expressly excludes the warranty of non-infringement + * of any third-party rights. + * + * This program is distributed WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * + */ +#pragma once +#include "../CustomShape.h" + +// 126 +namespace NSCustomShapesConvert +{ +class CFlowChartSortType : public CCustomShape +{ +public: + CFlowChartSortType() + + { + m_bConcentricFill = true; + m_eJoin = ODRAW::lineJoinMiter; + m_strPath = _T("m10800,l,10800,10800,21600,21600,10800xem,10800nfl21600,10800e"); + LoadConnectorsList(_T("Rectangle")); + LoadTextRect(_T("5400,5400,16200,16200")); + } +}; +} + diff --git a/MsBinaryFile/Common/ODraw/oldAutoShapes/FlowChartSummingJunctionType.h b/MsBinaryFile/Common/ODraw/oldAutoShapes/FlowChartSummingJunctionType.h new file mode 100644 index 0000000000..6fcb4d2a33 --- /dev/null +++ b/MsBinaryFile/Common/ODraw/oldAutoShapes/FlowChartSummingJunctionType.h @@ -0,0 +1,52 @@ +/* + * (c) Copyright Ascensio System SIA 2010-2019 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect + * that Ascensio System SIA expressly excludes the warranty of non-infringement + * of any third-party rights. + * + * This program is distributed WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * + */ +#pragma once +#include "../CustomShape.h" + +// 123 +namespace NSCustomShapesConvert +{ +class CFlowChartSummingJunctionType : public CCustomShape +{ +public: + CFlowChartSummingJunctionType() + + { + m_bConcentricFill = false; + m_eJoin = ODRAW::lineJoinMiter; + m_strPath = _T("m10800,qx,10800,10800,21600,21600,10800,10800,xem3163,3163nfl18437,18437em3163,18437nfl18437,3163e"); + LoadConnectorsList(_T("10800,0;3163,3163;0,10800;3163,18437;10800,21600;18437,18437;21600,10800;18437,3163")); + LoadTextRect(_T("3163,3163,18437,18437")); + } +}; +} + diff --git a/MsBinaryFile/Common/ODraw/oldAutoShapes/FlowChartTerminatorType.h b/MsBinaryFile/Common/ODraw/oldAutoShapes/FlowChartTerminatorType.h new file mode 100644 index 0000000000..27a5a22638 --- /dev/null +++ b/MsBinaryFile/Common/ODraw/oldAutoShapes/FlowChartTerminatorType.h @@ -0,0 +1,53 @@ +/* + * (c) Copyright Ascensio System SIA 2010-2019 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect + * that Ascensio System SIA expressly excludes the warranty of non-infringement + * of any third-party rights. + * + * This program is distributed WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * + */ +#pragma once +#include "../CustomShape.h" + +// 116 +namespace NSCustomShapesConvert +{ +class CFlowChartTerminatorType : public CCustomShape +{ +public: + CFlowChartTerminatorType() + + { + m_bConcentricFill = true; + m_eJoin = ODRAW::lineJoinRound; + + m_strPath = _T("m3475,qx,10800,3475,21600l18125,21600qx21600,10800,18125,xe"); + + LoadConnectorsList(_T("Rectangle")); + LoadTextRect(_T("1018,3163,20582,18437")); + } +}; +} \ No newline at end of file diff --git a/MsBinaryFile/Common/ODraw/oldAutoShapes/FoldedCornerType.h b/MsBinaryFile/Common/ODraw/oldAutoShapes/FoldedCornerType.h new file mode 100644 index 0000000000..3d35ebf3dc --- /dev/null +++ b/MsBinaryFile/Common/ODraw/oldAutoShapes/FoldedCornerType.h @@ -0,0 +1,76 @@ +/* + * (c) Copyright Ascensio System SIA 2010-2019 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect + * that Ascensio System SIA expressly excludes the warranty of non-infringement + * of any third-party rights. + * + * This program is distributed WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * + */ +#pragma once +#include "../CustomShape.h" + +// 65 +namespace NSCustomShapesConvert +{ +class CFoldedCornerType : public CCustomShape +{ +public: + CFoldedCornerType() + + { + m_bConcentricFill = false; + m_eJoin = ODRAW::lineJoinMiter; + + m_strPath = _T("m,l,21600@0,21600,21600@0,21600,xem@0,21600nfl@3@5c@7@9@11@13,21600@0e"); + + AddGuide(_T("val #0")); + AddGuide(_T("sum 21600 0 @0")); + AddGuide(_T("prod @1 8481 32768")); + AddGuide(_T("sum @2 @0 0")); + AddGuide(_T("prod @1 1117 32768")); + AddGuide(_T("sum @4 @0 0")); + AddGuide(_T("prod @1 11764 32768")); + AddGuide(_T("sum @6 @0 0")); + AddGuide(_T("prod @1 6144 32768")); + AddGuide(_T("sum @8 @0 0")); + AddGuide(_T("prod @1 20480 32768")); + AddGuide(_T("sum @10 @0 0")); + AddGuide(_T("prod @1 6144 32768")); + AddGuide(_T("sum @12 @0 0")); + + m_arAdjustments.push_back(18900); + + LoadConnectorsList(_T("Rectangle")); + LoadTextRect(_T("0,0,21600,@13")); + + CHandle_ oHandle1; + oHandle1.position = _T("#0,bottomRight"); + oHandle1.xrange = _T("10800,21600"); + m_arHandles.push_back(oHandle1); + + } +}; +} \ No newline at end of file diff --git a/MsBinaryFile/Common/ODraw/oldAutoShapes/HeartType.h b/MsBinaryFile/Common/ODraw/oldAutoShapes/HeartType.h new file mode 100644 index 0000000000..b652197ce2 --- /dev/null +++ b/MsBinaryFile/Common/ODraw/oldAutoShapes/HeartType.h @@ -0,0 +1,63 @@ +/* + * (c) Copyright Ascensio System SIA 2010-2019 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect + * that Ascensio System SIA expressly excludes the warranty of non-infringement + * of any third-party rights. + * + * This program is distributed WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * + */ +#pragma once +#include "../CustomShape.h" + +// 74 +namespace NSCustomShapesConvert +{ +class CHeartType : public CCustomShape +{ +public: + CHeartType() + + { + m_bConcentricFill = true; + m_eJoin = ODRAW::lineJoinMiter; + m_strPath = _T("m10860,2187c10451,1746,9529,1018,9015,730,7865,152,6685,,5415,,4175,152,2995,575,1967,1305,1150,2187,575,3222,242,4220,,5410,242,6560,575,7597l10860,21600,20995,7597v485,-1037,605,-2187,485,-3377c21115,3222,20420,2187,19632,1305,18575,575,17425,152,16275,,15005,,13735,152,12705,730v-529,288,-1451,1016,-1845,1457xe"); + + LoadConnectorsList(_T("10860,2187;2928,10800;10860,21600;18672,10800")); + + m_arConnectorAngles.push_back(270); + m_arConnectorAngles.push_back(180); + m_arConnectorAngles.push_back(90); + m_arConnectorAngles.push_back(0); + + LoadTextRect(_T("5037,2277,16557,13677")); + } +}; +} + + + + + diff --git a/MsBinaryFile/Common/ODraw/oldAutoShapes/HexagonType.h b/MsBinaryFile/Common/ODraw/oldAutoShapes/HexagonType.h new file mode 100644 index 0000000000..1528bbc677 --- /dev/null +++ b/MsBinaryFile/Common/ODraw/oldAutoShapes/HexagonType.h @@ -0,0 +1,68 @@ +/* + * (c) Copyright Ascensio System SIA 2010-2019 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect + * that Ascensio System SIA expressly excludes the warranty of non-infringement + * of any third-party rights. + * + * This program is distributed WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * + */ +#pragma once +#include "../CustomShape.h" + +// 9 +namespace NSCustomShapesConvert +{ +class CHexagonType : public CCustomShape +{ +public: + CHexagonType() + + { + m_bConcentricFill = true; + m_eJoin = ODRAW::lineJoinMiter; + + m_strPath = _T("m@0,l,10800@0,21600@1,21600,21600,10800@1,xe"); + + AddGuide(_T("val #0")); + AddGuide(_T("sum width 0 #0")); + AddGuide(_T("sum height 0 #0")); + AddGuide(_T("prod @0 2929 10000")); + AddGuide(_T("sum width 0 @3")); + AddGuide(_T("sum height 0 @3")); + + m_arAdjustments.push_back(5400); + + LoadConnectorsList(_T("Rectangle")); + LoadTextRect(_T("1800,1800,19800,19800;3600,3600,18000,18000;6300,6300,15300,15300")); + + CHandle_ oHandle1; + oHandle1.position = _T("#0,topLeft"); + oHandle1.xrange = _T("0,10800"); + m_arHandles.push_back(oHandle1); + + } +}; +} \ No newline at end of file diff --git a/MsBinaryFile/Common/ODraw/oldAutoShapes/HomePlateType.h b/MsBinaryFile/Common/ODraw/oldAutoShapes/HomePlateType.h new file mode 100644 index 0000000000..0990079e09 --- /dev/null +++ b/MsBinaryFile/Common/ODraw/oldAutoShapes/HomePlateType.h @@ -0,0 +1,68 @@ +/* + * (c) Copyright Ascensio System SIA 2010-2019 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect + * that Ascensio System SIA expressly excludes the warranty of non-infringement + * of any third-party rights. + * + * This program is distributed WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * + */ +#pragma once +#include "../CustomShape.h" + +// 15 +namespace NSCustomShapesConvert +{ +class CHomePlateType : public CCustomShape +{ +public: + CHomePlateType() + + { + m_bConcentricFill = true; + m_eJoin = ODRAW::lineJoinMiter; + m_strPath = _T("m@0,l,,,21600@0,21600,21600,10800xe"); + + AddGuide(_T("val #0")); + AddGuide(_T("prod #0 1 2")); + + m_arAdjustments.push_back(16200); + + LoadConnectorsList(_T("@1,0;0,10800;@1,21600;21600,10800")); + + m_arConnectorAngles.push_back(270); + m_arConnectorAngles.push_back(180); + m_arConnectorAngles.push_back(90); + m_arConnectorAngles.push_back(0); + + LoadTextRect(_T("0,0,10800,21600;0,0,16200,21600;0,0,21600,21600")); + + CHandle_ oHandle1; + oHandle1.position = _T("#0,topLeft"); + oHandle1.xrange = _T("0,21600"); + m_arHandles.push_back(oHandle1); + } +}; +} \ No newline at end of file diff --git a/MsBinaryFile/Common/ODraw/oldAutoShapes/HorisontalScrollType.h b/MsBinaryFile/Common/ODraw/oldAutoShapes/HorisontalScrollType.h new file mode 100644 index 0000000000..7eb441edd6 --- /dev/null +++ b/MsBinaryFile/Common/ODraw/oldAutoShapes/HorisontalScrollType.h @@ -0,0 +1,85 @@ +/* + * (c) Copyright Ascensio System SIA 2010-2019 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect + * that Ascensio System SIA expressly excludes the warranty of non-infringement + * of any third-party rights. + * + * This program is distributed WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * + */ +#pragma once +#include "../CustomShape.h" + +// 98 +namespace NSCustomShapesConvert +{ +class CHorizontalScrollType : public CCustomShape +{ +public: + CHorizontalScrollType() + + { + m_bConcentricFill = false; + m_eJoin = ODRAW::lineJoinMiter; + //Encaps: Flat + + m_strPath = _T("m0@5qy@2@1l@0@1@0@2qy@7,,21600@2l21600@9qy@7@10l@1@10@1@11qy@2,21600,0@11xem0@5nfqy@2@6@1@5@3@4@2@5l@2@6em@1@5nfl@1@10em21600@2nfqy@7@1l@0@1em@0@2nfqy@8@3@7@2l@7@1e"); + + AddGuide(_T("sum width 0 #0")); + AddGuide(_T("val #0")); + AddGuide(_T("prod @1 1 2")); + AddGuide(_T("prod @1 3 4")); + AddGuide(_T("prod @1 5 4")); + AddGuide(_T("prod @1 3 2")); + AddGuide(_T("prod @1 2 1")); + AddGuide(_T("sum width 0 @2")); + AddGuide(_T("sum width 0 @3")); + AddGuide(_T("sum height 0 @5")); + AddGuide(_T("sum height 0 @1")); + AddGuide(_T("sum height 0 @2")); + AddGuide(_T("val width")); + AddGuide(_T("prod width 1 2")); + AddGuide(_T("prod height 1 2")); + + m_arAdjustments.push_back(2700); + + LoadConnectorsList(_T("@13,@1;0,@14;@13,@10;@12,@14")); + LoadTextRect(_T("@1,@1,@7,@10")); + + m_arConnectorAngles.push_back(270); + m_arConnectorAngles.push_back(180); + m_arConnectorAngles.push_back(90); + m_arConnectorAngles.push_back(0); + + CHandle_ oHandle1; + oHandle1.position = _T("topLeft,#0"); + oHandle1.yrange = _T("0,5400"); + m_arHandles.push_back(oHandle1); + + m_lLimoX = 10800; + m_lLimoY = 10800; + } +}; +} \ No newline at end of file diff --git a/MsBinaryFile/Common/ODraw/oldAutoShapes/IrregularSealOneType.h b/MsBinaryFile/Common/ODraw/oldAutoShapes/IrregularSealOneType.h new file mode 100644 index 0000000000..e682de5842 --- /dev/null +++ b/MsBinaryFile/Common/ODraw/oldAutoShapes/IrregularSealOneType.h @@ -0,0 +1,59 @@ +/* + * (c) Copyright Ascensio System SIA 2010-2019 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect + * that Ascensio System SIA expressly excludes the warranty of non-infringement + * of any third-party rights. + * + * This program is distributed WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * + */ +#pragma once +#include "../CustomShape.h" + +// 71 +namespace NSCustomShapesConvert +{ +class CIrregularSealOneType : public CCustomShape +{ +public: + CIrregularSealOneType() + + { + m_bConcentricFill = false; + m_eJoin = ODRAW::lineJoinMiter; + + m_strPath = _T("m10800,5800l8352,2295,7312,6320,370,2295,4627,7617,,8615r3722,3160l135,14587r5532,-650l4762,17617,7715,15627r770,5973l10532,14935r2715,4802l14020,14457r4125,3638l16837,12942r4763,348l17607,10475,21097,8137,16702,7315,18380,4457r-4225,868l14522,xe"); + + LoadConnectorsList(_T("14522,0;0,8615;8485,21600;21600,13290")); + + m_arConnectorAngles.push_back(270); + m_arConnectorAngles.push_back(180); + m_arConnectorAngles.push_back(90); + m_arConnectorAngles.push_back(0); + + LoadTextRect(_T("4627,6320,16702,13937")); + } +}; +} \ No newline at end of file diff --git a/MsBinaryFile/Common/ODraw/oldAutoShapes/IrregularSealTwo.h b/MsBinaryFile/Common/ODraw/oldAutoShapes/IrregularSealTwo.h new file mode 100644 index 0000000000..6d27c2251c --- /dev/null +++ b/MsBinaryFile/Common/ODraw/oldAutoShapes/IrregularSealTwo.h @@ -0,0 +1,60 @@ +/* + * (c) Copyright Ascensio System SIA 2010-2019 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect + * that Ascensio System SIA expressly excludes the warranty of non-infringement + * of any third-party rights. + * + * This program is distributed WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * + */ +#pragma once +#include "../CustomShape.h" + +// 72 +namespace NSCustomShapesConvert +{ +class CIrregularSealTwo : public CCustomShape +{ +public: + CIrregularSealTwo() + + { + m_bConcentricFill = false; + m_eJoin = ODRAW::lineJoinMiter; + + m_strPath = _T("m11462,4342l9722,1887,8550,6382,4502,3625r870,4192l1172,8270r2763,3322l,12877r3330,2493l1285,17825r3520,415l4917,21600,7527,18125r1173,1587l9872,17370r1740,1472l12180,15935r2762,1435l14640,14350r4237,1282l16380,12310r1890,-1020l16985,9402,21600,6645,16380,6532,18007,3172,14525,5777,14790,xe"); + + LoadConnectorsList(_T("9722,1887;0,12877;11612,18842;21600,6645")); + + m_arConnectorAngles.push_back(270); + m_arConnectorAngles.push_back(180); + m_arConnectorAngles.push_back(90); + m_arConnectorAngles.push_back(0); + + LoadTextRect(_T("5372,6382,14640,15935")); + + } +}; +} \ No newline at end of file diff --git a/MsBinaryFile/Common/ODraw/oldAutoShapes/IsoscelesTriangleType.h b/MsBinaryFile/Common/ODraw/oldAutoShapes/IsoscelesTriangleType.h new file mode 100644 index 0000000000..fb4a44575c --- /dev/null +++ b/MsBinaryFile/Common/ODraw/oldAutoShapes/IsoscelesTriangleType.h @@ -0,0 +1,65 @@ +/* + * (c) Copyright Ascensio System SIA 2010-2019 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect + * that Ascensio System SIA expressly excludes the warranty of non-infringement + * of any third-party rights. + * + * This program is distributed WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * + */ +#pragma once +#include "../CustomShape.h" + +// 5 +namespace NSCustomShapesConvert +{ +class CIsoscelesTriangleType : public CCustomShape +{ +public: + CIsoscelesTriangleType() + + { + m_bConcentricFill = true; + m_eJoin = ODRAW::lineJoinMiter; + + m_strPath = _T("m@0,l,21600r21600,xe"); + + AddGuide(_T("val #0")); + AddGuide(_T("prod #0 1 2")); + AddGuide(_T("sum @1 10800 0")); + + m_arAdjustments.push_back(10800); + + LoadConnectorsList(_T("@0,0;@1,10800;0,21600;10800,21600;21600,21600;@2,10800")); + + LoadTextRect(_T("0,10800,10800,18000;5400,10800,16200,18000;10800,10800,21600,18000;0,7200,7200,21600;7200,7200,14400,21600;14400,7200,21600,21600")); + + CHandle_ oHandle1; + oHandle1.position = _T("#0,topLeft"); + oHandle1.xrange = _T("0,21600"); + m_arHandles.push_back(oHandle1); + } +}; +} \ No newline at end of file diff --git a/MsBinaryFile/Common/ODraw/oldAutoShapes/LeftArrowCalloutType.h b/MsBinaryFile/Common/ODraw/oldAutoShapes/LeftArrowCalloutType.h new file mode 100644 index 0000000000..b1fc3ff58c --- /dev/null +++ b/MsBinaryFile/Common/ODraw/oldAutoShapes/LeftArrowCalloutType.h @@ -0,0 +1,88 @@ +/* + * (c) Copyright Ascensio System SIA 2010-2019 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect + * that Ascensio System SIA expressly excludes the warranty of non-infringement + * of any third-party rights. + * + * This program is distributed WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * + */ +#pragma once +#include "../CustomShape.h" + +// 77 +namespace NSCustomShapesConvert +{ +class CLeftArrowCalloutType : public CCustomShape +{ +public: + CLeftArrowCalloutType() + + { + m_bConcentricFill = false; + m_eJoin = ODRAW::lineJoinMiter; + + m_strPath = _T("m@0,l@0@3@2@3@2@1,,10800@2@4@2@5@0@5@0,21600,21600,21600,21600,xe"); + + AddGuide(_T("val #0")); + AddGuide(_T("val #1")); + AddGuide(_T("val #2")); + AddGuide(_T("val #3")); + AddGuide(_T("sum 21600 0 #1")); + AddGuide(_T("sum 21600 0 #3")); + AddGuide(_T("sum #0 21600 0")); + + m_arAdjustments.push_back(7200); + m_arAdjustments.push_back(5400); + m_arAdjustments.push_back(3600); + m_arAdjustments.push_back(8100); + + LoadConnectorsList(_T("@7,0;0,10800;@7,21600;21600,10800")); + + m_arConnectorAngles.push_back(270); + m_arConnectorAngles.push_back(180); + m_arConnectorAngles.push_back(90); + m_arConnectorAngles.push_back(0); + + LoadTextRect(_T("@0,0,21600,21600")); + + CHandle_ oHandle1; + oHandle1.position = _T("#0,topLeft"); + oHandle1.xrange = _T("@2,21600"); + m_arHandles.push_back(oHandle1); + + CHandle_ oHandle2; + oHandle2.position = _T("topLeft,#1"); + oHandle2.yrange = _T("0,@3"); + m_arHandles.push_back(oHandle2); + + CHandle_ oHandle3; + oHandle3.position = _T("#2,#3"); + oHandle3.xrange = _T("0,@0"); + oHandle3.yrange = _T("@1,10800"); + m_arHandles.push_back(oHandle3); + } +}; +} \ No newline at end of file diff --git a/MsBinaryFile/Common/ODraw/oldAutoShapes/LeftArrowType.h b/MsBinaryFile/Common/ODraw/oldAutoShapes/LeftArrowType.h new file mode 100644 index 0000000000..5ee599fad2 --- /dev/null +++ b/MsBinaryFile/Common/ODraw/oldAutoShapes/LeftArrowType.h @@ -0,0 +1,76 @@ +/* + * (c) Copyright Ascensio System SIA 2010-2019 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect + * that Ascensio System SIA expressly excludes the warranty of non-infringement + * of any third-party rights. + * + * This program is distributed WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * + */ +#pragma once +#include "../CustomShape.h" + +// 66 +namespace NSCustomShapesConvert +{ +class CLeftArrowType : public CCustomShape +{ +public: + CLeftArrowType() + + { + m_bConcentricFill = false; + m_eJoin = ODRAW::lineJoinMiter; + + m_strPath = _T("m@0,l@0@1,0@1,0@2@0@2@0,21600,21600,10800xe"); + + AddGuide(_T("val #0")); + AddGuide(_T("val #1")); + AddGuide(_T("sum height 0 #1")); + AddGuide(_T("sum 10800 0 #1")); + AddGuide(_T("sum width 0 #0")); + AddGuide(_T("prod @4 @3 10800")); + AddGuide(_T("sum width 0 @5")); + + m_arAdjustments.push_back(16200); + m_arAdjustments.push_back(5400); + + LoadConnectorsList(_T("@0,0;0,10800;@0,21600;21600,10800")); + + m_arConnectorAngles.push_back(270); + m_arConnectorAngles.push_back(180); + m_arConnectorAngles.push_back(90); + m_arConnectorAngles.push_back(0); + + LoadTextRect(_T("0,@1,@6,@2")); + + CHandle_ oHandle1; + oHandle1.position = _T("#0,#1"); + oHandle1.xrange = _T("0,21600"); + oHandle1.yrange = _T("0,10800"); + m_arHandles.push_back(oHandle1); + } +}; +} \ No newline at end of file diff --git a/MsBinaryFile/Common/ODraw/oldAutoShapes/LeftBraceType.h b/MsBinaryFile/Common/ODraw/oldAutoShapes/LeftBraceType.h new file mode 100644 index 0000000000..8bd2ae98f0 --- /dev/null +++ b/MsBinaryFile/Common/ODraw/oldAutoShapes/LeftBraceType.h @@ -0,0 +1,81 @@ +/* + * (c) Copyright Ascensio System SIA 2010-2019 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect + * that Ascensio System SIA expressly excludes the warranty of non-infringement + * of any third-party rights. + * + * This program is distributed WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * + */ +#pragma once +#include "../CustomShape.h" + +// 87 +namespace NSCustomShapesConvert +{ +class CLeftBraceType : public CCustomShape +{ +public: + CLeftBraceType() + + { + m_bConcentricFill = false; + m_eJoin = ODRAW::lineJoinMiter; + //Endcaps: Flat + + m_strPath = _T("m21600,qx10800@0l10800@2qy0@11,10800@3l10800@1qy21600,21600e"); + + AddGuide(_T("val #0")); + AddGuide(_T("sum 21600 0 #0")); + AddGuide(_T("sum #1 0 #0")); + AddGuide(_T("sum #1 #0 0")); + AddGuide(_T("prod #0 9598 32768")); + AddGuide(_T("sum 21600 0 @4")); + AddGuide(_T("sum 21600 0 #1")); + AddGuide(_T("min #1 @6")); + AddGuide(_T("prod @7 1 2")); + AddGuide(_T("prod #0 2 1")); + AddGuide(_T("sum 21600 0 @9")); + AddGuide(_T("val #1")); + + m_arAdjustments.push_back(1800); + m_arAdjustments.push_back(10800); + + LoadConnectorsList(_T("21600,0;0,10800;21600,21600")); + LoadTextRect(_T("13963,@4,21600,@5")); + + CHandle_ oHandle1; + CHandle_ oHandle2; + + oHandle1.position = _T("center,#0"); + oHandle1.yrange = _T("0,@8"); + oHandle2.position = _T("topLeft,#1"); + oHandle2.yrange = _T("@9,@10"); + + m_arHandles.push_back(oHandle1); + m_arHandles.push_back(oHandle2); + } +}; +} \ No newline at end of file diff --git a/MsBinaryFile/Common/ODraw/oldAutoShapes/LeftBracketType.h b/MsBinaryFile/Common/ODraw/oldAutoShapes/LeftBracketType.h new file mode 100644 index 0000000000..972a457469 --- /dev/null +++ b/MsBinaryFile/Common/ODraw/oldAutoShapes/LeftBracketType.h @@ -0,0 +1,66 @@ +/* + * (c) Copyright Ascensio System SIA 2010-2019 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect + * that Ascensio System SIA expressly excludes the warranty of non-infringement + * of any third-party rights. + * + * This program is distributed WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * + */ +#pragma once +#include "../CustomShape.h" + +// 85 +namespace NSCustomShapesConvert +{ +class CLeftBracketType : public CCustomShape +{ +public: + CLeftBracketType() + + { + m_bConcentricFill = false; + m_eJoin = ODRAW::lineJoinRound; + //Endcaps: Flat + + m_strPath = _T("m21600,qx0@0l0@1qy21600,21600e"); + + AddGuide(_T("val #0")); + AddGuide(_T("sum 21600 0 #0")); + AddGuide(_T("prod #0 9598 32768")); + AddGuide(_T("sum 21600 0 @2")); + + m_arAdjustments.push_back(1800); + + LoadConnectorsList(_T("21600,0;0,10800;21600,21600")); + LoadTextRect(_T("6326,@2,21600,@3")); + + CHandle_ oHandle1; + oHandle1.position = _T("topLeft,#0"); + oHandle1.yrange = _T("0,10800"); + m_arHandles.push_back(oHandle1); + } +}; +} diff --git a/MsBinaryFile/Common/ODraw/oldAutoShapes/LeftRightArrowCalloutType.h b/MsBinaryFile/Common/ODraw/oldAutoShapes/LeftRightArrowCalloutType.h new file mode 100644 index 0000000000..12cc838584 --- /dev/null +++ b/MsBinaryFile/Common/ODraw/oldAutoShapes/LeftRightArrowCalloutType.h @@ -0,0 +1,91 @@ +/* + * (c) Copyright Ascensio System SIA 2010-2019 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect + * that Ascensio System SIA expressly excludes the warranty of non-infringement + * of any third-party rights. + * + * This program is distributed WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * + */ +#pragma once +#include "../CustomShape.h" + +// 81 +namespace NSCustomShapesConvert +{ +class CLeftRightArrowCalloutType : public CCustomShape +{ +public: + CLeftRightArrowCalloutType() + + { + m_bConcentricFill = false; + m_eJoin = ODRAW::lineJoinMiter; + m_strPath = _T("m@0,l@0@3@2@3@2@1,,10800@2@4@2@5@0@5@0,21600@8,21600@8@5@9@5@9@4,21600,10800@9@1@9@3@8@3@8,xe"); + + AddGuide(_T("val #0")); + AddGuide(_T("val #1")); + AddGuide(_T("val #2")); + AddGuide(_T("val #3")); + AddGuide(_T("sum 21600 0 #1")); + AddGuide(_T("sum 21600 0 #3")); + AddGuide(_T("sum #0 21600 0")); + AddGuide(_T("prod @6 1 2")); + AddGuide(_T("sum 21600 0 #0")); + AddGuide(_T("sum 21600 0 #2")); + + m_arAdjustments.push_back(5400); + m_arAdjustments.push_back(5400); + m_arAdjustments.push_back(2700); + m_arAdjustments.push_back(8100); + + LoadConnectorsList(_T("10800,0;0,10800;10800,21600;21600,10800")); + + m_arConnectorAngles.push_back(270); + m_arConnectorAngles.push_back(180); + m_arConnectorAngles.push_back(90); + m_arConnectorAngles.push_back(0); + + LoadTextRect(_T("@0,0,@8,21600")); + + CHandle_ oHandle1; + oHandle1.position = _T("#0,topLeft"); + oHandle1.xrange = _T("@2,10800"); + m_arHandles.push_back(oHandle1); + + CHandle_ oHandle2; + oHandle2.position = _T("topLeft,#1"); + oHandle2.yrange = _T("0,@3"); + m_arHandles.push_back(oHandle2); + + CHandle_ oHandle3; + oHandle3.position = _T("#2,#3"); + oHandle3.xrange = _T("0,@0"); + oHandle3.yrange = _T("@1,10800"); + m_arHandles.push_back(oHandle3); + } +}; +} + diff --git a/MsBinaryFile/Common/ODraw/oldAutoShapes/LeftRightArrowType.h b/MsBinaryFile/Common/ODraw/oldAutoShapes/LeftRightArrowType.h new file mode 100644 index 0000000000..cdf933e219 --- /dev/null +++ b/MsBinaryFile/Common/ODraw/oldAutoShapes/LeftRightArrowType.h @@ -0,0 +1,81 @@ +/* + * (c) Copyright Ascensio System SIA 2010-2019 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect + * that Ascensio System SIA expressly excludes the warranty of non-infringement + * of any third-party rights. + * + * This program is distributed WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * + */ +#pragma once +#include "../CustomShape.h" + +// 69 +namespace NSCustomShapesConvert +{ +class CLeftRightArrowType : public CCustomShape +{ +public: + CLeftRightArrowType() + + { + m_bConcentricFill = false; + m_eJoin = ODRAW::lineJoinMiter; + + m_strPath = _T("m,10800l@0,21600@0@3@2@3@2,21600,21600,10800@2,0@2@1@0@1@0,xe"); + + AddGuide(_T("val #0")); + AddGuide(_T("val #1")); + AddGuide(_T("sum 21600 0 #0")); + AddGuide(_T("sum 21600 0 #1")); + AddGuide(_T("prod #0 #1 10800")); + AddGuide(_T("sum #0 0 @4")); + AddGuide(_T("sum 21600 0 @5")); + + m_arAdjustments.push_back(4320); + m_arAdjustments.push_back(5400); + + LoadConnectorsList(_T("@2,0;10800,@1;@0,0;0,10800;@0,21600;10800,@3;@2,21600;21600,10800")); + + m_arConnectorAngles.push_back(270); + m_arConnectorAngles.push_back(270); + m_arConnectorAngles.push_back(270); + m_arConnectorAngles.push_back(180); + m_arConnectorAngles.push_back(90); + m_arConnectorAngles.push_back(90); + m_arConnectorAngles.push_back(90); + m_arConnectorAngles.push_back(0); + + LoadTextRect(_T("@5,@1,@6,@3")); + + CHandle_ oHandle1; + oHandle1.position = _T("#0,#1"); + oHandle1.xrange = _T("0,10800"); + oHandle1.yrange = _T("0,10800"); + m_arHandles.push_back(oHandle1); + + } +}; +} \ No newline at end of file diff --git a/MsBinaryFile/Common/ODraw/oldAutoShapes/LeftRightUpArrow.h b/MsBinaryFile/Common/ODraw/oldAutoShapes/LeftRightUpArrow.h new file mode 100644 index 0000000000..15153a1060 --- /dev/null +++ b/MsBinaryFile/Common/ODraw/oldAutoShapes/LeftRightUpArrow.h @@ -0,0 +1,92 @@ +/* + * (c) Copyright Ascensio System SIA 2010-2019 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect + * that Ascensio System SIA expressly excludes the warranty of non-infringement + * of any third-party rights. + * + * This program is distributed WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * + */ +#pragma once +#include "../CustomShape.h" + +// 182 +namespace NSCustomShapesConvert +{ +class CLeftRightUpArrow : public CCustomShape +{ +public: + CLeftRightUpArrow() + + { + m_bConcentricFill = false; + m_eJoin = ODRAW::lineJoinMiter; + m_strPath = _T("m10800,l@0@2@1@2@1@6@7@6@7@5,0@8@7,21600@7@9@10@9@10,21600,21600@8@10@5@10@6@4@6@4@2@3@2xe"); + + AddGuide(_T("val #0")); + AddGuide(_T("val #1")); + AddGuide(_T("val #2")); + AddGuide(_T("sum 21600 0 #0")); + AddGuide(_T("sum 21600 0 #1")); + AddGuide(_T("prod @0 21600 @3")); + AddGuide(_T("prod @1 21600 @3")); + AddGuide(_T("prod @2 @3 21600")); + AddGuide(_T("prod 10800 21600 @3")); + AddGuide(_T("prod @4 21600 @3")); + AddGuide(_T("sum 21600 0 @7")); + AddGuide(_T("sum @5 0 @8")); + AddGuide(_T("sum @6 0 @8")); + AddGuide(_T("prod @12 @7 @11")); + AddGuide(_T("sum 21600 0 @13")); + AddGuide(_T("sum @0 0 10800")); + AddGuide(_T("sum @1 0 10800")); + AddGuide(_T("prod @2 @16 @15")); + + m_arAdjustments.push_back(6480); + m_arAdjustments.push_back(8640); + m_arAdjustments.push_back(6171); + + LoadConnectorsList(_T("10800,0;0,@8;10800,@9;21600,@8")); + + m_arConnectorAngles.push_back(270); + m_arConnectorAngles.push_back(180); + m_arConnectorAngles.push_back(90); + m_arConnectorAngles.push_back(0); + + LoadTextRect(_T("@13,@6,@14,@9;@1,@17,@4,@9")); + + CHandle_ oHandle1; + oHandle1.position = _T("#0,topLeft"); + oHandle1.xrange = _T("@2,@1"); + m_arHandles.push_back(oHandle1); + + CHandle_ oHandle2; + oHandle2.position = _T("#1,#2"); + oHandle2.xrange = _T("@0,10800"); + oHandle2.yrange = _T("0,@5"); + m_arHandles.push_back(oHandle2); + } +}; +} \ No newline at end of file diff --git a/MsBinaryFile/Common/ODraw/oldAutoShapes/LeftUpArrowType.h b/MsBinaryFile/Common/ODraw/oldAutoShapes/LeftUpArrowType.h new file mode 100644 index 0000000000..e8f5c38a88 --- /dev/null +++ b/MsBinaryFile/Common/ODraw/oldAutoShapes/LeftUpArrowType.h @@ -0,0 +1,91 @@ +/* + * (c) Copyright Ascensio System SIA 2010-2019 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect + * that Ascensio System SIA expressly excludes the warranty of non-infringement + * of any third-party rights. + * + * This program is distributed WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * + */ +#pragma once +#include "../CustomShape.h" + +// 89 +namespace NSCustomShapesConvert +{ +class CLeftUpArrowType : public CCustomShape +{ +public: + CLeftUpArrowType() + + { + m_bConcentricFill = false; + m_eJoin = ODRAW::lineJoinMiter; + m_strPath = _T("m@4,l@0@2@5@2@5@5@2@5@2@0,0@4@2,21600@2@1@1@1@1@2,21600@2xe"); + + AddGuide(_T("val #0")); + AddGuide(_T("val #1")); + AddGuide(_T("val #2")); + AddGuide(_T("prod #0 1 2")); + AddGuide(_T("sum @3 10800 0")); + AddGuide(_T("sum 21600 #0 #1")); + AddGuide(_T("sum #1 #2 0")); + AddGuide(_T("prod @6 1 2")); + AddGuide(_T("prod #1 2 1")); + AddGuide(_T("sum @8 0 21600")); + AddGuide(_T("sum @5 0 @4")); + AddGuide(_T("sum #0 0 @4")); + AddGuide(_T("prod @2 @10 @11")); + + m_arAdjustments.push_back(9257); + m_arAdjustments.push_back(18514); + m_arAdjustments.push_back(6171); + + LoadConnectorsList(_T("@4,0;@0,@2;@2,@0;0,@4;@2,21600;@7,@1;@1,@7;21600,@2")); + + m_arConnectorAngles.push_back(270); + m_arConnectorAngles.push_back(180); + m_arConnectorAngles.push_back(270); + m_arConnectorAngles.push_back(180); + m_arConnectorAngles.push_back(90); + m_arConnectorAngles.push_back(90); + m_arConnectorAngles.push_back(0); + m_arConnectorAngles.push_back(0); + + LoadTextRect(_T("@12,@5,@1,@1;@5,@12,@1,@1")); + + CHandle_ oHandle1; + oHandle1.position = _T("#0,topLeft"); + oHandle1.xrange = _T("@2,@9"); + m_arHandles.push_back(oHandle1); + + CHandle_ oHandle2; + oHandle2.position = _T("#1,#2"); + oHandle2.xrange = _T("@4,21600"); + oHandle2.yrange = _T("0,@0"); + m_arHandles.push_back(oHandle2); + } +}; +} \ No newline at end of file diff --git a/MsBinaryFile/Common/ODraw/oldAutoShapes/LightningBoltType.h b/MsBinaryFile/Common/ODraw/oldAutoShapes/LightningBoltType.h new file mode 100644 index 0000000000..517a1334de --- /dev/null +++ b/MsBinaryFile/Common/ODraw/oldAutoShapes/LightningBoltType.h @@ -0,0 +1,61 @@ +/* + * (c) Copyright Ascensio System SIA 2010-2019 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect + * that Ascensio System SIA expressly excludes the warranty of non-infringement + * of any third-party rights. + * + * This program is distributed WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * + */ +#pragma once +#include "../CustomShape.h" + +// 73 +namespace NSCustomShapesConvert +{ +class CLightningBoltType : public CCustomShape +{ +public: + CLightningBoltType() + + { + m_bConcentricFill = true; + m_eJoin = ODRAW::lineJoinMiter; + m_strPath = _T("m8472,l,3890,7602,8382,5022,9705r7200,4192l10012,14915r11588,6685l14767,12877r1810,-870l11050,6797r1810,-717xe"); + + LoadConnectorsList(_T("8472,0;0,3890;5022,9705;10012,14915;21600,21600;16577,12007;12860,6080")); + + m_arConnectorAngles.push_back(270); + m_arConnectorAngles.push_back(270); + m_arConnectorAngles.push_back(180); + m_arConnectorAngles.push_back(180); + m_arConnectorAngles.push_back(90); + m_arConnectorAngles.push_back(0); + m_arConnectorAngles.push_back(0); + + LoadTextRect(_T("8757,7437,13917,14277")); + } +}; +} \ No newline at end of file diff --git a/MsBinaryFile/Common/ODraw/oldAutoShapes/LineType.h b/MsBinaryFile/Common/ODraw/oldAutoShapes/LineType.h new file mode 100644 index 0000000000..294ba564c7 --- /dev/null +++ b/MsBinaryFile/Common/ODraw/oldAutoShapes/LineType.h @@ -0,0 +1,51 @@ +/* + * (c) Copyright Ascensio System SIA 2010-2019 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect + * that Ascensio System SIA expressly excludes the warranty of non-infringement + * of any third-party rights. + * + * This program is distributed WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * + */ +#pragma once +#include "../CustomShape.h" + +// 20 +namespace NSCustomShapesConvert +{ +class CLineType : public CCustomShape +{ +public: + CLineType() + + { + m_bConcentricFill = true; + m_eJoin = ODRAW::lineJoinRound; + m_strPath = _T("m0,0l21600,21600nfe"); + + LoadConnectorsList(_T("0,0;21600,21600;10800,10800")); + } +}; +} \ No newline at end of file diff --git a/MsBinaryFile/Common/ODraw/oldAutoShapes/MoonType.h b/MsBinaryFile/Common/ODraw/oldAutoShapes/MoonType.h new file mode 100644 index 0000000000..e7849ce283 --- /dev/null +++ b/MsBinaryFile/Common/ODraw/oldAutoShapes/MoonType.h @@ -0,0 +1,83 @@ +/* + * (c) Copyright Ascensio System SIA 2010-2019 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect + * that Ascensio System SIA expressly excludes the warranty of non-infringement + * of any third-party rights. + * + * This program is distributed WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * + */ +#pragma once +#include "../CustomShape.h" + +// 184 +namespace NSCustomShapesConvert +{ +class CMoonType : public CCustomShape +{ +public: + CMoonType() + + { + m_bConcentricFill = false; + m_eJoin = ODRAW::lineJoinMiter; + m_strPath = _T("m21600,qx,10800,21600,21600wa@0@10@6@11,21600,21600,21600,xe"); + + AddGuide(_T("val #0")); + AddGuide(_T("sum 21600 0 #0")); + AddGuide(_T("prod #0 #0 @1")); + AddGuide(_T("prod 21600 21600 @1")); + AddGuide(_T("prod @3 2 1")); + AddGuide(_T("sum @4 0 @2")); + AddGuide(_T("sum @5 0 #0")); + AddGuide(_T("prod @5 1 2")); + AddGuide(_T("sum @7 0 #0")); + AddGuide(_T("prod @8 1 2")); + AddGuide(_T("sum 10800 0 @9")); + AddGuide(_T("sum @9 10800 0")); + AddGuide(_T("prod #0 9598 32768")); + AddGuide(_T("sum 21600 0 @12")); + AddGuide(_T("ellipse @13 21600 10800")); + AddGuide(_T("sum 10800 0 @14")); + AddGuide(_T("sum @14 10800 0")); + + m_arAdjustments.push_back(10800); + + LoadConnectorsList(_T("21600,0;0,10800;21600,21600;@0,10800")); + + m_arConnectorAngles.push_back(270); + m_arConnectorAngles.push_back(180); + m_arConnectorAngles.push_back(90); + m_arConnectorAngles.push_back(0); + + LoadTextRect(_T("@12,@15,@0,@16")); + + CHandle_ oHandle1; + oHandle1.position = _T("#0,center"); + oHandle1.xrange = _T("0,18900"); + m_arHandles.push_back(oHandle1); + } +}; +} \ No newline at end of file diff --git a/MsBinaryFile/Common/ODraw/oldAutoShapes/NoSmokingType.h b/MsBinaryFile/Common/ODraw/oldAutoShapes/NoSmokingType.h new file mode 100644 index 0000000000..d5855df9dd --- /dev/null +++ b/MsBinaryFile/Common/ODraw/oldAutoShapes/NoSmokingType.h @@ -0,0 +1,79 @@ +/* + * (c) Copyright Ascensio System SIA 2010-2019 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect + * that Ascensio System SIA expressly excludes the warranty of non-infringement + * of any third-party rights. + * + * This program is distributed WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * + */ +#pragma once +#include "../CustomShape.h" + +// 57 +namespace NSCustomShapesConvert +{ +class CNoSmokingType : public CCustomShape +{ +public: + CNoSmokingType() + + { + m_bConcentricFill = false; + m_eJoin = ODRAW::lineJoinMiter; + m_strPath = _T("m,10800qy10800,,21600,10800,10800,21600,,10800xar@0@0@16@16@12@14@15@13xar@0@0@16@16@13@15@14@12xe"); + + AddGuide(_T("val #0")); + AddGuide(_T("prod @0 2 1")); + AddGuide(_T("sum 21600 0 @1")); + AddGuide(_T("prod @2 @2 1")); + AddGuide(_T("prod @0 @0 1")); + AddGuide(_T("sum @3 0 @4")); + AddGuide(_T("prod @5 1 8")); + AddGuide(_T("sqrt @6")); + AddGuide(_T("prod @4 1 8")); + AddGuide(_T("sqrt @8")); + AddGuide(_T("sum @7 @9 0")); + AddGuide(_T("sum @7 0 @9")); + AddGuide(_T("sum @10 10800 0")); + AddGuide(_T("sum 10800 0 @10")); + AddGuide(_T("sum @11 10800 0")); + AddGuide(_T("sum 10800 0 @11")); + AddGuide(_T("sum 21600 0 @0")); + + m_arAdjustments.push_back(2700); + + LoadConnectorsList(_T("10800,0;3163,3163;0,10800;3163,18437;10800,21600;18437,18437;21600,10800;18437,3163")); + + LoadTextRect(_T("3163,3163,18437,18437")); + + CHandle_ oHandle1; + oHandle1.position = _T("#0,center"); + oHandle1.xrange = _T("0,7200"); + m_arHandles.push_back(oHandle1); + } +}; + +} \ No newline at end of file diff --git a/MsBinaryFile/Common/ODraw/oldAutoShapes/NotchedRightArrowType.h b/MsBinaryFile/Common/ODraw/oldAutoShapes/NotchedRightArrowType.h new file mode 100644 index 0000000000..4369affabf --- /dev/null +++ b/MsBinaryFile/Common/ODraw/oldAutoShapes/NotchedRightArrowType.h @@ -0,0 +1,75 @@ +/* + * (c) Copyright Ascensio System SIA 2010-2019 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect + * that Ascensio System SIA expressly excludes the warranty of non-infringement + * of any third-party rights. + * + * This program is distributed WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * + */ +#pragma once +#include "../CustomShape.h" + +// 94 +namespace NSCustomShapesConvert +{ +class CNotchedRightArrowType : public CCustomShape +{ +public: + CNotchedRightArrowType() + + { + m_bConcentricFill = false; + m_eJoin = ODRAW::lineJoinMiter; + m_strPath = _T("m@0,l@0@1,0@1@5,10800,0@2@0@2@0,21600,21600,10800xe"); + + AddGuide(_T("val #0")); + AddGuide(_T("val #1")); + AddGuide(_T("sum height 0 #1")); + AddGuide(_T("sum 10800 0 #1")); + AddGuide(_T("sum width 0 #0")); + AddGuide(_T("prod @4 @3 10800")); + AddGuide(_T("sum width 0 @5")); + + m_arAdjustments.push_back(16200); + m_arAdjustments.push_back(5400); + + LoadConnectorsList(_T("@0,0;@5,10800;@0,21600;21600,10800")); + + m_arConnectorAngles.push_back(270); + m_arConnectorAngles.push_back(180); + m_arConnectorAngles.push_back(90); + m_arConnectorAngles.push_back(0); + + LoadTextRect(_T("@5,@1,@6,@2")); + + CHandle_ oHandle1; + oHandle1.position = _T("#0,#1"); + oHandle1.xrange = _T("0,21600"); + oHandle1.yrange = _T("0,10800"); + m_arHandles.push_back(oHandle1); + } +}; +} \ No newline at end of file diff --git a/MsBinaryFile/Common/ODraw/oldAutoShapes/OctagonType.h b/MsBinaryFile/Common/ODraw/oldAutoShapes/OctagonType.h new file mode 100644 index 0000000000..6377fcb3db --- /dev/null +++ b/MsBinaryFile/Common/ODraw/oldAutoShapes/OctagonType.h @@ -0,0 +1,75 @@ +/* + * (c) Copyright Ascensio System SIA 2010-2019 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect + * that Ascensio System SIA expressly excludes the warranty of non-infringement + * of any third-party rights. + * + * This program is distributed WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * + */ +#pragma once +#include "../CustomShape.h" + +// 10 +namespace NSCustomShapesConvert +{ +class COctagonType : public CCustomShape +{ +public: + COctagonType() + + { + m_bConcentricFill = true; + m_eJoin = ODRAW::lineJoinMiter; + + m_strPath = _T("m@0,l0@0,0@2@0,21600@1,21600,21600@2,21600@0@1,xe"); + + AddGuide(_T("val #0")); + AddGuide(_T("sum width 0 #0")); + AddGuide(_T("sum height 0 #0")); + AddGuide(_T("prod @0 2929 10000")); + AddGuide(_T("sum width 0 @3")); + AddGuide(_T("sum height 0 @3")); + AddGuide(_T("val width")); + AddGuide(_T("val height")); + AddGuide(_T("prod width 1 2")); + AddGuide(_T("prod height 1 2")); + + m_arAdjustments.push_back(6326); + + LoadConnectorsList(_T("@8,0;0,@9;@8,@7;@6,@9")); + LoadTextRect(_T("0,0,21600,21600;2700,2700,18900,18900;5400,5400,16200,16200")); + + CHandle_ oHandle1; + oHandle1.position = _T("#0,topLeft"); + oHandle1.switchHandle = _T("true"); + oHandle1.xrange = _T("0,10800"); + m_arHandles.push_back(oHandle1); + + m_lLimoX = 10800; + m_lLimoY = 10800; + } +}; +} \ No newline at end of file diff --git a/MsBinaryFile/Common/ODraw/oldAutoShapes/ParallelogramType.h b/MsBinaryFile/Common/ODraw/oldAutoShapes/ParallelogramType.h new file mode 100644 index 0000000000..4854f63323 --- /dev/null +++ b/MsBinaryFile/Common/ODraw/oldAutoShapes/ParallelogramType.h @@ -0,0 +1,74 @@ +/* + * (c) Copyright Ascensio System SIA 2010-2019 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect + * that Ascensio System SIA expressly excludes the warranty of non-infringement + * of any third-party rights. + * + * This program is distributed WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * + */ +#pragma once +#include "../CustomShape.h" + +// 7 +namespace NSCustomShapesConvert +{ +class CParallelogramType : public CCustomShape +{ +public: + CParallelogramType() + + { + m_bConcentricFill = true; + m_eJoin = ODRAW::lineJoinMiter; + + m_strPath = _T("m@0,l,21600@1,21600,21600,xe"); + + AddGuide(_T("val #0")); + AddGuide(_T("sum width 0 #0")); + AddGuide(_T("prod #0 1 2")); + AddGuide(_T("sum width 0 @2")); + AddGuide(_T("mid #0 width")); + AddGuide(_T("mid @1 0")); + AddGuide(_T("prod height width #0")); + AddGuide(_T("prod @6 1 2")); + AddGuide(_T("sum height 0 @7")); + AddGuide(_T("prod width 1 2")); + AddGuide(_T("sum #0 0 @9")); + AddGuide(_T("if @10 @8 0")); + AddGuide(_T("if @10 @7 height")); + + m_arAdjustments.push_back(5400); + + LoadConnectorsList(_T("@4,0;10800,@11;@3,10800;@5,21600;10800,@12;@2,10800")); + LoadTextRect(_T("1800,1800,19800,19800;8100,8100,13500,13500;10800,10800,10800,10800")); + + CHandle_ oHandle1; + oHandle1.position = _T("#0,topLeft"); + oHandle1.xrange = _T("0,21600"); + m_arHandles.push_back(oHandle1); + } +}; +} \ No newline at end of file diff --git a/MsBinaryFile/Common/ODraw/oldAutoShapes/PentagonType.h b/MsBinaryFile/Common/ODraw/oldAutoShapes/PentagonType.h new file mode 100644 index 0000000000..35a8dfea42 --- /dev/null +++ b/MsBinaryFile/Common/ODraw/oldAutoShapes/PentagonType.h @@ -0,0 +1,60 @@ +/* + * (c) Copyright Ascensio System SIA 2010-2019 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect + * that Ascensio System SIA expressly excludes the warranty of non-infringement + * of any third-party rights. + * + * This program is distributed WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * + */ +#pragma once +#include "../CustomShape.h" + +// 56 +namespace NSCustomShapesConvert +{ +class CPentagonType : public CCustomShape +{ +public: + CPentagonType() + + { + m_bConcentricFill = true; + m_eJoin = ODRAW::lineJoinMiter; + + m_strPath = _T("m10800,l,8259,4200,21600r13200,l21600,8259xe"); + LoadConnectorsList(_T("10800,0;0,8259;4200,21600;10800,21600;17400,21600;21600,8259")); + + m_arConnectorAngles.push_back(270); + m_arConnectorAngles.push_back(180); + m_arConnectorAngles.push_back(90); + m_arConnectorAngles.push_back(90); + m_arConnectorAngles.push_back(90); + m_arConnectorAngles.push_back(0); + + LoadTextRect(_T("4200,5077,17400,21600")); + } +}; +} \ No newline at end of file diff --git a/MsBinaryFile/Common/ODraw/oldAutoShapes/PlaqueType.h b/MsBinaryFile/Common/ODraw/oldAutoShapes/PlaqueType.h new file mode 100644 index 0000000000..6db21645b7 --- /dev/null +++ b/MsBinaryFile/Common/ODraw/oldAutoShapes/PlaqueType.h @@ -0,0 +1,74 @@ +/* + * (c) Copyright Ascensio System SIA 2010-2019 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect + * that Ascensio System SIA expressly excludes the warranty of non-infringement + * of any third-party rights. + * + * This program is distributed WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * + */ +#pragma once +#include "../CustomShape.h" + +// 21 +namespace NSCustomShapesConvert +{ +class CPlaqueType : public CCustomShape +{ +public: + CPlaqueType() + + { + m_bConcentricFill = true; + m_eJoin = ODRAW::lineJoinMiter; + m_strPath = _T("m@0,qy0@0l0@2qx@0,21600l@1,21600qy21600@2l21600@0qx@1,xe"); + + AddGuide(_T("val #0")); + AddGuide(_T("sum width 0 #0")); + AddGuide(_T("sum height 0 #0")); + AddGuide(_T("prod @0 7071 10000")); + AddGuide(_T("sum width 0 @3")); + AddGuide(_T("sum height 0 @3")); + AddGuide(_T("val width")); + AddGuide(_T("val height")); + AddGuide(_T("prod width 1 2")); + AddGuide(_T("prod height 1 2")); + + m_arAdjustments.push_back(3600); + + LoadConnectorsList(_T("@8,0;0,@9;@8,@7;@6,@9")); + LoadTextRect(_T("@3,@3,@4,@5")); + + CHandle_ oHandle1; + oHandle1.position = _T("#0,topLeft"); + oHandle1.switchHandle = _T("true"); + oHandle1.xrange = _T("0,10800"); + m_arHandles.push_back(oHandle1); + + m_lLimoX = 10800; + m_lLimoY = 10800; + } +}; +} \ No newline at end of file diff --git a/MsBinaryFile/Common/ODraw/oldAutoShapes/PlusType.h b/MsBinaryFile/Common/ODraw/oldAutoShapes/PlusType.h new file mode 100644 index 0000000000..29cbdbf6c3 --- /dev/null +++ b/MsBinaryFile/Common/ODraw/oldAutoShapes/PlusType.h @@ -0,0 +1,75 @@ +/* + * (c) Copyright Ascensio System SIA 2010-2019 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect + * that Ascensio System SIA expressly excludes the warranty of non-infringement + * of any third-party rights. + * + * This program is distributed WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * + */ +#pragma once +#include "../CustomShape.h" + +// 11 +namespace NSCustomShapesConvert +{ +class CPlusType : public CCustomShape +{ +public: + CPlusType() + + { + m_bConcentricFill = true; + m_eJoin = ODRAW::lineJoinMiter; + + m_strPath = _T("m@0,l@0@0,0@0,0@2@0@2@0,21600@1,21600@1@2,21600@2,21600@0@1@0@1,xe"); + + AddGuide(_T("val #0")); + AddGuide(_T("sum width 0 #0")); + AddGuide(_T("sum height 0 #0")); + AddGuide(_T("prod @0 2929 10000")); + AddGuide(_T("sum width 0 @3")); + AddGuide(_T("sum height 0 @3")); + AddGuide(_T("val width")); + AddGuide(_T("val height")); + AddGuide(_T("prod width 1 2")); + AddGuide(_T("prod height 1 2")); + + m_arAdjustments.push_back(5400); + + LoadConnectorsList(_T("@8,0;0,@9;@8,@7;@6,@9")); + LoadTextRect(_T("0,0,21600,21600;5400,5400,16200,16200;10800,10800,10800,10800")); + + CHandle_ oHandle1; + oHandle1.position = _T("#0,topLeft"); + oHandle1.switchHandle = _T("true"); + oHandle1.xrange = _T("0,10800"); + m_arHandles.push_back(oHandle1); + + m_lLimoX = 10800; + m_lLimoY = 10800; + } +}; +} \ No newline at end of file diff --git a/MsBinaryFile/Common/ODraw/oldAutoShapes/QuadArrowCalloutType.h b/MsBinaryFile/Common/ODraw/oldAutoShapes/QuadArrowCalloutType.h new file mode 100644 index 0000000000..e8db1cf75f --- /dev/null +++ b/MsBinaryFile/Common/ODraw/oldAutoShapes/QuadArrowCalloutType.h @@ -0,0 +1,85 @@ +/* + * (c) Copyright Ascensio System SIA 2010-2019 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect + * that Ascensio System SIA expressly excludes the warranty of non-infringement + * of any third-party rights. + * + * This program is distributed WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * + */ +#pragma once +#include "../CustomShape.h" + +// 83 +namespace NSCustomShapesConvert +{ +class CQuadArrowCalloutType : public CCustomShape +{ +public: + CQuadArrowCalloutType() + + { + m_bConcentricFill = false; + m_eJoin = ODRAW::lineJoinMiter; + m_strPath = _T("m@0@0l@3@0@3@2@1@2,10800,0@4@2@5@2@5@0@8@0@8@3@9@3@9@1,21600,10800@9@4@9@5@8@5@8@8@5@8@5@9@4@9,10800,21600@1@9@3@9@3@8@0@8@0@5@2@5@2@4,,10800@2@1@2@3@0@3xe"); + + AddGuide(_T("val #0")); + AddGuide(_T("val #1")); + AddGuide(_T("val #2")); + AddGuide(_T("val #3")); + AddGuide(_T("sum 21600 0 #1")); + AddGuide(_T("sum 21600 0 #3")); + AddGuide(_T("sum #0 21600 0")); + AddGuide(_T("prod @6 1 2")); + AddGuide(_T("sum 21600 0 #0")); + AddGuide(_T("sum 21600 0 #2")); + + m_arAdjustments.push_back(5400); + m_arAdjustments.push_back(8100); + m_arAdjustments.push_back(2700); + m_arAdjustments.push_back(9450); + + LoadConnectorsList(_T("Rectangle")); + + LoadTextRect(_T("@0,@0,@8,@8")); + + CHandle_ oHandle1; + oHandle1.position = _T("topLeft,#0"); + oHandle1.yrange = _T("@2,@1"); + m_arHandles.push_back(oHandle1); + + CHandle_ oHandle2; + oHandle2.position = _T("#1,topLeft"); + oHandle2.xrange = _T("@0,@3"); + m_arHandles.push_back(oHandle2); + + CHandle_ oHandle3; + oHandle3.position = _T("#3,#2"); + oHandle3.xrange = _T("@1,10800"); + oHandle3.yrange = _T("0,@0"); + m_arHandles.push_back(oHandle3); + } +}; +} \ No newline at end of file diff --git a/MsBinaryFile/Common/ODraw/oldAutoShapes/QuadArrowType.h b/MsBinaryFile/Common/ODraw/oldAutoShapes/QuadArrowType.h new file mode 100644 index 0000000000..184fdf0439 --- /dev/null +++ b/MsBinaryFile/Common/ODraw/oldAutoShapes/QuadArrowType.h @@ -0,0 +1,79 @@ +/* + * (c) Copyright Ascensio System SIA 2010-2019 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect + * that Ascensio System SIA expressly excludes the warranty of non-infringement + * of any third-party rights. + * + * This program is distributed WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * + */ +#pragma once +#include "../CustomShape.h" + +// 76 +namespace NSCustomShapesConvert +{ +class CQuadArrowType : public CCustomShape +{ +public: + CQuadArrowType() + + { + m_bConcentricFill = false; + m_eJoin = ODRAW::lineJoinMiter; + m_strPath = _T("m10800,l@0@2@1@2@1@1@2@1@2@0,,10800@2@3@2@4@1@4@1@5@0@5,10800,21600@3@5@4@5@4@4@5@4@5@3,21600,10800@5@0@5@1@4@1@4@2@3@2xe"); + + AddGuide(_T("val #0")); + AddGuide(_T("val #1")); + AddGuide(_T("val #2")); + AddGuide(_T("sum 21600 0 #0")); + AddGuide(_T("sum 21600 0 #1")); + AddGuide(_T("sum 21600 0 #2")); + AddGuide(_T("sum #0 0 10800")); + AddGuide(_T("sum #1 0 10800")); + AddGuide(_T("prod @7 #2 @6")); + AddGuide(_T("sum 21600 0 @8")); + + m_arAdjustments.push_back(6480); + m_arAdjustments.push_back(8640); + m_arAdjustments.push_back(4320); + + LoadConnectorsList(_T("Rectangle")); + + LoadTextRect(_T("@8,@1,@9,@4;@1,@8,@4,@9")); + + CHandle_ oHandle1; + oHandle1.position = _T("#0,topLeft"); + oHandle1.xrange = _T("@2,@1"); + m_arHandles.push_back(oHandle1); + + CHandle_ oHandle2; + oHandle2.position = _T("#1,#2"); + oHandle2.xrange = _T("@0,10800"); + oHandle2.yrange = _T("0,@0"); + m_arHandles.push_back(oHandle2); + } +}; +} \ No newline at end of file diff --git a/MsBinaryFile/Common/ODraw/oldAutoShapes/RectangleType.h b/MsBinaryFile/Common/ODraw/oldAutoShapes/RectangleType.h new file mode 100644 index 0000000000..12c6f4f43b --- /dev/null +++ b/MsBinaryFile/Common/ODraw/oldAutoShapes/RectangleType.h @@ -0,0 +1,49 @@ +/* + * (c) Copyright Ascensio System SIA 2010-2019 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect + * that Ascensio System SIA expressly excludes the warranty of non-infringement + * of any third-party rights. + * + * This program is distributed WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * + */ +#pragma once +#include "../CustomShape.h" + +// 1 +namespace NSCustomShapesConvert +{ +class CRectangleType : public CCustomShape +{ +public: + CRectangleType() + + { + m_bConcentricFill = true; + m_eJoin = ODRAW::lineJoinMiter; + m_strPath = _T("m,l,21600r21600,l21600,xe"); + } +}; +} diff --git a/MsBinaryFile/Common/ODraw/oldAutoShapes/RibbonDownType.h b/MsBinaryFile/Common/ODraw/oldAutoShapes/RibbonDownType.h new file mode 100644 index 0000000000..906fcad37a --- /dev/null +++ b/MsBinaryFile/Common/ODraw/oldAutoShapes/RibbonDownType.h @@ -0,0 +1,97 @@ +/* + * (c) Copyright Ascensio System SIA 2010-2019 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect + * that Ascensio System SIA expressly excludes the warranty of non-infringement + * of any third-party rights. + * + * This program is distributed WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * + */ +#pragma once +#include "../CustomShape.h" + +// 53 +namespace NSCustomShapesConvert +{ +class CRibbonDownType : public CCustomShape +{ +public: + CRibbonDownType() + + { + m_bConcentricFill = false; + m_eJoin = ODRAW::lineJoinMiter; + + m_strPath = _T("m,l@3,qx@4@11l@4@10@5@10@5@11qy@6,l@21,0@19@15@21@16@9@16@9@17qy@8@22l@1@22qx@0@17l@0@16,0@16,2700@15xem@4@11nfqy@3@12l@1@12qx@0@13@1@10l@4@10em@5@11nfqy@6@12l@8@12qx@9@13@8@10l@5@10em@0@13nfl@0@16em@9@13nfl@9@16e"); + + AddGuide(_T("val #0")); + AddGuide(_T("sum @0 675 0")); + AddGuide(_T("sum @1 675 0")); + AddGuide(_T("sum @2 675 0")); + AddGuide(_T("sum @3 675 0")); + AddGuide(_T("sum width 0 @4")); + AddGuide(_T("sum width 0 @3")); + AddGuide(_T("sum width 0 @2")); + AddGuide(_T("sum width 0 @1")); + AddGuide(_T("sum width 0 @0")); + AddGuide(_T("val #1")); + AddGuide(_T("prod @10 1 4")); + AddGuide(_T("prod @11 2 1")); + AddGuide(_T("prod @11 3 1")); + AddGuide(_T("prod height 1 2")); + AddGuide(_T("sum @14 0 @12")); + AddGuide(_T("sum height 0 @10")); + AddGuide(_T("sum height 0 @11")); + AddGuide(_T("prod width 1 2")); + AddGuide(_T("sum width 0 2700")); + AddGuide(_T("sum @18 0 2700")); + AddGuide(_T("val width")); + AddGuide(_T("val height")); + + m_arAdjustments.push_back(5400); + m_arAdjustments.push_back(2700); + + LoadConnectorsList(_T("@18,@10;2700,@15;@18,21600;@19,@15")); + + m_arConnectorAngles.push_back(270); + m_arConnectorAngles.push_back(180); + m_arConnectorAngles.push_back(90); + m_arConnectorAngles.push_back(0); + + LoadTextRect(_T("@0,@10,@9,21600")); + + CHandle_ oHandle1; + CHandle_ oHandle2; + + oHandle1.position = _T("#0,bottomRight"); + oHandle1.xrange = _T("2700,8100"); + oHandle2.position = _T("center,#1"); + oHandle2.yrange = _T("0,7200"); + + m_arHandles.push_back(oHandle1); + m_arHandles.push_back(oHandle2); + } +}; +} \ No newline at end of file diff --git a/MsBinaryFile/Common/ODraw/oldAutoShapes/RibbonUpType.h b/MsBinaryFile/Common/ODraw/oldAutoShapes/RibbonUpType.h new file mode 100644 index 0000000000..6f939e3a9d --- /dev/null +++ b/MsBinaryFile/Common/ODraw/oldAutoShapes/RibbonUpType.h @@ -0,0 +1,102 @@ +/* + * (c) Copyright Ascensio System SIA 2010-2019 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect + * that Ascensio System SIA expressly excludes the warranty of non-infringement + * of any third-party rights. + * + * This program is distributed WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * + */ +#pragma once +#include "../CustomShape.h" + +// 54 +namespace NSCustomShapesConvert +{ +class CRibbonUpType : public CCustomShape +{ +public: + CRibbonUpType() + + { + m_bConcentricFill = false; + m_eJoin = ODRAW::lineJoinMiter; + + m_strPath = _T("m0@29l@3@29qx@4@19l@4@10@5@10@5@19qy@6@29l@28@29@26@22@28@23@9@23@9@24qy@8,l@1,qx@0@24l@0@23,0@23,2700@22xem@4@19nfqy@3@20l@1@20qx@0@21@1@10l@4@10em@5@19nfqy@6@20l@8@20qx@9@21@8@10l@5@10em@0@21nfl@0@23em@9@21nfl@9@23e"); + + AddGuide(_T("val #0")); + AddGuide(_T("sum @0 675 0")); + AddGuide(_T("sum @1 675 0")); + AddGuide(_T("sum @2 675 0")); + AddGuide(_T("sum @3 675 0")); + AddGuide(_T("sum width 0 @4")); + AddGuide(_T("sum width 0 @3")); + AddGuide(_T("sum width 0 @2")); + AddGuide(_T("sum width 0 @1")); + AddGuide(_T("sum width 0 @0")); + AddGuide(_T("val #1")); + AddGuide(_T("prod @10 1 4")); + AddGuide(_T("prod @10 1 2")); + AddGuide(_T("prod @10 3 4")); + AddGuide(_T("prod height 3 4")); + AddGuide(_T("prod height 1 2")); + AddGuide(_T("prod height 1 4")); + AddGuide(_T("prod height 3 2")); + AddGuide(_T("prod height 2 3")); + AddGuide(_T("sum @11 @14 0")); + AddGuide(_T("sum @12 @15 0")); + AddGuide(_T("sum @13 @16 0")); + AddGuide(_T("sum @17 0 @20")); + AddGuide(_T("sum height 0 @10")); + AddGuide(_T("sum height 0 @19")); + AddGuide(_T("prod width 1 2")); + AddGuide(_T("sum width 0 2700")); + AddGuide(_T("sum @25 0 2700")); + AddGuide(_T("val width")); + AddGuide(_T("val height")); + + m_arAdjustments.push_back(5400); + m_arAdjustments.push_back(18900); + + LoadConnectorsList(_T("@25,0;2700,@22;@25,@10;@26,@22")); + + m_arConnectorAngles.push_back(270); + m_arConnectorAngles.push_back(180); + m_arConnectorAngles.push_back(90); + m_arConnectorAngles.push_back(0); + + LoadTextRect(_T("@0,0,@9,@10")); + + CHandle_ oHandle1; + CHandle_ oHandle2; + oHandle1.position = _T("#0,topLeft"); + oHandle1.xrange = _T("2700,8100"); + oHandle2.position = _T("center,#1"); + oHandle2.yrange = _T("14400,21600"); + m_arHandles.push_back(oHandle1); + m_arHandles.push_back(oHandle2); + } +}; +} \ No newline at end of file diff --git a/MsBinaryFile/Common/ODraw/oldAutoShapes/RightArrowCalloutType.h b/MsBinaryFile/Common/ODraw/oldAutoShapes/RightArrowCalloutType.h new file mode 100644 index 0000000000..2c8bee037f --- /dev/null +++ b/MsBinaryFile/Common/ODraw/oldAutoShapes/RightArrowCalloutType.h @@ -0,0 +1,89 @@ +/* + * (c) Copyright Ascensio System SIA 2010-2019 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect + * that Ascensio System SIA expressly excludes the warranty of non-infringement + * of any third-party rights. + * + * This program is distributed WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * + */ +#pragma once +#include "../CustomShape.h" + +// 78 +namespace NSCustomShapesConvert +{ +class CRightArrowCalloutType : public CCustomShape +{ +public: + CRightArrowCalloutType() + + { + m_bConcentricFill = false; + m_eJoin = ODRAW::lineJoinMiter; + m_strPath = _T("m,l,21600@0,21600@0@5@2@5@2@4,21600,10800@2@1@2@3@0@3@0,x"); + + AddGuide(_T("val #0")); + AddGuide(_T("val #1")); + AddGuide(_T("val #2")); + AddGuide(_T("val #3")); + AddGuide(_T("sum 21600 0 #1")); + AddGuide(_T("sum 21600 0 #3")); + AddGuide(_T("prod #0 1 2")); + + m_arAdjustments.push_back(14400); + m_arAdjustments.push_back(5400); + m_arAdjustments.push_back(18000); + m_arAdjustments.push_back(8100); + + LoadConnectorsList(_T("@6,0;0,10800;@6,21600;21600,10800")); + + m_arConnectorAngles.push_back(270); + m_arConnectorAngles.push_back(180); + m_arConnectorAngles.push_back(90); + m_arConnectorAngles.push_back(0); + + LoadTextRect(_T("0,0,@0,21600")); + + CHandle_ oHandle1; + oHandle1.position = _T("#0,topLeft"); + oHandle1.xrange = _T("0,@2"); + m_arHandles.push_back(oHandle1); + + CHandle_ oHandle2; + oHandle2.position = _T("bottomRight,#1"); + oHandle2.yrange = _T("0,@3"); + m_arHandles.push_back(oHandle2); + + CHandle_ oHandle3; + oHandle3.position = _T("#2,#3"); + oHandle3.xrange = _T("@0,21600"); + oHandle3.yrange = _T("@1,10800"); + m_arHandles.push_back(oHandle3); + } +}; +} + + diff --git a/MsBinaryFile/Common/ODraw/oldAutoShapes/RightArrowType.h b/MsBinaryFile/Common/ODraw/oldAutoShapes/RightArrowType.h new file mode 100644 index 0000000000..9fe07b7626 --- /dev/null +++ b/MsBinaryFile/Common/ODraw/oldAutoShapes/RightArrowType.h @@ -0,0 +1,76 @@ +/* + * (c) Copyright Ascensio System SIA 2010-2019 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect + * that Ascensio System SIA expressly excludes the warranty of non-infringement + * of any third-party rights. + * + * This program is distributed WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * + */ +#pragma once +#include "../CustomShape.h" + +// 13 +namespace NSCustomShapesConvert +{ +class CRightArrowType : public CCustomShape +{ +public: + CRightArrowType() + + { + m_bConcentricFill = false; + m_eJoin = ODRAW::lineJoinMiter; + + m_strPath = _T("m@0,l@0@1,0@1,0@2@0@2@0,21600,21600,10800xe"); + + AddGuide(_T("val #0")); + AddGuide(_T("val #1")); + AddGuide(_T("sum height 0 #1")); + AddGuide(_T("sum 10800 0 #1")); + AddGuide(_T("sum width 0 #0")); + AddGuide(_T("prod @4 @3 10800")); + AddGuide(_T("sum width 0 @5")); + + m_arAdjustments.push_back(16200); + m_arAdjustments.push_back(5400); + + LoadConnectorsList(_T("@0,0;0,10800;@0,21600;21600,10800")); + + m_arConnectorAngles.push_back(270); + m_arConnectorAngles.push_back(180); + m_arConnectorAngles.push_back(90); + m_arConnectorAngles.push_back(0); + + LoadTextRect(_T("0,@1,@6,@2")); + + CHandle_ oHandle1; + oHandle1.position = _T("#0,#1"); + oHandle1.xrange = _T("0,21600"); + oHandle1.yrange = _T("0,10800"); + m_arHandles.push_back(oHandle1); + } +}; +} \ No newline at end of file diff --git a/MsBinaryFile/Common/ODraw/oldAutoShapes/RightBracetype.h b/MsBinaryFile/Common/ODraw/oldAutoShapes/RightBracetype.h new file mode 100644 index 0000000000..71aee6ac8e --- /dev/null +++ b/MsBinaryFile/Common/ODraw/oldAutoShapes/RightBracetype.h @@ -0,0 +1,78 @@ +/* + * (c) Copyright Ascensio System SIA 2010-2019 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect + * that Ascensio System SIA expressly excludes the warranty of non-infringement + * of any third-party rights. + * + * This program is distributed WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * + */ +#pragma once +#include "../CustomShape.h" + +// 88 +namespace NSCustomShapesConvert +{ +class CRightBracetype : public CCustomShape +{ +public: + CRightBracetype() + + { + m_bConcentricFill = false; + m_eJoin = ODRAW::lineJoinMiter; + + m_strPath = _T("m,qx10800@0l10800@2qy21600@11,10800@3l10800@1qy,21600e"); + + AddGuide(_T("val #0")); + AddGuide(_T("sum 21600 0 #0")); + AddGuide(_T("sum #1 0 #0")); + AddGuide(_T("sum #1 #0 0")); + AddGuide(_T("prod #0 9598 32768")); + AddGuide(_T("sum 21600 0 @4")); + AddGuide(_T("sum 21600 0 #1")); + AddGuide(_T("min #1 @6")); + AddGuide(_T("prod @7 1 2")); + AddGuide(_T("prod #0 2 1")); + AddGuide(_T("sum 21600 0 @9")); + AddGuide(_T("val #1")); + + m_arAdjustments.push_back(1800); + m_arAdjustments.push_back(10800); + + LoadConnectorsList(_T("0,0;21600,@11;0,21600")); + LoadTextRect(_T("0,@4,7637,@5")); + + CHandle_ oHandle1; + CHandle_ oHandle2; + oHandle1.position = _T("center,#0"); + oHandle1.yrange = _T("0,@8"); + oHandle2.position = _T("bottomRight,#1"); + oHandle2.yrange = _T("@9,@10"); + m_arHandles.push_back(oHandle1); + m_arHandles.push_back(oHandle2); + } +}; +} \ No newline at end of file diff --git a/MsBinaryFile/Common/ODraw/oldAutoShapes/RightBracketType.h b/MsBinaryFile/Common/ODraw/oldAutoShapes/RightBracketType.h new file mode 100644 index 0000000000..aa5890fbfd --- /dev/null +++ b/MsBinaryFile/Common/ODraw/oldAutoShapes/RightBracketType.h @@ -0,0 +1,66 @@ +/* + * (c) Copyright Ascensio System SIA 2010-2019 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect + * that Ascensio System SIA expressly excludes the warranty of non-infringement + * of any third-party rights. + * + * This program is distributed WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * + */ +#pragma once +#include "../CustomShape.h" + +// 86 +namespace NSCustomShapesConvert +{ +class CRightBracketType : public CCustomShape +{ +public: + CRightBracketType() + + { + m_bConcentricFill = false; + m_eJoin = ODRAW::lineJoinRound; + //Endcaps: Flat + + m_strPath = _T("m,qx21600@0l21600@1qy,21600e"); + + AddGuide(_T("val #0")); + AddGuide(_T("sum 21600 0 #0")); + AddGuide(_T("prod #0 9598 32768")); + AddGuide(_T("sum 21600 0 @2")); + + m_arAdjustments.push_back(1800); + + LoadConnectorsList(_T("0,0;0,21600;21600,10800")); + LoadTextRect(_T("0,@2,15274,@3")); + + CHandle_ oHandle1; + oHandle1.position = _T("bottomRight,#0"); + oHandle1.yrange = _T("0,10800"); + m_arHandles.push_back(oHandle1); + } +}; +} diff --git a/MsBinaryFile/Common/ODraw/oldAutoShapes/RightTriangleType.h b/MsBinaryFile/Common/ODraw/oldAutoShapes/RightTriangleType.h new file mode 100644 index 0000000000..5a3192e408 --- /dev/null +++ b/MsBinaryFile/Common/ODraw/oldAutoShapes/RightTriangleType.h @@ -0,0 +1,53 @@ +/* + * (c) Copyright Ascensio System SIA 2010-2019 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect + * that Ascensio System SIA expressly excludes the warranty of non-infringement + * of any third-party rights. + * + * This program is distributed WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * + */ +#pragma once +#include "../CustomShape.h" + +// 6 +namespace NSCustomShapesConvert +{ +class CRightTriangleType : public CCustomShape +{ +public: + CRightTriangleType() + + { + m_bConcentricFill = true; + m_eJoin = ODRAW::lineJoinMiter; + + m_strPath = _T("m,l,21600r21600,xe"); + + LoadConnectorsList(_T("0,0;0,10800;0,21600;10800,21600;21600,21600;10800,10800")); + LoadTextRect(_T("1800,12600,12600,19800")); + } +}; +} diff --git a/MsBinaryFile/Common/ODraw/oldAutoShapes/RoundedRectangleType.h b/MsBinaryFile/Common/ODraw/oldAutoShapes/RoundedRectangleType.h new file mode 100644 index 0000000000..f53e4f2930 --- /dev/null +++ b/MsBinaryFile/Common/ODraw/oldAutoShapes/RoundedRectangleType.h @@ -0,0 +1,65 @@ +/* + * (c) Copyright Ascensio System SIA 2010-2019 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect + * that Ascensio System SIA expressly excludes the warranty of non-infringement + * of any third-party rights. + * + * This program is distributed WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * + */ +#pragma once +#include "../CustomShape.h" + +// 2 +namespace NSCustomShapesConvert +{ +class CRoundedRectangleType : public CCustomShape +{ +public: + CRoundedRectangleType() + + { + m_bConcentricFill = true; + m_eJoin = ODRAW::lineJoinMiter; + + m_strPath = _T("m0@0qy@0,0l@1,0qx21600@0l21600@1qy@1,21600l@0,21600qx0@1xe"); + + AddGuide(_T("val #0")); + AddGuide(_T("sum 21600 0 #0")); + + m_arAdjustments.push_back(5400); + + LoadTextRect(_T("0,0,21600,21600")); + + CHandle_ oHandle1; + oHandle1.position = _T("#0,topLeft"); + oHandle1.xrange = _T("0,10800"); + m_arHandles.push_back(oHandle1); + + m_lLimoX = 10800; + m_lLimoY = 10800; + } +}; +} \ No newline at end of file diff --git a/MsBinaryFile/Common/ODraw/oldAutoShapes/Seal16Type.h b/MsBinaryFile/Common/ODraw/oldAutoShapes/Seal16Type.h new file mode 100644 index 0000000000..14c45fdebf --- /dev/null +++ b/MsBinaryFile/Common/ODraw/oldAutoShapes/Seal16Type.h @@ -0,0 +1,76 @@ +/* + * (c) Copyright Ascensio System SIA 2010-2019 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect + * that Ascensio System SIA expressly excludes the warranty of non-infringement + * of any third-party rights. + * + * This program is distributed WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * + */ +#pragma once +#include "../CustomShape.h" + +// 59 +namespace NSCustomShapesConvert +{ +class CSeal16Type : public CCustomShape +{ +public: + CSeal16Type() + + { + m_bConcentricFill = true; + m_eJoin = ODRAW::lineJoinMiter; + m_strPath = _T("m21600,10800l@5@10,20777,6667@7@12,18436,3163@8@11,14932,822@6@9,10800,0@10@9,6667,822@12@11,3163,3163@11@12,822,6667@9@10,,10800@9@6,822,14932@11@8,3163,18436@12@7,6667,20777@10@5,10800,21600@6@5,14932,20777@8@7,18436,18436@7@8,20777,14932@5@6xe"); + + AddGuide(_T("sum 10800 0 #0")); + AddGuide(_T("prod @0 32138 32768")); + AddGuide(_T("prod @0 6393 32768")); + AddGuide(_T("prod @0 27246 32768")); + AddGuide(_T("prod @0 18205 32768")); + AddGuide(_T("sum @1 10800 0")); + AddGuide(_T("sum @2 10800 0")); + AddGuide(_T("sum @3 10800 0")); + AddGuide(_T("sum @4 10800 0")); + AddGuide(_T("sum 10800 0 @1")); + AddGuide(_T("sum 10800 0 @2")); + AddGuide(_T("sum 10800 0 @3")); + AddGuide(_T("sum 10800 0 @4")); + AddGuide(_T("prod @0 23170 32768")); + AddGuide(_T("sum @13 10800 0")); + AddGuide(_T("sum 10800 0 @13")); + + m_arAdjustments.push_back(2700); + + LoadConnectorsList(_T("Rectangle")); + LoadTextRect(_T("@15,@15,@14,@14")); + + CHandle_ oHandle1; + oHandle1.position = _T("#0,center"); + oHandle1.xrange = _T("0,10800"); + m_arHandles.push_back(oHandle1); + } +}; +} diff --git a/MsBinaryFile/Common/ODraw/oldAutoShapes/Seal24Type.h b/MsBinaryFile/Common/ODraw/oldAutoShapes/Seal24Type.h new file mode 100644 index 0000000000..e30f797540 --- /dev/null +++ b/MsBinaryFile/Common/ODraw/oldAutoShapes/Seal24Type.h @@ -0,0 +1,83 @@ +/* + * (c) Copyright Ascensio System SIA 2010-2019 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect + * that Ascensio System SIA expressly excludes the warranty of non-infringement + * of any third-party rights. + * + * This program is distributed WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * + */ +#pragma once +#include "../CustomShape.h" + +// 92 +namespace NSCustomShapesConvert +{ +class CSeal24Type : public CCustomShape +{ +public: + CSeal24Type() + + { + m_bConcentricFill = true; + m_eJoin = ODRAW::lineJoinMiter; + m_strPath = _T("m21600,10800l@7@14,21232,8005@9@16,20153,5400@11@18,18437,3163@12@17,16200,1447@10@15,13595,368@8@13,10800,0@14@13,8005,368@16@15,5400,1447@18@17,3163,3163@17@18,1447,5400@15@16,368,8005@13@14,,10800@13@8,368,13595@15@10,1447,16200@17@12,3163,18437@18@11,5400,20153@16@9,8005,21232@14@7,10800,21600@8@7,13595,21232@10@9,16200,20153@12@11,18437,18437@11@12,20153,16200@9@10,21232,13595@7@8xe"); + + AddGuide(_T("sum 10800 0 #0")); + AddGuide(_T("prod @0 32488 32768")); + AddGuide(_T("prod @0 4277 32768")); + AddGuide(_T("prod @0 30274 32768")); + AddGuide(_T("prod @0 12540 32768")); + AddGuide(_T("prod @0 25997 32768")); + AddGuide(_T("prod @0 19948 32768")); + AddGuide(_T("sum @1 10800 0")); + AddGuide(_T("sum @2 10800 0")); + AddGuide(_T("sum @3 10800 0")); + AddGuide(_T("sum @4 10800 0")); + AddGuide(_T("sum @5 10800 0")); + AddGuide(_T("sum @6 10800 0")); + AddGuide(_T("sum 10800 0 @1")); + AddGuide(_T("sum 10800 0 @2")); + AddGuide(_T("sum 10800 0 @3")); + AddGuide(_T("sum 10800 0 @4")); + AddGuide(_T("sum 10800 0 @5")); + AddGuide(_T("sum 10800 0 @6")); + AddGuide(_T("prod @0 23170 32768")); + AddGuide(_T("sum @19 10800 0")); + AddGuide(_T("sum 10800 0 @19")); + + m_arAdjustments.push_back(2700); + + LoadConnectorsList(_T("Rectangle")); + LoadTextRect(_T("@21,@21,@20,@20")); + + CHandle_ oHandle1; + oHandle1.position = _T("#0,center"); + oHandle1.xrange = _T("0,10800"); + m_arHandles.push_back(oHandle1); + } +}; +} + diff --git a/MsBinaryFile/Common/ODraw/oldAutoShapes/Seal32Type.h b/MsBinaryFile/Common/ODraw/oldAutoShapes/Seal32Type.h new file mode 100644 index 0000000000..54002b2d35 --- /dev/null +++ b/MsBinaryFile/Common/ODraw/oldAutoShapes/Seal32Type.h @@ -0,0 +1,89 @@ +/* + * (c) Copyright Ascensio System SIA 2010-2019 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect + * that Ascensio System SIA expressly excludes the warranty of non-infringement + * of any third-party rights. + * + * This program is distributed WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * + */ +#pragma once +#include "../CustomShape.h" + +// 60 +namespace NSCustomShapesConvert +{ +class CSeal32Type : public CCustomShape +{ +public: + CSeal32Type() + + { + m_bConcentricFill = true; + m_eJoin = ODRAW::lineJoinMiter; + m_strPath = _T("m21600,10800l@9@18,21392,8693@11@20,20777,6667@13@22,19780,4800@15@24,18436,3163@16@23,16800,1820@14@21,14932,822@12@19,12907,208@10@17,10800,0@18@17,8693,208@20@19,6667,822@22@21,4800,1820@24@23,3163,3163@23@24,1820,4800@21@22,822,6667@19@20,208,8693@17@18,,10800@17@10,208,12907@19@12,822,14932@21@14,1820,16800@23@16,3163,18436@24@15,4800,19780@22@13,6667,20777@20@11,8693,21392@18@9,10800,21600@10@9,12907,21392@12@11,14932,20777@14@13,16800,19780@16@15,18436,18436@15@16,19780,16800@13@14,20777,14932@11@12,21392,12907@9@10xe"); + + AddGuide(_T("sum 10800 0 #0")); + AddGuide(_T("prod @0 32610 32768")); + AddGuide(_T("prod @0 3212 32768")); + AddGuide(_T("prod @0 31357 32768")); + AddGuide(_T("prod @0 9512 32768")); + AddGuide(_T("prod @0 28899 32768")); + AddGuide(_T("prod @0 15447 32768")); + AddGuide(_T("prod @0 25330 32768")); + AddGuide(_T("prod @0 20788 32768")); + AddGuide(_T("sum @1 10800 0")); + AddGuide(_T("sum @2 10800 0")); + AddGuide(_T("sum @3 10800 0")); + AddGuide(_T("sum @4 10800 0")); + AddGuide(_T("sum @5 10800 0")); + AddGuide(_T("sum @6 10800 0")); + AddGuide(_T("sum @7 10800 0")); + AddGuide(_T("sum @8 10800 0")); + AddGuide(_T("sum 10800 0 @1")); + AddGuide(_T("sum 10800 0 @2")); + AddGuide(_T("sum 10800 0 @3")); + AddGuide(_T("sum 10800 0 @4")); + AddGuide(_T("sum 10800 0 @5")); + AddGuide(_T("sum 10800 0 @6")); + AddGuide(_T("sum 10800 0 @7")); + AddGuide(_T("sum 10800 0 @8")); + AddGuide(_T("prod @0 23170 32768")); + AddGuide(_T("sum @25 10800 0")); + AddGuide(_T("sum 10800 0 @25")); + + m_arAdjustments.push_back(2700); + + LoadConnectorsList(_T("Rectangle")); + LoadTextRect(_T("@27,@27,@26,@26")); + + CHandle_ oHandle1; + oHandle1.position = _T("#0,center"); + oHandle1.xrange = _T("0,10800"); + m_arHandles.push_back(oHandle1); + } +}; +} + diff --git a/MsBinaryFile/Common/ODraw/oldAutoShapes/Seal4Type.h b/MsBinaryFile/Common/ODraw/oldAutoShapes/Seal4Type.h new file mode 100644 index 0000000000..f0731b0cc6 --- /dev/null +++ b/MsBinaryFile/Common/ODraw/oldAutoShapes/Seal4Type.h @@ -0,0 +1,66 @@ +/* + * (c) Copyright Ascensio System SIA 2010-2019 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect + * that Ascensio System SIA expressly excludes the warranty of non-infringement + * of any third-party rights. + * + * This program is distributed WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * + */ +#pragma once +#include "../CustomShape.h" + +// 187 +namespace NSCustomShapesConvert +{ +class CSeal4Type : public CCustomShape +{ +public: + CSeal4Type() + + { + m_bConcentricFill = true; + m_eJoin = ODRAW::lineJoinMiter; + m_strPath = _T("m21600,10800l@2@3,10800,0@3@3,,10800@3@2,10800,21600@2@2xe"); + + AddGuide(_T("sum 10800 0 #0")); + AddGuide(_T("prod @0 23170 32768")); + AddGuide(_T("sum @1 10800 0")); + AddGuide(_T("sum 10800 0 @1")); + + m_arAdjustments.push_back(8100); + + LoadConnectorsList(_T("Rectangle")); + LoadTextRect(_T("@3,@3,@2,@2")); + + CHandle_ oHandle1; + oHandle1.position = _T("#0,center"); + oHandle1.xrange = _T("0,10800"); + m_arHandles.push_back(oHandle1); + } +}; + + +} \ No newline at end of file diff --git a/MsBinaryFile/Common/ODraw/oldAutoShapes/Seal8Type.h b/MsBinaryFile/Common/ODraw/oldAutoShapes/Seal8Type.h new file mode 100644 index 0000000000..09304feb42 --- /dev/null +++ b/MsBinaryFile/Common/ODraw/oldAutoShapes/Seal8Type.h @@ -0,0 +1,73 @@ +/* + * (c) Copyright Ascensio System SIA 2010-2019 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect + * that Ascensio System SIA expressly excludes the warranty of non-infringement + * of any third-party rights. + * + * This program is distributed WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * + */ +#pragma once +#include "../CustomShape.h" + +// 58 +namespace NSCustomShapesConvert +{ + +class CSeal8Type : public CCustomShape +{ +public: + CSeal8Type() + + { + m_bConcentricFill = true; + m_eJoin = ODRAW::lineJoinMiter; + m_strPath = _T("m21600,10800l@3@6,18436,3163@4@5,10800,0@6@5,3163,3163@5@6,,10800@5@4,3163,18436@6@3,10800,21600@4@3,18436,18436@3@4xe"); + + AddGuide(_T("sum 10800 0 #0")); + AddGuide(_T("prod @0 30274 32768")); + AddGuide(_T("prod @0 12540 32768")); + AddGuide(_T("sum @1 10800 0")); + AddGuide(_T("sum @2 10800 0")); + AddGuide(_T("sum 10800 0 @1")); + AddGuide(_T("sum 10800 0 @2")); + AddGuide(_T("prod @0 23170 32768")); + AddGuide(_T("sum @7 10800 0")); + AddGuide(_T("sum 10800 0 @7")); + + m_arAdjustments.push_back(2538); + + LoadConnectorsList(_T("Rectangle")); + LoadTextRect(_T("@9,@9,@8,@8")); + + CHandle_ oHandle1; + oHandle1.position = _T("#0,center"); + oHandle1.xrange = _T("0,10800"); + m_arHandles.push_back(oHandle1); + } +}; +} + + diff --git a/MsBinaryFile/Common/ODraw/oldAutoShapes/SmileyFaceType.h b/MsBinaryFile/Common/ODraw/oldAutoShapes/SmileyFaceType.h new file mode 100644 index 0000000000..1bbb0de531 --- /dev/null +++ b/MsBinaryFile/Common/ODraw/oldAutoShapes/SmileyFaceType.h @@ -0,0 +1,66 @@ +/* + * (c) Copyright Ascensio System SIA 2010-2019 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect + * that Ascensio System SIA expressly excludes the warranty of non-infringement + * of any third-party rights. + * + * This program is distributed WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * + */ +#pragma once +#include "../CustomShape.h" + +// 96 +namespace NSCustomShapesConvert +{ + +class CSmileyFaceType : public CCustomShape +{ +public: + CSmileyFaceType() + + { + m_bConcentricFill = true; + m_eJoin = ODRAW::lineJoinRound; + + m_strPath = _T("m10800,qx,10800,10800,21600,21600,10800,10800,xem7340,6445qx6215,7570,7340,8695,8465,7570,7340,6445xnfem14260,6445qx13135,7570,14260,8695,15385,7570,14260,6445xnfem4960@0c8853@3,12747@3,16640@0nfe"); + + AddGuide(_T("sum 33030 0 #0")); + AddGuide(_T("prod #0 4 3")); + AddGuide(_T("prod @0 1 3")); + AddGuide(_T("sum @1 0 @2")); + + m_arAdjustments.push_back(17520); + + LoadConnectorsList(_T("10800,0;3163,3163;0,10800;3163,18437;10800,21600;18437,18437;21600,10800;18437,3163")); + LoadTextRect(_T("3163,3163,18437,18437")); + + CHandle_ oHandle1; + oHandle1.position = _T("center,#0"); + oHandle1.yrange = _T("15510,17520"); + m_arHandles.push_back(oHandle1); + } +}; +} \ No newline at end of file diff --git a/MsBinaryFile/Common/ODraw/oldAutoShapes/Startype.h b/MsBinaryFile/Common/ODraw/oldAutoShapes/Startype.h new file mode 100644 index 0000000000..197f215f6a --- /dev/null +++ b/MsBinaryFile/Common/ODraw/oldAutoShapes/Startype.h @@ -0,0 +1,54 @@ +/* + * (c) Copyright Ascensio System SIA 2010-2019 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect + * that Ascensio System SIA expressly excludes the warranty of non-infringement + * of any third-party rights. + * + * This program is distributed WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * + */ +#pragma once +#include "../CustomShape.h" + +// 12 +namespace NSCustomShapesConvert +{ + +class CStarType : public CCustomShape +{ +public: + CStarType() + + { + m_bConcentricFill = true; + m_eJoin = ODRAW::lineJoinMiter; + + m_strPath = _T("m10800,l8280,8259,,8259r6720,5146l4200,21600r6600,-5019l17400,21600,14880,13405,21600,8259r-8280,xe"); + + LoadConnectorsList(_T("10800,0;0,8259;4200,21600;17400,21600;21600,8259")); + LoadTextRect(_T("6720,8259,14880,15628")); + } +}; +} \ No newline at end of file diff --git a/MsBinaryFile/Common/ODraw/oldAutoShapes/StraightConnectorType.h b/MsBinaryFile/Common/ODraw/oldAutoShapes/StraightConnectorType.h new file mode 100644 index 0000000000..0ad16a6274 --- /dev/null +++ b/MsBinaryFile/Common/ODraw/oldAutoShapes/StraightConnectorType.h @@ -0,0 +1,49 @@ +/* + * (c) Copyright Ascensio System SIA 2010-2019 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect + * that Ascensio System SIA expressly excludes the warranty of non-infringement + * of any third-party rights. + * + * This program is distributed WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * + */ +#pragma once +#include "../CustomShape.h" + +// 32 +namespace NSCustomShapesConvert +{ + +class CStraightConnectorType : public CCustomShape +{ +public: + CStraightConnectorType() + + { + m_strPath = _T("m,l21600,21600e"); + LoadConnectorsList(_T("0,0;21600,21600")); + } +}; +} diff --git a/MsBinaryFile/Common/ODraw/oldAutoShapes/StripedRightArrowType.h b/MsBinaryFile/Common/ODraw/oldAutoShapes/StripedRightArrowType.h new file mode 100644 index 0000000000..7e81f03766 --- /dev/null +++ b/MsBinaryFile/Common/ODraw/oldAutoShapes/StripedRightArrowType.h @@ -0,0 +1,77 @@ +/* + * (c) Copyright Ascensio System SIA 2010-2019 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect + * that Ascensio System SIA expressly excludes the warranty of non-infringement + * of any third-party rights. + * + * This program is distributed WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * + */ +#pragma once +#include "../CustomShape.h" + +// 93 +namespace NSCustomShapesConvert +{ + +class CStripedRightArrowType : public CCustomShape +{ +public: + CStripedRightArrowType() + + { + m_bConcentricFill = false; + m_eJoin = ODRAW::lineJoinMiter; + m_strPath = _T("m@0,l@0@1,3375@1,3375@2@0@2@0,21600,21600,10800xem1350@1l1350@2,2700@2,2700@1xem0@1l0@2,675@2,675@1xe"); + + AddGuide(_T("val #0")); + AddGuide(_T("val #1")); + AddGuide(_T("sum height 0 #1")); + AddGuide(_T("sum 10800 0 #1")); + AddGuide(_T("sum width 0 #0")); + AddGuide(_T("prod @4 @3 10800")); + AddGuide(_T("sum width 0 @5")); + + m_arAdjustments.push_back(16200); + m_arAdjustments.push_back(5400); + + LoadConnectorsList(_T("@0,0;0,10800;@0,21600;21600,10800")); + + m_arConnectorAngles.push_back(270); + m_arConnectorAngles.push_back(180); + m_arConnectorAngles.push_back(90); + m_arConnectorAngles.push_back(0); + + + LoadTextRect(_T("3375,@1,@6,@2")); + + CHandle_ oHandle1; + oHandle1.position = _T("#0,#1"); + oHandle1.xrange = _T("3375,21600"); + oHandle1.yrange = _T("0,10800"); + m_arHandles.push_back(oHandle1); + } +}; +} \ No newline at end of file diff --git a/MsBinaryFile/Common/ODraw/oldAutoShapes/SunType.h b/MsBinaryFile/Common/ODraw/oldAutoShapes/SunType.h new file mode 100644 index 0000000000..21c50c7fc4 --- /dev/null +++ b/MsBinaryFile/Common/ODraw/oldAutoShapes/SunType.h @@ -0,0 +1,81 @@ +/* + * (c) Copyright Ascensio System SIA 2010-2019 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect + * that Ascensio System SIA expressly excludes the warranty of non-infringement + * of any third-party rights. + * + * This program is distributed WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * + */ +#pragma once +#include "../CustomShape.h" + +// 183 +namespace NSCustomShapesConvert +{ + +class CSunType : public CCustomShape +{ +public: + CSunType() + + { + m_bConcentricFill = false; + m_eJoin = ODRAW::lineJoinMiter; + m_strPath = _T("m21600,10800l@15@14@15@18xem18436,3163l@17@12@16@13xem10800,l@14@10@18@10xem3163,3163l@12@13@13@12xem,10800l@10@18@10@14xem3163,18436l@13@16@12@17xem10800,21600l@18@15@14@15xem18436,18436l@16@17@17@16xem10800@19qx@19,10800,10800@20@20,10800,10800@19xe"); + + AddGuide(_T("sum 10800 0 #0")); + AddGuide(_T("prod @0 30274 32768")); + AddGuide(_T("prod @0 12540 32768")); + AddGuide(_T("sum @1 10800 0")); + AddGuide(_T("sum @2 10800 0")); + AddGuide(_T("sum 10800 0 @1")); + AddGuide(_T("sum 10800 0 @2")); + AddGuide(_T("prod @0 23170 32768")); + AddGuide(_T("sum @7 10800 0")); + AddGuide(_T("sum 10800 0 @7")); + AddGuide(_T("prod @5 3 4")); + AddGuide(_T("prod @6 3 4")); + AddGuide(_T("sum @10 791 0")); + AddGuide(_T("sum @11 791 0")); + AddGuide(_T("sum @11 2700 0")); + AddGuide(_T("sum 21600 0 @10")); + AddGuide(_T("sum 21600 0 @12")); + AddGuide(_T("sum 21600 0 @13")); + AddGuide(_T("sum 21600 0 @14")); + AddGuide(_T("val #0")); + AddGuide(_T("sum 21600 0 #0")); + + m_arAdjustments.push_back(5400); + + LoadTextRect(_T("@9,@9,@8,@8")); + + CHandle_ oHandle1; + oHandle1.position = _T("#0,center"); + oHandle1.xrange = _T("2700,10125"); + m_arHandles.push_back(oHandle1); + } +}; +} \ No newline at end of file diff --git a/MsBinaryFile/Common/ODraw/oldAutoShapes/TextboxType.h b/MsBinaryFile/Common/ODraw/oldAutoShapes/TextboxType.h new file mode 100644 index 0000000000..46be559584 --- /dev/null +++ b/MsBinaryFile/Common/ODraw/oldAutoShapes/TextboxType.h @@ -0,0 +1,51 @@ +/* + * (c) Copyright Ascensio System SIA 2010-2019 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect + * that Ascensio System SIA expressly excludes the warranty of non-infringement + * of any third-party rights. + * + * This program is distributed WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * + */ +#pragma once +#include "../CustomShape.h" + +///////// !!!!!!!!!!!!!!!!!!!! ///////////// +// 202 +namespace NSCustomShapesConvert +{ + +class CTextboxType : public CCustomShape +{ +public: + CTextboxType() + + { + m_bConcentricFill = true; + m_eJoin = ODRAW::lineJoinMiter; + m_strPath = _T("m,l,21600r21600,l21600,xe"); + } +}; +} \ No newline at end of file diff --git a/MsBinaryFile/Common/ODraw/oldAutoShapes/TrapezoidType.h b/MsBinaryFile/Common/ODraw/oldAutoShapes/TrapezoidType.h new file mode 100644 index 0000000000..6762557696 --- /dev/null +++ b/MsBinaryFile/Common/ODraw/oldAutoShapes/TrapezoidType.h @@ -0,0 +1,74 @@ +/* + * (c) Copyright Ascensio System SIA 2010-2019 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect + * that Ascensio System SIA expressly excludes the warranty of non-infringement + * of any third-party rights. + * + * This program is distributed WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * + */ +#pragma once +#include "../CustomShape.h" + +// 8 +namespace NSCustomShapesConvert +{ + +class CTrapezoidType : public CCustomShape +{ +public: + CTrapezoidType() + + { + m_bConcentricFill = true; + m_eJoin = ODRAW::lineJoinMiter; + m_strPath = _T("m,l@0,21600@1,21600,21600,xe"); + + AddGuide(_T("val #0")); + AddGuide(_T("sum width 0 #0")); + AddGuide(_T("prod #0 1 2")); + AddGuide(_T("sum width 0 @2")); + AddGuide(_T("mid #0 width")); + AddGuide(_T("mid @1 0")); + AddGuide(_T("prod height width #0")); + AddGuide(_T("prod @6 1 2")); + AddGuide(_T("sum height 0 @7")); + AddGuide(_T("prod width 1 2")); + AddGuide(_T("sum #0 0 @9")); + AddGuide(_T("if @10 @8 0")); + AddGuide(_T("if @10 @7 height")); + + m_arAdjustments.push_back(5400); + + LoadConnectorsList(_T("@3,10800;10800,21600;@2,10800;10800,0")); + LoadTextRect(_T("1800,1800,19800,19800;4500,4500,17100,17100;7200,7200,14400,14400")); + + CHandle_ oHandle1; + oHandle1.position = _T("#0,bottomRight"); + oHandle1.xrange = _T("0,10800"); + m_arHandles.push_back(oHandle1); + } +}; +} \ No newline at end of file diff --git a/MsBinaryFile/Common/ODraw/oldAutoShapes/UpArrowCalloutType.h b/MsBinaryFile/Common/ODraw/oldAutoShapes/UpArrowCalloutType.h new file mode 100644 index 0000000000..c8754460fd --- /dev/null +++ b/MsBinaryFile/Common/ODraw/oldAutoShapes/UpArrowCalloutType.h @@ -0,0 +1,89 @@ +/* + * (c) Copyright Ascensio System SIA 2010-2019 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect + * that Ascensio System SIA expressly excludes the warranty of non-infringement + * of any third-party rights. + * + * This program is distributed WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * + */ +#pragma once +#include "../CustomShape.h" + +// 79 +namespace NSCustomShapesConvert +{ + +class CUpArrowCalloutType : public CCustomShape +{ +public: + CUpArrowCalloutType() + + { + m_bConcentricFill = false; + m_eJoin = ODRAW::lineJoinMiter; + m_strPath = _T("m0@0l@3@0@3@2@1@2,10800,0@4@2@5@2@5@0,21600@0,21600,21600,,21600xe"); + + AddGuide(_T("val #0")); + AddGuide(_T("val #1")); + AddGuide(_T("val #2")); + AddGuide(_T("val #3")); + AddGuide(_T("sum 21600 0 #1")); + AddGuide(_T("sum 21600 0 #3")); + AddGuide(_T("sum #0 21600 0")); + AddGuide(_T("prod @6 1 2")); + + m_arAdjustments.push_back(7200); + m_arAdjustments.push_back(5400); + m_arAdjustments.push_back(3600); + m_arAdjustments.push_back(8100); + + LoadConnectorsList(_T("10800,0;0,@7;10800,21600;21600,@7")); + + m_arConnectorAngles.push_back(270); + m_arConnectorAngles.push_back(180); + m_arConnectorAngles.push_back(90); + m_arConnectorAngles.push_back(0); + + LoadTextRect(_T("0,@0,21600,21600")); + + CHandle_ oHandle1; + oHandle1.position = _T("topLeft,#0"); + oHandle1.yrange = _T("@2,21600"); + m_arHandles.push_back(oHandle1); + + CHandle_ oHandle2; + oHandle2.position = _T("#1,topLeft"); + oHandle2.xrange = _T("0,@3"); + m_arHandles.push_back(oHandle2); + + CHandle_ oHandle3; + oHandle3.position = _T("#3,#2"); + oHandle3.xrange = _T("@1,10800"); + oHandle3.yrange = _T("0,@0"); + m_arHandles.push_back(oHandle3); + } +}; +} \ No newline at end of file diff --git a/MsBinaryFile/Common/ODraw/oldAutoShapes/UpArrowType.h b/MsBinaryFile/Common/ODraw/oldAutoShapes/UpArrowType.h new file mode 100644 index 0000000000..d21bc7772d --- /dev/null +++ b/MsBinaryFile/Common/ODraw/oldAutoShapes/UpArrowType.h @@ -0,0 +1,74 @@ +/* + * (c) Copyright Ascensio System SIA 2010-2019 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect + * that Ascensio System SIA expressly excludes the warranty of non-infringement + * of any third-party rights. + * + * This program is distributed WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * + */ +#pragma once +#include "../CustomShape.h" + +// 68 +namespace NSCustomShapesConvert +{ + +class CUpArrowType : public CCustomShape +{ +public: + CUpArrowType() + + { + m_bConcentricFill = false; + m_eJoin = ODRAW::lineJoinMiter; + m_strPath = _T("m0@0l@1@0@1,21600@2,21600@2@0,21600@0,10800,xe"); + + AddGuide(_T("val #0")); + AddGuide(_T("val #1")); + AddGuide(_T("sum 21600 0 #1")); + AddGuide(_T("prod #0 #1 10800")); + AddGuide(_T("sum #0 0 @3")); + + m_arAdjustments.push_back(5400); + m_arAdjustments.push_back(5400); + + LoadConnectorsList(_T("10800,0;0,@0;10800,21600;21600,@0")); + + m_arConnectorAngles.push_back(270); + m_arConnectorAngles.push_back(180); + m_arConnectorAngles.push_back(90); + m_arConnectorAngles.push_back(0); + + LoadTextRect(_T("@1,@4,@2,21600")); + + CHandle_ oHandle1; + oHandle1.position = _T("#1,#0"); + oHandle1.xrange = _T("0,10800"); + oHandle1.yrange = _T("0,21600"); + m_arHandles.push_back(oHandle1); + } +}; +} \ No newline at end of file diff --git a/MsBinaryFile/Common/ODraw/oldAutoShapes/UpDownArrowCalloutType.h b/MsBinaryFile/Common/ODraw/oldAutoShapes/UpDownArrowCalloutType.h new file mode 100644 index 0000000000..7647ef1974 --- /dev/null +++ b/MsBinaryFile/Common/ODraw/oldAutoShapes/UpDownArrowCalloutType.h @@ -0,0 +1,91 @@ +/* + * (c) Copyright Ascensio System SIA 2010-2019 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect + * that Ascensio System SIA expressly excludes the warranty of non-infringement + * of any third-party rights. + * + * This program is distributed WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * + */ +#pragma once +#include "../CustomShape.h" + +// 82 +namespace NSCustomShapesConvert +{ + +class CUpDownArrowCalloutType : public CCustomShape +{ +public: + CUpDownArrowCalloutType() + + { + m_bConcentricFill = false; + m_eJoin = ODRAW::lineJoinMiter; + m_strPath = _T("m0@0l@3@0@3@2@1@2,10800,0@4@2@5@2@5@0,21600@0,21600@8@5@8@5@9@4@9,10800,21600@1@9@3@9@3@8,0@8xe"); + + AddGuide(_T("val #0")); + AddGuide(_T("val #1")); + AddGuide(_T("val #2")); + AddGuide(_T("val #3")); + AddGuide(_T("sum 21600 0 #1")); + AddGuide(_T("sum 21600 0 #3")); + AddGuide(_T("sum #0 21600 0")); + AddGuide(_T("prod @6 1 2")); + AddGuide(_T("sum 21600 0 #0")); + AddGuide(_T("sum 21600 0 #2")); + + m_arAdjustments.push_back(5400); + m_arAdjustments.push_back(5400); + m_arAdjustments.push_back(2700); + m_arAdjustments.push_back(8100); + + LoadConnectorsList(_T("10800,0;0,10800;10800,21600;21600,10800")); + + m_arConnectorAngles.push_back(270); + m_arConnectorAngles.push_back(180); + m_arConnectorAngles.push_back(90); + m_arConnectorAngles.push_back(0); + + LoadTextRect(_T("0,@0,21600,@8")); + + CHandle_ oHandle1; + oHandle1.position = _T("topLeft,#0"); + oHandle1.yrange = _T("@2,10800"); + m_arHandles.push_back(oHandle1); + + CHandle_ oHandle2; + oHandle2.position = _T("#1,topLeft"); + oHandle2.xrange = _T("0,@3"); + m_arHandles.push_back(oHandle2); + + CHandle_ oHandle3; + oHandle3.position = _T("#3,#2"); + oHandle3.xrange = _T("@1,10800"); + oHandle3.yrange = _T("0,@0"); + m_arHandles.push_back(oHandle3); + } +}; +} \ No newline at end of file diff --git a/MsBinaryFile/Common/ODraw/oldAutoShapes/UpDownArrowType.h b/MsBinaryFile/Common/ODraw/oldAutoShapes/UpDownArrowType.h new file mode 100644 index 0000000000..0bbbdbda2f --- /dev/null +++ b/MsBinaryFile/Common/ODraw/oldAutoShapes/UpDownArrowType.h @@ -0,0 +1,80 @@ +/* + * (c) Copyright Ascensio System SIA 2010-2019 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect + * that Ascensio System SIA expressly excludes the warranty of non-infringement + * of any third-party rights. + * + * This program is distributed WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * + */ +#pragma once +#include "../CustomShape.h" + +// 70 +namespace NSCustomShapesConvert +{ + +class CUpDownArrowType : public CCustomShape +{ +public: + CUpDownArrowType() + + { + m_bConcentricFill = false; + m_eJoin = ODRAW::lineJoinMiter; + m_strPath = _T("m10800,l21600@0@3@0@3@2,21600@2,10800,21600,0@2@1@2@1@0,0@0xe"); + + AddGuide(_T("val #1")); + AddGuide(_T("val #0")); + AddGuide(_T("sum 21600 0 #1")); + AddGuide(_T("sum 21600 0 #0")); + AddGuide(_T("prod #1 #0 10800")); + AddGuide(_T("sum #1 0 @4")); + AddGuide(_T("sum 21600 0 @5")); + + m_arAdjustments.push_back(5400); + m_arAdjustments.push_back(4320); + + LoadConnectorsList(_T("10800,0;0,@0;@1,10800;0,@2;10800,21600;21600,@2;@3,10800;21600,@0")); + + m_arConnectorAngles.push_back(270); + m_arConnectorAngles.push_back(180); + m_arConnectorAngles.push_back(180); + m_arConnectorAngles.push_back(180); + m_arConnectorAngles.push_back(90); + m_arConnectorAngles.push_back(0); + m_arConnectorAngles.push_back(0); + m_arConnectorAngles.push_back(0); + + LoadTextRect(_T("@1,@5,@3,@6")); + + CHandle_ oHandle1; + oHandle1.position = _T("#0,#1"); + oHandle1.xrange = _T("0,10800"); + oHandle1.yrange = _T("0,10800"); + m_arHandles.push_back(oHandle1); + } +}; +} \ No newline at end of file diff --git a/MsBinaryFile/Common/ODraw/oldAutoShapes/UturnArrowType.h b/MsBinaryFile/Common/ODraw/oldAutoShapes/UturnArrowType.h new file mode 100644 index 0000000000..0072806f28 --- /dev/null +++ b/MsBinaryFile/Common/ODraw/oldAutoShapes/UturnArrowType.h @@ -0,0 +1,60 @@ +/* + * (c) Copyright Ascensio System SIA 2010-2019 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect + * that Ascensio System SIA expressly excludes the warranty of non-infringement + * of any third-party rights. + * + * This program is distributed WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * + */ +#pragma once +#include "../CustomShape.h" + +// 101 +namespace NSCustomShapesConvert +{ + +class CUturnArrowType : public CCustomShape +{ +public: + CUturnArrowType() + + { + m_bConcentricFill = false; + m_eJoin = ODRAW::lineJoinMiter; + m_strPath = _T("m15662,14285l21600,8310r-2970,qy9250,,,8485l,21600r6110,l6110,8310qy8907,5842l9725,5842qx12520,8310l9725,8310xe"); + + LoadConnectorsList(_T("9250,0;3055,21600;9725,8310;15662,14285;21600,8310")); + + m_arConnectorAngles.push_back(270); + m_arConnectorAngles.push_back(90); + m_arConnectorAngles.push_back(90); + m_arConnectorAngles.push_back(90); + m_arConnectorAngles.push_back(0); + + LoadTextRect(_T("0,8310,6110,21600")); + } +}; +} \ No newline at end of file diff --git a/MsBinaryFile/Common/ODraw/oldAutoShapes/VerticalScrollType.h b/MsBinaryFile/Common/ODraw/oldAutoShapes/VerticalScrollType.h new file mode 100644 index 0000000000..dd8c17efe7 --- /dev/null +++ b/MsBinaryFile/Common/ODraw/oldAutoShapes/VerticalScrollType.h @@ -0,0 +1,86 @@ +/* + * (c) Copyright Ascensio System SIA 2010-2019 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect + * that Ascensio System SIA expressly excludes the warranty of non-infringement + * of any third-party rights. + * + * This program is distributed WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * + */ +#pragma once +#include "../CustomShape.h" + +// 97 +namespace NSCustomShapesConvert +{ + +class CVerticalScrollType : public CCustomShape +{ +public: + CVerticalScrollType() + + { + m_bConcentricFill = false; + m_eJoin = ODRAW::lineJoinMiter; + //Encaps: Flat + + m_strPath = _T("m@5,qx@1@2l@1@0@2@0qx0@7@2,21600l@9,21600qx@10@7l@10@1@11@1qx21600@2@11,xem@5,nfqx@6@2@5@1@4@3@5@2l@6@2em@5@1nfl@10@1em@2,21600nfqx@1@7l@1@0em@2@0nfqx@3@8@2@7l@1@7e"); + + AddGuide(_T("sum height 0 #0")); + AddGuide(_T("val #0")); + AddGuide(_T("prod @1 1 2")); + AddGuide(_T("prod @1 3 4")); + AddGuide(_T("prod @1 5 4")); + AddGuide(_T("prod @1 3 2")); + AddGuide(_T("prod @1 2 1")); + AddGuide(_T("sum height 0 @2")); + AddGuide(_T("sum height 0 @3")); + AddGuide(_T("sum width 0 @5")); + AddGuide(_T("sum width 0 @1")); + AddGuide(_T("sum width 0 @2")); + AddGuide(_T("val height")); + AddGuide(_T("prod height 1 2")); + AddGuide(_T("prod width 1 2")); + + m_arAdjustments.push_back(2700); + + LoadConnectorsList(_T("@14,0;@1,@13;@14,@12;@10,@13")); + LoadTextRect(_T("@1,@1,@10,@7")); + + m_arConnectorAngles.push_back(270); + m_arConnectorAngles.push_back(180); + m_arConnectorAngles.push_back(90); + m_arConnectorAngles.push_back(0); + + CHandle_ oHandle1; + oHandle1.position = _T("topLeft,#0"); + oHandle1.yrange = _T("0,5400"); + m_arHandles.push_back(oHandle1); + + m_lLimoX = 10800; + m_lLimoY = 10800; + } +}; +} \ No newline at end of file diff --git a/MsBinaryFile/Common/ODraw/oldAutoShapes/WaveDoubleType.h b/MsBinaryFile/Common/ODraw/oldAutoShapes/WaveDoubleType.h new file mode 100644 index 0000000000..540d71ffcd --- /dev/null +++ b/MsBinaryFile/Common/ODraw/oldAutoShapes/WaveDoubleType.h @@ -0,0 +1,126 @@ +/* + * (c) Copyright Ascensio System SIA 2010-2019 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect + * that Ascensio System SIA expressly excludes the warranty of non-infringement + * of any third-party rights. + * + * This program is distributed WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * + */ +#pragma once +#include "../CustomShape.h" + +// 188 +namespace NSCustomShapesConvert +{ + +class CWaveDoubleType : public CCustomShape +{ +public: + CWaveDoubleType() + + { + m_bConcentricFill = false; + m_eJoin = ODRAW::lineJoinMiter; + //Encaps: Flat + + m_strPath = _T("m@43@0c@42@1@41@3@40@0@39@1@38@3@37@0l@30@4c@31@5@32@6@33@4@34@5@35@6@36@4xe"); + + AddGuide(_T("val #0")); + AddGuide(_T("prod @0 41 9")); + AddGuide(_T("prod @0 23 9")); + AddGuide(_T("sum 0 0 @2")); + AddGuide(_T("sum 21600 0 #0")); + AddGuide(_T("sum 21600 0 @1")); + AddGuide(_T("sum 21600 0 @3")); + AddGuide(_T("sum #1 0 10800")); + AddGuide(_T("sum 21600 0 #1")); + AddGuide(_T("prod @8 1 3")); + AddGuide(_T("prod @8 2 3")); + AddGuide(_T("prod @8 4 3")); + AddGuide(_T("prod @8 5 3")); + AddGuide(_T("prod @8 2 1")); + AddGuide(_T("sum 21600 0 @9")); + AddGuide(_T("sum 21600 0 @10")); + AddGuide(_T("sum 21600 0 @8")); + AddGuide(_T("sum 21600 0 @11")); + AddGuide(_T("sum 21600 0 @12")); + AddGuide(_T("sum 21600 0 @13")); + AddGuide(_T("prod #1 1 3")); + AddGuide(_T("prod #1 2 3")); + AddGuide(_T("prod #1 4 3")); + AddGuide(_T("prod #1 5 3")); + AddGuide(_T("prod #1 2 1")); + AddGuide(_T("sum 21600 0 @20")); + AddGuide(_T("sum 21600 0 @21")); + AddGuide(_T("sum 21600 0 @22")); + AddGuide(_T("sum 21600 0 @23")); + AddGuide(_T("sum 21600 0 @24")); + AddGuide(_T("if @7 @19 0")); + AddGuide(_T("if @7 @18 @20")); + AddGuide(_T("if @7 @17 @21")); + AddGuide(_T("if @7 @16 #1")); + AddGuide(_T("if @7 @15 @22")); + AddGuide(_T("if @7 @14 @23")); + AddGuide(_T("if @7 21600 @24")); + AddGuide(_T("if @7 0 @29")); + AddGuide(_T("if @7 @9 @28")); + AddGuide(_T("if @7 @10 @27")); + AddGuide(_T("if @7 @8 @8")); + AddGuide(_T("if @7 @11 @26")); + AddGuide(_T("if @7 @12 @25")); + AddGuide(_T("if @7 @13 21600")); + AddGuide(_T("sum @36 0 @30")); + AddGuide(_T("sum @4 0 @0")); + AddGuide(_T("max @30 @37")); + AddGuide(_T("min @36 @43")); + AddGuide(_T("prod @0 2 1")); + AddGuide(_T("sum 21600 0 @48")); + AddGuide(_T("mid @36 @43")); + AddGuide(_T("mid @30 @37")); + + m_arAdjustments.push_back(1404); + m_arAdjustments.push_back(10800); + + LoadConnectorsList(_T("@40,@0;@51,10800;@33,@4;@50,10800")); + LoadTextRect(_T("@46,@48,@47,@49")); + + m_arConnectorAngles.push_back(270); + m_arConnectorAngles.push_back(180); + m_arConnectorAngles.push_back(90); + m_arConnectorAngles.push_back(0); + + CHandle_ oHandle1; + oHandle1.position = _T("topLeft,#0"); + oHandle1.yrange = _T("0,2229"); + m_arHandles.push_back(oHandle1); + + CHandle_ oHandle2; + oHandle2.position = _T("bottomRight,#1"); + oHandle2.xrange = _T("8640,12960"); + m_arHandles.push_back(oHandle2); + } +}; +} \ No newline at end of file diff --git a/MsBinaryFile/Common/ODraw/oldAutoShapes/WaveType.h b/MsBinaryFile/Common/ODraw/oldAutoShapes/WaveType.h new file mode 100644 index 0000000000..b878a044d1 --- /dev/null +++ b/MsBinaryFile/Common/ODraw/oldAutoShapes/WaveType.h @@ -0,0 +1,113 @@ +/* + * (c) Copyright Ascensio System SIA 2010-2019 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect + * that Ascensio System SIA expressly excludes the warranty of non-infringement + * of any third-party rights. + * + * This program is distributed WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * + */ +#pragma once +#include "../CustomShape.h" + +// 64 +namespace NSCustomShapesConvert +{ + +class CWaveType : public CCustomShape +{ +public: + CWaveType() + + { + m_bConcentricFill = false; + m_eJoin = ODRAW::lineJoinMiter; + //Encaps: Flat + + m_strPath = _T("m@28@0c@27@1@26@3@25@0l@21@4c@22@5@23@6@24@4xe"); + + AddGuide(_T("val #0")); + AddGuide(_T("prod @0 41 9")); + AddGuide(_T("prod @0 23 9")); + AddGuide(_T("sum 0 0 @2")); + AddGuide(_T("sum 21600 0 #0")); + AddGuide(_T("sum 21600 0 @1")); + AddGuide(_T("sum 21600 0 @3")); + AddGuide(_T("sum #1 0 10800")); + AddGuide(_T("sum 21600 0 #1")); + AddGuide(_T("prod @8 2 3")); + AddGuide(_T("prod @8 4 3")); + AddGuide(_T("prod @8 2 1")); + AddGuide(_T("sum 21600 0 @9")); + AddGuide(_T("sum 21600 0 @10")); + AddGuide(_T("sum 21600 0 @11")); + AddGuide(_T("prod #1 2 3")); + AddGuide(_T("prod #1 4 3")); + AddGuide(_T("prod #1 2 1")); + AddGuide(_T("sum 21600 0 @15")); + AddGuide(_T("sum 21600 0 @16")); + AddGuide(_T("sum 21600 0 @17")); + AddGuide(_T("if @7 @14 0")); + AddGuide(_T("if @7 @13 @15")); + AddGuide(_T("if @7 @12 @16")); + AddGuide(_T("if @7 21600 @17")); + AddGuide(_T("if @7 0 @20")); + AddGuide(_T("if @7 @9 @19")); + AddGuide(_T("if @7 @10 @18")); + AddGuide(_T("if @7 @11 21600")); + AddGuide(_T("sum @24 0 @21")); + AddGuide(_T("sum @4 0 @0")); + AddGuide(_T("max @21 @25")); + AddGuide(_T("min @24 @28")); + AddGuide(_T("prod @0 2 1")); + AddGuide(_T("sum 21600 0 @33")); + AddGuide(_T("mid @26 @27")); + AddGuide(_T("mid @24 @28")); + AddGuide(_T("mid @22 @23")); + AddGuide(_T("mid @21 @25")); + + m_arAdjustments.push_back(2809); + m_arAdjustments.push_back(10800); + + LoadConnectorsList(_T("@35,@0;@38,10800;@37,@4;@36,10800")); + LoadTextRect(_T("@31,@33,@32,@34")); + + m_arConnectorAngles.push_back(270); + m_arConnectorAngles.push_back(180); + m_arConnectorAngles.push_back(90); + m_arConnectorAngles.push_back(0); + + CHandle_ oHandle1; + oHandle1.position = _T("topLeft,#0"); + oHandle1.yrange = _T("0,4459"); + m_arHandles.push_back(oHandle1); + + CHandle_ oHandle2; + oHandle2.position = _T("bottomRight,#1"); + oHandle2.xrange = _T("8640,12960"); + m_arHandles.push_back(oHandle2); + } +}; +} \ No newline at end of file diff --git a/MsBinaryFile/Common/ODraw/oldAutoShapes/WedgeEllipseCalloutType.h b/MsBinaryFile/Common/ODraw/oldAutoShapes/WedgeEllipseCalloutType.h new file mode 100644 index 0000000000..ff58dec298 --- /dev/null +++ b/MsBinaryFile/Common/ODraw/oldAutoShapes/WedgeEllipseCalloutType.h @@ -0,0 +1,84 @@ +/* + * (c) Copyright Ascensio System SIA 2010-2019 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect + * that Ascensio System SIA expressly excludes the warranty of non-infringement + * of any third-party rights. + * + * This program is distributed WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * + */ +#pragma once +#include "../CustomShape.h" + +// 63 +namespace NSCustomShapesConvert +{ + +class CWedgeEllipseCalloutType : public CCustomShape +{ +public: + CWedgeEllipseCalloutType() + + { + m_bConcentricFill = false; + m_eJoin = ODRAW::lineJoinMiter; + m_strPath = _T("wr,,21600,21600@15@16@17@18l@21@22xe"); + + AddGuide(_T("val #0")); + AddGuide(_T("val #1")); + AddGuide(_T("sum 10800 0 #0")); + AddGuide(_T("sum 10800 0 #1")); + AddGuide(_T("atan2 @2 @3")); + AddGuide(_T("sumangle @4 11 0")); + AddGuide(_T("sumangle @4 0 11")); + AddGuide(_T("cos 10800 @4")); + AddGuide(_T("sin 10800 @4")); + AddGuide(_T("cos 10800 @5")); + AddGuide(_T("sin 10800 @5")); + AddGuide(_T("cos 10800 @6")); + AddGuide(_T("sin 10800 @6")); + AddGuide(_T("sum 10800 0 @7")); + AddGuide(_T("sum 10800 0 @8")); + AddGuide(_T("sum 10800 0 @9")); + AddGuide(_T("sum 10800 0 @10")); + AddGuide(_T("sum 10800 0 @11")); + AddGuide(_T("sum 10800 0 @12")); + AddGuide(_T("mod @2 @3 0")); + AddGuide(_T("sum @19 0 10800")); + AddGuide(_T("if @20 #0 @13")); + AddGuide(_T("if @20 #1 @14")); + + m_arAdjustments.push_back(1350); + m_arAdjustments.push_back(25920); + + LoadConnectorsList(_T("10800,0;3163,3163;0,10800;3163,18437;10800,21600;18437,18437;21600,10800;18437,3163;@21,@22")); + LoadTextRect(_T("3163,3163,18437,18437")); + + CHandle_ oHandle1; + oHandle1.position = _T("#0,#1"); + m_arHandles.push_back(oHandle1); + } +}; +} \ No newline at end of file diff --git a/MsBinaryFile/Common/ODraw/oldAutoShapes/WedgeRectCalloutType.h b/MsBinaryFile/Common/ODraw/oldAutoShapes/WedgeRectCalloutType.h new file mode 100644 index 0000000000..8ef8ea8559 --- /dev/null +++ b/MsBinaryFile/Common/ODraw/oldAutoShapes/WedgeRectCalloutType.h @@ -0,0 +1,96 @@ +/* + * (c) Copyright Ascensio System SIA 2010-2019 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect + * that Ascensio System SIA expressly excludes the warranty of non-infringement + * of any third-party rights. + * + * This program is distributed WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * + */ +#pragma once +#include "../CustomShape.h" + +// 61 +namespace NSCustomShapesConvert +{ + +class CWedgeRectCalloutType : public CCustomShape +{ +public: + CWedgeRectCalloutType() + + { + m_bConcentricFill = false; + m_eJoin = ODRAW::lineJoinMiter; + m_strPath = _T("m,l0@8@12@24,0@9,,21600@6,21600@15@27@7,21600,21600,21600,21600@9@18@30,21600@8,21600,0@7,0@21@33@6,xe"); + + AddGuide(_T("sum 10800 0 #0")); + AddGuide(_T("sum 10800 0 #1")); + AddGuide(_T("sum #0 0 #1")); + AddGuide(_T("sum @0 @1 0")); + AddGuide(_T("sum 21600 0 #0")); + AddGuide(_T("sum 21600 0 #1")); + AddGuide(_T("if @0 3600 12600")); + AddGuide(_T("if @0 9000 18000")); + AddGuide(_T("if @1 3600 12600")); + AddGuide(_T("if @1 9000 18000")); + AddGuide(_T("if @2 0 #0")); + AddGuide(_T("if @3 @10 0")); + AddGuide(_T("if #0 0 @11")); + AddGuide(_T("if @2 @6 #0")); + AddGuide(_T("if @3 @6 @13")); + AddGuide(_T("if @5 @6 @14")); + AddGuide(_T("if @2 #0 21600")); + AddGuide(_T("if @3 21600 @16")); + AddGuide(_T("if @4 21600 @17")); + AddGuide(_T("if @2 #0 @6")); + AddGuide(_T("if @3 @19 @6")); + AddGuide(_T("if #1 @6 @20")); + AddGuide(_T("if @2 @8 #1")); + AddGuide(_T("if @3 @22 @8")); + AddGuide(_T("if #0 @8 @23")); + AddGuide(_T("if @2 21600 #1")); + AddGuide(_T("if @3 21600 @25")); + AddGuide(_T("if @5 21600 @26")); + AddGuide(_T("if @2 #1 @8")); + AddGuide(_T("if @3 @8 @28")); + AddGuide(_T("if @4 @8 @29")); + AddGuide(_T("if @2 #1 0")); + AddGuide(_T("if @3 @31 0")); + AddGuide(_T("if #1 0 @32")); + AddGuide(_T("val #0")); + AddGuide(_T("val #1")); + + m_arAdjustments.push_back(1350); + m_arAdjustments.push_back(25920); + + LoadConnectorsList(_T("10800,0;0,10800;10800,21600;21600,10800;@34,@35")); + + CHandle_ oHandle1; + oHandle1.position = _T("#0,#1"); + m_arHandles.push_back(oHandle1); + } +}; +} \ No newline at end of file diff --git a/MsBinaryFile/Common/ODraw/oldAutoShapes/WedgeRoundedRectCalloutType.h b/MsBinaryFile/Common/ODraw/oldAutoShapes/WedgeRoundedRectCalloutType.h new file mode 100644 index 0000000000..fb811a0606 --- /dev/null +++ b/MsBinaryFile/Common/ODraw/oldAutoShapes/WedgeRoundedRectCalloutType.h @@ -0,0 +1,97 @@ +/* + * (c) Copyright Ascensio System SIA 2010-2019 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect + * that Ascensio System SIA expressly excludes the warranty of non-infringement + * of any third-party rights. + * + * This program is distributed WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * + */ +#pragma once +#include "../CustomShape.h" + +// 62 +namespace NSCustomShapesConvert +{ + +class CWedgeRoundedRectCalloutType : public CCustomShape +{ +public: + CWedgeRoundedRectCalloutType() + + { + m_bConcentricFill = false; + m_eJoin = ODRAW::lineJoinMiter; + m_strPath = _T("m3600,qx,3600l0@8@12@24,0@9,,18000qy3600,21600l@6,21600@15@27@7,21600,18000,21600qx21600,18000l21600@9@18@30,21600@8,21600,3600qy18000,l@7,0@21@33@6,xe"); + + AddGuide(_T("sum 10800 0 #0")); + AddGuide(_T("sum 10800 0 #1")); + AddGuide(_T("sum #0 0 #1")); + AddGuide(_T("sum @0 @1 0")); + AddGuide(_T("sum 21600 0 #0")); + AddGuide(_T("sum 21600 0 #1")); + AddGuide(_T("if @0 3600 12600")); + AddGuide(_T("if @0 9000 18000")); + AddGuide(_T("if @1 3600 12600")); + AddGuide(_T("if @1 9000 18000")); + AddGuide(_T("if @2 0 #0")); + AddGuide(_T("if @3 @10 0")); + AddGuide(_T("if #0 0 @11")); + AddGuide(_T("if @2 @6 #0")); + AddGuide(_T("if @3 @6 @13")); + AddGuide(_T("if @5 @6 @14")); + AddGuide(_T("if @2 #0 21600")); + AddGuide(_T("if @3 21600 @16")); + AddGuide(_T("if @4 21600 @17")); + AddGuide(_T("if @2 #0 @6")); + AddGuide(_T("if @3 @19 @6")); + AddGuide(_T("if #1 @6 @20")); + AddGuide(_T("if @2 @8 #1")); + AddGuide(_T("if @3 @22 @8")); + AddGuide(_T("if #0 @8 @23")); + AddGuide(_T("if @2 21600 #1")); + AddGuide(_T("if @3 21600 @25")); + AddGuide(_T("if @5 21600 @26")); + AddGuide(_T("if @2 #1 @8")); + AddGuide(_T("if @3 @8 @28")); + AddGuide(_T("if @4 @8 @29")); + AddGuide(_T("if @2 #1 0")); + AddGuide(_T("if @3 @31 0")); + AddGuide(_T("if #1 0 @32")); + AddGuide(_T("val #0")); + AddGuide(_T("val #1")); + + m_arAdjustments.push_back(1350); + m_arAdjustments.push_back(25920); + + LoadConnectorsList(_T("10800,0;0,10800;10800,21600;21600,10800;@34,@35")); + LoadTextRect(_T("791,791,20809,20809")); + + CHandle_ oHandle1; + oHandle1.position = _T("#0,#1"); + m_arHandles.push_back(oHandle1); + } +}; +} \ No newline at end of file diff --git a/MsBinaryFile/Common/ODraw/oldAutoShapes/accentbordercallout1type.h b/MsBinaryFile/Common/ODraw/oldAutoShapes/accentbordercallout1type.h new file mode 100644 index 0000000000..c3b1bafdcf --- /dev/null +++ b/MsBinaryFile/Common/ODraw/oldAutoShapes/accentbordercallout1type.h @@ -0,0 +1,71 @@ +/* + * (c) Copyright Ascensio System SIA 2010-2019 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect + * that Ascensio System SIA expressly excludes the warranty of non-infringement + * of any third-party rights. + * + * This program is distributed WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * + */ +#pragma once +#include "../CustomShape.h" + +// 50 +namespace NSCustomShapesConvert +{ + +class CAccentBorderCallout1Type : public CCustomShape +{ +public: + CAccentBorderCallout1Type() + { + m_bConcentricFill = true; + m_eJoin = ODRAW::lineJoinMiter; + //Encaps: Flat + + m_strPath = _T("m@0@1l@2@3nfem@2,l@2,21600nfem,l21600,r,21600l,21600xe"); + + AddGuide(_T("val #0")); + AddGuide(_T("val #1")); + AddGuide(_T("val #2")); + AddGuide(_T("val #3")); + + m_arAdjustments.push_back(8280); + m_arAdjustments.push_back(24300); + m_arAdjustments.push_back(-1800); + m_arAdjustments.push_back(4050); + + LoadConnectorsList(_T("@0,@1;10800,0;10800,21600;0,10800;21600,10800")); + + CHandle_ oHandle1; + oHandle1.position = _T("#0,#1"); + m_arHandles.push_back(oHandle1); + + CHandle_ oHandle2; + oHandle2.position = _T("#2,#3"); + m_arHandles.push_back(oHandle2); + } +}; +} diff --git a/MsBinaryFile/Common/ODraw/oldAutoShapes/accentbordercallout3type.h b/MsBinaryFile/Common/ODraw/oldAutoShapes/accentbordercallout3type.h new file mode 100644 index 0000000000..6895866f9b --- /dev/null +++ b/MsBinaryFile/Common/ODraw/oldAutoShapes/accentbordercallout3type.h @@ -0,0 +1,86 @@ +/* + * (c) Copyright Ascensio System SIA 2010-2019 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect + * that Ascensio System SIA expressly excludes the warranty of non-infringement + * of any third-party rights. + * + * This program is distributed WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * + */ +#pragma once +#include "../CustomShape.h" + +// 52 +namespace NSCustomShapesConvert +{ +class CAccentBorderCallout3Type : public CCustomShape +{ +public: + CAccentBorderCallout3Type() + { + m_bConcentricFill = true; + m_eJoin = ODRAW::lineJoinMiter; + //Encaps: Flat + + m_strPath = _T("m@0@1l@2@3@4@5@6@7nfem@6,l@6,21600nfem,l21600,r,21600l,21600xe"); + + AddGuide(_T("val #0")); + AddGuide(_T("val #1")); + AddGuide(_T("val #2")); + AddGuide(_T("val #3")); + AddGuide(_T("val #4")); + AddGuide(_T("val #5")); + AddGuide(_T("val #6")); + AddGuide(_T("val #7")); + + m_arAdjustments.push_back(23400); + m_arAdjustments.push_back(24400); + m_arAdjustments.push_back(25200); + m_arAdjustments.push_back(21600); + m_arAdjustments.push_back(25200); + m_arAdjustments.push_back(4050); + m_arAdjustments.push_back(23400); + m_arAdjustments.push_back(4050); + + LoadConnectorsList(_T("@0,@1;10800,0;10800,21600;0,10800;21600,10800")); + + CHandle_ oHandle1; + oHandle1.position = _T("#0,#1"); + m_arHandles.push_back(oHandle1); + + CHandle_ oHandle2; + oHandle2.position = _T("#2,#3"); + m_arHandles.push_back(oHandle2); + + CHandle_ oHandle3; + oHandle3.position = _T("#4,#5"); + m_arHandles.push_back(oHandle3); + + CHandle_ oHandle4; + oHandle4.position = _T("#6,#7"); + m_arHandles.push_back(oHandle4); + } +}; +} \ No newline at end of file diff --git a/MsBinaryFile/Common/ODraw/oldAutoShapes/accentbordercallout90type.h b/MsBinaryFile/Common/ODraw/oldAutoShapes/accentbordercallout90type.h new file mode 100644 index 0000000000..dce0347ee5 --- /dev/null +++ b/MsBinaryFile/Common/ODraw/oldAutoShapes/accentbordercallout90type.h @@ -0,0 +1,71 @@ +/* + * (c) Copyright Ascensio System SIA 2010-2019 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect + * that Ascensio System SIA expressly excludes the warranty of non-infringement + * of any third-party rights. + * + * This program is distributed WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * + */ +#pragma once +#include "../CustomShape.h" + +// 181 +namespace NSCustomShapesConvert +{ + +class CAccentBorderCallout90Type : public CCustomShape +{ +public: + CAccentBorderCallout90Type() + { + m_bConcentricFill = true; + m_eJoin = ODRAW::lineJoinMiter; + //Encaps: Flat + + m_strPath = _T("m@0@1l@2@3nfem,l21600,r,21600l,21600xe"); + + AddGuide(_T("val #0")); + AddGuide(_T("val #1")); + AddGuide(_T("val #2")); + AddGuide(_T("val #3")); + + m_arAdjustments.push_back(-1800); + m_arAdjustments.push_back(24300); + m_arAdjustments.push_back(-1800); + m_arAdjustments.push_back(4050); + + LoadConnectorsList(_T("@0,@1;10800,0;10800,21600;0,10800;21600,10800")); + + CHandle_ oHandle1; + oHandle1.position = _T("#0,#1"); + m_arHandles.push_back(oHandle1); + + CHandle_ oHandle2; + oHandle2.position = _T("#2,#3"); + m_arHandles.push_back(oHandle2); + } +}; +} \ No newline at end of file diff --git a/MsBinaryFile/Common/ODraw/oldAutoShapes/arctype.h b/MsBinaryFile/Common/ODraw/oldAutoShapes/arctype.h new file mode 100644 index 0000000000..b6bbe31045 --- /dev/null +++ b/MsBinaryFile/Common/ODraw/oldAutoShapes/arctype.h @@ -0,0 +1,70 @@ +/* + * (c) Copyright Ascensio System SIA 2010-2019 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect + * that Ascensio System SIA expressly excludes the warranty of non-infringement + * of any third-party rights. + * + * This program is distributed WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * + */ +#pragma once +#include "../CustomShape.h" + +// 19 +namespace NSCustomShapesConvert +{ +class CArcType : public CCustomShape +{ +public: + CArcType() + { + m_bConcentricFill = true; + m_eJoin = ODRAW::lineJoinRound; + m_strPath = _T("wr-21600,,21600,43200,,,21600,21600nfewr-21600,,21600,43200,,,21600,21600l,21600nsxe"); + + AddGuide(_T("val #2")); + AddGuide(_T("val #3")); + AddGuide(_T("val #4")); + + m_arAdjustments.push_back(-5898240); + m_arAdjustments.push_back(0); + m_arAdjustments.push_back(0); + m_arAdjustments.push_back(43200/*ShapeSizeVML*/);//43200?? + m_arAdjustments.push_back(43200/*ShapeSizeVML*/);//??43200 + + LoadConnectorsList(_T("0,0;21600,21600;0,21600")); + + CHandle_ oHandle1; + oHandle1.position = _T("@2,#0"); + oHandle1.polar = _T("@0,@1"); + m_arHandles.push_back(oHandle1); + + CHandle_ oHandle2; + oHandle2.position = _T("@2,#1"); + oHandle2.polar = _T("@0,@1"); + m_arHandles.push_back(oHandle2); + } +}; +} diff --git a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/AccentBorderCallout2Type.h b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/AccentBorderCallout2Type.h index a2628efcef..59932d4af6 100644 --- a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/AccentBorderCallout2Type.h +++ b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/AccentBorderCallout2Type.h @@ -1,4 +1,4 @@ -/* +/* * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or @@ -29,12 +29,8 @@ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode * */ - #pragma once #include "../PptShape.h" -#ifdef USE_CUSTOM_SHAPES - DEFINE_SHAPE_CLASS(CAccentBorderCallout2Type, CCustomShape) -#else - DEFINE_SHAPE_CLASS(CAccentBorderCallout2Type, CPPTShape) -#endif +// 51 +DEFINE_SHAPE_CLASS(CAccentBorderCallout2Type, CPPTShape) diff --git a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/AccentCallout1Type.h b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/AccentCallout1Type.h index d65dcba9e6..767b6da2ac 100644 --- a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/AccentCallout1Type.h +++ b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/AccentCallout1Type.h @@ -1,4 +1,4 @@ -/* +/* * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or @@ -29,12 +29,8 @@ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode * */ - #pragma once #include "../PptShape.h" -#ifdef USE_CUSTOM_SHAPES - DEFINE_SHAPE_CLASS(CAccentCallout1Type, CCustomShape) -#else - DEFINE_SHAPE_CLASS(CAccentCallout1Type, CPPTShape) -#endif +// 44 +DEFINE_SHAPE_CLASS(CAccentCallout1Type, CPPTShape) diff --git a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/AccentCallout2Type.h b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/AccentCallout2Type.h index 4e45f4b89a..25c27c0e40 100644 --- a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/AccentCallout2Type.h +++ b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/AccentCallout2Type.h @@ -1,4 +1,4 @@ -/* +/* * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or @@ -29,12 +29,8 @@ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode * */ - #pragma once #include "../PptShape.h" -#ifdef USE_CUSTOM_SHAPES - DEFINE_SHAPE_CLASS(CAccentCallout2Type, CCustomShape) -#else - DEFINE_SHAPE_CLASS(CAccentCallout2Type, CPPTShape) -#endif +// 45 +DEFINE_SHAPE_CLASS(CAccentCallout2Type, CPPTShape) diff --git a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/AccentCallout3Type.h b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/AccentCallout3Type.h index 39351d857e..60b3e0aa69 100644 --- a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/AccentCallout3Type.h +++ b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/AccentCallout3Type.h @@ -1,4 +1,4 @@ -/* +/* * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or @@ -29,12 +29,8 @@ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode * */ - #pragma once #include "../PptShape.h" -#ifdef USE_CUSTOM_SHAPES - DEFINE_SHAPE_CLASS(CAccentCallout3Type, CCustomShape) -#else - DEFINE_SHAPE_CLASS(CAccentCallout3Type, CPPTShape) -#endif +// 46 +DEFINE_SHAPE_CLASS(CAccentCallout3Type, CPPTShape) diff --git a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/AccentCallout90Type.h b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/AccentCallout90Type.h index 00ac507e66..7f8164f445 100644 --- a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/AccentCallout90Type.h +++ b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/AccentCallout90Type.h @@ -1,4 +1,4 @@ -/* +/* * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or @@ -29,12 +29,8 @@ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode * */ - #pragma once #include "../PptShape.h" -#ifdef USE_CUSTOM_SHAPES - DEFINE_SHAPE_CLASS(CAccentCallout90Type, CCustomShape) -#else - DEFINE_SHAPE_CLASS(CAccentCallout90Type, CPPTShape) -#endif +// 179 +DEFINE_SHAPE_CLASS(CAccentCallout90Type, CPPTShape) diff --git a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/ActionButtonBack.h b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/ActionButtonBack.h index 132eaa6401..3e41fc0532 100644 --- a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/ActionButtonBack.h +++ b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/ActionButtonBack.h @@ -1,4 +1,4 @@ -/* +/* * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or @@ -29,12 +29,8 @@ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode * */ - #pragma once #include "../PptShape.h" -#ifdef USE_CUSTOM_SHAPES - DEFINE_SHAPE_CLASS(CActionButtonBackType, CCustomShape) -#else - DEFINE_SHAPE_CLASS(CActionButtonBackType, CPPTShape) -#endif +// 194 +DEFINE_SHAPE_CLASS(CActionButtonBackType, CPPTShape) diff --git a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/ActionButtonBeginning.h b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/ActionButtonBeginning.h index 86915503c1..9cbac2ded6 100644 --- a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/ActionButtonBeginning.h +++ b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/ActionButtonBeginning.h @@ -1,4 +1,4 @@ -/* +/* * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or @@ -29,12 +29,8 @@ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode * */ - #pragma once #include "../PptShape.h" -#ifdef USE_CUSTOM_SHAPES - DEFINE_SHAPE_CLASS(CActionButtonBeginType, CCustomShape) -#else - DEFINE_SHAPE_CLASS(CActionButtonBeginType, CPPTShape) -#endif +// 196 +DEFINE_SHAPE_CLASS(CActionButtonBeginType, CPPTShape) diff --git a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/ActionButtonBlank.h b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/ActionButtonBlank.h index f8621f322c..60f543d735 100644 --- a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/ActionButtonBlank.h +++ b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/ActionButtonBlank.h @@ -1,4 +1,4 @@ -/* +/* * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or @@ -29,12 +29,8 @@ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode * */ - #pragma once #include "../PptShape.h" -#ifdef USE_CUSTOM_SHAPES - DEFINE_SHAPE_CLASS(CActionButtonBlankType, CCustomShape) -#else - DEFINE_SHAPE_CLASS(CActionButtonBlankType, CPPTShape) -#endif +// 189 +DEFINE_SHAPE_CLASS(CActionButtonBlankType, CPPTShape) diff --git a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/ActionButtonDocument.h b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/ActionButtonDocument.h index 365938584c..389690c7c3 100644 --- a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/ActionButtonDocument.h +++ b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/ActionButtonDocument.h @@ -1,4 +1,4 @@ -/* +/* * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or @@ -29,12 +29,8 @@ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode * */ - #pragma once #include "../PptShape.h" -#ifdef USE_CUSTOM_SHAPES - DEFINE_SHAPE_CLASS(CActionButtonDocType, CCustomShape) -#else - DEFINE_SHAPE_CLASS(CActionButtonDocType, CPPTShape) -#endif +// 198 +DEFINE_SHAPE_CLASS(CActionButtonDocType, CPPTShape) diff --git a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/ActionButtonEnd.h b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/ActionButtonEnd.h index 1c519907fb..4f211bbb27 100644 --- a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/ActionButtonEnd.h +++ b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/ActionButtonEnd.h @@ -1,4 +1,4 @@ -/* +/* * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or @@ -29,12 +29,8 @@ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode * */ - #pragma once #include "../PptShape.h" -#ifdef USE_CUSTOM_SHAPES - DEFINE_SHAPE_CLASS(CActionButtonEndType, CCustomShape) -#else - DEFINE_SHAPE_CLASS(CActionButtonEndType, CPPTShape) -#endif +// 195 +DEFINE_SHAPE_CLASS(CActionButtonEndType, CPPTShape) diff --git a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/ActionButtonHelp.h b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/ActionButtonHelp.h index 48f801d7b3..94b27d73c1 100644 --- a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/ActionButtonHelp.h +++ b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/ActionButtonHelp.h @@ -1,4 +1,4 @@ -/* +/* * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or @@ -29,12 +29,8 @@ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode * */ - #pragma once #include "../PptShape.h" -#ifdef USE_CUSTOM_SHAPES - DEFINE_SHAPE_CLASS(CActionButtonHelpType, CCustomShape) -#else - DEFINE_SHAPE_CLASS(CActionButtonHelpType, CPPTShape) -#endif +// 191 +DEFINE_SHAPE_CLASS(CActionButtonHelpType, CPPTShape) diff --git a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/ActionButtonHome.h b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/ActionButtonHome.h index 7a5989e812..497ad83a1a 100644 --- a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/ActionButtonHome.h +++ b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/ActionButtonHome.h @@ -1,4 +1,4 @@ -/* +/* * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or @@ -29,12 +29,8 @@ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode * */ - #pragma once #include "../PptShape.h" -#ifdef USE_CUSTOM_SHAPES - DEFINE_SHAPE_CLASS(CActionButtonHomeType, CCustomShape) -#else - DEFINE_SHAPE_CLASS(CActionButtonHomeType, CPPTShape) -#endif +// 190 +DEFINE_SHAPE_CLASS(CActionButtonHomeType, CPPTShape) diff --git a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/ActionButtonInfo.h b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/ActionButtonInfo.h index b93552a436..7c8a915820 100644 --- a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/ActionButtonInfo.h +++ b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/ActionButtonInfo.h @@ -1,4 +1,4 @@ -/* +/* * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or @@ -29,12 +29,8 @@ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode * */ - #pragma once #include "../PptShape.h" -#ifdef USE_CUSTOM_SHAPES - DEFINE_SHAPE_CLASS(CActionButtonInfoType, CCustomShape) -#else - DEFINE_SHAPE_CLASS(CActionButtonInfoType, CPPTShape) -#endif +// 192 +DEFINE_SHAPE_CLASS(CActionButtonInfoType, CPPTShape) diff --git a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/ActionButtonMovie.h b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/ActionButtonMovie.h index dbf7b9b3e2..74595ded6c 100644 --- a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/ActionButtonMovie.h +++ b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/ActionButtonMovie.h @@ -1,4 +1,4 @@ -/* +/* * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or @@ -29,12 +29,8 @@ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode * */ - #pragma once #include "../PptShape.h" -#ifdef USE_CUSTOM_SHAPES - DEFINE_SHAPE_CLASS(CActionButtonMovieType, CCustomShape) -#else - DEFINE_SHAPE_CLASS(CActionButtonMovieType, CPPTShape) -#endif +// 200 +DEFINE_SHAPE_CLASS(CActionButtonMovieType, CPPTShape) diff --git a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/ActionButtonNext.h b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/ActionButtonNext.h index dd49b6b95f..8ef7ddf06f 100644 --- a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/ActionButtonNext.h +++ b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/ActionButtonNext.h @@ -1,4 +1,4 @@ -/* +/* * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or @@ -29,12 +29,8 @@ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode * */ - #pragma once #include "../PptShape.h" -#ifdef USE_CUSTOM_SHAPES - DEFINE_SHAPE_CLASS(CActionButtonNextType, CCustomShape) -#else - DEFINE_SHAPE_CLASS(CActionButtonNextType, CPPTShape) -#endif +// 193 +DEFINE_SHAPE_CLASS(CActionButtonNextType, CPPTShape) diff --git a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/ActionButtonReturn.h b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/ActionButtonReturn.h index a11804ff79..4cfab80a1c 100644 --- a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/ActionButtonReturn.h +++ b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/ActionButtonReturn.h @@ -1,4 +1,4 @@ -/* +/* * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or @@ -29,12 +29,8 @@ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode * */ - #pragma once #include "../PptShape.h" -#ifdef USE_CUSTOM_SHAPES - DEFINE_SHAPE_CLASS(CActionButtonReturnType, CCustomShape) -#else - DEFINE_SHAPE_CLASS(CActionButtonReturnType, CPPTShape) -#endif +// 197 +DEFINE_SHAPE_CLASS(CActionButtonReturnType, CPPTShape) diff --git a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/ActionButtonSound.h b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/ActionButtonSound.h index 89f3ab5d33..d77999281c 100644 --- a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/ActionButtonSound.h +++ b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/ActionButtonSound.h @@ -1,4 +1,4 @@ -/* +/* * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or @@ -29,12 +29,8 @@ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode * */ - #pragma once #include "../PptShape.h" -#ifdef USE_CUSTOM_SHAPES - DEFINE_SHAPE_CLASS(CActionButtonSoundType, CCustomShape) -#else - DEFINE_SHAPE_CLASS(CActionButtonSoundType, CPPTShape) -#endif +// 199 +DEFINE_SHAPE_CLASS(CActionButtonSoundType, CPPTShape) diff --git a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/BentArrowType.h b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/BentArrowType.h index 8cd906772e..f12e18d637 100644 --- a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/BentArrowType.h +++ b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/BentArrowType.h @@ -1,4 +1,4 @@ -/* +/* * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or @@ -29,12 +29,8 @@ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode * */ - #pragma once #include "../PptShape.h" -#ifdef USE_CUSTOM_SHAPES - DEFINE_SHAPE_CLASS(CBentArrowType, CCustomShape) -#else - DEFINE_SHAPE_CLASS(CBentArrowType, CPPTShape) -#endif +// 91 +DEFINE_SHAPE_CLASS(CBentArrowType, CPPTShape) diff --git a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/BentConnector.h b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/BentConnector.h index ef1beb5707..ebf94bffa0 100644 --- a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/BentConnector.h +++ b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/BentConnector.h @@ -1,4 +1,4 @@ -/* +/* * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or @@ -29,12 +29,8 @@ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode * */ - #pragma once #include "../PptShape.h" -#ifdef USE_CUSTOM_SHAPES - DEFINE_SHAPE_CLASS(CBentConnectorType, CCustomShape) -#else - DEFINE_SHAPE_CLASS(CBentConnectorType, CPPTShape) -#endif +// 34 +DEFINE_SHAPE_CLASS(CBentConnectorType, CPPTShape) diff --git a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/BentUpArrowType.h b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/BentUpArrowType.h index 7669a2db27..ea7c011d96 100644 --- a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/BentUpArrowType.h +++ b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/BentUpArrowType.h @@ -1,4 +1,4 @@ -/* +/* * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or @@ -29,12 +29,8 @@ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode * */ - #pragma once #include "../PptShape.h" -#ifdef USE_CUSTOM_SHAPES - DEFINE_SHAPE_CLASS(CBentUpArrowType, CCustomShape) -#else - DEFINE_SHAPE_CLASS(CBentUpArrowType, CPPTShape) -#endif +// 90 +DEFINE_SHAPE_CLASS(CBentUpArrowType, CPPTShape) diff --git a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/BevelType.h b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/BevelType.h index 63454a1719..848dcb60d4 100644 --- a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/BevelType.h +++ b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/BevelType.h @@ -1,4 +1,4 @@ -/* +/* * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or @@ -29,12 +29,8 @@ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode * */ - #pragma once #include "../PptShape.h" -#ifdef USE_CUSTOM_SHAPES - DEFINE_SHAPE_CLASS(CBevelType, CCustomShape) -#else - DEFINE_SHAPE_CLASS(CBevelType, CPPTShape) -#endif +// 84 +DEFINE_SHAPE_CLASS(CBevelType, CPPTShape) diff --git a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/BlockArcType.h b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/BlockArcType.h index 913ae8e8a8..f1e4c85ed1 100644 --- a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/BlockArcType.h +++ b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/BlockArcType.h @@ -1,4 +1,4 @@ -/* +/* * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or @@ -29,12 +29,8 @@ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode * */ - #pragma once #include "../PptShape.h" -#ifdef USE_CUSTOM_SHAPES - DEFINE_SHAPE_CLASS(CBlockArcType, CCustomShape) -#else - DEFINE_SHAPE_CLASS(CBlockArcType, CPPTShape) -#endif +// 95 +DEFINE_SHAPE_CLASS(CBlockArcType, CPPTShape) diff --git a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/BorderCallout1Type.h b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/BorderCallout1Type.h index eeed42e09e..fd7fa6f45c 100644 --- a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/BorderCallout1Type.h +++ b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/BorderCallout1Type.h @@ -1,4 +1,4 @@ -/* +/* * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or @@ -29,12 +29,8 @@ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode * */ - #pragma once #include "../PptShape.h" -#ifdef USE_CUSTOM_SHAPES - DEFINE_SHAPE_CLASS(CBorderCallout1Type, CCustomShape) -#else - DEFINE_SHAPE_CLASS(CBorderCallout1Type, CPPTShape) -#endif +// 47 +DEFINE_SHAPE_CLASS(CBorderCallout1Type, CPPTShape) diff --git a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/BorderCallout2Type.h b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/BorderCallout2Type.h index 83f6edc33a..813be05fd3 100644 --- a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/BorderCallout2Type.h +++ b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/BorderCallout2Type.h @@ -1,4 +1,4 @@ -/* +/* * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or @@ -29,12 +29,8 @@ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode * */ - #pragma once #include "../PptShape.h" -#ifdef USE_CUSTOM_SHAPES - DEFINE_SHAPE_CLASS(CBorderCallout2Type, CCustomShape) -#else - DEFINE_SHAPE_CLASS(CBorderCallout2Type, CPPTShape) -#endif +// 48 +DEFINE_SHAPE_CLASS(CBorderCallout2Type, CPPTShape) diff --git a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/BorderCallout3Type.h b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/BorderCallout3Type.h index 1e2cd70060..e2725913b6 100644 --- a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/BorderCallout3Type.h +++ b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/BorderCallout3Type.h @@ -1,4 +1,4 @@ -/* +/* * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or @@ -29,12 +29,8 @@ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode * */ - #pragma once #include "../PptShape.h" -#ifdef USE_CUSTOM_SHAPES - DEFINE_SHAPE_CLASS(CBorderCallout3Type, CCustomShape) -#else - DEFINE_SHAPE_CLASS(CBorderCallout3Type, CPPTShape) -#endif +// 49 +DEFINE_SHAPE_CLASS(CBorderCallout3Type, CPPTShape) diff --git a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/BorderCallout90Type.h b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/BorderCallout90Type.h index de651ac4b4..104c7994de 100644 --- a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/BorderCallout90Type.h +++ b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/BorderCallout90Type.h @@ -1,4 +1,4 @@ -/* +/* * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or @@ -29,12 +29,8 @@ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode * */ - #pragma once #include "../PptShape.h" -#ifdef USE_CUSTOM_SHAPES - DEFINE_SHAPE_CLASS(CBorderCallout90Type, CCustomShape) -#else - DEFINE_SHAPE_CLASS(CBorderCallout90Type, CPPTShape) -#endif +// 180 +DEFINE_SHAPE_CLASS(CBorderCallout90Type, CPPTShape) diff --git a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/BracePairType.h b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/BracePairType.h index 482daa4bb7..f17a6dde45 100644 --- a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/BracePairType.h +++ b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/BracePairType.h @@ -1,4 +1,4 @@ -/* +/* * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or @@ -29,12 +29,8 @@ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode * */ - #pragma once #include "../PptShape.h" -#ifdef USE_CUSTOM_SHAPES - DEFINE_SHAPE_CLASS(CBracePairType, CCustomShape) -#else - DEFINE_SHAPE_CLASS(CBracePairType, CPPTShape) -#endif +// 186 +DEFINE_SHAPE_CLASS(CBracePairType, CPPTShape) diff --git a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/BracketPairType.h b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/BracketPairType.h index bc1af8fd3b..f0091eb269 100644 --- a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/BracketPairType.h +++ b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/BracketPairType.h @@ -1,4 +1,4 @@ -/* +/* * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or @@ -29,12 +29,8 @@ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode * */ - #pragma once #include "../PptShape.h" -#ifdef USE_CUSTOM_SHAPES - DEFINE_SHAPE_CLASS(CBracketPairType, CCustomShape) -#else - DEFINE_SHAPE_CLASS(CBracketPairType, CPPTShape) -#endif +// 185 +DEFINE_SHAPE_CLASS(CBracketPairType, CPPTShape) diff --git a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/Callout1Type.h b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/Callout1Type.h index a91f1fb19a..0cfa23feb9 100644 --- a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/Callout1Type.h +++ b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/Callout1Type.h @@ -1,4 +1,4 @@ -/* +/* * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or @@ -29,12 +29,8 @@ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode * */ - #pragma once #include "../PptShape.h" -#ifdef USE_CUSTOM_SHAPES - DEFINE_SHAPE_CLASS(CCallout1Type, CCustomShape) -#else - DEFINE_SHAPE_CLASS(CCallout1Type, CPPTShape) -#endif +// 41 +DEFINE_SHAPE_CLASS(CCallout1Type, CPPTShape) diff --git a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/Callout2Type.h b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/Callout2Type.h index 1db1b6c217..f3b61a08d1 100644 --- a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/Callout2Type.h +++ b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/Callout2Type.h @@ -1,4 +1,4 @@ -/* +/* * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or @@ -29,12 +29,8 @@ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode * */ - #pragma once #include "../PptShape.h" -#ifdef USE_CUSTOM_SHAPES - DEFINE_SHAPE_CLASS(CCallout2Type, CCustomShape) -#else - DEFINE_SHAPE_CLASS(CCallout2Type, CPPTShape) -#endif +// 42 +DEFINE_SHAPE_CLASS(CCallout2Type, CPPTShape) diff --git a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/Callout3Type.h b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/Callout3Type.h index a0a6666643..0840e0770a 100644 --- a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/Callout3Type.h +++ b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/Callout3Type.h @@ -1,4 +1,4 @@ -/* +/* * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or @@ -29,12 +29,8 @@ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode * */ - #pragma once #include "../PptShape.h" -#ifdef USE_CUSTOM_SHAPES - DEFINE_SHAPE_CLASS(CCallout3Type, CCustomShape) -#else - DEFINE_SHAPE_CLASS(CCallout3Type, CPPTShape) -#endif +// 43 +DEFINE_SHAPE_CLASS(CCallout3Type, CPPTShape) diff --git a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/Callout90Type.h b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/Callout90Type.h index 3d3b82fdd6..757015ab94 100644 --- a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/Callout90Type.h +++ b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/Callout90Type.h @@ -1,4 +1,4 @@ -/* +/* * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or @@ -29,12 +29,8 @@ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode * */ - #pragma once #include "../PptShape.h" -#ifdef USE_CUSTOM_SHAPES - DEFINE_SHAPE_CLASS(CCallout90Type, CCustomShape) -#else - DEFINE_SHAPE_CLASS(CCallout90Type, CPPTShape) -#endif +// 178 +DEFINE_SHAPE_CLASS(CCallout90Type, CPPTShape) diff --git a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/CanType.h b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/CanType.h index 1867e34b35..800e6502de 100644 --- a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/CanType.h +++ b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/CanType.h @@ -1,4 +1,4 @@ -/* +/* * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or @@ -29,12 +29,8 @@ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode * */ - #pragma once #include "../PptShape.h" -#ifdef USE_CUSTOM_SHAPES - DEFINE_SHAPE_CLASS(CCanType, CCustomShape) -#else - DEFINE_SHAPE_CLASS(CCanType, CPPTShape) -#endif +// 22 +DEFINE_SHAPE_CLASS(CCanType, CPPTShape) diff --git a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/ChevronType.h b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/ChevronType.h index 6eb5eaf025..2b638433de 100644 --- a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/ChevronType.h +++ b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/ChevronType.h @@ -1,4 +1,4 @@ -/* +/* * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or @@ -29,12 +29,8 @@ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode * */ - #pragma once #include "../PptShape.h" -#ifdef USE_CUSTOM_SHAPES - DEFINE_SHAPE_CLASS(CChevronType, CCustomShape) -#else - DEFINE_SHAPE_CLASS(CChevronType, CPPTShape) -#endif +// 55 +DEFINE_SHAPE_CLASS(CChevronType, CPPTShape) diff --git a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/CircularArrowType.h b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/CircularArrowType.h index de95efd98b..fee55e5a07 100644 --- a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/CircularArrowType.h +++ b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/CircularArrowType.h @@ -1,4 +1,4 @@ -/* +/* * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or @@ -29,12 +29,10 @@ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode * */ - #pragma once #include "../PptShape.h" -#ifdef USE_CUSTOM_SHAPES - DEFINE_SHAPE_CLASS(CCircularArrowType, CCustomShape) -#else - DEFINE_SHAPE_CLASS(CCircularArrowType, CPPTShape) -#endif +// 99 +DEFINE_SHAPE_CLASS(CCircularArrowType, CPPTShape) + + diff --git a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/CloudCalloutType.h b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/CloudCalloutType.h index 2d540fbb5f..db48e01784 100644 --- a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/CloudCalloutType.h +++ b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/CloudCalloutType.h @@ -1,4 +1,4 @@ -/* +/* * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or @@ -29,12 +29,8 @@ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode * */ - #pragma once #include "../PptShape.h" -#ifdef USE_CUSTOM_SHAPES - DEFINE_SHAPE_CLASS(CCloudCalloutType, CCustomShape) -#else - DEFINE_SHAPE_CLASS(CCloudCalloutType, CPPTShape) -#endif +// 106 +DEFINE_SHAPE_CLASS(CCloudCalloutType, CPPTShape) diff --git a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/CubeType.h b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/CubeType.h index f57a1a7dde..7e86058c38 100644 --- a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/CubeType.h +++ b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/CubeType.h @@ -1,4 +1,4 @@ -/* +/* * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or @@ -29,12 +29,8 @@ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode * */ - #pragma once #include "../PptShape.h" -#ifdef USE_CUSTOM_SHAPES - DEFINE_SHAPE_CLASS(CCubeType, CCustomShape) -#else - DEFINE_SHAPE_CLASS(CCubeType, CPPTShape) -#endif +// 16 +DEFINE_SHAPE_CLASS(CCubeType, CPPTShape) diff --git a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/CurvedConnector.h b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/CurvedConnector.h index 9f891c19ef..1e521c0ff7 100644 --- a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/CurvedConnector.h +++ b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/CurvedConnector.h @@ -1,4 +1,4 @@ -/* +/* * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or @@ -29,12 +29,8 @@ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode * */ - #pragma once #include "../PptShape.h" -#ifdef USE_CUSTOM_SHAPES - DEFINE_SHAPE_CLASS(CCurvedConnectorType, CCustomShape) -#else - DEFINE_SHAPE_CLASS(CCurvedConnectorType, CPPTShape) -#endif +// 38 +DEFINE_SHAPE_CLASS(CCurvedConnectorType, CPPTShape) diff --git a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/CurvedDownArrowType.h b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/CurvedDownArrowType.h index fc7dc54667..452a233d85 100644 --- a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/CurvedDownArrowType.h +++ b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/CurvedDownArrowType.h @@ -1,4 +1,4 @@ -/* +/* * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or @@ -29,12 +29,8 @@ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode * */ - #pragma once #include "../PptShape.h" -#ifdef USE_CUSTOM_SHAPES - DEFINE_SHAPE_CLASS(CCurvedDownArrowType, CCustomShape) -#else - DEFINE_SHAPE_CLASS(CCurvedDownArrowType, CPPTShape) -#endif +// 105 +DEFINE_SHAPE_CLASS(CCurvedDownArrowType, CPPTShape) diff --git a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/CurvedLeftArrowType.h b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/CurvedLeftArrowType.h index 2784a0e095..85318c650d 100644 --- a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/CurvedLeftArrowType.h +++ b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/CurvedLeftArrowType.h @@ -1,4 +1,4 @@ -/* +/* * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or @@ -29,12 +29,8 @@ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode * */ - #pragma once #include "../PptShape.h" -#ifdef USE_CUSTOM_SHAPES - DEFINE_SHAPE_CLASS(CCurvedLeftArrowType, CCustomShape) -#else - DEFINE_SHAPE_CLASS(CCurvedLeftArrowType, CPPTShape) -#endif +// 103 +DEFINE_SHAPE_CLASS(CCurvedLeftArrowType, CPPTShape) diff --git a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/CurvedRightArrowType.h b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/CurvedRightArrowType.h index 1c0b44e14f..b682ca510f 100644 --- a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/CurvedRightArrowType.h +++ b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/CurvedRightArrowType.h @@ -1,4 +1,4 @@ -/* +/* * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or @@ -29,12 +29,8 @@ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode * */ - #pragma once #include "../PptShape.h" -#ifdef USE_CUSTOM_SHAPES - DEFINE_SHAPE_CLASS(CCurvedRightArrowType, CCustomShape) -#else - DEFINE_SHAPE_CLASS(CCurvedRightArrowType, CPPTShape) -#endif +// 102 +DEFINE_SHAPE_CLASS(CCurvedRightArrowType, CPPTShape) diff --git a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/CurvedUpArrowType.h b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/CurvedUpArrowType.h index 90a3787ec6..8b31bda8a5 100644 --- a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/CurvedUpArrowType.h +++ b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/CurvedUpArrowType.h @@ -1,4 +1,4 @@ -/* +/* * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or @@ -29,12 +29,8 @@ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode * */ - #pragma once #include "../PptShape.h" -#ifdef USE_CUSTOM_SHAPES - DEFINE_SHAPE_CLASS(CCurvedUpArrowType, CCustomShape) -#else - DEFINE_SHAPE_CLASS(CCurvedUpArrowType, CPPTShape) -#endif +//104 +DEFINE_SHAPE_CLASS(CCurvedUpArrowType, CPPTShape) diff --git a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/DiamondType.h b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/DiamondType.h index 788b4cd137..707d286f64 100644 --- a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/DiamondType.h +++ b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/DiamondType.h @@ -1,4 +1,4 @@ -/* +/* * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or @@ -29,12 +29,8 @@ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode * */ - #pragma once #include "../PptShape.h" -#ifdef USE_CUSTOM_SHAPES - DEFINE_SHAPE_CLASS(CDiamondType, CCustomShape) -#else - DEFINE_SHAPE_CLASS(CDiamondType, CPPTShape) -#endif +// 4 +DEFINE_SHAPE_CLASS(CDiamondType, CPPTShape) diff --git a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/DonutType.h b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/DonutType.h index 35d90effa7..fd0493ecdb 100644 --- a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/DonutType.h +++ b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/DonutType.h @@ -1,4 +1,4 @@ -/* +/* * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or @@ -29,12 +29,8 @@ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode * */ - #pragma once #include "../PptShape.h" -#ifdef USE_CUSTOM_SHAPES - DEFINE_SHAPE_CLASS(CDonutType, CCustomShape) -#else - DEFINE_SHAPE_CLASS(CDonutType, CPPTShape) -#endif +// 23 +DEFINE_SHAPE_CLASS(CDonutType, CPPTShape) diff --git a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/DownArrowCalloutType.h b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/DownArrowCalloutType.h index 85604a554b..cde5edc644 100644 --- a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/DownArrowCalloutType.h +++ b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/DownArrowCalloutType.h @@ -1,4 +1,4 @@ -/* +/* * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or @@ -29,12 +29,10 @@ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode * */ - #pragma once #include "../PptShape.h" -#ifdef USE_CUSTOM_SHAPES - DEFINE_SHAPE_CLASS(CDownArrowCalloutType, CCustomShape) -#else - DEFINE_SHAPE_CLASS(CDownArrowCalloutType, CPPTShape) -#endif +// 80 +DEFINE_SHAPE_CLASS(CDownArrowCalloutType, CPPTShape) + + diff --git a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/DownArrowType.h b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/DownArrowType.h index e05ccb723b..4d88303526 100644 --- a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/DownArrowType.h +++ b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/DownArrowType.h @@ -1,4 +1,4 @@ -/* +/* * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or @@ -29,12 +29,8 @@ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode * */ - #pragma once #include "../PptShape.h" -#ifdef USE_CUSTOM_SHAPES - DEFINE_SHAPE_CLASS(CDownArrowType, CCustomShape) -#else - DEFINE_SHAPE_CLASS(CDownArrowType, CPPTShape) -#endif +// 67 +DEFINE_SHAPE_CLASS(CDownArrowType, CPPTShape) diff --git a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/EllipseRibbon2Type.h b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/EllipseRibbon2Type.h index ed91b4d8a8..b123283a72 100644 --- a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/EllipseRibbon2Type.h +++ b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/EllipseRibbon2Type.h @@ -1,4 +1,4 @@ -/* +/* * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or @@ -29,12 +29,8 @@ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode * */ - #pragma once #include "../PptShape.h" -#ifdef USE_CUSTOM_SHAPES - DEFINE_SHAPE_CLASS(CEllipceRibbon2Type, CCustomShape) -#else - DEFINE_SHAPE_CLASS(CEllipceRibbon2Type, CPPTShape) -#endif +// 108 +DEFINE_SHAPE_CLASS(CEllipceRibbon2Type, CPPTShape) diff --git a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/EllipseRibbonType.h b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/EllipseRibbonType.h index 4b634ab09f..98138cc60c 100644 --- a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/EllipseRibbonType.h +++ b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/EllipseRibbonType.h @@ -1,4 +1,4 @@ -/* +/* * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or @@ -29,12 +29,8 @@ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode * */ - #pragma once #include "../PptShape.h" -#ifdef USE_CUSTOM_SHAPES - DEFINE_SHAPE_CLASS(CEllipceRibbonType, CCustomShape) -#else - DEFINE_SHAPE_CLASS(CEllipceRibbonType, CPPTShape) -#endif +// 107 +DEFINE_SHAPE_CLASS(CEllipceRibbonType, CPPTShape) diff --git a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/EllipseType.h b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/EllipseType.h index afe9c35ce0..b721c754f9 100644 --- a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/EllipseType.h +++ b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/EllipseType.h @@ -1,4 +1,4 @@ -/* +/* * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or @@ -29,12 +29,8 @@ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode * */ - #pragma once #include "../PptShape.h" -#ifdef USE_CUSTOM_SHAPES - DEFINE_SHAPE_CLASS(CEllipseType, CCustomShape) -#else - DEFINE_SHAPE_CLASS(CEllipseType, CPPTShape) -#endif +// 3 +DEFINE_SHAPE_CLASS(CEllipseType, CPPTShape) diff --git a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/FlowChartAlternateProcessType.h b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/FlowChartAlternateProcessType.h index 61372c95e9..0daef4b3c9 100644 --- a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/FlowChartAlternateProcessType.h +++ b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/FlowChartAlternateProcessType.h @@ -1,4 +1,4 @@ -/* +/* * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or @@ -29,12 +29,8 @@ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode * */ - #pragma once #include "../PptShape.h" -#ifdef USE_CUSTOM_SHAPES - DEFINE_SHAPE_CLASS(CFlowChartAlternateProcessType, CCustomShape) -#else - DEFINE_SHAPE_CLASS(CFlowChartAlternateProcessType, CPPTShape) -#endif +// 176 +DEFINE_SHAPE_CLASS(CFlowChartAlternateProcessType, CPPTShape) diff --git a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/FlowChartCollateType.h b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/FlowChartCollateType.h index 2d0f766030..67c1b105f9 100644 --- a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/FlowChartCollateType.h +++ b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/FlowChartCollateType.h @@ -1,4 +1,4 @@ -/* +/* * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or @@ -29,12 +29,10 @@ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode * */ - #pragma once #include "../PptShape.h" -#ifdef USE_CUSTOM_SHAPES - DEFINE_SHAPE_CLASS(CFlowChartCollateType, CCustomShape) -#else - DEFINE_SHAPE_CLASS(CFlowChartCollateType, CPPTShape) -#endif +// 125 +DEFINE_SHAPE_CLASS(CFlowChartCollateType, CPPTShape) + + diff --git a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/FlowChartConnectorType.h b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/FlowChartConnectorType.h index 2511d2a19e..65fa89d820 100644 --- a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/FlowChartConnectorType.h +++ b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/FlowChartConnectorType.h @@ -1,4 +1,4 @@ -/* +/* * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or @@ -29,12 +29,8 @@ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode * */ - #pragma once #include "../PptShape.h" -#ifdef USE_CUSTOM_SHAPES - DEFINE_SHAPE_CLASS(CFlowChartConnectorType, CCustomShape) -#else - DEFINE_SHAPE_CLASS(CFlowChartConnectorType, CPPTShape) -#endif +// 120 +DEFINE_SHAPE_CLASS(CFlowChartConnectorType, CPPTShape) diff --git a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/FlowChartDecisionType.h b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/FlowChartDecisionType.h index c8c03f1e00..f8982ff891 100644 --- a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/FlowChartDecisionType.h +++ b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/FlowChartDecisionType.h @@ -1,4 +1,4 @@ -/* +/* * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or @@ -29,12 +29,8 @@ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode * */ - #pragma once #include "../PptShape.h" -#ifdef USE_CUSTOM_SHAPES - DEFINE_SHAPE_CLASS(CFlowChartDecisionType, CCustomShape) -#else - DEFINE_SHAPE_CLASS(CFlowChartDecisionType, CPPTShape) -#endif +// 110 +DEFINE_SHAPE_CLASS(CFlowChartDecisionType, CPPTShape) diff --git a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/FlowChartDelayType.h b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/FlowChartDelayType.h index 3bc933565e..e431a3b554 100644 --- a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/FlowChartDelayType.h +++ b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/FlowChartDelayType.h @@ -1,4 +1,4 @@ -/* +/* * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or @@ -29,12 +29,10 @@ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode * */ - #pragma once #include "../PptShape.h" -#ifdef USE_CUSTOM_SHAPES - DEFINE_SHAPE_CLASS(CFlowChartDelayType, CCustomShape) -#else - DEFINE_SHAPE_CLASS(CFlowChartDelayType, CPPTShape) -#endif +// 135 +DEFINE_SHAPE_CLASS(CFlowChartDelayType, CPPTShape) + + diff --git a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/FlowChartDisplayType.h b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/FlowChartDisplayType.h index d6fae9c217..d6d9384a2b 100644 --- a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/FlowChartDisplayType.h +++ b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/FlowChartDisplayType.h @@ -1,4 +1,4 @@ -/* +/* * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or @@ -29,12 +29,10 @@ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode * */ - #pragma once #include "../PptShape.h" -#ifdef USE_CUSTOM_SHAPES - DEFINE_SHAPE_CLASS(CFlowChartDisplayType, CCustomShape) -#else - DEFINE_SHAPE_CLASS(CFlowChartDisplayType, CPPTShape) -#endif +// 134 +DEFINE_SHAPE_CLASS(CFlowChartDisplayType, CPPTShape) + + diff --git a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/FlowChartDocumentType.h b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/FlowChartDocumentType.h index c001e78980..42a390ab2f 100644 --- a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/FlowChartDocumentType.h +++ b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/FlowChartDocumentType.h @@ -1,4 +1,4 @@ -/* +/* * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or @@ -29,12 +29,8 @@ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode * */ - #pragma once #include "../PptShape.h" -#ifdef USE_CUSTOM_SHAPES - DEFINE_SHAPE_CLASS(CFlowChartDocumentType, CCustomShape) -#else - DEFINE_SHAPE_CLASS(CFlowChartDocumentType, CPPTShape) -#endif +//114 +DEFINE_SHAPE_CLASS(CFlowChartDocumentType, CPPTShape) diff --git a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/FlowChartExtractType.h b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/FlowChartExtractType.h index 3ab54cb82e..52b5b660a5 100644 --- a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/FlowChartExtractType.h +++ b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/FlowChartExtractType.h @@ -1,4 +1,4 @@ -/* +/* * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or @@ -29,12 +29,10 @@ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode * */ - #pragma once #include "../PptShape.h" -#ifdef USE_CUSTOM_SHAPES - DEFINE_SHAPE_CLASS(CFlowChartExtractType, CCustomShape) -#else - DEFINE_SHAPE_CLASS(CFlowChartExtractType, CPPTShape) -#endif +// 127 +DEFINE_SHAPE_CLASS(CFlowChartExtractType, CPPTShape) + + diff --git a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/FlowChartInputOutputType.h b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/FlowChartInputOutputType.h index 7e8325f819..d3c878c8d1 100644 --- a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/FlowChartInputOutputType.h +++ b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/FlowChartInputOutputType.h @@ -1,4 +1,4 @@ -/* +/* * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or @@ -29,12 +29,8 @@ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode * */ - #pragma once #include "../PptShape.h" -#ifdef USE_CUSTOM_SHAPES - DEFINE_SHAPE_CLASS(CFlowChartInputOutputType, CCustomShape) -#else - DEFINE_SHAPE_CLASS(CFlowChartInputOutputType, CPPTShape) -#endif +// 111 +DEFINE_SHAPE_CLASS(CFlowChartInputOutputType, CPPTShape) diff --git a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/FlowChartInternalStorageType.h b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/FlowChartInternalStorageType.h index e47d3e5f87..c9deb7d984 100644 --- a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/FlowChartInternalStorageType.h +++ b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/FlowChartInternalStorageType.h @@ -1,4 +1,4 @@ -/* +/* * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or @@ -29,12 +29,8 @@ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode * */ - #pragma once #include "../PptShape.h" -#ifdef USE_CUSTOM_SHAPES - DEFINE_SHAPE_CLASS(CFlowChartInternalStorageType, CCustomShape) -#else - DEFINE_SHAPE_CLASS(CFlowChartInternalStorageType, CPPTShape) -#endif +// 113 +DEFINE_SHAPE_CLASS(CFlowChartInternalStorageType, CPPTShape) diff --git a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/FlowChartMagneticDiskType.h b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/FlowChartMagneticDiskType.h index 380eed2568..e3f8d64a1e 100644 --- a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/FlowChartMagneticDiskType.h +++ b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/FlowChartMagneticDiskType.h @@ -1,4 +1,4 @@ -/* +/* * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or @@ -29,12 +29,10 @@ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode * */ - #pragma once #include "../PptShape.h" -#ifdef USE_CUSTOM_SHAPES - DEFINE_SHAPE_CLASS(CFlowChartMagneticDiskType, CCustomShape) -#else - DEFINE_SHAPE_CLASS(CFlowChartMagneticDiskType, CPPTShape) -#endif +// 132 +DEFINE_SHAPE_CLASS(CFlowChartMagneticDiskType, CPPTShape) + + diff --git a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/FlowChartMagneticDrumType.h b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/FlowChartMagneticDrumType.h index 03c945396e..1162c6da8d 100644 --- a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/FlowChartMagneticDrumType.h +++ b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/FlowChartMagneticDrumType.h @@ -1,4 +1,4 @@ -/* +/* * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or @@ -29,12 +29,10 @@ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode * */ - #pragma once #include "../PptShape.h" -#ifdef USE_CUSTOM_SHAPES - DEFINE_SHAPE_CLASS(CFlowChartMagneticDrumType, CCustomShape) -#else - DEFINE_SHAPE_CLASS(CFlowChartMagneticDrumType, CPPTShape) -#endif +// 133 +DEFINE_SHAPE_CLASS(CFlowChartMagneticDrumType, CPPTShape) + + diff --git a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/FlowChartMagneticTapeType.h b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/FlowChartMagneticTapeType.h index 6f9b0a12ac..04f722320f 100644 --- a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/FlowChartMagneticTapeType.h +++ b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/FlowChartMagneticTapeType.h @@ -1,4 +1,4 @@ -/* +/* * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or @@ -29,12 +29,10 @@ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode * */ - #pragma once #include "../PptShape.h" -#ifdef USE_CUSTOM_SHAPES - DEFINE_SHAPE_CLASS(CFlowChartMagneticTapeType, CCustomShape) -#else - DEFINE_SHAPE_CLASS(CFlowChartMagneticTapeType, CPPTShape) -#endif +// 131 +DEFINE_SHAPE_CLASS(CFlowChartMagneticTapeType, CPPTShape) + + diff --git a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/FlowChartManualInputType.h b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/FlowChartManualInputType.h index 3c9c675cb9..479f1dc38a 100644 --- a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/FlowChartManualInputType.h +++ b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/FlowChartManualInputType.h @@ -1,4 +1,4 @@ -/* +/* * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or @@ -29,12 +29,8 @@ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode * */ - #pragma once #include "../PptShape.h" -#ifdef USE_CUSTOM_SHAPES - DEFINE_SHAPE_CLASS(CFlowChartManualInputType, CCustomShape) -#else - DEFINE_SHAPE_CLASS(CFlowChartManualInputType, CPPTShape) -#endif +// 118 +DEFINE_SHAPE_CLASS(CFlowChartManualInputType, CPPTShape) diff --git a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/FlowChartManualOperationType.h b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/FlowChartManualOperationType.h index 42fe0e39e3..969052ab78 100644 --- a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/FlowChartManualOperationType.h +++ b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/FlowChartManualOperationType.h @@ -1,4 +1,4 @@ -/* +/* * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or @@ -29,12 +29,8 @@ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode * */ - #pragma once #include "../PptShape.h" -#ifdef USE_CUSTOM_SHAPES - DEFINE_SHAPE_CLASS(CFlowChartManualOperationType, CCustomShape) -#else - DEFINE_SHAPE_CLASS(CFlowChartManualOperationType, CPPTShape) -#endif +// 119 +DEFINE_SHAPE_CLASS(CFlowChartManualOperationType, CPPTShape) diff --git a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/FlowChartMergeType.h b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/FlowChartMergeType.h index 720bf8fa22..96f97aab20 100644 --- a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/FlowChartMergeType.h +++ b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/FlowChartMergeType.h @@ -1,4 +1,4 @@ -/* +/* * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or @@ -29,12 +29,10 @@ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode * */ - #pragma once #include "../PptShape.h" -#ifdef USE_CUSTOM_SHAPES - DEFINE_SHAPE_CLASS(CFlowChartMergeType, CCustomShape) -#else - DEFINE_SHAPE_CLASS(CFlowChartMergeType, CPPTShape) -#endif +// 128 +DEFINE_SHAPE_CLASS(CFlowChartMergeType, CPPTShape) + + diff --git a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/FlowChartMultidocumentType.h b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/FlowChartMultidocumentType.h index 4fc6179edd..1b04f5ec87 100644 --- a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/FlowChartMultidocumentType.h +++ b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/FlowChartMultidocumentType.h @@ -1,4 +1,4 @@ -/* +/* * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or @@ -29,12 +29,8 @@ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode * */ - #pragma once #include "../PptShape.h" -#ifdef USE_CUSTOM_SHAPES - DEFINE_SHAPE_CLASS(CFlowChartMultidocumentType, CCustomShape) -#else - DEFINE_SHAPE_CLASS(CFlowChartMultidocumentType, CPPTShape) -#endif +// 115 +DEFINE_SHAPE_CLASS(CFlowChartMultidocumentType, CPPTShape) diff --git a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/FlowChartOffpageConnectorType.h b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/FlowChartOffpageConnectorType.h index 43cb6dd048..797750452a 100644 --- a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/FlowChartOffpageConnectorType.h +++ b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/FlowChartOffpageConnectorType.h @@ -1,4 +1,4 @@ -/* +/* * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or @@ -29,12 +29,9 @@ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode * */ - #pragma once #include "../PptShape.h" -#ifdef USE_CUSTOM_SHAPES - DEFINE_SHAPE_CLASS(CFlowChartOffpageConnectorType, CCustomShape) -#else - DEFINE_SHAPE_CLASS(CFlowChartOffpageConnectorType, CPPTShape) -#endif +// 177 +DEFINE_SHAPE_CLASS(CFlowChartOffpageConnectorType, CPPTShape) + diff --git a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/FlowChartOnlineStorageType.h b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/FlowChartOnlineStorageType.h index edca623392..fbab5b3c55 100644 --- a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/FlowChartOnlineStorageType.h +++ b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/FlowChartOnlineStorageType.h @@ -1,4 +1,4 @@ -/* +/* * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or @@ -29,12 +29,10 @@ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode * */ - #pragma once #include "../PptShape.h" -#ifdef USE_CUSTOM_SHAPES - DEFINE_SHAPE_CLASS(CFlowChartOnlineStorageType, CCustomShape) -#else - DEFINE_SHAPE_CLASS(CFlowChartOnlineStorageType, CPPTShape) -#endif +// 130 +DEFINE_SHAPE_CLASS(CFlowChartOnlineStorageType, CPPTShape) + + diff --git a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/FlowChartOrType.h b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/FlowChartOrType.h index aab8d217c1..81a138e40c 100644 --- a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/FlowChartOrType.h +++ b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/FlowChartOrType.h @@ -1,4 +1,4 @@ -/* +/* * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or @@ -29,12 +29,10 @@ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode * */ - #pragma once #include "../PptShape.h" -#ifdef USE_CUSTOM_SHAPES - DEFINE_SHAPE_CLASS(CFlowChartOrType, CCustomShape) -#else - DEFINE_SHAPE_CLASS(CFlowChartOrType, CPPTShape) -#endif +// 124 +DEFINE_SHAPE_CLASS(CFlowChartOrType, CPPTShape) + + diff --git a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/FlowChartPredefinedProcessType.h b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/FlowChartPredefinedProcessType.h index 5beae87409..1d7250d07f 100644 --- a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/FlowChartPredefinedProcessType.h +++ b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/FlowChartPredefinedProcessType.h @@ -1,4 +1,4 @@ -/* +/* * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or @@ -29,12 +29,8 @@ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode * */ - #pragma once #include "../PptShape.h" -#ifdef USE_CUSTOM_SHAPES - DEFINE_SHAPE_CLASS(CFlowChartPredefinedProcessType, CCustomShape) -#else - DEFINE_SHAPE_CLASS(CFlowChartPredefinedProcessType, CPPTShape) -#endif +// 112 +DEFINE_SHAPE_CLASS(CFlowChartPredefinedProcessType, CPPTShape) diff --git a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/FlowChartPreparationType.h b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/FlowChartPreparationType.h index 90b6176613..01921f3f3f 100644 --- a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/FlowChartPreparationType.h +++ b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/FlowChartPreparationType.h @@ -1,4 +1,4 @@ -/* +/* * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or @@ -29,12 +29,8 @@ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode * */ - #pragma once #include "../PptShape.h" -#ifdef USE_CUSTOM_SHAPES - DEFINE_SHAPE_CLASS(CFlowChartPreparationType, CCustomShape) -#else - DEFINE_SHAPE_CLASS(CFlowChartPreparationType, CPPTShape) -#endif +// 117 +DEFINE_SHAPE_CLASS(CFlowChartPreparationType, CPPTShape) diff --git a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/FlowChartProcessType.h b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/FlowChartProcessType.h index 3ed87fdc48..9fcf3683bc 100644 --- a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/FlowChartProcessType.h +++ b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/FlowChartProcessType.h @@ -1,4 +1,4 @@ -/* +/* * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or @@ -29,12 +29,8 @@ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode * */ - #pragma once #include "../PptShape.h" -#ifdef USE_CUSTOM_SHAPES - DEFINE_SHAPE_CLASS(CFlowChartProcessType, CCustomShape) -#else - DEFINE_SHAPE_CLASS(CFlowChartProcessType, CPPTShape) -#endif +// 109 +DEFINE_SHAPE_CLASS(CFlowChartProcessType, CPPTShape) diff --git a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/FlowChartPunchedCardType.h b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/FlowChartPunchedCardType.h index 35fd9b3abc..2d82d2b24b 100644 --- a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/FlowChartPunchedCardType.h +++ b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/FlowChartPunchedCardType.h @@ -1,4 +1,4 @@ -/* +/* * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or @@ -29,12 +29,10 @@ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode * */ - #pragma once #include "../PptShape.h" -#ifdef USE_CUSTOM_SHAPES - DEFINE_SHAPE_CLASS(CFlowChartPunchedCardType, CCustomShape) -#else - DEFINE_SHAPE_CLASS(CFlowChartPunchedCardType, CPPTShape) -#endif +// 121 +DEFINE_SHAPE_CLASS(CFlowChartPunchedCardType, CPPTShape) + + diff --git a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/FlowChartPunchedTapeType.h b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/FlowChartPunchedTapeType.h index a12f3f70b9..d55170cb9c 100644 --- a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/FlowChartPunchedTapeType.h +++ b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/FlowChartPunchedTapeType.h @@ -1,4 +1,4 @@ -/* +/* * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or @@ -29,12 +29,10 @@ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode * */ - #pragma once #include "../PptShape.h" -#ifdef USE_CUSTOM_SHAPES - DEFINE_SHAPE_CLASS(CFlowChartPunchedTapeType, CCustomShape) -#else - DEFINE_SHAPE_CLASS(CFlowChartPunchedTapeType, CPPTShape) -#endif +// 122 +DEFINE_SHAPE_CLASS(CFlowChartPunchedTapeType, CPPTShape) + + diff --git a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/FlowChartSortType.h b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/FlowChartSortType.h index 2eb163092e..a24fa8db0c 100644 --- a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/FlowChartSortType.h +++ b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/FlowChartSortType.h @@ -1,4 +1,4 @@ -/* +/* * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or @@ -29,12 +29,10 @@ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode * */ - #pragma once #include "../PptShape.h" -#ifdef USE_CUSTOM_SHAPES - DEFINE_SHAPE_CLASS(CFlowChartSortType, CCustomShape) -#else - DEFINE_SHAPE_CLASS(CFlowChartSortType, CPPTShape) -#endif +// 126 +DEFINE_SHAPE_CLASS(CFlowChartSortType, CPPTShape) + + diff --git a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/FlowChartSummingJunctionType.h b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/FlowChartSummingJunctionType.h index 623e5b01a6..9b8aea9bb9 100644 --- a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/FlowChartSummingJunctionType.h +++ b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/FlowChartSummingJunctionType.h @@ -1,4 +1,4 @@ -/* +/* * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or @@ -29,12 +29,10 @@ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode * */ - #pragma once #include "../PptShape.h" -#ifdef USE_CUSTOM_SHAPES - DEFINE_SHAPE_CLASS(CFlowChartSummingJunctionType, CCustomShape) -#else - DEFINE_SHAPE_CLASS(CFlowChartSummingJunctionType, CPPTShape) -#endif +// 123 +DEFINE_SHAPE_CLASS(CFlowChartSummingJunctionType, CPPTShape) + + diff --git a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/FlowChartTerminatorType.h b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/FlowChartTerminatorType.h index 84677ad29f..03d47a65d5 100644 --- a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/FlowChartTerminatorType.h +++ b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/FlowChartTerminatorType.h @@ -1,4 +1,4 @@ -/* +/* * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or @@ -29,12 +29,8 @@ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode * */ - #pragma once #include "../PptShape.h" -#ifdef USE_CUSTOM_SHAPES - DEFINE_SHAPE_CLASS(CFlowChartTerminatorType, CCustomShape) -#else - DEFINE_SHAPE_CLASS(CFlowChartTerminatorType, CPPTShape) -#endif +// 116 +DEFINE_SHAPE_CLASS(CFlowChartTerminatorType, CPPTShape) diff --git a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/FoldedCornerType.h b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/FoldedCornerType.h index 2db089fba6..b139f3a701 100644 --- a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/FoldedCornerType.h +++ b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/FoldedCornerType.h @@ -1,4 +1,4 @@ -/* +/* * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or @@ -29,12 +29,8 @@ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode * */ - #pragma once #include "../PptShape.h" -#ifdef USE_CUSTOM_SHAPES - DEFINE_SHAPE_CLASS(CFoldedCornerType, CCustomShape) -#else - DEFINE_SHAPE_CLASS(CFoldedCornerType, CPPTShape) -#endif +// 65 +DEFINE_SHAPE_CLASS(CFoldedCornerType, CPPTShape) diff --git a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/HeartType.h b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/HeartType.h index 83eec7c5f3..092f20e026 100644 --- a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/HeartType.h +++ b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/HeartType.h @@ -1,4 +1,4 @@ -/* +/* * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or @@ -29,12 +29,14 @@ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode * */ - #pragma once #include "../PptShape.h" -#ifdef USE_CUSTOM_SHAPES - DEFINE_SHAPE_CLASS(CHeartType, CCustomShape) -#else - DEFINE_SHAPE_CLASS(CHeartType, CPPTShape) -#endif +// 74 +DEFINE_SHAPE_CLASS(CHeartType, CPPTShape) + + + + + + diff --git a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/HexagonType.h b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/HexagonType.h index d8de1147bf..5d4edaea7f 100644 --- a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/HexagonType.h +++ b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/HexagonType.h @@ -1,4 +1,4 @@ -/* +/* * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or @@ -29,12 +29,8 @@ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode * */ - #pragma once #include "../PptShape.h" -#ifdef USE_CUSTOM_SHAPES - DEFINE_SHAPE_CLASS(CHexagonType, CCustomShape) -#else - DEFINE_SHAPE_CLASS(CHexagonType, CPPTShape) -#endif +// 9 +DEFINE_SHAPE_CLASS(CHexagonType, CPPTShape) diff --git a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/HomePlateType.h b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/HomePlateType.h index 4a7c157438..5abbb1207f 100644 --- a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/HomePlateType.h +++ b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/HomePlateType.h @@ -1,4 +1,4 @@ -/* +/* * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or @@ -29,12 +29,10 @@ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode * */ - #pragma once #include "../PptShape.h" -#ifdef USE_CUSTOM_SHAPES - DEFINE_SHAPE_CLASS(CHomePlateType, CCustomShape) -#else - DEFINE_SHAPE_CLASS(CHomePlateType, CPPTShape) -#endif +// 15 +DEFINE_SHAPE_CLASS(CHomePlateType, CPPTShape) + + diff --git a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/HorisontalScrollType.h b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/HorisontalScrollType.h index 42cb45d716..b77dd41932 100644 --- a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/HorisontalScrollType.h +++ b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/HorisontalScrollType.h @@ -1,4 +1,4 @@ -/* +/* * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or @@ -29,12 +29,8 @@ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode * */ - #pragma once #include "../PptShape.h" -#ifdef USE_CUSTOM_SHAPES - DEFINE_SHAPE_CLASS(CHorizontalScrollType, CCustomShape) -#else - DEFINE_SHAPE_CLASS(CHorizontalScrollType, CPPTShape) -#endif +// 98 +DEFINE_SHAPE_CLASS(CHorizontalScrollType, CPPTShape) diff --git a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/IrregularSealOneType.h b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/IrregularSealOneType.h index 4db7cadb83..6c825ead4b 100644 --- a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/IrregularSealOneType.h +++ b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/IrregularSealOneType.h @@ -1,4 +1,4 @@ -/* +/* * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or @@ -29,12 +29,8 @@ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode * */ - #pragma once #include "../PptShape.h" -#ifdef USE_CUSTOM_SHAPES - DEFINE_SHAPE_CLASS(CIrregularSealOneType, CCustomShape) -#else - DEFINE_SHAPE_CLASS(CIrregularSealOneType, CPPTShape) -#endif +// 71 +DEFINE_SHAPE_CLASS(CIrregularSealOneType, CPPTShape) diff --git a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/IrregularSealTwo.h b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/IrregularSealTwo.h index ee1b7e8e04..072c84bc0f 100644 --- a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/IrregularSealTwo.h +++ b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/IrregularSealTwo.h @@ -1,4 +1,4 @@ -/* +/* * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or @@ -29,12 +29,8 @@ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode * */ - #pragma once #include "../PptShape.h" -#ifdef USE_CUSTOM_SHAPES - DEFINE_SHAPE_CLASS(CIrregularSealTwo, CCustomShape) -#else - DEFINE_SHAPE_CLASS(CIrregularSealTwo, CPPTShape) -#endif +// 72 +DEFINE_SHAPE_CLASS(CIrregularSealTwo, CPPTShape) diff --git a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/IsoscelesTriangleType.h b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/IsoscelesTriangleType.h index 4622c0e716..899b36558b 100644 --- a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/IsoscelesTriangleType.h +++ b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/IsoscelesTriangleType.h @@ -1,4 +1,4 @@ -/* +/* * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or @@ -29,12 +29,8 @@ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode * */ - #pragma once #include "../PptShape.h" -#ifdef USE_CUSTOM_SHAPES - DEFINE_SHAPE_CLASS(CIsoscelesTriangleType, CCustomShape) -#else - DEFINE_SHAPE_CLASS(CIsoscelesTriangleType, CPPTShape) -#endif +// 5 +DEFINE_SHAPE_CLASS(CIsoscelesTriangleType, CPPTShape) diff --git a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/LeftArrowCalloutType.h b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/LeftArrowCalloutType.h index 5954109839..d8b6727654 100644 --- a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/LeftArrowCalloutType.h +++ b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/LeftArrowCalloutType.h @@ -1,4 +1,4 @@ -/* +/* * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or @@ -29,12 +29,9 @@ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode * */ - #pragma once #include "../PptShape.h" -#ifdef USE_CUSTOM_SHAPES - DEFINE_SHAPE_CLASS(CLeftArrowCalloutType, CCustomShape) -#else - DEFINE_SHAPE_CLASS(CLeftArrowCalloutType, CPPTShape) -#endif +// 77 +DEFINE_SHAPE_CLASS(CLeftArrowCalloutType, CPPTShape) + diff --git a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/LeftArrowType.h b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/LeftArrowType.h index fbfca103fe..1545e2df85 100644 --- a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/LeftArrowType.h +++ b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/LeftArrowType.h @@ -1,4 +1,4 @@ -/* +/* * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or @@ -29,12 +29,8 @@ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode * */ - #pragma once #include "../PptShape.h" -#ifdef USE_CUSTOM_SHAPES - DEFINE_SHAPE_CLASS(CLeftArrowType, CCustomShape) -#else - DEFINE_SHAPE_CLASS(CLeftArrowType, CPPTShape) -#endif +// 66 +DEFINE_SHAPE_CLASS(CLeftArrowType, CPPTShape) diff --git a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/LeftBraceType.h b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/LeftBraceType.h index f91c82d038..ee59893882 100644 --- a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/LeftBraceType.h +++ b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/LeftBraceType.h @@ -1,4 +1,4 @@ -/* +/* * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or @@ -29,12 +29,8 @@ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode * */ - #pragma once #include "../PptShape.h" -#ifdef USE_CUSTOM_SHAPES - DEFINE_SHAPE_CLASS(CLeftBraceType, CCustomShape) -#else - DEFINE_SHAPE_CLASS(CLeftBraceType, CPPTShape) -#endif +// 87 +DEFINE_SHAPE_CLASS(CLeftBraceType, CPPTShape) diff --git a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/LeftBracketType.h b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/LeftBracketType.h index eb34f46423..7565a0f70c 100644 --- a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/LeftBracketType.h +++ b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/LeftBracketType.h @@ -1,4 +1,4 @@ -/* +/* * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or @@ -29,12 +29,8 @@ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode * */ - #pragma once #include "../PptShape.h" -#ifdef USE_CUSTOM_SHAPES - DEFINE_SHAPE_CLASS(CLeftBracketType, CCustomShape) -#else - DEFINE_SHAPE_CLASS(CLeftBracketType, CPPTShape) -#endif +// 85 +DEFINE_SHAPE_CLASS(CLeftBracketType, CPPTShape) diff --git a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/LeftRightArrowCalloutType.h b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/LeftRightArrowCalloutType.h index ce9b70664d..d8f78df704 100644 --- a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/LeftRightArrowCalloutType.h +++ b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/LeftRightArrowCalloutType.h @@ -1,4 +1,4 @@ -/* +/* * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or @@ -29,12 +29,10 @@ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode * */ - #pragma once #include "../PptShape.h" -#ifdef USE_CUSTOM_SHAPES - DEFINE_SHAPE_CLASS(CLeftRightArrowCalloutType, CCustomShape) -#else - DEFINE_SHAPE_CLASS(CLeftRightArrowCalloutType, CPPTShape) -#endif +// 81 +DEFINE_SHAPE_CLASS(CLeftRightArrowCalloutType, CPPTShape) + + diff --git a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/LeftRightArrowType.h b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/LeftRightArrowType.h index faa8e0b9d9..b11cfe8eae 100644 --- a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/LeftRightArrowType.h +++ b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/LeftRightArrowType.h @@ -1,4 +1,4 @@ -/* +/* * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or @@ -29,12 +29,8 @@ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode * */ - #pragma once #include "../PptShape.h" -#ifdef USE_CUSTOM_SHAPES - DEFINE_SHAPE_CLASS(CLeftRightArrowType, CCustomShape) -#else - DEFINE_SHAPE_CLASS(CLeftRightArrowType, CPPTShape) -#endif +// 69 +DEFINE_SHAPE_CLASS(CLeftRightArrowType, CPPTShape) diff --git a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/LeftRightUpArrow.h b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/LeftRightUpArrow.h index 775391b9c6..214882890e 100644 --- a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/LeftRightUpArrow.h +++ b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/LeftRightUpArrow.h @@ -1,4 +1,4 @@ -/* +/* * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or @@ -29,12 +29,8 @@ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode * */ - #pragma once #include "../PptShape.h" -#ifdef USE_CUSTOM_SHAPES - DEFINE_SHAPE_CLASS(CLeftRightUpArrow, CCustomShape) -#else - DEFINE_SHAPE_CLASS(CLeftRightUpArrow, CPPTShape) -#endif +// 182 +DEFINE_SHAPE_CLASS(CLeftRightUpArrow, CPPTShape) diff --git a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/LeftUpArrowType.h b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/LeftUpArrowType.h index ea7a41d480..fa8e155a49 100644 --- a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/LeftUpArrowType.h +++ b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/LeftUpArrowType.h @@ -1,4 +1,4 @@ -/* +/* * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or @@ -29,12 +29,8 @@ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode * */ - #pragma once #include "../PptShape.h" -#ifdef USE_CUSTOM_SHAPES - DEFINE_SHAPE_CLASS(CLeftUpArrowType, CCustomShape) -#else - DEFINE_SHAPE_CLASS(CLeftUpArrowType, CPPTShape) -#endif +// 89 +DEFINE_SHAPE_CLASS(CLeftUpArrowType, CPPTShape) diff --git a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/LightningBoltType.h b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/LightningBoltType.h index 2bec4902b5..72187e42a7 100644 --- a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/LightningBoltType.h +++ b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/LightningBoltType.h @@ -1,4 +1,4 @@ -/* +/* * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or @@ -29,12 +29,8 @@ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode * */ - #pragma once #include "../PptShape.h" -#ifdef USE_CUSTOM_SHAPES - DEFINE_SHAPE_CLASS(CLightningBoltType, CCustomShape) -#else - DEFINE_SHAPE_CLASS(CLightningBoltType, CPPTShape) -#endif +// 73 +DEFINE_SHAPE_CLASS(CLightningBoltType, CPPTShape) diff --git a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/LineType.h b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/LineType.h index c91bb84f70..0cbced8bb0 100644 --- a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/LineType.h +++ b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/LineType.h @@ -1,4 +1,4 @@ -/* +/* * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or @@ -29,12 +29,8 @@ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode * */ - #pragma once #include "../PptShape.h" -#ifdef USE_CUSTOM_SHAPES - DEFINE_SHAPE_CLASS(CLineType, CCustomShape) -#else - DEFINE_SHAPE_CLASS(CLineType, CPPTShape) -#endif +// 20 +DEFINE_SHAPE_CLASS(CLineType, CPPTShape) diff --git a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/MoonType.h b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/MoonType.h index c6f688f4f1..6ac44696d0 100644 --- a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/MoonType.h +++ b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/MoonType.h @@ -1,4 +1,4 @@ -/* +/* * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or @@ -29,12 +29,8 @@ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode * */ - #pragma once #include "../PptShape.h" -#ifdef USE_CUSTOM_SHAPES - DEFINE_SHAPE_CLASS(CMoonType, CCustomShape) -#else - DEFINE_SHAPE_CLASS(CMoonType, CPPTShape) -#endif +// 184 +DEFINE_SHAPE_CLASS(CMoonType, CPPTShape) diff --git a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/NoSmokingType.h b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/NoSmokingType.h index 505286fee9..11c0639646 100644 --- a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/NoSmokingType.h +++ b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/NoSmokingType.h @@ -1,4 +1,4 @@ -/* +/* * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or @@ -29,12 +29,8 @@ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode * */ - #pragma once #include "../PptShape.h" -#ifdef USE_CUSTOM_SHAPES - DEFINE_SHAPE_CLASS(CNoSmokingType, CCustomShape) -#else - DEFINE_SHAPE_CLASS(CNoSmokingType, CPPTShape) -#endif +// 57 +DEFINE_SHAPE_CLASS(CNoSmokingType, CPPTShape) diff --git a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/NotchedRightArrowType.h b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/NotchedRightArrowType.h index 8bea305652..6871a893bb 100644 --- a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/NotchedRightArrowType.h +++ b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/NotchedRightArrowType.h @@ -1,4 +1,4 @@ -/* +/* * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or @@ -29,12 +29,8 @@ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode * */ - #pragma once #include "../PptShape.h" -#ifdef USE_CUSTOM_SHAPES - DEFINE_SHAPE_CLASS(CNotchedRightArrowType, CCustomShape) -#else - DEFINE_SHAPE_CLASS(CNotchedRightArrowType, CPPTShape) -#endif +// 94 +DEFINE_SHAPE_CLASS(CNotchedRightArrowType, CPPTShape) diff --git a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/OctagonType.h b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/OctagonType.h index 4f0dfd33f5..7693eb49b0 100644 --- a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/OctagonType.h +++ b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/OctagonType.h @@ -1,4 +1,4 @@ -/* +/* * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or @@ -29,12 +29,8 @@ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode * */ - #pragma once #include "../PptShape.h" -#ifdef USE_CUSTOM_SHAPES - DEFINE_SHAPE_CLASS(COctagonType, CCustomShape) -#else - DEFINE_SHAPE_CLASS(COctagonType, CPPTShape) -#endif +// 10 +DEFINE_SHAPE_CLASS(COctagonType, CPPTShape) diff --git a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/ParallelogramType.h b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/ParallelogramType.h index 8f32702261..4ed8696816 100644 --- a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/ParallelogramType.h +++ b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/ParallelogramType.h @@ -1,4 +1,4 @@ -/* +/* * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or @@ -29,12 +29,8 @@ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode * */ - #pragma once #include "../PptShape.h" -#ifdef USE_CUSTOM_SHAPES - DEFINE_SHAPE_CLASS(CParallelogramType, CCustomShape) -#else - DEFINE_SHAPE_CLASS(CParallelogramType, CPPTShape) -#endif +// 7 +DEFINE_SHAPE_CLASS(CParallelogramType, CPPTShape) diff --git a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/PentagonType.h b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/PentagonType.h index 11a9102942..6d3092cd2a 100644 --- a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/PentagonType.h +++ b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/PentagonType.h @@ -1,4 +1,4 @@ -/* +/* * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or @@ -29,12 +29,8 @@ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode * */ - #pragma once #include "../PptShape.h" -#ifdef USE_CUSTOM_SHAPES - DEFINE_SHAPE_CLASS(CPentagonType, CCustomShape) -#else - DEFINE_SHAPE_CLASS(CPentagonType, CPPTShape) -#endif +// 56 +DEFINE_SHAPE_CLASS(CPentagonType, CPPTShape) diff --git a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/PlaqueType.h b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/PlaqueType.h index 45e0e8ccbc..f4efe9ebc4 100644 --- a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/PlaqueType.h +++ b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/PlaqueType.h @@ -1,4 +1,4 @@ -/* +/* * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or @@ -29,12 +29,8 @@ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode * */ - #pragma once #include "../PptShape.h" -#ifdef USE_CUSTOM_SHAPES - DEFINE_SHAPE_CLASS(CPlaqueType, CCustomShape) -#else - DEFINE_SHAPE_CLASS(CPlaqueType, CPPTShape) -#endif +// 21 +DEFINE_SHAPE_CLASS(CPlaqueType, CPPTShape) diff --git a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/PlusType.h b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/PlusType.h index 007694ba87..edc308c856 100644 --- a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/PlusType.h +++ b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/PlusType.h @@ -1,4 +1,4 @@ -/* +/* * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or @@ -29,12 +29,8 @@ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode * */ - #pragma once #include "../PptShape.h" -#ifdef USE_CUSTOM_SHAPES - DEFINE_SHAPE_CLASS(CPlusType, CCustomShape) -#else - DEFINE_SHAPE_CLASS(CPlusType, CPPTShape) -#endif +// 11 +DEFINE_SHAPE_CLASS(CPlusType, CPPTShape) diff --git a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/QuadArrowCalloutType.h b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/QuadArrowCalloutType.h index ebe6420d14..b3e8e3cb7e 100644 --- a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/QuadArrowCalloutType.h +++ b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/QuadArrowCalloutType.h @@ -1,4 +1,4 @@ -/* +/* * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or @@ -29,12 +29,9 @@ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode * */ - #pragma once #include "../PptShape.h" -#ifdef USE_CUSTOM_SHAPES - DEFINE_SHAPE_CLASS(CQuadArrowCalloutType, CCustomShape) -#else - DEFINE_SHAPE_CLASS(CQuadArrowCalloutType, CPPTShape) -#endif +// 83 +DEFINE_SHAPE_CLASS(CQuadArrowCalloutType, CPPTShape) + diff --git a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/QuadArrowType.h b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/QuadArrowType.h index ee8263b208..3bd0edf293 100644 --- a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/QuadArrowType.h +++ b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/QuadArrowType.h @@ -1,4 +1,4 @@ -/* +/* * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or @@ -29,12 +29,8 @@ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode * */ - #pragma once #include "../PptShape.h" -#ifdef USE_CUSTOM_SHAPES - DEFINE_SHAPE_CLASS(CQuadArrowType, CCustomShape) -#else - DEFINE_SHAPE_CLASS(CQuadArrowType, CPPTShape) -#endif +// 76 +DEFINE_SHAPE_CLASS(CQuadArrowType, CPPTShape) diff --git a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/RectangleType.h b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/RectangleType.h index a3063bbae9..8a32ecacb2 100644 --- a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/RectangleType.h +++ b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/RectangleType.h @@ -1,4 +1,4 @@ -/* +/* * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or @@ -29,12 +29,8 @@ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode * */ - #pragma once #include "../PptShape.h" -#ifdef USE_CUSTOM_SHAPES - DEFINE_SHAPE_CLASS(CRectangleType, CCustomShape) -#else - DEFINE_SHAPE_CLASS(CRectangleType, CPPTShape) -#endif +// 1 +DEFINE_SHAPE_CLASS(CRectangleType, CPPTShape) diff --git a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/RibbonDownType.h b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/RibbonDownType.h index 0ea66d4bc6..1127b22736 100644 --- a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/RibbonDownType.h +++ b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/RibbonDownType.h @@ -1,4 +1,4 @@ -/* +/* * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or @@ -29,12 +29,8 @@ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode * */ - #pragma once #include "../PptShape.h" -#ifdef USE_CUSTOM_SHAPES - DEFINE_SHAPE_CLASS(CRibbonDownType, CCustomShape) -#else - DEFINE_SHAPE_CLASS(CRibbonDownType, CPPTShape) -#endif +// 53 +DEFINE_SHAPE_CLASS(CRibbonDownType, CPPTShape) diff --git a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/RibbonUpType.h b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/RibbonUpType.h index 32472578e0..6a9ab9a980 100644 --- a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/RibbonUpType.h +++ b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/RibbonUpType.h @@ -1,4 +1,4 @@ -/* +/* * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or @@ -29,12 +29,8 @@ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode * */ - #pragma once #include "../PptShape.h" -#ifdef USE_CUSTOM_SHAPES - DEFINE_SHAPE_CLASS(CRibbonUpType, CCustomShape) -#else - DEFINE_SHAPE_CLASS(CRibbonUpType, CPPTShape) -#endif +// 54 +DEFINE_SHAPE_CLASS(CRibbonUpType, CPPTShape) diff --git a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/RightArrowCalloutType.h b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/RightArrowCalloutType.h index a49f58644f..b585754001 100644 --- a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/RightArrowCalloutType.h +++ b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/RightArrowCalloutType.h @@ -1,4 +1,4 @@ -/* +/* * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or @@ -29,12 +29,8 @@ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode * */ - #pragma once #include "../PptShape.h" -#ifdef USE_CUSTOM_SHAPES - DEFINE_SHAPE_CLASS(CRightArrowCalloutType, CCustomShape) -#else - DEFINE_SHAPE_CLASS(CRightArrowCalloutType, CPPTShape) -#endif +// 78 +DEFINE_SHAPE_CLASS(CRightArrowCalloutType, CPPTShape) diff --git a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/RightArrowType.h b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/RightArrowType.h index 542f9bcd64..f13d710815 100644 --- a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/RightArrowType.h +++ b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/RightArrowType.h @@ -1,4 +1,4 @@ -/* +/* * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or @@ -29,12 +29,8 @@ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode * */ - #pragma once #include "../PptShape.h" -#ifdef USE_CUSTOM_SHAPES - DEFINE_SHAPE_CLASS(CRightArrowType, CCustomShape) -#else - DEFINE_SHAPE_CLASS(CRightArrowType, CPPTShape) -#endif +// 13 +DEFINE_SHAPE_CLASS(CRightArrowType, CPPTShape) diff --git a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/RightBracetype.h b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/RightBracetype.h index e9f43323d4..2166d95760 100644 --- a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/RightBracetype.h +++ b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/RightBracetype.h @@ -1,4 +1,4 @@ -/* +/* * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or @@ -29,12 +29,8 @@ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode * */ - #pragma once #include "../PptShape.h" -#ifdef USE_CUSTOM_SHAPES - DEFINE_SHAPE_CLASS(CRightBracetype, CCustomShape) -#else - DEFINE_SHAPE_CLASS(CRightBracetype, CPPTShape) -#endif +// 88 +DEFINE_SHAPE_CLASS(CRightBracetype, CPPTShape) diff --git a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/RightBracketType.h b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/RightBracketType.h index 91d586a620..6b1e0c0f07 100644 --- a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/RightBracketType.h +++ b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/RightBracketType.h @@ -1,4 +1,4 @@ -/* +/* * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or @@ -29,12 +29,8 @@ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode * */ - #pragma once #include "../PptShape.h" -#ifdef USE_CUSTOM_SHAPES - DEFINE_SHAPE_CLASS(CRightBracketType, CCustomShape) -#else - DEFINE_SHAPE_CLASS(CRightBracketType, CPPTShape) -#endif +// 86 +DEFINE_SHAPE_CLASS(CRightBracketType, CPPTShape) diff --git a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/RightTriangleType.h b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/RightTriangleType.h index 663d7ca010..a241df0f19 100644 --- a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/RightTriangleType.h +++ b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/RightTriangleType.h @@ -1,4 +1,4 @@ -/* +/* * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or @@ -29,12 +29,8 @@ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode * */ - #pragma once #include "../PptShape.h" -#ifdef USE_CUSTOM_SHAPES - DEFINE_SHAPE_CLASS(CRightTriangleType, CCustomShape) -#else - DEFINE_SHAPE_CLASS(CRightTriangleType, CPPTShape) -#endif +// 6 +DEFINE_SHAPE_CLASS(CRightTriangleType, CPPTShape) diff --git a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/RoundedRectangleType.h b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/RoundedRectangleType.h index 64df144981..e0ecb04577 100644 --- a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/RoundedRectangleType.h +++ b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/RoundedRectangleType.h @@ -1,4 +1,4 @@ -/* +/* * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or @@ -29,12 +29,8 @@ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode * */ - #pragma once #include "../PptShape.h" -#ifdef USE_CUSTOM_SHAPES - DEFINE_SHAPE_CLASS(CRoundedRectangleType, CCustomShape) -#else - DEFINE_SHAPE_CLASS(CRoundedRectangleType, CPPTShape) -#endif +// 2 +DEFINE_SHAPE_CLASS(CRoundedRectangleType, CPPTShape) diff --git a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/Seal16Type.h b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/Seal16Type.h index 240ef52416..dc46288e72 100644 --- a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/Seal16Type.h +++ b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/Seal16Type.h @@ -1,4 +1,4 @@ -/* +/* * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or @@ -29,12 +29,8 @@ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode * */ - #pragma once #include "../PptShape.h" -#ifdef USE_CUSTOM_SHAPES - DEFINE_SHAPE_CLASS(CSeal16Type, CCustomShape) -#else - DEFINE_SHAPE_CLASS(CSeal16Type, CPPTShape) -#endif +// 59 +DEFINE_SHAPE_CLASS(CSeal16Type, CPPTShape) diff --git a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/Seal24Type.h b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/Seal24Type.h index db027b15c3..881c831f0e 100644 --- a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/Seal24Type.h +++ b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/Seal24Type.h @@ -1,4 +1,4 @@ -/* +/* * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or @@ -29,12 +29,8 @@ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode * */ - #pragma once #include "../PptShape.h" -#ifdef USE_CUSTOM_SHAPES - DEFINE_SHAPE_CLASS(CSeal24Type, CCustomShape) -#else - DEFINE_SHAPE_CLASS(CSeal24Type, CPPTShape) -#endif +// 92 +DEFINE_SHAPE_CLASS(CSeal24Type, CPPTShape) diff --git a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/Seal32Type.h b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/Seal32Type.h index 3df0c1a80f..fc3bc87b40 100644 --- a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/Seal32Type.h +++ b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/Seal32Type.h @@ -1,4 +1,4 @@ -/* +/* * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or @@ -29,12 +29,9 @@ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode * */ - #pragma once #include "../PptShape.h" -#ifdef USE_CUSTOM_SHAPES - DEFINE_SHAPE_CLASS(CSeal32Type, CCustomShape) -#else - DEFINE_SHAPE_CLASS(CSeal32Type, CPPTShape) -#endif +// 60 +DEFINE_SHAPE_CLASS(CSeal32Type, CPPTShape) + diff --git a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/Seal4Type.h b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/Seal4Type.h index df5c52dfa5..056c2f8d66 100644 --- a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/Seal4Type.h +++ b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/Seal4Type.h @@ -1,4 +1,4 @@ -/* +/* * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or @@ -29,12 +29,9 @@ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode * */ - #pragma once #include "../PptShape.h" -#ifdef USE_CUSTOM_SHAPES - DEFINE_SHAPE_CLASS(CSeal4Type, CCustomShape) -#else - DEFINE_SHAPE_CLASS(CSeal4Type, CPPTShape) -#endif +// 187 +DEFINE_SHAPE_CLASS(CSeal4Type, CPPTShape) + diff --git a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/Seal8Type.h b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/Seal8Type.h index 53701ee1c7..501c926125 100644 --- a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/Seal8Type.h +++ b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/Seal8Type.h @@ -1,4 +1,4 @@ -/* +/* * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or @@ -29,12 +29,10 @@ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode * */ - #pragma once #include "../PptShape.h" -#ifdef USE_CUSTOM_SHAPES - DEFINE_SHAPE_CLASS(CSeal8Type, CCustomShape) -#else - DEFINE_SHAPE_CLASS(CSeal8Type, CPPTShape) -#endif +// 58 +DEFINE_SHAPE_CLASS(CSeal8Type, CPPTShape) + + diff --git a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/SmileyFaceType.h b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/SmileyFaceType.h index e95fb9011a..6301121dff 100644 --- a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/SmileyFaceType.h +++ b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/SmileyFaceType.h @@ -1,4 +1,4 @@ -/* +/* * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or @@ -29,12 +29,8 @@ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode * */ - #pragma once #include "../PptShape.h" -#ifdef USE_CUSTOM_SHAPES - DEFINE_SHAPE_CLASS(CSmileyFaceType, CCustomShape) -#else - DEFINE_SHAPE_CLASS(CSmileyFaceType, CPPTShape) -#endif +// 96 +DEFINE_SHAPE_CLASS(CSmileyFaceType, CPPTShape) diff --git a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/Startype.h b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/Startype.h index 9d24a83e2c..493d61adc4 100644 --- a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/Startype.h +++ b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/Startype.h @@ -1,4 +1,4 @@ -/* +/* * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or @@ -29,12 +29,8 @@ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode * */ - #pragma once #include "../PptShape.h" -#ifdef USE_CUSTOM_SHAPES - DEFINE_SHAPE_CLASS(CStarType, CCustomShape) -#else - DEFINE_SHAPE_CLASS(CStarType, CPPTShape) -#endif +// 12 +DEFINE_SHAPE_CLASS(CStarType, CPPTShape) diff --git a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/StraightConnectorType.h b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/StraightConnectorType.h index 69d533067f..8cbddf9e9a 100644 --- a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/StraightConnectorType.h +++ b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/StraightConnectorType.h @@ -1,4 +1,4 @@ -/* +/* * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or @@ -29,12 +29,8 @@ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode * */ - #pragma once #include "../PptShape.h" -#ifdef USE_CUSTOM_SHAPES - DEFINE_SHAPE_CLASS(CStraightConnectorType, CCustomShape) -#else - DEFINE_SHAPE_CLASS(CStraightConnectorType, CPPTShape) -#endif +// 32 +DEFINE_SHAPE_CLASS(CStraightConnectorType, CPPTShape) diff --git a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/StripedRightArrowType.h b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/StripedRightArrowType.h index bd4682da49..030056f9b6 100644 --- a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/StripedRightArrowType.h +++ b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/StripedRightArrowType.h @@ -1,4 +1,4 @@ -/* +/* * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or @@ -29,12 +29,8 @@ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode * */ - #pragma once #include "../PptShape.h" -#ifdef USE_CUSTOM_SHAPES - DEFINE_SHAPE_CLASS(CStripedRightArrowType, CCustomShape) -#else - DEFINE_SHAPE_CLASS(CStripedRightArrowType, CPPTShape) -#endif +// 93 +DEFINE_SHAPE_CLASS(CStripedRightArrowType, CPPTShape) diff --git a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/SunType.h b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/SunType.h index 4a18faf83e..ebd552586a 100644 --- a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/SunType.h +++ b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/SunType.h @@ -1,4 +1,4 @@ -/* +/* * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or @@ -29,12 +29,8 @@ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode * */ - #pragma once #include "../PptShape.h" -#ifdef USE_CUSTOM_SHAPES - DEFINE_SHAPE_CLASS(CSunType, CCustomShape) -#else - DEFINE_SHAPE_CLASS(CSunType, CPPTShape) -#endif +// 183 +DEFINE_SHAPE_CLASS(CSunType, CPPTShape) diff --git a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/TextboxType.h b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/TextboxType.h index cb6a7ca0de..156a0e4b84 100644 --- a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/TextboxType.h +++ b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/TextboxType.h @@ -1,4 +1,4 @@ -/* +/* * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or @@ -29,12 +29,9 @@ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode * */ - #pragma once #include "../PptShape.h" -#ifdef USE_CUSTOM_SHAPES - DEFINE_SHAPE_CLASS(CTextboxType, CCustomShape) -#else - DEFINE_SHAPE_CLASS(CTextboxType, CPPTShape) -#endif +///////// !!!!!!!!!!!!!!!!!!!! ///////////// +// 202 +DEFINE_SHAPE_CLASS(CTextboxType, CPPTShape) diff --git a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/TrapezoidType.h b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/TrapezoidType.h index 49b240b81b..0a3d196a86 100644 --- a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/TrapezoidType.h +++ b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/TrapezoidType.h @@ -1,4 +1,4 @@ -/* +/* * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or @@ -29,12 +29,8 @@ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode * */ - #pragma once #include "../PptShape.h" -#ifdef USE_CUSTOM_SHAPES - DEFINE_SHAPE_CLASS(CTrapezoidType, CCustomShape) -#else - DEFINE_SHAPE_CLASS(CTrapezoidType, CPPTShape) -#endif +// 8 +DEFINE_SHAPE_CLASS(CTrapezoidType, CPPTShape) diff --git a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/UpArrowCalloutType.h b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/UpArrowCalloutType.h index 45b209d84d..3560345861 100644 --- a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/UpArrowCalloutType.h +++ b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/UpArrowCalloutType.h @@ -1,4 +1,4 @@ -/* +/* * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or @@ -29,12 +29,8 @@ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode * */ - #pragma once #include "../PptShape.h" -#ifdef USE_CUSTOM_SHAPES - DEFINE_SHAPE_CLASS(CUpArrowCalloutType, CCustomShape) -#else - DEFINE_SHAPE_CLASS(CUpArrowCalloutType, CPPTShape) -#endif +// 79 +DEFINE_SHAPE_CLASS(CUpArrowCalloutType, CPPTShape) diff --git a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/UpArrowType.h b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/UpArrowType.h index 402cae1739..d71da9af96 100644 --- a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/UpArrowType.h +++ b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/UpArrowType.h @@ -1,4 +1,4 @@ -/* +/* * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or @@ -29,12 +29,8 @@ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode * */ - #pragma once #include "../PptShape.h" -#ifdef USE_CUSTOM_SHAPES - DEFINE_SHAPE_CLASS(CUpArrowType, CCustomShape) -#else - DEFINE_SHAPE_CLASS(CUpArrowType, CPPTShape) -#endif +// 68 +DEFINE_SHAPE_CLASS(CUpArrowType, CPPTShape) diff --git a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/UpDownArrowCalloutType.h b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/UpDownArrowCalloutType.h index 7f7d1c6538..ccc8aabb74 100644 --- a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/UpDownArrowCalloutType.h +++ b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/UpDownArrowCalloutType.h @@ -1,4 +1,4 @@ -/* +/* * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or @@ -29,12 +29,8 @@ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode * */ - #pragma once #include "../PptShape.h" -#ifdef USE_CUSTOM_SHAPES - DEFINE_SHAPE_CLASS(CUpDownArrowCalloutType, CCustomShape) -#else - DEFINE_SHAPE_CLASS(CUpDownArrowCalloutType, CPPTShape) -#endif +// 82 +DEFINE_SHAPE_CLASS(CUpDownArrowCalloutType, CPPTShape) diff --git a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/UpDownArrowType.h b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/UpDownArrowType.h index c03436da90..a6b44afcd4 100644 --- a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/UpDownArrowType.h +++ b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/UpDownArrowType.h @@ -1,4 +1,4 @@ -/* +/* * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or @@ -29,12 +29,8 @@ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode * */ - #pragma once #include "../PptShape.h" -#ifdef USE_CUSTOM_SHAPES - DEFINE_SHAPE_CLASS(CUpDownArrowType, CCustomShape) -#else - DEFINE_SHAPE_CLASS(CUpDownArrowType, CPPTShape) -#endif +// 70 +DEFINE_SHAPE_CLASS(CUpDownArrowType, CPPTShape) diff --git a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/UturnArrowType.h b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/UturnArrowType.h index 84b30976d5..9ddbb76804 100644 --- a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/UturnArrowType.h +++ b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/UturnArrowType.h @@ -1,4 +1,4 @@ -/* +/* * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or @@ -29,12 +29,8 @@ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode * */ - #pragma once #include "../PptShape.h" -#ifdef USE_CUSTOM_SHAPES - DEFINE_SHAPE_CLASS(CUturnArrowType, CCustomShape) -#else - DEFINE_SHAPE_CLASS(CUturnArrowType, CPPTShape) -#endif +// 101 +DEFINE_SHAPE_CLASS(CUturnArrowType, CPPTShape) diff --git a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/VerticalScrollType.h b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/VerticalScrollType.h index d6e7c859fc..c5499ae15f 100644 --- a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/VerticalScrollType.h +++ b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/VerticalScrollType.h @@ -1,4 +1,4 @@ -/* +/* * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or @@ -29,12 +29,8 @@ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode * */ - #pragma once #include "../PptShape.h" -#ifdef USE_CUSTOM_SHAPES - DEFINE_SHAPE_CLASS(CVerticalScrollType, CCustomShape) -#else - DEFINE_SHAPE_CLASS(CVerticalScrollType, CPPTShape) -#endif +// 97 +DEFINE_SHAPE_CLASS(CVerticalScrollType, CPPTShape) diff --git a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/WaveDoubleType.h b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/WaveDoubleType.h index abf6503796..adbe56f596 100644 --- a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/WaveDoubleType.h +++ b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/WaveDoubleType.h @@ -1,4 +1,4 @@ -/* +/* * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or @@ -29,12 +29,8 @@ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode * */ - #pragma once #include "../PptShape.h" -#ifdef USE_CUSTOM_SHAPES - DEFINE_SHAPE_CLASS(CWaveDoubleType, CCustomShape) -#else - DEFINE_SHAPE_CLASS(CWaveDoubleType, CPPTShape) -#endif +// 188 +DEFINE_SHAPE_CLASS(CWaveDoubleType, CPPTShape) diff --git a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/WaveType.h b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/WaveType.h index dad22bb115..7219be782e 100644 --- a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/WaveType.h +++ b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/WaveType.h @@ -1,4 +1,4 @@ -/* +/* * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or @@ -29,12 +29,8 @@ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode * */ - #pragma once #include "../PptShape.h" -#ifdef USE_CUSTOM_SHAPES - DEFINE_SHAPE_CLASS(CWaveType, CCustomShape) -#else - DEFINE_SHAPE_CLASS(CWaveType, CPPTShape) -#endif +// 64 +DEFINE_SHAPE_CLASS(CWaveType, CPPTShape) diff --git a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/WedgeEllipseCalloutType.h b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/WedgeEllipseCalloutType.h index 29a3699660..9b5de71289 100644 --- a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/WedgeEllipseCalloutType.h +++ b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/WedgeEllipseCalloutType.h @@ -1,4 +1,4 @@ -/* +/* * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or @@ -29,12 +29,8 @@ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode * */ - #pragma once #include "../PptShape.h" -#ifdef USE_CUSTOM_SHAPES - DEFINE_SHAPE_CLASS(CWedgeEllipseCalloutType, CCustomShape) -#else - DEFINE_SHAPE_CLASS(CWedgeEllipseCalloutType, CPPTShape) -#endif +// 63 +DEFINE_SHAPE_CLASS(CWedgeEllipseCalloutType, CPPTShape) diff --git a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/WedgeRectCalloutType.h b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/WedgeRectCalloutType.h index a20d67e0cc..d4e43728f9 100644 --- a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/WedgeRectCalloutType.h +++ b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/WedgeRectCalloutType.h @@ -1,4 +1,4 @@ -/* +/* * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or @@ -29,12 +29,8 @@ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode * */ - #pragma once #include "../PptShape.h" -#ifdef USE_CUSTOM_SHAPES - DEFINE_SHAPE_CLASS(CWedgeRectCalloutType, CCustomShape) -#else - DEFINE_SHAPE_CLASS(CWedgeRectCalloutType, CPPTShape) -#endif +// 61 +DEFINE_SHAPE_CLASS(CWedgeRectCalloutType, CPPTShape) diff --git a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/WedgeRoundedRectCalloutType.h b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/WedgeRoundedRectCalloutType.h index f04c5fb14e..a56cc2c18c 100644 --- a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/WedgeRoundedRectCalloutType.h +++ b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/WedgeRoundedRectCalloutType.h @@ -1,4 +1,4 @@ -/* +/* * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or @@ -29,12 +29,8 @@ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode * */ - #pragma once #include "../PptShape.h" -#ifdef USE_CUSTOM_SHAPES - DEFINE_SHAPE_CLASS(CWedgeRoundedRectCalloutType, CCustomShape) -#else - DEFINE_SHAPE_CLASS(CWedgeRoundedRectCalloutType, CPPTShape) -#endif +// 62 +DEFINE_SHAPE_CLASS(CWedgeRoundedRectCalloutType, CPPTShape) diff --git a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/accentbordercallout1type.h b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/accentbordercallout1type.h index 21559f7416..8d29689ada 100644 --- a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/accentbordercallout1type.h +++ b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/accentbordercallout1type.h @@ -1,4 +1,4 @@ -/* +/* * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or @@ -29,12 +29,8 @@ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode * */ - #pragma once #include "../PptShape.h" -#ifdef USE_CUSTOM_SHAPES - DEFINE_SHAPE_CLASS(CAccentBorderCallout1Type, CCustomShape) -#else - DEFINE_SHAPE_CLASS(CAccentBorderCallout1Type, CPPTShape) -#endif +// 50 +DEFINE_SHAPE_CLASS(CAccentBorderCallout1Type, CPPTShape) diff --git a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/accentbordercallout3type.h b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/accentbordercallout3type.h index bd538e8d9c..95ad6dd957 100644 --- a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/accentbordercallout3type.h +++ b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/accentbordercallout3type.h @@ -1,4 +1,4 @@ -/* +/* * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or @@ -29,12 +29,8 @@ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode * */ - #pragma once #include "../PptShape.h" -#ifdef USE_CUSTOM_SHAPES - DEFINE_SHAPE_CLASS(CAccentBorderCallout3Type, CCustomShape) -#else - DEFINE_SHAPE_CLASS(CAccentBorderCallout3Type, CPPTShape) -#endif +// 52 +DEFINE_SHAPE_CLASS(CAccentBorderCallout3Type, CPPTShape) diff --git a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/accentbordercallout90type.h b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/accentbordercallout90type.h index 6084665105..b1eea199ec 100644 --- a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/accentbordercallout90type.h +++ b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/accentbordercallout90type.h @@ -1,4 +1,4 @@ -/* +/* * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or @@ -29,12 +29,8 @@ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode * */ - #pragma once #include "../PptShape.h" -#ifdef USE_CUSTOM_SHAPES - DEFINE_SHAPE_CLASS(CAccentBorderCallout90Type, CCustomShape) -#else - DEFINE_SHAPE_CLASS(CAccentBorderCallout90Type, CPPTShape) -#endif +// 181 +DEFINE_SHAPE_CLASS(CAccentBorderCallout90Type, CPPTShape) diff --git a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/arctype.h b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/arctype.h index dea52adbf1..adf73b285a 100644 --- a/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/arctype.h +++ b/MsBinaryFile/Common/Vml/PPTShape/PPTAutoShapes/arctype.h @@ -1,4 +1,4 @@ -/* +/* * (c) Copyright Ascensio System SIA 2010-2019 * * This program is a free software product. You can redistribute it and/or @@ -29,12 +29,8 @@ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode * */ - #pragma once #include "../PptShape.h" -#ifdef USE_CUSTOM_SHAPES - DEFINE_SHAPE_CLASS(CArcType, CCustomShape) -#else - DEFINE_SHAPE_CLASS(CArcType, CPPTShape) -#endif +// 19 +DEFINE_SHAPE_CLASS(CArcType, CPPTShape) diff --git a/MsBinaryFile/Projects/XlsFormatLib/Linux/XlsFormatLib.pro b/MsBinaryFile/Projects/XlsFormatLib/Linux/XlsFormatLib.pro index 9a8edc4d86..f653878a63 100644 --- a/MsBinaryFile/Projects/XlsFormatLib/Linux/XlsFormatLib.pro +++ b/MsBinaryFile/Projects/XlsFormatLib/Linux/XlsFormatLib.pro @@ -19,13 +19,9 @@ include(../../../../Common/base.pri) #BOOST include($$PWD/../../../../Common/3dParty/boost/boost.pri) -#PPTSHAPES -include($$PWD/../../../Common/Vml/PPTShape/PPTAutoShapes/pri/ppt_shapes.pri) - DEFINES += UNICODE \ _UNICODE \ - DONT_WRITE_EMBEDDED_FONTS \ - USE_CUSTOM_SHAPES + DONT_WRITE_EMBEDDED_FONTS INCLUDEPATH += ../../../XlsFile/Format INCLUDEPATH += ../../../Common @@ -1693,4 +1689,146 @@ HEADERS += \ ../../../XlsFile/Format/Logic/Biff_unions/IMDATAOBJECT.h \ ../../../XlsFile/Format/Logic/Biff_records/IMDATA.h \ ../../../XlsFile/Format/Logic/Biff_structures/CFDatabar.h \ - ../../../XlsFile/Format/Logic/Biff_structures/CFGradient.h + ../../../XlsFile/Format/Logic/Biff_structures/CFGradient.h \ + \ + ../../../Common/ODraw/oldAutoShapes/accentbordercallout1type.h \ + ../../../Common/ODraw/oldAutoShapes/accentbordercallout3type.h \ + ../../../Common/ODraw/oldAutoShapes/accentbordercallout90type.h \ + ../../../Common/ODraw/oldAutoShapes/AccentBorderCallout2Type.h \ + ../../../Common/ODraw/oldAutoShapes/AccentCallout1Type.h \ + ../../../Common/ODraw/oldAutoShapes/AccentCallout2Type.h \ + ../../../Common/ODraw/oldAutoShapes/AccentCallout3Type.h \ + ../../../Common/ODraw/oldAutoShapes/AccentCallout90Type.h \ + ../../../Common/ODraw/oldAutoShapes/ActionButtonBack.h \ + ../../../Common/ODraw/oldAutoShapes/ActionButtonBeginning.h \ + ../../../Common/ODraw/oldAutoShapes/ActionButtonBlank.h \ + ../../../Common/ODraw/oldAutoShapes/ActionButtonDocument.h \ + ../../../Common/ODraw/oldAutoShapes/ActionButtonEnd.h \ + ../../../Common/ODraw/oldAutoShapes/ActionButtonHelp.h \ + ../../../Common/ODraw/oldAutoShapes/ActionButtonHome.h \ + ../../../Common/ODraw/oldAutoShapes/ActionButtonInfo.h \ + ../../../Common/ODraw/oldAutoShapes/ActionButtonMovie.h \ + ../../../Common/ODraw/oldAutoShapes/ActionButtonNext.h \ + ../../../Common/ODraw/oldAutoShapes/ActionButtonReturn.h \ + ../../../Common/ODraw/oldAutoShapes/ActionButtonSound.h \ + ../../../Common/ODraw/oldAutoShapes/arctype.h \ + ../../../Common/ODraw/oldAutoShapes/BentArrowType.h \ + ../../../Common/ODraw/oldAutoShapes/BentConnector.h \ + ../../../Common/ODraw/oldAutoShapes/BentUpArrowType.h \ + ../../../Common/ODraw/oldAutoShapes/BevelType.h \ + ../../../Common/ODraw/oldAutoShapes/BlockArcType.h \ + ../../../Common/ODraw/oldAutoShapes/BorderCallout1Type.h \ + ../../../Common/ODraw/oldAutoShapes/BorderCallout2Type.h \ + ../../../Common/ODraw/oldAutoShapes/BorderCallout3Type.h \ + ../../../Common/ODraw/oldAutoShapes/BorderCallout90Type.h \ + ../../../Common/ODraw/oldAutoShapes/BracePairType.h \ + ../../../Common/ODraw/oldAutoShapes/BracketPairType.h \ + ../../../Common/ODraw/oldAutoShapes/Callout1Type.h \ + ../../../Common/ODraw/oldAutoShapes/Callout2Type.h \ + ../../../Common/ODraw/oldAutoShapes/Callout3Type.h \ + ../../../Common/ODraw/oldAutoShapes/Callout90Type.h \ + ../../../Common/ODraw/oldAutoShapes/CanType.h \ + ../../../Common/ODraw/oldAutoShapes/ChevronType.h \ + ../../../Common/ODraw/oldAutoShapes/CircularArrowType.h \ + ../../../Common/ODraw/oldAutoShapes/CloudCalloutType.h \ + ../../../Common/ODraw/oldAutoShapes/CubeType.h \ + ../../../Common/ODraw/oldAutoShapes/CurvedConnector.h \ + ../../../Common/ODraw/oldAutoShapes/CurvedDownArrowType.h \ + ../../../Common/ODraw/oldAutoShapes/CurvedLeftArrowType.h \ + ../../../Common/ODraw/oldAutoShapes/CurvedRightArrowType.h \ + ../../../Common/ODraw/oldAutoShapes/CurvedUpArrowType.h \ + ../../../Common/ODraw/oldAutoShapes/DiamondType.h \ + ../../../Common/ODraw/oldAutoShapes/DonutType.h \ + ../../../Common/ODraw/oldAutoShapes/DownArrowCalloutType.h \ + ../../../Common/ODraw/oldAutoShapes/DownArrowType.h \ + ../../../Common/ODraw/oldAutoShapes/EllipseRibbon2Type.h \ + ../../../Common/ODraw/oldAutoShapes/EllipseRibbonType.h \ + ../../../Common/ODraw/oldAutoShapes/EllipseType.h \ + ../../../Common/ODraw/oldAutoShapes/FlowChartAlternateProcessType.h \ + ../../../Common/ODraw/oldAutoShapes/FlowChartCollateType.h \ + ../../../Common/ODraw/oldAutoShapes/FlowChartConnectorType.h \ + ../../../Common/ODraw/oldAutoShapes/FlowChartDecisionType.h \ + ../../../Common/ODraw/oldAutoShapes/FlowChartDelayType.h \ + ../../../Common/ODraw/oldAutoShapes/FlowChartDisplayType.h \ + ../../../Common/ODraw/oldAutoShapes/FlowChartDocumentType.h \ + ../../../Common/ODraw/oldAutoShapes/FlowChartExtractType.h \ + ../../../Common/ODraw/oldAutoShapes/FlowChartInputOutputType.h \ + ../../../Common/ODraw/oldAutoShapes/FlowChartInternalStorageType.h \ + ../../../Common/ODraw/oldAutoShapes/FlowChartMagneticDiskType.h \ + ../../../Common/ODraw/oldAutoShapes/FlowChartMagneticDrumType.h \ + ../../../Common/ODraw/oldAutoShapes/FlowChartMagneticTapeType.h \ + ../../../Common/ODraw/oldAutoShapes/FlowChartManualInputType.h \ + ../../../Common/ODraw/oldAutoShapes/FlowChartManualOperationType.h \ + ../../../Common/ODraw/oldAutoShapes/FlowChartMergeType.h \ + ../../../Common/ODraw/oldAutoShapes/FlowChartMultidocumentType.h \ + ../../../Common/ODraw/oldAutoShapes/FlowChartOffpageConnectorType.h \ + ../../../Common/ODraw/oldAutoShapes/FlowChartOnlineStorageType.h \ + ../../../Common/ODraw/oldAutoShapes/FlowChartOrType.h \ + ../../../Common/ODraw/oldAutoShapes/FlowChartPredefinedProcessType.h \ + ../../../Common/ODraw/oldAutoShapes/FlowChartPreparationType.h \ + ../../../Common/ODraw/oldAutoShapes/FlowChartProcessType.h \ + ../../../Common/ODraw/oldAutoShapes/FlowChartPunchedCardType.h \ + ../../../Common/ODraw/oldAutoShapes/FlowChartPunchedTapeType.h \ + ../../../Common/ODraw/oldAutoShapes/FlowChartSortType.h \ + ../../../Common/ODraw/oldAutoShapes/FlowChartSummingJunctionType.h \ + ../../../Common/ODraw/oldAutoShapes/FlowChartTerminatorType.h \ + ../../../Common/ODraw/oldAutoShapes/FoldedCornerType.h \ + ../../../Common/ODraw/oldAutoShapes/HeartType.h \ + ../../../Common/ODraw/oldAutoShapes/HexagonType.h \ + ../../../Common/ODraw/oldAutoShapes/HomePlateType.h \ + ../../../Common/ODraw/oldAutoShapes/HorisontalScrollType.h \ + ../../../Common/ODraw/oldAutoShapes/IrregularSealOneType.h \ + ../../../Common/ODraw/oldAutoShapes/IrregularSealTwo.h \ + ../../../Common/ODraw/oldAutoShapes/IsoscelesTriangleType.h \ + ../../../Common/ODraw/oldAutoShapes/LeftArrowCalloutType.h \ + ../../../Common/ODraw/oldAutoShapes/LeftArrowType.h \ + ../../../Common/ODraw/oldAutoShapes/LeftBraceType.h \ + ../../../Common/ODraw/oldAutoShapes/LeftBracketType.h \ + ../../../Common/ODraw/oldAutoShapes/LeftRightArrowCalloutType.h \ + ../../../Common/ODraw/oldAutoShapes/LeftRightArrowType.h \ + ../../../Common/ODraw/oldAutoShapes/LeftRightUpArrow.h \ + ../../../Common/ODraw/oldAutoShapes/LeftUpArrowType.h \ + ../../../Common/ODraw/oldAutoShapes/LightningBoltType.h \ + ../../../Common/ODraw/oldAutoShapes/LineType.h \ + ../../../Common/ODraw/oldAutoShapes/MoonType.h \ + ../../../Common/ODraw/oldAutoShapes/NoSmokingType.h \ + ../../../Common/ODraw/oldAutoShapes/NotchedRightArrowType.h \ + ../../../Common/ODraw/oldAutoShapes/OctagonType.h \ + ../../../Common/ODraw/oldAutoShapes/ParallelogramType.h \ + ../../../Common/ODraw/oldAutoShapes/PentagonType.h \ + ../../../Common/ODraw/oldAutoShapes/PlaqueType.h \ + ../../../Common/ODraw/oldAutoShapes/PlusType.h \ + ../../../Common/ODraw/oldAutoShapes/QuadArrowCalloutType.h \ + ../../../Common/ODraw/oldAutoShapes/QuadArrowType.h \ + ../../../Common/ODraw/oldAutoShapes/RectangleType.h \ + ../../../Common/ODraw/oldAutoShapes/RibbonDownType.h \ + ../../../Common/ODraw/oldAutoShapes/RibbonUpType.h \ + ../../../Common/ODraw/oldAutoShapes/RightArrowCalloutType.h \ + ../../../Common/ODraw/oldAutoShapes/RightArrowType.h \ + ../../../Common/ODraw/oldAutoShapes/RightBracetype.h \ + ../../../Common/ODraw/oldAutoShapes/RightBracketType.h \ + ../../../Common/ODraw/oldAutoShapes/RightTriangleType.h \ + ../../../Common/ODraw/oldAutoShapes/RoundedRectangleType.h \ + ../../../Common/ODraw/oldAutoShapes/Seal4Type.h \ + ../../../Common/ODraw/oldAutoShapes/Seal8Type.h \ + ../../../Common/ODraw/oldAutoShapes/Seal16Type.h \ + ../../../Common/ODraw/oldAutoShapes/Seal24Type.h \ + ../../../Common/ODraw/oldAutoShapes/Seal32Type.h \ + ../../../Common/ODraw/oldAutoShapes/SmileyFaceType.h \ + ../../../Common/ODraw/oldAutoShapes/Startype.h \ + ../../../Common/ODraw/oldAutoShapes/StraightConnectorType.h \ + ../../../Common/ODraw/oldAutoShapes/StripedRightArrowType.h \ + ../../../Common/ODraw/oldAutoShapes/SunType.h \ + ../../../Common/ODraw/oldAutoShapes/TextboxType.h \ + ../../../Common/ODraw/oldAutoShapes/TrapezoidType.h \ + ../../../Common/ODraw/oldAutoShapes/UpArrowCalloutType.h \ + ../../../Common/ODraw/oldAutoShapes/UpArrowType.h \ + ../../../Common/ODraw/oldAutoShapes/UpDownArrowCalloutType.h \ + ../../../Common/ODraw/oldAutoShapes/UpDownArrowType.h \ + ../../../Common/ODraw/oldAutoShapes/UturnArrowType.h \ + ../../../Common/ODraw/oldAutoShapes/VerticalScrollType.h \ + ../../../Common/ODraw/oldAutoShapes/WaveDoubleType.h \ + ../../../Common/ODraw/oldAutoShapes/WaveType.h \ + ../../../Common/ODraw/oldAutoShapes/WedgeEllipseCalloutType.h \ + ../../../Common/ODraw/oldAutoShapes/WedgeRectCalloutType.h \ + ../../../Common/ODraw/oldAutoShapes/WedgeRoundedRectCalloutType.h diff --git a/MsBinaryFile/XlsFile/Converter/xlsx_drawing_context.cpp b/MsBinaryFile/XlsFile/Converter/xlsx_drawing_context.cpp index de3c76f8dd..4a9c3bb359 100644 --- a/MsBinaryFile/XlsFile/Converter/xlsx_drawing_context.cpp +++ b/MsBinaryFile/XlsFile/Converter/xlsx_drawing_context.cpp @@ -1765,7 +1765,7 @@ bool xlsx_drawing_context::is_lined_shape(_drawing_state_ptr & drawing_state) std::wstring xlsx_drawing_context::convert_custom_shape(_drawing_state_ptr & drawing_state) { - CCustomShape * shape = CCustomShape::CreateByType(drawing_state->shape_id); + NSCustomShapesConvert::CCustomShape * shape = NSCustomShapesConvert::CCustomShape::CreateByType(drawing_state->shape_id); if (shape == NULL) return L""; std::wstring strResult; diff --git a/OOXML/Base/DateTime.h b/OOXML/Base/DateTime.h index a63b9b8380..6460d07ac3 100644 --- a/OOXML/Base/DateTime.h +++ b/OOXML/Base/DateTime.h @@ -33,7 +33,7 @@ #ifndef UTILITY_DATE_TIME_INCLUDE_H_ #define UTILITY_DATE_TIME_INCLUDE_H_ -#include "./Base.h" +#include //---------------------------------------------------------------------------------------------- // DateTime diff --git a/OOXML/Binary/Document/BinReader/CustomXmlWriter.cpp b/OOXML/Binary/Document/BinReader/CustomXmlWriter.cpp index b739486306..de03f20fc8 100644 --- a/OOXML/Binary/Document/BinReader/CustomXmlWriter.cpp +++ b/OOXML/Binary/Document/BinReader/CustomXmlWriter.cpp @@ -33,6 +33,7 @@ #include "CustomXmlWriter.h" #include "../../../DocxFormat/CustomXml.h" #include "../../../PPTXFormat/DrawingConverter/ASCOfficeDrawingConverter.h" +#include "../../../../DesktopEditor/common/Directory.h" namespace Writers { diff --git a/OOXML/Binary/Document/BinReader/Readers.cpp b/OOXML/Binary/Document/BinReader/Readers.cpp index cf82c05a11..e400744d7c 100644 --- a/OOXML/Binary/Document/BinReader/Readers.cpp +++ b/OOXML/Binary/Document/BinReader/Readers.cpp @@ -31,7 +31,6 @@ */ #include "Readers.h" -#include "ReaderClasses.h" #include "../BinWriter/BinReaderWriterDefines.h" #include "../../Sheets/Writer/BinaryReader.h" @@ -40,27 +39,17 @@ #include "../../../PPTXFormat/Core.h" #include "../../../PPTXFormat/Logic/HeadingVariant.h" -#include "../../../DocxFormat/Docx.h" -#include "../../../DocxFormat/Document.h" -#include "../../../DocxFormat/FontTable.h" -#include "../../../DocxFormat/Numbering.h" -#include "../../../DocxFormat/Comments.h" -#include "../../../DocxFormat/Styles.h" -#include "../../../DocxFormat/Footnote.h" -#include "../../../DocxFormat/Endnote.h" #include "../../../DocxFormat/Settings/Settings.h" #include "../../../DocxFormat/App.h" #include "../../../DocxFormat/Core.h" #include "../../../DocxFormat/CustomXml.h" #include "../../../DocxFormat/Math/oMathContent.h" +#include "../../../DocxFormat/Logic/DocParts.h" #include "../DocWrapper/XlsxSerializer.h" -#include "../../../../DesktopEditor/common/ASCVariant.h" #include "../../../../OfficeUtils/src/OfficeUtils.h" - #include "../../../../DesktopEditor/common/Directory.h" -#include "../../../../DesktopEditor/raster/ImageFileFormatChecker.h" #define UINT_TO_COMPLEX_BOOL(offset, val) \ if (0 != ((nFlags >> offset) & 1)) { \ diff --git a/OOXML/Binary/Document/BinReader/Readers.h b/OOXML/Binary/Document/BinReader/Readers.h index dc2d2ae276..e63947bff7 100644 --- a/OOXML/Binary/Document/BinReader/Readers.h +++ b/OOXML/Binary/Document/BinReader/Readers.h @@ -41,9 +41,9 @@ namespace OOX class CSettingsCustom; class CSettings; } -namespace BinDocxRW { - +namespace BinDocxRW +{ class Binary_CommonReader { protected: diff --git a/OOXML/Binary/Document/BinWriter/BinWriters.cpp b/OOXML/Binary/Document/BinWriter/BinWriters.cpp index 2fbde736d9..9d84ae0dc6 100644 --- a/OOXML/Binary/Document/BinWriter/BinWriters.cpp +++ b/OOXML/Binary/Document/BinWriter/BinWriters.cpp @@ -49,6 +49,9 @@ #include "../../../../HtmlFile2/htmlfile2.h" #include "../../../../RtfFile/Format/ConvertationManager.h" +#include "../../../DocxFormat/App.h" +#include "../../../DocxFormat/Core.h" + #include "../../../DocxFormat/CustomXml.h" #include "../../../DocxFormat/Logic/AlternateContent.h" #include "../../../DocxFormat/Logic/Dir.h" diff --git a/OOXML/Binary/Document/BinWriter/BinWriters.h b/OOXML/Binary/Document/BinWriter/BinWriters.h index 67eeac858d..f73a468b69 100644 --- a/OOXML/Binary/Document/BinWriter/BinWriters.h +++ b/OOXML/Binary/Document/BinWriter/BinWriters.h @@ -34,31 +34,24 @@ #include "BinReaderWriterDefines.h" #include "../../../DocxFormat/DocxFlat.h" -#include "../../../DocxFormat/Docx.h" -#include "../../../Binary/MathEquation/MathEquation.h" - #include "../../../DocxFormat/Document.h" -#include "../../../DocxFormat/FontTable.h" #include "../../../DocxFormat/Numbering.h" #include "../../../DocxFormat/Styles.h" #include "../../../DocxFormat/Comments.h" #include "../../../DocxFormat/Settings/Settings.h" -#include "../../../DocxFormat/External/HyperLink.h" -#include "../../../DocxFormat/Media/VbaProject.h" #include "../../../DocxFormat/Media/JsaProject.h" #include "../../../DocxFormat/HeaderFooter.h" -#include "../../../DocxFormat/App.h" -#include "../../../DocxFormat/Core.h" #include "../../../DocxFormat/Footnote.h" #include "../../../DocxFormat/Endnote.h" -#include "../../../DocxFormat/Math/OMath.h" #include "../../../DocxFormat/Math/oMathPara.h" + #include "../../../DocxFormat/Logic/Sdt.h" #include "../../../DocxFormat/Logic/Table.h" #include "../../../DocxFormat/Logic/Paragraph.h" #include "../../../DocxFormat/Logic/Annotations.h" #include "../../../DocxFormat/Logic/Hyperlink.h" #include "../../../DocxFormat/Logic/FldSimple.h" +#include "../../../DocxFormat/Logic/DocParts.h" namespace NSBinPptxRW { diff --git a/OOXML/Common/ComplexTypes.h b/OOXML/Common/ComplexTypes.h index ca63a3bffb..bfb9c6011b 100644 --- a/OOXML/Common/ComplexTypes.h +++ b/OOXML/Common/ComplexTypes.h @@ -41,14 +41,6 @@ namespace ComplexTypes { #define ComplexTypes_AdditionConstructors(Class) \ - Class(XmlUtils::CXmlNode& oNode)\ - {\ - FromXML( oNode );\ - }\ - Class(XmlUtils::CXmlLiteReader& oReader)\ - {\ - FromXML( oReader );\ - }\ const Class& operator =(const XmlUtils::CXmlNode &oNode)\ {\ FromXML( (XmlUtils::CXmlNode &)oNode );\ diff --git a/OOXML/Common/SimpleTypes_Base.h b/OOXML/Common/SimpleTypes_Base.h index 5bbadfffd6..741aa8b2bf 100644 --- a/OOXML/Common/SimpleTypes_Base.h +++ b/OOXML/Common/SimpleTypes_Base.h @@ -31,7 +31,6 @@ */ #pragma once -#include #include "../Base/Base.h" namespace SimpleTypes diff --git a/OOXML/Common/SimpleTypes_Vml.h b/OOXML/Common/SimpleTypes_Vml.h index 1d1b032073..c5fa190c9f 100644 --- a/OOXML/Common/SimpleTypes_Vml.h +++ b/OOXML/Common/SimpleTypes_Vml.h @@ -33,10 +33,6 @@ #include "SimpleTypes_Drawing.h" -#include -#include -#include - // Here are simple types Vml from spec Office Open Xml Part4 14 namespace SimpleTypes { diff --git a/OOXML/DocxFormat/App.cpp b/OOXML/DocxFormat/App.cpp index 1303fd0073..34f27ebba7 100644 --- a/OOXML/DocxFormat/App.cpp +++ b/OOXML/DocxFormat/App.cpp @@ -30,8 +30,11 @@ * */ #include "App.h" +#include "Docx.h" #include "../XlsxFormat/Xlsx.h" #include "../PPTXFormat/App.h" +#include "../Common/SimpleTypes_Word.h" +#include "../../DesktopEditor/common/SystemUtils.h" namespace OOX { diff --git a/OOXML/DocxFormat/App.h b/OOXML/DocxFormat/App.h index 6140655905..744c3acc24 100644 --- a/OOXML/DocxFormat/App.h +++ b/OOXML/DocxFormat/App.h @@ -31,12 +31,8 @@ */ #pragma once -#include "Docx.h" #include "File.h" #include "../Base/Nullable.h" -#include "../Common/SimpleTypes_Word.h" -#include "../Common/SimpleTypes_Shared.h" -#include "../../DesktopEditor/common/SystemUtils.h" namespace PPTX { diff --git a/OOXML/DocxFormat/Comments.h b/OOXML/DocxFormat/Comments.h index 55801d68ed..695d604145 100644 --- a/OOXML/DocxFormat/Comments.h +++ b/OOXML/DocxFormat/Comments.h @@ -34,7 +34,6 @@ #include "File.h" #include "IFileContainer.h" #include "../Base/Nullable.h" -#include "FileTypes.h" #include "WritingElement.h" #include "../Common/SimpleTypes_Shared.h" diff --git a/OOXML/DocxFormat/ContentTypes.h b/OOXML/DocxFormat/ContentTypes.h index 7dd6808840..d6a6c626cb 100644 --- a/OOXML/DocxFormat/ContentTypes.h +++ b/OOXML/DocxFormat/ContentTypes.h @@ -35,11 +35,9 @@ #include "../SystemUtility/SystemUtility.h" -#include "FileType.h" #include "WritingElement.h" #include - namespace OOX { namespace ContentTypes diff --git a/OOXML/DocxFormat/Core.cpp b/OOXML/DocxFormat/Core.cpp index a7ee483aa5..27871780f4 100644 --- a/OOXML/DocxFormat/Core.cpp +++ b/OOXML/DocxFormat/Core.cpp @@ -29,10 +29,14 @@ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode * */ + #include "Core.h" +#include "Docx.h" #include "../XlsxFormat/Xlsx.h" #include "../PPTXFormat/Core.h" +#include "../../DesktopEditor/common/SystemUtils.h" + namespace OOX { CCore::CCore(OOX::Document* pMain) : OOX::File(pMain) diff --git a/OOXML/DocxFormat/Core.h b/OOXML/DocxFormat/Core.h index 11ed023d65..a254303773 100644 --- a/OOXML/DocxFormat/Core.h +++ b/OOXML/DocxFormat/Core.h @@ -31,10 +31,8 @@ */ #pragma once -#include "Docx.h" #include "File.h" #include "../Base/Nullable.h" -#include "../../DesktopEditor/common/SystemUtils.h" namespace PPTX { diff --git a/OOXML/DocxFormat/CustomXml.cpp b/OOXML/DocxFormat/CustomXml.cpp index ef1468bd5d..4bfda519e6 100644 --- a/OOXML/DocxFormat/CustomXml.cpp +++ b/OOXML/DocxFormat/CustomXml.cpp @@ -31,6 +31,7 @@ */ #include "CustomXml.h" +#include "Document.h" namespace OOX { diff --git a/OOXML/DocxFormat/CustomXml.h b/OOXML/DocxFormat/CustomXml.h index 8c1a6de064..128140de4c 100644 --- a/OOXML/DocxFormat/CustomXml.h +++ b/OOXML/DocxFormat/CustomXml.h @@ -33,10 +33,8 @@ #include "File.h" #include "IFileContainer.h" -#include "FileTypes.h" #include "WritingElement.h" #include "../Common/SimpleTypes_Shared.h" -#include "Document.h" namespace OOX { diff --git a/OOXML/DocxFormat/Diagram/DiagramData.h b/OOXML/DocxFormat/Diagram/DiagramData.h index b59f218fde..e9c70ddab9 100644 --- a/OOXML/DocxFormat/Diagram/DiagramData.h +++ b/OOXML/DocxFormat/Diagram/DiagramData.h @@ -31,9 +31,6 @@ */ #pragma once -#include "../IFileContainer.h" -#include "../FileTypes.h" -#include "../File.h" #include "../../Base/Nullable.h" #include "../WritingElement.h" diff --git a/OOXML/DocxFormat/Diagram/DiagramDrawing.h b/OOXML/DocxFormat/Diagram/DiagramDrawing.h index a4b9217958..2bcbf365d7 100644 --- a/OOXML/DocxFormat/Diagram/DiagramDrawing.h +++ b/OOXML/DocxFormat/Diagram/DiagramDrawing.h @@ -31,13 +31,8 @@ */ #pragma once -#include "../IFileContainer.h" -#include "../FileTypes.h" -#include "../File.h" #include "../../Base/Nullable.h" - #include "../WritingElement.h" - #include "../../PPTXFormat/Logic/SpTree.h" namespace OOX diff --git a/OOXML/DocxFormat/Document.cpp b/OOXML/DocxFormat/Document.cpp index 6a3d9d76b6..fbfc3cd22b 100644 --- a/OOXML/DocxFormat/Document.cpp +++ b/OOXML/DocxFormat/Document.cpp @@ -30,18 +30,16 @@ * */ #pragma once -#include "Document.h" +#include "Document.h" #include "Math/oMathPara.h" -#include "Math/OMath.h" #include "Logic/Annotations.h" #include "Logic/Hyperlink.h" #include "Logic/Paragraph.h" #include "Logic/Sdt.h" #include "Logic/Table.h" - -#include "External/HyperLink.h" +#include "Logic/DocParts.h" namespace OOX { diff --git a/OOXML/DocxFormat/Document.h b/OOXML/DocxFormat/Document.h index c6c52561b9..dcba235e53 100644 --- a/OOXML/DocxFormat/Document.h +++ b/OOXML/DocxFormat/Document.h @@ -40,7 +40,6 @@ #include "FileTypes.h" #include "IFileContainer.h" -#include "Logic/DocParts.h" #include "Logic/SectionProperty.h" #include "Logic/Pict.h" diff --git a/OOXML/DocxFormat/Docx.cpp b/OOXML/DocxFormat/Docx.cpp index 86170783fa..2f4b14ae2a 100644 --- a/OOXML/DocxFormat/Docx.cpp +++ b/OOXML/DocxFormat/Docx.cpp @@ -40,12 +40,7 @@ #include "Styles.h" #include "Footnote.h" #include "Endnote.h" -#include "Settings/WebSettings.h" #include "Settings/Settings.h" -#include "External/HyperLink.h" -#include "Media/Image.h" -#include "Media/OleObject.h" -#include "Media/ActiveX.h" #include "Media/VbaProject.h" #include "Media/JsaProject.h" #include "HeaderFooter.h" diff --git a/OOXML/DocxFormat/Docx.h b/OOXML/DocxFormat/Docx.h index 9bd72fb490..ddc95cfd18 100644 --- a/OOXML/DocxFormat/Docx.h +++ b/OOXML/DocxFormat/Docx.h @@ -31,14 +31,13 @@ */ #pragma once -#include "Rels.h" #include "IFileContainer.h" -#include "FileTypes.h" #include "../../DesktopEditor/common/Directory.h" #if !defined(_WIN32) && !defined (_WIN64) #include #endif + namespace PPTX { class Theme; diff --git a/OOXML/DocxFormat/DocxFlat.h b/OOXML/DocxFormat/DocxFlat.h index 75ea830ea4..5fdaf77d42 100644 --- a/OOXML/DocxFormat/DocxFlat.h +++ b/OOXML/DocxFormat/DocxFlat.h @@ -31,9 +31,7 @@ */ #pragma once - #include "IFileContainer.h" -#include "FileTypes.h" #include "../Common/SimpleTypes_Word.h" #include "../../DesktopEditor/common/File.h" diff --git a/OOXML/DocxFormat/Drawing/Drawing.cpp b/OOXML/DocxFormat/Drawing/Drawing.cpp index 5b3bd49a56..cd19d1e762 100644 --- a/OOXML/DocxFormat/Drawing/Drawing.cpp +++ b/OOXML/DocxFormat/Drawing/Drawing.cpp @@ -611,7 +611,9 @@ namespace OOX } else if ( bStart && _T("lineTo") == sName ) { - ComplexTypes::Drawing::CPoint2D *oPoint = new ComplexTypes::Drawing::CPoint2D(oNode); + ComplexTypes::Drawing::CPoint2D *oPoint = new ComplexTypes::Drawing::CPoint2D(); + *oPoint = oNode; + if (oPoint) m_arrLineTo.push_back( oPoint ); } } @@ -637,7 +639,9 @@ namespace OOX } else if ( bStart && _T("wp:lineTo") == sName ) { - ComplexTypes::Drawing::CPoint2D *oPoint = new ComplexTypes::Drawing::CPoint2D(oReader); + ComplexTypes::Drawing::CPoint2D *oPoint = new ComplexTypes::Drawing::CPoint2D(); + *oPoint = oReader; + if (oPoint) m_arrLineTo.push_back( oPoint ); } } diff --git a/OOXML/DocxFormat/Drawing/Drawing.h b/OOXML/DocxFormat/Drawing/Drawing.h index 70e47cbd9c..a9742141c7 100644 --- a/OOXML/DocxFormat/Drawing/Drawing.h +++ b/OOXML/DocxFormat/Drawing/Drawing.h @@ -36,12 +36,8 @@ #include "../../Common/SimpleTypes_Shared.h" #include "../WritingElement.h" -#include "../RId.h" - #include "../../PPTXFormat/Logic/GraphicFrame.h" -#include "../../SystemUtility/SystemUtility.h" - namespace OOX { namespace Drawing diff --git a/OOXML/DocxFormat/Logic/AlternateContent.h b/OOXML/DocxFormat/Logic/AlternateContent.h index 045d283076..7e4cbfd63d 100644 --- a/OOXML/DocxFormat/Logic/AlternateContent.h +++ b/OOXML/DocxFormat/Logic/AlternateContent.h @@ -35,7 +35,7 @@ #include "../../Base/Nullable.h" #include "../WritingElement.h" -#include "../../XlsxFormat/WritingElement.h" + namespace OOX { namespace Logic diff --git a/OOXML/DocxFormat/Logic/Annotations.h b/OOXML/DocxFormat/Logic/Annotations.h index d358f99040..deabc0d6b8 100644 --- a/OOXML/DocxFormat/Logic/Annotations.h +++ b/OOXML/DocxFormat/Logic/Annotations.h @@ -32,11 +32,7 @@ #pragma once #include "../../Base/Nullable.h" - -#include "../../Common/SimpleTypes_Shared.h" #include "../../Common/SimpleTypes_Word.h" -#include "../../Common/ComplexTypes.h" - #include "./../WritingElement.h" namespace OOX diff --git a/OOXML/DocxFormat/Logic/DocParts.cpp b/OOXML/DocxFormat/Logic/DocParts.cpp index a5b101d643..590442cafb 100644 --- a/OOXML/DocxFormat/Logic/DocParts.cpp +++ b/OOXML/DocxFormat/Logic/DocParts.cpp @@ -418,7 +418,7 @@ namespace OOX if (L"w:behavior" == sName) { - m_arrItems.push_back(new ComplexTypes::Word::CDocPartBehavior(oReader)); + m_arrItems.push_back(PPTX::CreatePtrXmlContent(oReader)); } } } @@ -463,7 +463,7 @@ namespace OOX if (L"w:type" == sName) { - m_arrItems.push_back(new ComplexTypes::Word::String(oReader)); + m_arrItems.push_back(PPTX::CreatePtrXmlContent(oReader)); } } } diff --git a/OOXML/DocxFormat/Logic/FldChar.cpp b/OOXML/DocxFormat/Logic/FldChar.cpp index bc87ec2753..20057f5379 100644 --- a/OOXML/DocxFormat/Logic/FldChar.cpp +++ b/OOXML/DocxFormat/Logic/FldChar.cpp @@ -378,7 +378,9 @@ namespace OOX { if ( oListEntryNodes.GetAt( nIndex, oListEntryNode ) ) { - ComplexTypes::Word::String *oListEntry = new ComplexTypes::Word::String(oListEntryNode); + ComplexTypes::Word::String *oListEntry = new ComplexTypes::Word::String(); + *oListEntry = oListEntryNode; + if (oListEntry) m_arrListEntry.push_back( oListEntry ); } } @@ -399,7 +401,9 @@ namespace OOX m_oResult = oReader; else if ( L"w:listEntry" == sName ) { - ComplexTypes::Word::String *oListEntry = new ComplexTypes::Word::String(oReader); + ComplexTypes::Word::String *oListEntry = new ComplexTypes::Word::String(); + *oListEntry = oReader; + if (oListEntry) m_arrListEntry.push_back( oListEntry ); } } diff --git a/OOXML/DocxFormat/Logic/Hyperlink.cpp b/OOXML/DocxFormat/Logic/Hyperlink.cpp index 922cc726c8..a42c524421 100644 --- a/OOXML/DocxFormat/Logic/Hyperlink.cpp +++ b/OOXML/DocxFormat/Logic/Hyperlink.cpp @@ -375,7 +375,7 @@ namespace OOX WritingElement *pItem = NULL; if ( L"w:matchSrc" == sName ) - m_oMatchSrc = new ComplexTypes::Word::CMatchSrc( oItem ); + m_oMatchSrc = PPTX::CreatePtrXmlContent(oItem); } } } diff --git a/OOXML/DocxFormat/Logic/Hyperlink.h b/OOXML/DocxFormat/Logic/Hyperlink.h index e0d6106f55..95556c167a 100644 --- a/OOXML/DocxFormat/Logic/Hyperlink.h +++ b/OOXML/DocxFormat/Logic/Hyperlink.h @@ -34,7 +34,6 @@ #include "../../Base/Nullable.h" #include "../WritingElement.h" -#include "../../Common/SimpleTypes_Word.h" #include "../../Common/SimpleTypes_Shared.h" #include "../../Common/ComplexTypes.h" diff --git a/OOXML/DocxFormat/Logic/ParagraphProperty.cpp b/OOXML/DocxFormat/Logic/ParagraphProperty.cpp index f5d34ed501..ff06e685c5 100644 --- a/OOXML/DocxFormat/Logic/ParagraphProperty.cpp +++ b/OOXML/DocxFormat/Logic/ParagraphProperty.cpp @@ -400,7 +400,9 @@ namespace OOX { if ( oTabs.GetAt( nIndex, oTab ) ) { - ComplexTypes::Word::CTabStop *oTabStop = new ComplexTypes::Word::CTabStop(oTab); + ComplexTypes::Word::CTabStop *oTabStop = new ComplexTypes::Word::CTabStop(); + *oTabStop = oTab; + if (oTabStop) m_arrTabs.push_back( oTabStop ); } } @@ -417,7 +419,9 @@ namespace OOX std::wstring sName = oReader.GetName(); if ( L"w:tab" == sName ) { - ComplexTypes::Word::CTabStop *oTabStop = new ComplexTypes::Word::CTabStop(oReader); + ComplexTypes::Word::CTabStop *oTabStop = new ComplexTypes::Word::CTabStop(); + *oTabStop = oReader; + if (oTabStop) m_arrTabs.push_back( oTabStop ); } } diff --git a/OOXML/DocxFormat/Logic/ParagraphProperty.h b/OOXML/DocxFormat/Logic/ParagraphProperty.h index af7ecbad22..5522b99f7b 100644 --- a/OOXML/DocxFormat/Logic/ParagraphProperty.h +++ b/OOXML/DocxFormat/Logic/ParagraphProperty.h @@ -33,9 +33,7 @@ #ifndef OOX_LOGIC_PARAGRAPH_PROPERTY_INCLUDE_H_ #define OOX_LOGIC_PARAGRAPH_PROPERTY_INCLUDE_H_ -#include "../../Common/SimpleTypes_Shared.h" #include "../../Common/SimpleTypes_Word.h" - #include "./../WritingElement.h" #include "RunProperty.h" @@ -66,7 +64,6 @@ namespace OOX nullable m_oIlvl; nullable m_oIns; nullable m_oNumID; - }; //-------------------------------------------------------------------------------- diff --git a/OOXML/DocxFormat/Logic/Pict.h b/OOXML/DocxFormat/Logic/Pict.h index 239ed6c67b..9630d15408 100644 --- a/OOXML/DocxFormat/Logic/Pict.h +++ b/OOXML/DocxFormat/Logic/Pict.h @@ -32,7 +32,6 @@ #pragma once #include "../Drawing/Drawing.h" -#include "../../Common/SimpleTypes_Word.h" #include "VmlOfficeDrawing.h" #include "Vml.h" diff --git a/OOXML/DocxFormat/Logic/RunContent.h b/OOXML/DocxFormat/Logic/RunContent.h index 0aa6f9b0ac..069587802c 100644 --- a/OOXML/DocxFormat/Logic/RunContent.h +++ b/OOXML/DocxFormat/Logic/RunContent.h @@ -33,7 +33,6 @@ #include "../../DocxFormat/WritingElement.h" #include "../../Base/Nullable.h" -#include "../../Common/SimpleTypes_Word.h" #include "../../Common/ComplexTypes.h" #include "../../PPTXFormat/Logic/Xfrm.h" diff --git a/OOXML/DocxFormat/Logic/RunProperty.cpp b/OOXML/DocxFormat/Logic/RunProperty.cpp index a7ade195fc..ce37404963 100644 --- a/OOXML/DocxFormat/Logic/RunProperty.cpp +++ b/OOXML/DocxFormat/Logic/RunProperty.cpp @@ -71,7 +71,7 @@ namespace OOX if (L"stylisticSet" == sName) { - m_arrItems.push_back(new ComplexTypes::Word::CStylisticSet(oReader)); + m_arrItems.push_back(PPTX::CreatePtrXmlContent(oReader)); } } } diff --git a/OOXML/DocxFormat/Logic/RunProperty.h b/OOXML/DocxFormat/Logic/RunProperty.h index a52fd525b4..f6a7753755 100644 --- a/OOXML/DocxFormat/Logic/RunProperty.h +++ b/OOXML/DocxFormat/Logic/RunProperty.h @@ -34,7 +34,6 @@ #include "../WritingElement.h" #include "../../Base/Nullable.h" -#include "../../Common/SimpleTypes_Shared.h" #include "../../Common/ComplexTypes.h" #include "../../PPTXFormat/Logic/Ln.h" diff --git a/OOXML/DocxFormat/Logic/Sdt.cpp b/OOXML/DocxFormat/Logic/Sdt.cpp index 51565c1f95..a4ccef8308 100644 --- a/OOXML/DocxFormat/Logic/Sdt.cpp +++ b/OOXML/DocxFormat/Logic/Sdt.cpp @@ -851,7 +851,9 @@ namespace OOX { if ( oChilds.GetAt( nIndex, oItemNode ) ) { - ComplexTypes::Word::CSdtListItem *oListItem = new ComplexTypes::Word::CSdtListItem(oItemNode); + ComplexTypes::Word::CSdtListItem *oListItem = new ComplexTypes::Word::CSdtListItem(); + *oListItem = oItemNode; + if (oListItem) m_arrListItem.push_back( oListItem ); } } @@ -875,7 +877,9 @@ namespace OOX std::wstring sName = oReader.GetName(); if ( L"w:listItem" == sName ) { - ComplexTypes::Word::CSdtListItem *oListItem = new ComplexTypes::Word::CSdtListItem(oReader); + ComplexTypes::Word::CSdtListItem *oListItem = new ComplexTypes::Word::CSdtListItem(); + *oListItem = oReader; + m_arrListItem.push_back( oListItem ); } else if (L"w:format" == sName) @@ -1076,7 +1080,9 @@ namespace OOX { if ( oChilds.GetAt( nIndex, oItemNode ) ) { - ComplexTypes::Word::CSdtListItem *oListItem = new ComplexTypes::Word::CSdtListItem(oItemNode); + ComplexTypes::Word::CSdtListItem *oListItem = new ComplexTypes::Word::CSdtListItem(); + *oListItem = oItemNode; + if (oListItem) m_arrListItem.push_back( oListItem ); } } @@ -1095,7 +1101,9 @@ namespace OOX std::wstring sName = oReader.GetName(); if ( L"w:listItem" == sName ) { - ComplexTypes::Word::CSdtListItem *oListItem = new ComplexTypes::Word::CSdtListItem(oReader); + ComplexTypes::Word::CSdtListItem *oListItem = new ComplexTypes::Word::CSdtListItem(); + *oListItem = oReader; + if (oListItem)m_arrListItem.push_back( oListItem ); } } diff --git a/OOXML/DocxFormat/Logic/SectionProperty.cpp b/OOXML/DocxFormat/Logic/SectionProperty.cpp index 1fcf75d176..5023cab3a4 100644 --- a/OOXML/DocxFormat/Logic/SectionProperty.cpp +++ b/OOXML/DocxFormat/Logic/SectionProperty.cpp @@ -1009,7 +1009,9 @@ namespace OOX XmlUtils::CXmlNode oCol; if ( oCols.GetAt( nIndex, oCol ) ) { - ComplexTypes::Word::CColumn *oColumn = new ComplexTypes::Word::CColumn(oCol); + ComplexTypes::Word::CColumn *oColumn = new ComplexTypes::Word::CColumn(); + *oColumn = oCol; + if (oColumn) m_arrColumns.push_back( oColumn ); } } @@ -1028,7 +1030,9 @@ namespace OOX std::wstring sName = oReader.GetName(); if ( L"w:col" == sName ) { - ComplexTypes::Word::CColumn *oColumn = new ComplexTypes::Word::CColumn(oReader); + ComplexTypes::Word::CColumn *oColumn = new ComplexTypes::Word::CColumn(); + *oColumn = oReader; + if (oColumn) m_arrColumns.push_back( oColumn ); } } @@ -1558,7 +1562,9 @@ namespace OOX { if ( oNodes.GetAt( nIndex, oFooterNode ) ) { - ComplexTypes::Word::CHdrFtrRef *oFooter = new ComplexTypes::Word::CHdrFtrRef(oFooterNode); + ComplexTypes::Word::CHdrFtrRef *oFooter = new ComplexTypes::Word::CHdrFtrRef(); + *oFooter = oFooterNode; + if (oFooter) m_arrFooterReference.push_back( oFooter ); } } @@ -1581,7 +1587,9 @@ namespace OOX { if ( oNodes.GetAt( nIndex, oHeaderNode ) ) { - ComplexTypes::Word::CHdrFtrRef *oHeader = new ComplexTypes::Word::CHdrFtrRef(oHeaderNode); + ComplexTypes::Word::CHdrFtrRef *oHeader = new ComplexTypes::Word::CHdrFtrRef(); + *oHeader = oHeaderNode; + if (oHeader) m_arrHeaderReference.push_back( oHeader ); } } @@ -1653,7 +1661,9 @@ namespace OOX m_oEndnotePr = oReader; else if ( !m_bSectPrChange && L"w:footerReference" == sName ) { - ComplexTypes::Word::CHdrFtrRef *oFooter = new ComplexTypes::Word::CHdrFtrRef(oReader); + ComplexTypes::Word::CHdrFtrRef *oFooter = new ComplexTypes::Word::CHdrFtrRef(); + *oFooter = oReader; + if (oFooter) m_arrFooterReference.push_back( oFooter ); } else if ( L"w:footnotePr" == sName ) @@ -1662,7 +1672,9 @@ namespace OOX m_oFormProt = oReader; else if ( !m_bSectPrChange && L"w:headerReference" == sName ) { - ComplexTypes::Word::CHdrFtrRef *oHeader = new ComplexTypes::Word::CHdrFtrRef( oReader); + ComplexTypes::Word::CHdrFtrRef *oHeader = new ComplexTypes::Word::CHdrFtrRef(); + *oHeader = oReader; + if (oHeader) m_arrHeaderReference.push_back( oHeader ); } else if ( L"w:lnNumType" == sName ) diff --git a/OOXML/DocxFormat/Logic/SectionProperty.h b/OOXML/DocxFormat/Logic/SectionProperty.h index 5fe003dc46..e934da6fd6 100644 --- a/OOXML/DocxFormat/Logic/SectionProperty.h +++ b/OOXML/DocxFormat/Logic/SectionProperty.h @@ -32,10 +32,7 @@ #pragma once #include "../../Base/Nullable.h" - #include "../WritingElement.h" -#include "../../Common/SimpleTypes_Shared.h" -#include "../../Common/SimpleTypes_Word.h" #include "../../Common/ComplexTypes.h" namespace ComplexTypes diff --git a/OOXML/DocxFormat/Logic/SmartTag.h b/OOXML/DocxFormat/Logic/SmartTag.h index 0098ed8ee7..5982e27dc7 100644 --- a/OOXML/DocxFormat/Logic/SmartTag.h +++ b/OOXML/DocxFormat/Logic/SmartTag.h @@ -31,10 +31,7 @@ */ #pragma once #include "../../Base/Nullable.h" - #include "../WritingElement.h" -#include "../../Common/SimpleTypes_Word.h" -#include "../../Common/SimpleTypes_Shared.h" namespace OOX { diff --git a/OOXML/DocxFormat/Logic/Table.h b/OOXML/DocxFormat/Logic/Table.h index 054f34e9dd..1888c91948 100644 --- a/OOXML/DocxFormat/Logic/Table.h +++ b/OOXML/DocxFormat/Logic/Table.h @@ -150,7 +150,8 @@ namespace OOX { if ( oGridColNodes.GetAt( nIndex, oGridColNode ) ) { - ComplexTypes::Word::CTblGridCol *oGridCol = new ComplexTypes::Word::CTblGridCol(oGridColNode); + ComplexTypes::Word::CTblGridCol *oGridCol = new ComplexTypes::Word::CTblGridCol(); + *oGridCol = oGridColNode; if (oGridCol) m_arrGridCol.push_back( oGridCol ); } } @@ -169,7 +170,9 @@ namespace OOX m_oTblGridChange = oReader; else if ( L"w:gridCol" == sName ) { - ComplexTypes::Word::CTblGridCol *oGridCol = new ComplexTypes::Word::CTblGridCol(oReader); + ComplexTypes::Word::CTblGridCol *oGridCol = new ComplexTypes::Word::CTblGridCol(); + *oGridCol = oReader; + if (oGridCol) m_arrGridCol.push_back( oGridCol ); } } diff --git a/OOXML/DocxFormat/Logic/TableProperty.cpp b/OOXML/DocxFormat/Logic/TableProperty.cpp index 4c9913e41c..e22fe72c45 100644 --- a/OOXML/DocxFormat/Logic/TableProperty.cpp +++ b/OOXML/DocxFormat/Logic/TableProperty.cpp @@ -1474,7 +1474,9 @@ namespace OOX { if ( oHeaders.GetAt( nIndex, oHeader ) ) { - ComplexTypes::Word::String *oHead = new ComplexTypes::Word::String(oHeader); + ComplexTypes::Word::String *oHead = new ComplexTypes::Word::String(); + *oHead = oHeader; + if (oHead) m_arrHeaders.push_back( oHead ); } } @@ -1492,7 +1494,9 @@ namespace OOX if ( L"w:header" == sName ) { - ComplexTypes::Word::String *oHead = new ComplexTypes::Word::String(oReader); + ComplexTypes::Word::String *oHead = new ComplexTypes::Word::String(); + *oHead = oReader; + if (oHead) m_arrHeaders.push_back( oHead ); } } diff --git a/OOXML/DocxFormat/Logic/Vml.cpp b/OOXML/DocxFormat/Logic/Vml.cpp index 09a5e6a159..93f8504c07 100644 --- a/OOXML/DocxFormat/Logic/Vml.cpp +++ b/OOXML/DocxFormat/Logic/Vml.cpp @@ -32,6 +32,7 @@ #include "../DocxFlat.h" #include "Vml.h" #include "VmlOfficeDrawing.h" +#include "VmlWord.h" #include "Paragraph.h" #include "Annotations.h" diff --git a/OOXML/DocxFormat/Logic/Vml.h b/OOXML/DocxFormat/Logic/Vml.h index aa9a6fea0f..baab40a38f 100644 --- a/OOXML/DocxFormat/Logic/Vml.h +++ b/OOXML/DocxFormat/Logic/Vml.h @@ -32,17 +32,12 @@ #pragma once #include "../../Base/Nullable.h" - -#include "../../Common/SimpleTypes_Word.h" #include "../../Common/SimpleTypes_Vml.h" #include "../../XlsxFormat/Controls/Controls.h" -#include "VmlWord.h" #include "Shape.h" #include "../WritingElement.h" -#include "../RId.h" - #include "VmlOfficeDrawing.h" namespace OOX diff --git a/OOXML/DocxFormat/Logic/VmlOfficeDrawing.h b/OOXML/DocxFormat/Logic/VmlOfficeDrawing.h index 7a35774e5e..d8971b20a8 100644 --- a/OOXML/DocxFormat/Logic/VmlOfficeDrawing.h +++ b/OOXML/DocxFormat/Logic/VmlOfficeDrawing.h @@ -34,16 +34,10 @@ #define OOX_VML_OFFICE_INCLUDE_H_ #include "../../Base/Nullable.h" - #include "../../Common/ComplexTypes.h" - -#include "../../Common/SimpleTypes_Shared.h" -#include "../../Common/SimpleTypes_Word.h" #include "../../Common/SimpleTypes_Vml.h" #include "../WritingElement.h" -#include "../RId.h" - #include "../../PPTXFormat/WrapperWritingElement.h" namespace OOX diff --git a/OOXML/DocxFormat/Logic/VmlWord.h b/OOXML/DocxFormat/Logic/VmlWord.h index 2b47d7e444..42a1a34d68 100644 --- a/OOXML/DocxFormat/Logic/VmlWord.h +++ b/OOXML/DocxFormat/Logic/VmlWord.h @@ -34,12 +34,8 @@ #define OOX_VML_WORD_INCLUDE_H_ #include "../../Base/Nullable.h" - -#include "../../Common/SimpleTypes_Word.h" -#include "../../Common/SimpleTypes_Vml.h" - #include "../WritingElement.h" -#include "../RId.h" +#include "../../Common/SimpleTypes_Vml.h" namespace OOX { diff --git a/OOXML/DocxFormat/Math/OMath.h b/OOXML/DocxFormat/Math/OMath.h index 3a55e83448..63f0db2e1f 100644 --- a/OOXML/DocxFormat/Math/OMath.h +++ b/OOXML/DocxFormat/Math/OMath.h @@ -30,8 +30,8 @@ * */ #pragma once + #include "../WritingElement.h" -#include "../../Base/Nullable.h" namespace OOX { diff --git a/OOXML/DocxFormat/Math/oMathBottomNodes.h b/OOXML/DocxFormat/Math/oMathBottomNodes.h index d8e8bd9eaa..b5377cf2d8 100644 --- a/OOXML/DocxFormat/Math/oMathBottomNodes.h +++ b/OOXML/DocxFormat/Math/oMathBottomNodes.h @@ -30,6 +30,7 @@ * */ #pragma once +#include "../../Base/Nullable.h" #include "../WritingElement.h" #include "../../Common/SimpleTypes_Shared.h" #include "../../Common/SimpleTypes_OMath.h" diff --git a/OOXML/DocxFormat/Math/oMathContent.h b/OOXML/DocxFormat/Math/oMathContent.h index 4782e1a9fe..8ac50ad8eb 100644 --- a/OOXML/DocxFormat/Math/oMathContent.h +++ b/OOXML/DocxFormat/Math/oMathContent.h @@ -31,8 +31,6 @@ */ #pragma once -#include "../../Common/ComplexTypes.h" - #include "oMathBottomNodes.h" #include "OMath.h" @@ -44,7 +42,6 @@ #include "../Drawing/Drawing.h" #include "../../PPTXFormat/Logic/RunProperties.h" - namespace OOX { // Elements 22.1.2 diff --git a/OOXML/DocxFormat/Settings/Settings.cpp b/OOXML/DocxFormat/Settings/Settings.cpp index ac1c861ca3..68824ac4ac 100644 --- a/OOXML/DocxFormat/Settings/Settings.cpp +++ b/OOXML/DocxFormat/Settings/Settings.cpp @@ -1459,7 +1459,9 @@ namespace Settings if ( L"w:rsid" == sName ) { - ComplexTypes::Word::CLongHexNumber *oRsid = new ComplexTypes::Word::CLongHexNumber(oReader); + ComplexTypes::Word::CLongHexNumber *oRsid = new ComplexTypes::Word::CLongHexNumber(); + *oRsid = oReader; + if (oRsid) m_arrRsid.push_back( oRsid ); } else if ( L"w:rsidRoot" == sName ) diff --git a/OOXML/DocxFormat/Settings/Settings.h b/OOXML/DocxFormat/Settings/Settings.h index 9cf64f62ae..c0cb9c5b5a 100644 --- a/OOXML/DocxFormat/Settings/Settings.h +++ b/OOXML/DocxFormat/Settings/Settings.h @@ -32,7 +32,6 @@ #pragma once #include "../../Base/Nullable.h" -#include "../File.h" #include "../../Common/ComplexTypes.h" #include "../Logic/VmlOfficeDrawing.h" #include "../FtnEdn.h" diff --git a/OOXML/DocxFormat/Styles.cpp b/OOXML/DocxFormat/Styles.cpp index 7e66a49e26..aa188172d7 100644 --- a/OOXML/DocxFormat/Styles.cpp +++ b/OOXML/DocxFormat/Styles.cpp @@ -345,7 +345,9 @@ namespace OOX { if ( oList.GetAt( nIndex, oLsdNode ) ) { - ComplexTypes::Word::CLsdException *oLsdException = new ComplexTypes::Word::CLsdException(oLsdNode); + ComplexTypes::Word::CLsdException *oLsdException = new ComplexTypes::Word::CLsdException(); + *oLsdException = oLsdNode; + if (oLsdException ) m_arrLsdException.push_back( oLsdException ); } } @@ -364,7 +366,9 @@ namespace OOX std::wstring sName = oReader.GetName(); if ( L"w:lsdException" == sName ) { - ComplexTypes::Word::CLsdException *oLsdException = new ComplexTypes::Word::CLsdException (oReader); + ComplexTypes::Word::CLsdException *oLsdException = new ComplexTypes::Word::CLsdException(); + *oLsdException = oReader; + if (oLsdException) m_arrLsdException.push_back( oLsdException ); } } diff --git a/OOXML/DocxFormat/WritingElement.h b/OOXML/DocxFormat/WritingElement.h index 3c305165de..bc50cd176a 100644 --- a/OOXML/DocxFormat/WritingElement.h +++ b/OOXML/DocxFormat/WritingElement.h @@ -32,7 +32,6 @@ #pragma once #include "../../DesktopEditor/xml/include/xmlutils.h" -#include "../../MsBinaryFile/XlsFile/Format/Logic/BaseObject.h" #include "../Base/SmartPtr.h" namespace NSBinPptxRW diff --git a/OOXML/PPTXFormat/Logic/TxBody.cpp b/OOXML/PPTXFormat/Logic/TxBody.cpp index f02202de32..70a0d80193 100644 --- a/OOXML/PPTXFormat/Logic/TxBody.cpp +++ b/OOXML/PPTXFormat/Logic/TxBody.cpp @@ -38,7 +38,237 @@ namespace PPTX { namespace Logic - { + { + TxBody::TxBody(std::wstring name) + { + m_name = name; + } + TxBody::~TxBody() {} + TxBody::TxBody(XmlUtils::CXmlNode& node) + { + fromXML(node); + } + const TxBody& TxBody::operator =(XmlUtils::CXmlNode& node) + { + fromXML(node); + return *this; + } + TxBody::TxBody(XmlUtils::CXmlLiteReader& oReader) + { + fromXML(oReader); + } + const TxBody& TxBody::operator =(XmlUtils::CXmlLiteReader& oReader) + { + fromXML(oReader); + return *this; + } + TxBody::TxBody(const TxBody& oSrc) { *this = oSrc; } + TxBody& TxBody::operator=(const TxBody& oSrc) + { + parentFile = oSrc.parentFile; + parentElement = oSrc.parentElement; + + sp3d = oSrc.sp3d; + bodyPr = oSrc.bodyPr; + lstStyle = oSrc.lstStyle; + Paragrs = oSrc.Paragrs; + + m_name = oSrc.m_name; + + return *this; + } + void TxBody::fromXML(XmlUtils::CXmlLiteReader& oReader) + { + m_name = oReader.GetName(); + + if ( oReader.IsEmptyNode() ) + return; + + int nCurDepth = oReader.GetDepth(); + while( oReader.ReadNextSiblingNode( nCurDepth ) ) + { + std::wstring strName = oReader.GetName(); + if (L"a:bodyPr" == strName) + { + bodyPr = oReader; + } + else if (L"a:lstStyle" == strName) + { + lstStyle = oReader; + } + else if (L"a:sp3d" == strName) + { + sp3d = oReader; + } + else if (L"a:p" == strName) + { + Paragraph p; + Paragrs.push_back(p); + Paragrs.back().fromXML(oReader); + } + } + FillParentPointersForChilds(); + } + void TxBody::fromXML(XmlUtils::CXmlNode& node) + { + Paragrs.clear(); + + m_name = node.GetName(); + + bodyPr = node.ReadNode(L"a:bodyPr"); + lstStyle = node.ReadNode(L"a:lstStyle"); + sp3d = node.ReadNode(L"a:sp3d"); + + XmlMacroLoadArray(node, L"a:p", Paragrs, Paragraph); + + FillParentPointersForChilds(); + } + std::wstring TxBody::toXML() const + { + XmlUtils::CNodeValue oValue; + + oValue.WriteNullable(bodyPr); + oValue.WriteNullable(lstStyle); + oValue.WriteArray(Paragrs); + + return XmlUtils::CreateNode(m_name, oValue); + } + void TxBody::toXmlWriter(NSBinPptxRW::CXmlWriter* pWriter) const + { + pWriter->StartNode(m_name); + pWriter->EndAttributes(); + + if (bodyPr.IsInit()) + { + bodyPr->m_namespace = L"a"; + bodyPr->toXmlWriter(pWriter); + } + if (sp3d.IsInit()) + { + sp3d->toXmlWriter(pWriter); + } + if (lstStyle.IsInit()) + lstStyle->m_name = L"a:lstStyle"; + pWriter->Write(lstStyle); + + size_t nCount = Paragrs.size(); + for (size_t i = 0; i < nCount; ++i) + Paragrs[i].toXmlWriter(pWriter); + + pWriter->EndNode(m_name); + } + void TxBody::toXmlWriterExcel(NSBinPptxRW::CXmlWriter* pWriter) const + { + if (bodyPr.IsInit()) + { + bodyPr->m_namespace = L"a"; + bodyPr->toXmlWriter(pWriter); + } + if (sp3d.IsInit()) + { + sp3d->toXmlWriter(pWriter); + } + if (lstStyle.is_init()) + lstStyle->m_name = L"a:lstStyle"; + pWriter->Write(lstStyle); + + size_t nCount = Paragrs.size(); + for (size_t i = 0; i < nCount; ++i) + Paragrs[i].toXmlWriter(pWriter); + + /* + pWriter->EndNode(L"c:rich")); + */ + } + std::wstring TxBody::GetText(bool bParagraphSeparator)const + { + std::wstring result; + size_t count = Paragrs.size(); + + for (size_t i = 0; i < count; ++i) + result += Paragrs[i].GetText(bParagraphSeparator); + return result; + } + void TxBody::Merge(nullable& txBody) + { + if (!bodyPr.IsInit()) + bodyPr = new Logic::BodyPr(); + + bodyPr->Merge(txBody->bodyPr); + + if(lstStyle.IsInit()) + lstStyle->Merge(txBody->lstStyle); + } + void TxBody::toPPTY(NSBinPptxRW::CBinaryFileWriter* pWriter) const + { + pWriter->WriteRecord2(0, bodyPr); + pWriter->WriteRecord2(1, lstStyle); + pWriter->WriteRecordArray(2, 0, Paragrs); + pWriter->WriteRecord2(3, sp3d); + } + void TxBody::fromPPTY(NSBinPptxRW::CBinaryFileReader* pReader) + { + LONG _end_rec = pReader->GetPos() + pReader->GetRecordSize() + 4; + + while (pReader->GetPos() < _end_rec) + { + BYTE _at = pReader->GetUChar(); + switch (_at) + { + case 0: + { + bodyPr = new Logic::BodyPr(); + bodyPr->fromPPTY(pReader); + break; + } + case 1: + { + lstStyle = new Logic::TextListStyle(); + lstStyle->fromPPTY(pReader); + break; + } + case 2: + { + pReader->Skip(4); + ULONG _c = pReader->GetULong(); + for (ULONG i = 0; i < _c; ++i) + { + pReader->Skip(1); // type + Paragrs.push_back(Paragraph()); + Paragrs.back().fromPPTY(pReader); + } + break; + } + case 3: + { + sp3d = new Logic::Sp3d(); + sp3d->fromPPTY(pReader); + break; + } + default: + { + break; + } + } + } + + pReader->Seek(_end_rec); + + if (!bodyPr.IsInit()) + bodyPr = new Logic::BodyPr(); + } + void TxBody::FillParentPointersForChilds() + { + if(bodyPr.is_init()) + bodyPr->SetParentPointer(this); + + if(lstStyle.is_init()) + lstStyle->SetParentPointer(this); + + size_t count = Paragrs.size(); + for (size_t i = 0; i < count; ++i) + Paragrs[i].SetParentPointer(this); + } std::wstring TxBody::GetDocxTxBoxContent(NSBinPptxRW::CBinaryFileWriter* pWriter, const nullable& shape_style) { std::wstring strXml = _T("& txBody); - virtual void fromXML(XmlUtils::CXmlLiteReader& oReader) - { - m_name = oReader.GetName(); - - if ( oReader.IsEmptyNode() ) - return; - - int nCurDepth = oReader.GetDepth(); - while( oReader.ReadNextSiblingNode( nCurDepth ) ) - { - std::wstring strName = oReader.GetName(); - if (L"a:bodyPr" == strName) - { - bodyPr = oReader; - } - else if (L"a:lstStyle" == strName) - { - lstStyle = oReader; - } - else if (L"a:sp3d" == strName) - { - sp3d = oReader; - } - else if (L"a:p" == strName) - { - Paragraph p; - Paragrs.push_back(p); - Paragrs.back().fromXML(oReader); - } - } - FillParentPointersForChilds(); - } - virtual void fromXML(XmlUtils::CXmlNode& node) - { - Paragrs.clear(); - - m_name = node.GetName(); - - bodyPr = node.ReadNode(L"a:bodyPr"); - lstStyle = node.ReadNode(L"a:lstStyle"); - sp3d = node.ReadNode(L"a:sp3d"); - - XmlMacroLoadArray(node, L"a:p", Paragrs, Paragraph); - - FillParentPointersForChilds(); - } - virtual std::wstring toXML() const - { - XmlUtils::CNodeValue oValue; - - oValue.WriteNullable(bodyPr); - oValue.WriteNullable(lstStyle); - oValue.WriteArray(Paragrs); - - return XmlUtils::CreateNode(m_name, oValue); - } - - virtual void toXmlWriter(NSBinPptxRW::CXmlWriter* pWriter) const - { - pWriter->StartNode(m_name); - pWriter->EndAttributes(); - - if (bodyPr.IsInit()) - { - bodyPr->m_namespace = L"a"; - bodyPr->toXmlWriter(pWriter); - } - if (sp3d.IsInit()) - { - sp3d->toXmlWriter(pWriter); - } - if (lstStyle.IsInit()) - lstStyle->m_name = L"a:lstStyle"; - pWriter->Write(lstStyle); - - size_t nCount = Paragrs.size(); - for (size_t i = 0; i < nCount; ++i) - Paragrs[i].toXmlWriter(pWriter); - - pWriter->EndNode(m_name); - } - - void toXmlWriterExcel(NSBinPptxRW::CXmlWriter* pWriter) const - { - if (bodyPr.IsInit()) - { - bodyPr->m_namespace = L"a"; - bodyPr->toXmlWriter(pWriter); - } - if (sp3d.IsInit()) - { - sp3d->toXmlWriter(pWriter); - } - if (lstStyle.is_init()) - lstStyle->m_name = L"a:lstStyle"; - pWriter->Write(lstStyle); - - size_t nCount = Paragrs.size(); - for (size_t i = 0; i < nCount; ++i) - Paragrs[i].toXmlWriter(pWriter); - - /* - pWriter->EndNode(L"c:rich")); - */ - } - - std::wstring GetText(bool bParagraphSeparator = true)const - { - std::wstring result; - size_t count = Paragrs.size(); - - for (size_t i = 0; i < count; ++i) - result += Paragrs[i].GetText(bParagraphSeparator); - return result; - } - - void Merge(nullable& txBody) - { - if (!bodyPr.IsInit()) - bodyPr = new Logic::BodyPr(); - - bodyPr->Merge(txBody->bodyPr); - - if(lstStyle.IsInit()) - lstStyle->Merge(txBody->lstStyle); - } - - virtual void toPPTY(NSBinPptxRW::CBinaryFileWriter* pWriter) const - { - pWriter->WriteRecord2(0, bodyPr); - pWriter->WriteRecord2(1, lstStyle); - pWriter->WriteRecordArray(2, 0, Paragrs); - pWriter->WriteRecord2(3, sp3d); - } - virtual void fromPPTY(NSBinPptxRW::CBinaryFileReader* pReader) - { - LONG _end_rec = pReader->GetPos() + pReader->GetRecordSize() + 4; - - while (pReader->GetPos() < _end_rec) - { - BYTE _at = pReader->GetUChar(); - switch (_at) - { - case 0: - { - bodyPr = new Logic::BodyPr(); - bodyPr->fromPPTY(pReader); - break; - } - case 1: - { - lstStyle = new Logic::TextListStyle(); - lstStyle->fromPPTY(pReader); - break; - } - case 2: - { - pReader->Skip(4); - ULONG _c = pReader->GetULong(); - for (ULONG i = 0; i < _c; ++i) - { - pReader->Skip(1); // type - Paragrs.push_back(Paragraph()); - Paragrs.back().fromPPTY(pReader); - } - break; - } - case 3: - { - sp3d = new Logic::Sp3d(); - sp3d->fromPPTY(pReader); - break; - } - default: - { - break; - } - } - } - - pReader->Seek(_end_rec); - - if (!bodyPr.IsInit()) - bodyPr = new Logic::BodyPr(); - } + virtual void toPPTY(NSBinPptxRW::CBinaryFileWriter* pWriter) const; + virtual void fromPPTY(NSBinPptxRW::CBinaryFileReader* pReader); nullable sp3d; nullable bodyPr; @@ -279,22 +76,11 @@ namespace PPTX std::vector Paragrs; std::wstring m_name; + protected: - virtual void FillParentPointersForChilds() - { - if(bodyPr.is_init()) - bodyPr->SetParentPointer(this); - - if(lstStyle.is_init()) - lstStyle->SetParentPointer(this); - - size_t count = Paragrs.size(); - for (size_t i = 0; i < count; ++i) - Paragrs[i].SetParentPointer(this); - } + virtual void FillParentPointersForChilds(); public: - std::wstring GetDocxTxBoxContent(NSBinPptxRW::CBinaryFileWriter* pWriter, const nullable& shape_style); }; } // namespace Logic diff --git a/OOXML/Projects/Linux/DocxFormatLib/DocxFormatLib.pro b/OOXML/Projects/Linux/DocxFormatLib/DocxFormatLib.pro index 8177b1c4da..ad8d0b219e 100644 --- a/OOXML/Projects/Linux/DocxFormatLib/DocxFormatLib.pro +++ b/OOXML/Projects/Linux/DocxFormatLib/DocxFormatLib.pro @@ -221,7 +221,6 @@ HEADERS += \ ../../../DocxFormat/External/HyperLink.h \ ../../../DocxFormat/Logic/AlternateContent.h \ ../../../DocxFormat/Logic/Annotations.h \ - ../../../DocxFormat/Logic/BaseLogicSettings.h \ ../../../DocxFormat/Logic/Bdo.h \ ../../../DocxFormat/Logic/Dir.h \ ../../../DocxFormat/Logic/FldChar.h \ diff --git a/OOXML/XlsxFormat/ExternalLinks/ExternalLinks.cpp b/OOXML/XlsxFormat/ExternalLinks/ExternalLinks.cpp index e85026d749..0e3b12885d 100644 --- a/OOXML/XlsxFormat/ExternalLinks/ExternalLinks.cpp +++ b/OOXML/XlsxFormat/ExternalLinks/ExternalLinks.cpp @@ -74,7 +74,7 @@ namespace Spreadsheet std::wstring sName = oReader.GetName(); if (L"sheetName" == sName) { - m_arrItems.push_back(new ComplexTypes::Spreadsheet::String(oReader)); + m_arrItems.push_back(PPTX::CreatePtrXmlContent(oReader)); } } } diff --git a/OOXML/XlsxFormat/Pivot/Pivots.cpp b/OOXML/XlsxFormat/Pivot/Pivots.cpp index 156c9a3c1c..fd95281264 100644 --- a/OOXML/XlsxFormat/Pivot/Pivots.cpp +++ b/OOXML/XlsxFormat/Pivot/Pivots.cpp @@ -847,7 +847,7 @@ xmlns:xr16=\"http://schemas.microsoft.com/office/spreadsheetml/2017/revision16\" std::wstring sName = XmlUtils::GetNameNoNS(oReader.GetName()); if (L"x" == sName) - m_arrItems.push_back(new CSharedItemsIndex(oReader)); + m_arrItems.push_back(PPTX::CreatePtrXmlContent(oReader)); } } void CColumnRowItem::fromBin(XLS::BaseObjectPtr& obj) @@ -3086,7 +3086,7 @@ xmlns:xr16=\"http://schemas.microsoft.com/office/spreadsheetml/2017/revision16\" std::wstring sName = XmlUtils::GetNameNoNS(oReader.GetName()); if (L"x" == sName) - m_arrItems.push_back(new CSharedItemsIndex(oReader)); + m_arrItems.push_back(PPTX::CreatePtrXmlContent(oReader)); } } void CDiscreteGroupingProperties::fromBin(XLS::BaseObjectPtr& obj) @@ -3417,7 +3417,7 @@ xmlns:xr16=\"http://schemas.microsoft.com/office/spreadsheetml/2017/revision16\" std::wstring sName = XmlUtils::GetNameNoNS(oReader.GetName()); if ( L"x" == sName ) - m_arrItems.push_back(new CMemberPropertyIndex(oReader)); + m_arrItems.push_back(PPTX::CreatePtrXmlContent(oReader)); } } void CPivotCharacterValue::fromBin(XLS::BaseObjectPtr& obj) @@ -3537,7 +3537,7 @@ xmlns:xr16=\"http://schemas.microsoft.com/office/spreadsheetml/2017/revision16\" std::wstring sName = XmlUtils::GetNameNoNS(oReader.GetName()); if ( L"x" == sName ) - m_arrItems.push_back(new CMemberPropertyIndex(oReader)); + m_arrItems.push_back(PPTX::CreatePtrXmlContent(oReader)); } } void CPivotErrorValue::fromBin(XLS::BaseObjectPtr& obj) @@ -3677,7 +3677,7 @@ xmlns:xr16=\"http://schemas.microsoft.com/office/spreadsheetml/2017/revision16\" std::wstring sName = XmlUtils::GetNameNoNS(oReader.GetName()); if ( L"x" == sName ) - m_arrItems.push_back(new CMemberPropertyIndex(oReader)); + m_arrItems.push_back(PPTX::CreatePtrXmlContent(oReader)); } } void CPivotNumericValue::fromBin(XLS::BaseObjectPtr& obj) @@ -3790,7 +3790,7 @@ xmlns:xr16=\"http://schemas.microsoft.com/office/spreadsheetml/2017/revision16\" std::wstring sName = XmlUtils::GetNameNoNS(oReader.GetName()); if ( L"x" == sName ) - m_arrItems.push_back(new CMemberPropertyIndex(oReader)); + m_arrItems.push_back(PPTX::CreatePtrXmlContent(oReader)); } } void CPivotDateTimeValue::fromBin(XLS::BaseObjectPtr& obj) @@ -3878,7 +3878,7 @@ xmlns:xr16=\"http://schemas.microsoft.com/office/spreadsheetml/2017/revision16\" std::wstring sName = XmlUtils::GetNameNoNS(oReader.GetName()); if ( L"x" == sName ) - m_arrItems.push_back(new CMemberPropertyIndex(oReader)); + m_arrItems.push_back(PPTX::CreatePtrXmlContent(oReader)); } } void CPivotBooleanValue::fromBin(XLS::BaseObjectPtr& obj) @@ -3973,7 +3973,7 @@ xmlns:xr16=\"http://schemas.microsoft.com/office/spreadsheetml/2017/revision16\" std::wstring sName = XmlUtils::GetNameNoNS(oReader.GetName()); if ( L"x" == sName ) - m_arrItems.push_back(new CMemberPropertyIndex(oReader)); + m_arrItems.push_back(PPTX::CreatePtrXmlContent(oReader)); } } void CPivotNoValue::fromBin(XLS::BaseObjectPtr& obj) @@ -4822,7 +4822,7 @@ xmlns:xr16=\"http://schemas.microsoft.com/office/spreadsheetml/2017/revision16\" m_arrItems.push_back(pPivotCharacterValue); } else if ( L"x" == sName ) - m_arrItems.push_back(new CSharedItemsIndex(oReader)); + m_arrItems.push_back(PPTX::CreatePtrXmlContent(oReader)); } } void CPivotCacheRecord::fromBin(XLS::BaseObjectPtr& obj) diff --git a/OdfFile/Writer/Converter/Converter.h b/OdfFile/Writer/Converter/Converter.h index 33ad5b76da..35ebb13f61 100644 --- a/OdfFile/Writer/Converter/Converter.h +++ b/OdfFile/Writer/Converter/Converter.h @@ -34,6 +34,7 @@ #include #include "../../../OOXML/Base/SmartPtr.h" #include "../../../OOXML/DocxFormat/Math/oMathContent.h" +#include "../../../OOXML/DocxFormat/Logic/VmlWord.h" #include #include diff --git a/RtfFile/OOXml/Reader/OOXShapeReader.cpp b/RtfFile/OOXml/Reader/OOXShapeReader.cpp index 938b04ec96..b4de5fe7ef 100644 --- a/RtfFile/OOXml/Reader/OOXShapeReader.cpp +++ b/RtfFile/OOXml/Reader/OOXShapeReader.cpp @@ -41,6 +41,7 @@ #include "../../../OOXML/PPTXFormat/Logic/Pic.h" #include "../../../OOXML/PPTXFormat/Logic/Shape.h" #include "../../../OOXML/PPTXFormat/Logic/Colors/SchemeClr.h" +#include "../../../OOXML/DocxFormat/Logic/VmlWord.h" #include "../../../OdfFile/Reader/Format/svg_parser.h" #include diff --git a/RtfFile/OOXml/Reader/OOXShapeReader.h b/RtfFile/OOXml/Reader/OOXShapeReader.h index 0c08c83923..568d31c87c 100644 --- a/RtfFile/OOXml/Reader/OOXShapeReader.h +++ b/RtfFile/OOXml/Reader/OOXShapeReader.h @@ -37,6 +37,7 @@ #include "../../Format/RtfShape.h" #include "../../../OOXML/DocxFormat/Logic/Vml.h" +#include "../../../OOXML/PPTXFormat/Logic/SpTree.h" namespace OOX { diff --git a/TxtFile/Source/ConvertDocx2Txt.cpp b/TxtFile/Source/ConvertDocx2Txt.cpp index 518dd7de7a..49233abdf4 100644 --- a/TxtFile/Source/ConvertDocx2Txt.cpp +++ b/TxtFile/Source/ConvertDocx2Txt.cpp @@ -40,7 +40,6 @@ #include "../../OOXML/DocxFormat/Footnote.h" #include "../../OOXML/DocxFormat/Endnote.h" #include "../../OOXML/DocxFormat/FtnEdn.h" -#include "../../OOXML/DocxFormat/HeaderFooter.h" #include "../../OOXML/DocxFormat/Logic/Table.h" #include "../../OOXML/DocxFormat/Logic/Sdt.h" #include "../../OOXML/DocxFormat/Logic/FldSimple.h" diff --git a/TxtFile/Source/ConvertDocx2Txt.h b/TxtFile/Source/ConvertDocx2Txt.h index 352f6e26e5..ada2dc3e54 100644 --- a/TxtFile/Source/ConvertDocx2Txt.h +++ b/TxtFile/Source/ConvertDocx2Txt.h @@ -31,7 +31,6 @@ */ #pragma once -#include #include namespace Docx2Txt diff --git a/TxtFile/Source/ConvertTxt2Docx.h b/TxtFile/Source/ConvertTxt2Docx.h index 4e84eda0ae..b0cb62f506 100644 --- a/TxtFile/Source/ConvertTxt2Docx.h +++ b/TxtFile/Source/ConvertTxt2Docx.h @@ -31,7 +31,12 @@ */ #pragma once -#include "../../DesktopEditor/common/StringBuilder.h" +#include + +namespace NSStringUtils +{ + class CStringBuilder; +} namespace Txt2Docx { diff --git a/TxtFile/Source/TxtFormat/TxtFile.h b/TxtFile/Source/TxtFormat/TxtFile.h index 63715a1664..192cfa0f4b 100644 --- a/TxtFile/Source/TxtFormat/TxtFile.h +++ b/TxtFile/Source/TxtFormat/TxtFile.h @@ -36,8 +36,6 @@ #include #include -#include "../../../OOXML/SystemUtility/SystemUtility.h" - class TxtFile { public: