From 02ce053511cb0ec77f20c7fbb6e4500a092f59b0 Mon Sep 17 00:00:00 2001 From: "Elen.Subbotina" Date: Thu, 25 Feb 2016 12:16:40 +0000 Subject: [PATCH] =?UTF-8?q?XlsFormat=20-=20=D0=BF=D0=B5=D1=80=D0=B5=D0=BE?= =?UTF-8?q?=D0=B1=D0=B5=D1=80=D0=BD=D1=83=D1=82=20=D0=B2=20=D0=BD=D0=B5?= =?UTF-8?q?=D0=B9=D0=BC=D1=81=D0=BF=D0=B5=D0=B9=D1=81=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@68426 954022d7-b5bf-4e40-9824-e11837661b57 --- .../source/XlsFormat/Logic/Biff_records/CRN.h | 8 -- .../XlsFormat/Logic/Biff_records/ColInfo.h | 8 +- .../XlsFormat/Logic/Biff_records/Font.cpp | 4 +- .../XlsFormat/Logic/Biff_records/TxO.cpp | 16 +++- .../Logic/Biff_structures/BitMarkedStructs.h | 4 +- .../ODRAW/OfficeArtClientAnchorSheet.cpp | 9 +- .../ODRAW/OfficeArtClientAnchorSheet.h | 3 - .../Biff_structures/ODRAW/OfficeArtFOPTE.cpp | 82 +++++++++---------- .../Biff_structures/ODRAW/OfficeArtFOPTE.h | 4 +- .../XlsFormat/Logic/Biff_unions/COLUMNS.cpp | 7 +- .../ConvertShapes/BaseShape.h | 6 +- .../ConvertShapes/CustomGeomShape.h | 10 +-- .../ConvertShapes/CustomShape.cpp | 3 + .../ConvertShapes/CustomShape.h | 77 +++-------------- .../ConvertShapes/CustomShapeConvert.h | 26 +++--- .../ConvertShapes/FormulaShape.cpp | 2 +- .../ConvertShapes/FormulaShape.h | 5 +- .../ConvertShapes/GraphicsPath.h | 5 +- .../ConvertShapes/PathShape.h | 6 +- .../ConvertShapes/XmlWriter.h | 2 +- .../oldAutoShapes/AccentBorderCallout2Type.h | 6 +- .../oldAutoShapes/AccentCallout1Type.h | 6 +- .../oldAutoShapes/AccentCallout2Type.h | 6 +- .../oldAutoShapes/AccentCallout3Type.h | 6 +- .../oldAutoShapes/AccentCallout90Type.h | 5 +- .../oldAutoShapes/ActionButtonBack.h | 6 +- .../oldAutoShapes/ActionButtonBeginning.h | 6 +- .../oldAutoShapes/ActionButtonBlank.h | 6 +- .../oldAutoShapes/ActionButtonDocument.h | 6 +- .../oldAutoShapes/ActionButtonEnd.h | 6 +- .../oldAutoShapes/ActionButtonHelp.h | 6 +- .../oldAutoShapes/ActionButtonHome.h | 6 +- .../oldAutoShapes/ActionButtonInfo.h | 5 +- .../oldAutoShapes/ActionButtonMovie.h | 5 +- .../oldAutoShapes/ActionButtonNext.h | 5 +- .../oldAutoShapes/ActionButtonReturn.h | 5 +- .../oldAutoShapes/ActionButtonSound.h | 5 +- .../oldAutoShapes/BentArrowType.h | 3 + .../oldAutoShapes/BentConnector.h | 5 +- .../oldAutoShapes/BentUpArrowType.h | 3 + .../ConvertShapes/oldAutoShapes/BevelType.h | 5 +- .../oldAutoShapes/BlockArcType.h | 3 + .../oldAutoShapes/BorderCallout1Type.h | 5 +- .../oldAutoShapes/BorderCallout2Type.h | 5 +- .../oldAutoShapes/BorderCallout3Type.h | 5 +- .../oldAutoShapes/BorderCallout90Type.h | 5 +- .../oldAutoShapes/BracePairType.h | 3 + .../oldAutoShapes/BracketPairType.h | 3 + .../oldAutoShapes/Callout1Type.h | 5 +- .../oldAutoShapes/Callout2Type.h | 5 +- .../oldAutoShapes/Callout3Type.h | 5 +- .../oldAutoShapes/Callout90Type.h | 5 +- .../ConvertShapes/oldAutoShapes/CanType.h | 5 +- .../ConvertShapes/oldAutoShapes/ChevronType.h | 3 + .../oldAutoShapes/CircularArrowType.h | 5 +- .../oldAutoShapes/CloudCalloutType.h | 6 +- .../ConvertShapes/oldAutoShapes/CubeType.h | 3 + .../oldAutoShapes/CurvedConnector.h | 5 +- .../oldAutoShapes/CurvedDownArrowType.h | 3 + .../oldAutoShapes/CurvedLeftArrowType.h | 3 + .../oldAutoShapes/CurvedRightArrowType.h | 3 + .../oldAutoShapes/CurvedUpArrowType.h | 3 + .../ConvertShapes/oldAutoShapes/DiamondType.h | 5 +- .../ConvertShapes/oldAutoShapes/DonutType.h | 3 + .../oldAutoShapes/DownArrowCalloutType.h | 4 +- .../oldAutoShapes/DownArrowType.h | 3 + .../oldAutoShapes/EllipseRibbon2Type.h | 3 + .../oldAutoShapes/EllipseRibbonType.h | 5 +- .../ConvertShapes/oldAutoShapes/EllipseType.h | 5 +- .../FlowChartAlternateProcessType.h | 3 + .../oldAutoShapes/FlowChartCollateType.h | 4 +- .../oldAutoShapes/FlowChartConnectorType.h | 3 + .../oldAutoShapes/FlowChartDecisionType.h | 3 + .../oldAutoShapes/FlowChartDelayType.h | 4 +- .../oldAutoShapes/FlowChartDisplayType.h | 4 +- .../oldAutoShapes/FlowChartDocumentType.h | 3 + .../oldAutoShapes/FlowChartExtractType.h | 5 +- .../oldAutoShapes/FlowChartInputOutputType.h | 3 + .../FlowChartInternalStorageType.h | 3 + .../oldAutoShapes/FlowChartMagneticDiskType.h | 4 +- .../oldAutoShapes/FlowChartMagneticDrumType.h | 3 + .../oldAutoShapes/FlowChartMagneticTapeType.h | 3 + .../oldAutoShapes/FlowChartManualInputType.h | 5 +- .../FlowChartManualOperationType.h | 3 + .../oldAutoShapes/FlowChartMergeType.h | 3 + .../FlowChartMultidocumentType.h | 3 + .../FlowChartOffpageConnectorType.h | 3 + .../FlowChartOnlineStorageType.h | 4 +- .../oldAutoShapes/FlowChartOrType.h | 3 + .../FlowChartPredefinedProcessType.h | 3 + .../oldAutoShapes/FlowChartPreparationType.h | 5 +- .../oldAutoShapes/FlowChartProcessType.h | 3 + .../oldAutoShapes/FlowChartPunchedCardType.h | 4 +- .../oldAutoShapes/FlowChartPunchedTapeType.h | 4 +- .../oldAutoShapes/FlowChartSortType.h | 4 +- .../FlowChartSummingJunctionType.h | 4 +- .../oldAutoShapes/FlowChartTerminatorType.h | 3 + .../oldAutoShapes/FoldedCornerType.h | 5 +- .../ConvertShapes/oldAutoShapes/HeartType.h | 4 +- .../ConvertShapes/oldAutoShapes/HexagonType.h | 3 + .../oldAutoShapes/HomePlateType.h | 5 +- .../oldAutoShapes/HorisontalScrollType.h | 5 +- .../oldAutoShapes/IrregularSealOneType.h | 3 + .../oldAutoShapes/IrregularSealTwo.h | 3 + .../oldAutoShapes/IsoscelesTriangleType.h | 5 +- .../oldAutoShapes/LeftArrowCalloutType.h | 5 +- .../oldAutoShapes/LeftArrowType.h | 3 + .../oldAutoShapes/LeftBraceType.h | 5 +- .../oldAutoShapes/LeftBracketType.h | 3 + .../oldAutoShapes/LeftRightArrowCalloutType.h | 4 +- .../oldAutoShapes/LeftRightArrowType.h | 3 + .../oldAutoShapes/LeftRightUpArrow.h | 3 + .../oldAutoShapes/LeftUpArrowType.h | 3 + .../oldAutoShapes/LightningBoltType.h | 3 + .../ConvertShapes/oldAutoShapes/LineType.h | 5 +- .../ConvertShapes/oldAutoShapes/MoonType.h | 3 + .../oldAutoShapes/NoSmokingType.h | 3 + .../oldAutoShapes/NotchedRightArrowType.h | 3 + .../ConvertShapes/oldAutoShapes/OctagonType.h | 5 +- .../oldAutoShapes/ParallelogramType.h | 3 + .../oldAutoShapes/PentagonType.h | 3 + .../ConvertShapes/oldAutoShapes/PlaqueType.h | 3 + .../ConvertShapes/oldAutoShapes/PlusType.h | 3 + .../oldAutoShapes/QuadArrowCalloutType.h | 5 +- .../oldAutoShapes/QuadArrowType.h | 3 + .../oldAutoShapes/RectangleType.h | 3 + .../oldAutoShapes/RibbonDownType.h | 3 + .../oldAutoShapes/RibbonUpType.h | 3 + .../oldAutoShapes/RightArrowCalloutType.h | 3 + .../oldAutoShapes/RightArrowType.h | 3 + .../oldAutoShapes/RightBracetype.h | 3 + .../oldAutoShapes/RightBracketType.h | 3 + .../oldAutoShapes/RightTriangleType.h | 3 + .../oldAutoShapes/RoundedRectangleType.h | 5 +- .../ConvertShapes/oldAutoShapes/Seal16Type.h | 5 +- .../ConvertShapes/oldAutoShapes/Seal24Type.h | 4 +- .../ConvertShapes/oldAutoShapes/Seal32Type.h | 4 +- .../ConvertShapes/oldAutoShapes/Seal4Type.h | 3 + .../ConvertShapes/oldAutoShapes/Seal8Type.h | 4 + .../oldAutoShapes/SmileyFaceType.h | 6 +- .../ConvertShapes/oldAutoShapes/Startype.h | 4 + .../oldAutoShapes/StraightConnectorType.h | 4 + .../oldAutoShapes/StripedRightArrowType.h | 4 + .../ConvertShapes/oldAutoShapes/SunType.h | 4 + .../ConvertShapes/oldAutoShapes/TextboxType.h | 4 + .../oldAutoShapes/TrapezoidType.h | 4 + .../oldAutoShapes/UpArrowCalloutType.h | 6 +- .../ConvertShapes/oldAutoShapes/UpArrowType.h | 4 + .../oldAutoShapes/UpDownArrowCalloutType.h | 6 +- .../oldAutoShapes/UpDownArrowType.h | 4 + .../oldAutoShapes/UturnArrowType.h | 6 +- .../oldAutoShapes/VerticalScrollType.h | 6 +- .../oldAutoShapes/WaveDoubleType.h | 6 +- .../ConvertShapes/oldAutoShapes/WaveType.h | 6 +- .../oldAutoShapes/WedgeEllipseCalloutType.h | 6 +- .../oldAutoShapes/WedgeRectCalloutType.h | 4 + .../WedgeRoundedRectCalloutType.h | 4 + .../oldAutoShapes/accentbordercallout1type.h | 6 +- .../oldAutoShapes/accentbordercallout3type.h | 5 +- .../oldAutoShapes/accentbordercallout90type.h | 6 +- .../ConvertShapes/oldAutoShapes/arctype.h | 5 +- .../source/XlsXlsxConverter/XlsConverter.cpp | 1 - .../xlsx_comments_context.cpp | 2 +- .../XlsXlsxConverter/xlsx_drawing_context.cpp | 21 +++-- 164 files changed, 630 insertions(+), 271 deletions(-) diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/CRN.h b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/CRN.h index bf7299037a..c3e797614c 100644 --- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/CRN.h +++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/CRN.h @@ -28,14 +28,6 @@ public: BIFF_BYTE colFirst; BIFF_WORD row; BiffStructurePtrVector crnOper; -public: - //BO_ATTRIB_MARKUP_BEGIN - //BO_ATTRIB_MARKUP_ATTRIB(colLast) - //BO_ATTRIB_MARKUP_ATTRIB(colFirst) - //BO_ATTRIB_MARKUP_ATTRIB(row) - ////BO_ATTRIB_MARKUP_VECTOR_COMPLEX(crnOper, SerAr) // Temporarily commented to avoid compilation errors - - //BO_ATTRIB_MARKUP_END }; diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/ColInfo.h b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/ColInfo.h index 1c500f3ffc..400ae37630 100644 --- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/ColInfo.h +++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/ColInfo.h @@ -23,10 +23,10 @@ public: static const ElementType type = typeColInfo; //----------------------------- - Col256U colFirst; - Col256U colLast; - BIFF_WORD coldx; - IXFCell ixfe; + Col256U colFirst; + Col256U colLast; + BIFF_WORD coldx; + IXFCell ixfe; bool fHidden; bool fUserSet; diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Font.cpp b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Font.cpp index 092e460cbf..ce53019fa1 100644 --- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Font.cpp +++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Font.cpp @@ -265,7 +265,7 @@ int Font::serialize_rPr(std::wostream & stream, bool rtl, bool defRPr, std::wstr } -int Font::serialize_properties(std::wostream & stream, bool rPr) +int Font::serialize_properties(std::wostream & stream, bool isRPr) { CP_XML_WRITER(stream) { @@ -347,7 +347,7 @@ int Font::serialize_properties(std::wostream & stream, bool rPr) if (!fontName.value().empty()) { - if (rPr) + if (isRPr) { CP_XML_NODE(L"rFont") { diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/TxO.cpp b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/TxO.cpp index 0862a8568f..42bde96471 100644 --- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/TxO.cpp +++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/TxO.cpp @@ -113,6 +113,7 @@ int TxO::serialize (std::wostream & _stream) CP_XML_NODE(namespace_ + L"r") { Fmt = run->formatRun.ifnt; + serialize_rPr(CP_XML_STREAM(), Fmt, namespace_); CP_XML_NODE(namespace_ + L"t") @@ -145,7 +146,20 @@ int TxO::serialize_rPr (std::wostream & _stream, int iFmt, std::wstring namespac Font * font = dynamic_cast(pGlobalWorkbookInfoPtr->m_arFonts->at(iFmt-1).get()); - if (font) font->serialize_rPr(_stream, false, false, namespace_); + if (!font) return 0; + + if (namespace_.empty()) + { + CP_XML_WRITER(_stream) + { + CP_XML_NODE( L"rPr") + { + font->serialize_properties(CP_XML_STREAM(), true); + } + } + } + else + font->serialize_rPr(_stream, false, false, namespace_); return 0; } diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/BitMarkedStructs.h b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/BitMarkedStructs.h index e14bd81c45..8dd1e23f92 100644 --- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/BitMarkedStructs.h +++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/BitMarkedStructs.h @@ -16,8 +16,6 @@ namespace XLS { typedef BiffAttributeSimple<_UINT32> RwLongU; -typedef BiffAttributeSimple ColU; -typedef BiffAttributeSimple Col256U; typedef BiffAttributeSimple IXFCell; typedef BiffAttributeSimple Rw; typedef BiffAttributeSimple Col; @@ -28,6 +26,8 @@ typedef BiffAttributeSimple<_INT16> Col_NegativeOne; typedef BiffAttributeSimple R_RwU; // Special version for use as a record attribute typedef BiffAttributeSimple IFmt; typedef BiffAttributeSimple CrtLayout12Mode; +typedef BiffAttributeSimple ColU; +typedef unsigned short Col256U; typedef unsigned short RwU; typedef unsigned short Ilel; typedef unsigned char DColunByteU; diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/ODRAW/OfficeArtClientAnchorSheet.cpp b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/ODRAW/OfficeArtClientAnchorSheet.cpp index 8d054b9883..431e2977b5 100644 --- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/ODRAW/OfficeArtClientAnchorSheet.cpp +++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/ODRAW/OfficeArtClientAnchorSheet.cpp @@ -118,12 +118,9 @@ void OfficeArtClientAnchorSheet::loadFields(XLS::CFRecord& record) } else _dyB = dyB * kfRow * global_info->defaultRowHeight; -//---------------------------------------------------------------------------------------------------- - column = (std::min)(colL, colR); - row = (std::min)(rwT, rwB); -//---------------------------------------------------------------------------------------------------- - for (int i = 1 ; i < colL; i++) + //---------------------------------------------------------------------------------------------------- + for (int i = 0 ; i < colL; i++) { if (global_info->customColumnsWidth.find(i) != global_info->customColumnsWidth.end()) _x += 256 * kfCol * global_info->customColumnsWidth[i]; @@ -141,7 +138,7 @@ void OfficeArtClientAnchorSheet::loadFields(XLS::CFRecord& record) } _cx += _dxR; - for (int i = 1 ; i < rwT; i++) + for (int i = 0 ; i < rwT; i++) { if (global_info->customRowsHeight.find(i) != global_info->customRowsHeight.end()) { diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/ODRAW/OfficeArtClientAnchorSheet.h b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/ODRAW/OfficeArtClientAnchorSheet.h index 3c02951480..b8a7f68266 100644 --- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/ODRAW/OfficeArtClientAnchorSheet.h +++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/ODRAW/OfficeArtClientAnchorSheet.h @@ -38,9 +38,6 @@ public: XLS::RwU rwB; short dyB; - int column; - int row; - _UINT32 _dxL; _UINT32 _dyT; _UINT32 _dxR; diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/ODRAW/OfficeArtFOPTE.cpp b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/ODRAW/OfficeArtFOPTE.cpp index 8d5a042d45..9d3f9cd48b 100644 --- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/ODRAW/OfficeArtFOPTE.cpp +++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/ODRAW/OfficeArtFOPTE.cpp @@ -7,47 +7,47 @@ namespace ODRAW { - static int GetCountPoints2(NSGuidesVML::RulesType eRuler, int lRepeatCount) + static int GetCountPoints2(NSCustomShapesConvert::RulesType eRuler, int lRepeatCount) { switch (eRuler) { - case NSGuidesVML::rtMoveTo: - case NSGuidesVML::rtRMoveTo: + case NSCustomShapesConvert::rtMoveTo: + case NSCustomShapesConvert::rtRMoveTo: { return 1; } - case NSGuidesVML::rtLineTo: - case NSGuidesVML::rtRLineTo: + case NSCustomShapesConvert::rtLineTo: + case NSCustomShapesConvert::rtRLineTo: { return lRepeatCount; } - case NSGuidesVML::rtCurveTo: - case NSGuidesVML::rtRCurveTo: + case NSCustomShapesConvert::rtCurveTo: + case NSCustomShapesConvert::rtRCurveTo: { return 3 * lRepeatCount; } - case NSGuidesVML::rtNoFill: - case NSGuidesVML::rtNoStroke: - case NSGuidesVML::rtClose: - case NSGuidesVML::rtEnd: + case NSCustomShapesConvert::rtNoFill: + case NSCustomShapesConvert::rtNoStroke: + case NSCustomShapesConvert::rtClose: + case NSCustomShapesConvert::rtEnd: { return 0; } - case NSGuidesVML::rtAngleEllipseTo: - case NSGuidesVML::rtAngleEllipse: + case NSCustomShapesConvert::rtAngleEllipseTo: + case NSCustomShapesConvert::rtAngleEllipse: { return lRepeatCount; } - case NSGuidesVML::rtArc: - case NSGuidesVML::rtArcTo: + case NSCustomShapesConvert::rtArc: + case NSCustomShapesConvert::rtArcTo: - case NSGuidesVML::rtClockwiseArcTo: - case NSGuidesVML::rtClockwiseArc: + case NSCustomShapesConvert::rtClockwiseArcTo: + case NSCustomShapesConvert::rtClockwiseArc: { return lRepeatCount; } - case NSGuidesVML::rtEllipticalQuadrX: - case NSGuidesVML::rtEllipticalQuadrY: + case NSCustomShapesConvert::rtEllipticalQuadrX: + case NSCustomShapesConvert::rtEllipticalQuadrY: { return 1 * lRepeatCount; } - case NSGuidesVML::rtQuadrBesier: + case NSCustomShapesConvert::rtQuadrBesier: { return /*2 * */lRepeatCount; } - case NSGuidesVML::rtFillColor: - case NSGuidesVML::rtLineColor: + case NSCustomShapesConvert::rtFillColor: + case NSCustomShapesConvert::rtLineColor: { return 1; } @@ -680,7 +680,7 @@ void MSOPATHINFO::load(XLS::CFRecord& record) if (type <= 4) { - m_eRuler = (NSGuidesVML::RulesType)type; + m_eRuler = (NSCustomShapesConvert::RulesType)type; m_nCount = (mem & 0x1FFF); m_nCount = (_UINT16)GetCountPoints2(m_eRuler, m_nCount); return; @@ -693,68 +693,68 @@ void MSOPATHINFO::load(XLS::CFRecord& record) { case 0x00: { - m_eRuler = NSGuidesVML::rtLineTo; + m_eRuler = NSCustomShapesConvert::rtLineTo; break; } case 0x01: { - m_eRuler = NSGuidesVML::rtAngleEllipseTo; + m_eRuler = NSCustomShapesConvert::rtAngleEllipseTo; break; } case 0x02: { - m_eRuler = NSGuidesVML::rtAngleEllipse; + m_eRuler = NSCustomShapesConvert::rtAngleEllipse; break; } case 0x03: { - m_eRuler = NSGuidesVML::rtArcTo; + m_eRuler = NSCustomShapesConvert::rtArcTo; break; } case 0x04: { - m_eRuler = NSGuidesVML::rtArc; + m_eRuler = NSCustomShapesConvert::rtArc; break; } case 0x05: { - m_eRuler = NSGuidesVML::rtClockwiseArcTo; + m_eRuler = NSCustomShapesConvert::rtClockwiseArcTo; break; } case 0x06: { - m_eRuler = NSGuidesVML::rtClockwiseArc; + m_eRuler = NSCustomShapesConvert::rtClockwiseArc; break; } case 0x07: { - m_eRuler = NSGuidesVML::rtEllipticalQuadrX; + m_eRuler = NSCustomShapesConvert::rtEllipticalQuadrX; break; } case 0x08: { - m_eRuler = NSGuidesVML::rtEllipticalQuadrY; + m_eRuler = NSCustomShapesConvert::rtEllipticalQuadrY; break; } case 0x09: { - m_eRuler = NSGuidesVML::rtQuadrBesier; + m_eRuler = NSCustomShapesConvert::rtQuadrBesier; break; } case 0x0A: { - m_eRuler = NSGuidesVML::rtNoFill; + m_eRuler = NSCustomShapesConvert::rtNoFill; break; } case 0x0B: { - m_eRuler = NSGuidesVML::rtNoStroke; + m_eRuler = NSCustomShapesConvert::rtNoStroke; break; } case 0x0C: case 0x10: { - m_eRuler = NSGuidesVML::rtLineTo; + m_eRuler = NSCustomShapesConvert::rtLineTo; break; } case 0x0D: @@ -765,22 +765,22 @@ void MSOPATHINFO::load(XLS::CFRecord& record) case 0x13: case 0x14: { - m_eRuler = NSGuidesVML::rtCurveTo; + m_eRuler = NSCustomShapesConvert::rtCurveTo; break; } case 0x15: { - m_eRuler = NSGuidesVML::rtFillColor; + m_eRuler = NSCustomShapesConvert::rtFillColor; break; } case 0x16: { - m_eRuler = NSGuidesVML::rtLineColor; + m_eRuler = NSCustomShapesConvert::rtLineColor; break; } default: { - m_eRuler = NSGuidesVML::rtCurveTo; + m_eRuler = NSCustomShapesConvert::rtCurveTo; } }; @@ -810,7 +810,7 @@ void MSOSG::load(XLS::CFRecord& record) _UINT16 ftType; record >> ftType; - m_eType = NSGuidesVML::FormulaType(ftType & 0x1FFF); + m_eType = NSCustomShapesConvert::FormulaType(ftType & 0x1FFF); m_param_type1 = (unsigned char)(ftType & 0x04); m_param_type2 = (unsigned char)(ftType & 0x02); diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/ODRAW/OfficeArtFOPTE.h b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/ODRAW/OfficeArtFOPTE.h index 1d8c1de911..ed08c2b5d5 100644 --- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/ODRAW/OfficeArtFOPTE.h +++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/ODRAW/OfficeArtFOPTE.h @@ -558,7 +558,7 @@ class MSOPATHINFO : public XLS::BiffStructure static const XLS::ElementType type = XLS::typeOfficeArtRecord; - NSGuidesVML::RulesType m_eRuler; + NSCustomShapesConvert::RulesType m_eRuler; _UINT16 m_nCount; int cbElement; @@ -577,7 +577,7 @@ class MSOSG : public XLS::BiffStructure static const XLS::ElementType type = XLS::typeOfficeArtRecord; - NSGuidesVML::FormulaType m_eType; + NSCustomShapesConvert::FormulaType m_eType; unsigned char m_param_type1; unsigned char m_param_type2; diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/COLUMNS.cpp b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/COLUMNS.cpp index 2b4b3f79da..260747597b 100644 --- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/COLUMNS.cpp +++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/COLUMNS.cpp @@ -77,11 +77,8 @@ int COLUMNS::serialize(std::wostream & stream) CP_XML_ATTR(L"customWidth", true); } - if (column_info->colFirst.value()) - CP_XML_ATTR(L"min", column_info->colFirst + 1);/// from 0 - - if (column_info->colLast.value()) - CP_XML_ATTR(L"max", column_info->colLast + 1); + CP_XML_ATTR(L"min", column_info->colFirst + 1);/// from 0 + CP_XML_ATTR(L"max", column_info->colLast + 1); if ((column_info->ixfe.value()) && (column_info->ixfe > global_info_->cellStyleXfs_count)) { diff --git a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/BaseShape.h b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/BaseShape.h index c3d528ce33..deaf4bcfec 100644 --- a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/BaseShape.h +++ b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/BaseShape.h @@ -2,6 +2,8 @@ #include "PathShape.h" #include "../../../Common/DocxFormat/Source/Common/SimpleTypes_Base.h" +namespace NSCustomShapesConvert +{ class CHandle_ { @@ -34,9 +36,7 @@ public: return (*this); } }; -// -namespace NSGuidesVML -{ + class CBaseShape { public: diff --git a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/CustomGeomShape.h b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/CustomGeomShape.h index 9e7ed53140..9a4f2d7d7b 100644 --- a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/CustomGeomShape.h +++ b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/CustomGeomShape.h @@ -7,10 +7,8 @@ #include "../../../../Common/DocxFormat/Source/SystemUtility/File.h" -namespace NSCustomVML +namespace NSCustomShapesConvert { - using namespace NSGuidesVML; - class CSegment { public: @@ -97,7 +95,7 @@ namespace NSCustomVML return *this; } - void SetToFormula(NSGuidesVML::CFormula& oFormula) + void SetToFormula(NSCustomShapesConvert::CFormula& oFormula) { oFormula.m_eFormulaType = m_eType; @@ -255,7 +253,7 @@ namespace NSCustomVML m_pAdjustValues = pList; } - void ToCustomShape(CBaseShape* pShape, NSGuidesVML::CFormulasManager& oManager) + void ToCustomShape(CBaseShape* pShape, NSCustomShapesConvert::CFormulasManager& oManager) { if ((NULL == pShape) || (!IsCustom())) return; @@ -264,7 +262,7 @@ namespace NSCustomVML // сначала заполним формулы for (size_t nIndex = 0; nIndex < m_arGuides.size(); ++nIndex) { - NSGuidesVML::CFormula oF; + NSCustomShapesConvert::CFormula oF; m_arGuides[nIndex].SetToFormula(oF); oManager.AddFormula(oF); } diff --git a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/CustomShape.cpp b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/CustomShape.cpp index 59a0235488..15723025ce 100644 --- a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/CustomShape.cpp +++ b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/CustomShape.cpp @@ -12,6 +12,8 @@ const double EMU_MM = 36000; using namespace NSOfficeDrawing; +namespace NSCustomShapesConvert +{ CCustomShape* CCustomShape::CreateByType(oox::MSOSPT type) { CCustomShape* pShape = NULL; @@ -260,3 +262,4 @@ CCustomShape* CCustomShape::CreateByType(oox::MSOSPT type) return pShape; } +} \ No newline at end of file diff --git a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/CustomShape.h b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/CustomShape.h index 98f2cb60c8..abe61b5302 100644 --- a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/CustomShape.h +++ b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/CustomShape.h @@ -5,16 +5,19 @@ #include "../ShapeType.h" #include "../../../ASCOfficePPTXFile/Editor/Drawing/Shapes/BaseShape/PPTShape/Enums.h" -class CCustomShape : public NSGuidesVML::CBaseShape +namespace NSCustomShapesConvert +{ + +class CCustomShape : public NSCustomShapesConvert::CBaseShape { public: - oox::MSOSPT m_eType; - NSGuidesVML::CFormulasManager m_oManager; + oox::MSOSPT m_eType; + NSCustomShapesConvert::CFormulasManager m_oManager; - NSCustomVML::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; public: @@ -37,32 +40,6 @@ public: return true; } - //void LoadAHList(XmlUtils::CXmlNode& oNode) - //{ - // m_arHandles.clear(); - - // XmlUtils::CXmlNodes oNodes; - // if (oNode.GetNodes(_T("v:h"), oNodes)) - // { - // int nCount = oNodes.GetCount(); - // for (int i = 0; i < nCount; ++i) - // { - // XmlUtils::CXmlNode oNodeH; - // oNodes.GetAt(i, oNodeH); - - // CHandle_ oH; - // oH.polar = oNodeH.GetAttribute(_T("polar")); - // oH.position = oNodeH.GetAttribute(_T("position")); - // oH.radiusrange = oNodeH.GetAttribute(_T("radiusrange")); - // oH.switchHandle = oNodeH.GetAttribute(_T("switch")); - // oH.xrange = oNodeH.GetAttribute(_T("xrange")); - // oH.yrange = oNodeH.GetAttribute(_T("yrange")); - - // m_arHandles.push_back(oH); - // } - // } - //} - virtual bool LoadConnectorsList(const std::wstring& xml) { return true; @@ -150,39 +127,5 @@ public: m_eType = oox::msosptNotPrimitive; return false; } - -//protected: -// -// bool GetPos(std::wstring str, LONG& lValue) -// { -// if (str.GetLength() == 0) -// return false; -// -// TCHAR mem = str.GetAt(0); -// -// bool bFormula = false; -// if ('@' == mem) -// { -// bFormula = true; -// str.Delete(0); -// } -// -// if (!NSStringUtils::IsNumber(str)) -// return false; -// -// lValue = 0; -// lValue = _ttoi(str); -// -// if (bFormula) -// { -// if (lValue >= 0 || lValue < m_oManager.m_arResults.size()) -// { -// lValue = m_oManager.m_arResults[lValue]; -// return true; -// } -// return false; -// } -// -// return true; -// } }; +} diff --git a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/CustomShapeConvert.h b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/CustomShapeConvert.h index 9d974a9f78..f24ab18618 100644 --- a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/CustomShapeConvert.h +++ b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/CustomShapeConvert.h @@ -5,7 +5,7 @@ #include "XmlWriter.h" -namespace NSGuidesVML +namespace NSCustomShapesConvert { static int __wstrlen(const wchar_t* str) { @@ -201,7 +201,7 @@ namespace NSGuidesVML m_lMaxAdjUse = -1; } - void ConvertCoef(NSGuidesVML::CFormParam pCoef) + void ConvertCoef(NSCustomShapesConvert::CFormParam pCoef) { if (pCoef.m_eType == ptValue) ConvertVal(pCoef.m_lParam, pCoef.m_eType, false, m_oCoef); @@ -214,7 +214,7 @@ namespace NSGuidesVML m_oParam.m_eType = ptFormula; m_oParam.m_lCoef = pCoef.m_lCoef; } - void ConvertCoef2(NSGuidesVML::CFormParam pCoef) + void ConvertCoef2(NSCustomShapesConvert::CFormParam pCoef) { if (pCoef.m_eType == ptValue) ConvertVal(pCoef.m_lParam, pCoef.m_eType, false, m_oGuidsRes); @@ -890,12 +890,12 @@ namespace NSGuidesVML if ('#' == strParam2[0]) { - LONG lRes = (LONG)NSGuidesVML::GetInteger(strParam2.substr(1)); + LONG lRes = (LONG)NSCustomShapesConvert::GetInteger(strParam2.substr(1)); GetValue(lRes, ptAdjust, false, oWriter); } else if ('@' == strParam2[0]) { - LONG lRes = (LONG)NSGuidesVML::GetInteger(strParam2.substr(1)); + LONG lRes = (LONG)NSCustomShapesConvert::GetInteger(strParam2.substr(1)); GetValue(lRes, ptFormula, false, oWriter); } else @@ -925,7 +925,7 @@ namespace NSGuidesVML for (int nIndex = 0; nIndex < oArray.size(); ++nIndex) { std::wstring str = oArray[nIndex]; - lValue = NSGuidesVML::GetValue(oArray[nIndex], eParamType, bRes); + lValue = NSCustomShapesConvert::GetValue(oArray[nIndex], eParamType, bRes); if (bRes) { if (0 != m_arSlicesPath.size()) @@ -1053,17 +1053,17 @@ namespace NSGuidesVML if ('#' == strParam[0]) { - lRes = (LONG)NSGuidesVML::GetInteger(strParam.substr(1)); + lRes = (LONG)NSCustomShapesConvert::GetInteger(strParam.substr(1)); strFrmla = GetValue2(lRes, ptAdjust, false) + L" " + strSize; } else if ('&' == strParam[0]) { - lRes = (LONG)NSGuidesVML::GetInteger(strParam.substr(1)); + lRes = (LONG)NSCustomShapesConvert::GetInteger(strParam.substr(1)); strFrmla = GetValue2(lRes, ptFormula, true) + L" " + strSize; } else if ('@' == strParam[0]) { - lRes = (LONG)NSGuidesVML::GetInteger(strParam.substr(1)); + lRes = (LONG)NSCustomShapesConvert::GetInteger(strParam.substr(1)); strFrmla = GetValue2(lRes, ptFormula, false) + L" " + strSize; } else if (!NSStringUtils::IsNumber(strParam)) @@ -1077,7 +1077,7 @@ namespace NSGuidesVML } else { - lRes = (LONG)NSGuidesVML::GetInteger(strParam.c_str()); + lRes = (LONG)NSCustomShapesConvert::GetInteger(strParam.c_str()); strFrmla = GetValue2(lRes, ptValue, false) + strSize; } @@ -1105,12 +1105,12 @@ namespace NSGuidesVML if ('#' == strParam[0]) { ptType = ptAdjust; - return (LONG)NSGuidesVML::GetInteger(strParam.substr(1).c_str()); + return (LONG)NSCustomShapesConvert::GetInteger(strParam.substr(1).c_str()); } else if ('@' == strParam[0]) { ptType = ptFormula; - return (LONG)NSGuidesVML::GetInteger(strParam.substr(1).c_str()); + return (LONG)NSCustomShapesConvert::GetInteger(strParam.substr(1).c_str()); } else if (!NSStringUtils::IsNumber(strParam)) { @@ -1125,7 +1125,7 @@ namespace NSGuidesVML else { ptType = ptValue; - return (LONG)NSGuidesVML::GetInteger(strParam.c_str()); + return (LONG)NSCustomShapesConvert::GetInteger(strParam.c_str()); } } void ConvertQuadrX(Aggplus::POINT pPoint, SPointType pPointType) diff --git a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/FormulaShape.cpp b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/FormulaShape.cpp index 92e1304264..9bd6b36679 100644 --- a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/FormulaShape.cpp +++ b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/FormulaShape.cpp @@ -2,7 +2,7 @@ #include "FormulaShape.h" -LONG NSGuidesVML::CFormula::CalculateFormula(NSGuidesVML::CFormulasManager* pManager) +LONG NSCustomShapesConvert::CFormula::CalculateFormula(NSCustomShapesConvert::CFormulasManager* pManager) { if ((0 > m_lIndex) || (m_lIndex >= pManager->m_arResults.size())) return 0; diff --git a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/FormulaShape.h b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/FormulaShape.h index 4f627dfbb5..8d68c23fd3 100644 --- a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/FormulaShape.h +++ b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/FormulaShape.h @@ -11,7 +11,7 @@ #include "../../../../DesktopEditor/graphics/aggplustypes.h" -namespace NSGuidesVML +namespace NSCustomShapesConvert { enum FormulaType { @@ -161,10 +161,7 @@ namespace NSGuidesVML return ftVal; } -} -namespace NSGuidesVML -{ struct SPointType { ParamType x; diff --git a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/GraphicsPath.h b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/GraphicsPath.h index 2a53fe9503..476c51c28a 100644 --- a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/GraphicsPath.h +++ b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/GraphicsPath.h @@ -5,14 +5,11 @@ #include "../../../../DesktopEditor/graphics/GraphicsPath.h" -//#include "../../Metric.h" -//#include "../../Attributes.h" - #define _USE_MATH_DEFINES #include //M_PI #include -namespace NSGuidesVML +namespace NSCustomShapesConvert { const double c_dMasterUnitsToInchKoef = 1.0 / 576; const double c_dInchToMillimetreKoef = 25.4; diff --git a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/PathShape.h b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/PathShape.h index d2b4d85b59..efeba509a4 100644 --- a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/PathShape.h +++ b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/PathShape.h @@ -3,7 +3,7 @@ #include "GraphicsPath.h" #include "FormulaShape.h" -namespace NSGuidesVML +namespace NSCustomShapesConvert { static std::wstring GetRulerVML(RulesType eRuler) { @@ -504,7 +504,7 @@ namespace NSGuidesVML width = ShapeSizeVML; height = ShapeSizeVML; //43200? } - void FromXML(std::wstring strPath, NSGuidesVML::CFormulasManager& pManager) + void FromXML(std::wstring strPath, NSCustomShapesConvert::CFormulasManager& pManager) { NSStringUtils::CheckPathOn_Fill_Stroke(strPath, m_bFill, m_bStroke); std::vector oArray; @@ -577,7 +577,7 @@ namespace NSGuidesVML public: std::vector m_arParts; - void FromXML(std::wstring strPath, NSGuidesVML::CFormulasManager& pManager) + void FromXML(std::wstring strPath, NSCustomShapesConvert::CFormulasManager& pManager) { m_arParts.clear(); std::vector oArray; diff --git a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/XmlWriter.h b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/XmlWriter.h index 152af0b004..5edef44842 100644 --- a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/XmlWriter.h +++ b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/XmlWriter.h @@ -3,7 +3,7 @@ //#include "../../../Common/DocxFormat/Source/Base/Nullable.h" #include "../../../DesktopEditor/common/File.h" -namespace NSGuidesVML +namespace NSCustomShapesConvert { static int GetInteger (const std::wstring& string) { diff --git a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/AccentBorderCallout2Type.h b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/AccentBorderCallout2Type.h index 72dc4db9ae..c8274b740c 100644 --- a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/AccentBorderCallout2Type.h +++ b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/AccentBorderCallout2Type.h @@ -2,6 +2,9 @@ #include "../CustomShape.h" // 51 +namespace NSCustomShapesConvert +{ + class CAccentBorderCallout2Type : public CCustomShape { public: @@ -42,4 +45,5 @@ public: oHandle3.position = _T("#4,#5"); m_arHandles.push_back(oHandle3); } -}; \ No newline at end of file +}; +} \ No newline at end of file diff --git a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/AccentCallout1Type.h b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/AccentCallout1Type.h index 08b4d2e43b..0ac1e7a295 100644 --- a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/AccentCallout1Type.h +++ b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/AccentCallout1Type.h @@ -2,6 +2,9 @@ #include "../CustomShape.h" // 44 +namespace NSCustomShapesConvert +{ + class CAccentCallout1Type : public CCustomShape { public: @@ -33,4 +36,5 @@ public: oHandle2.position = _T("#2,#3"); m_arHandles.push_back(oHandle2); } -}; \ No newline at end of file +}; +} \ No newline at end of file diff --git a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/AccentCallout2Type.h b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/AccentCallout2Type.h index febc68c12b..62149250ed 100644 --- a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/AccentCallout2Type.h +++ b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/AccentCallout2Type.h @@ -2,6 +2,9 @@ #include "../CustomShape.h" // 45 +namespace NSCustomShapesConvert +{ + class CAccentCallout2Type : public CCustomShape { public: @@ -41,4 +44,5 @@ public: oHandle3.position = _T("#4,#5"); m_arHandles.push_back(oHandle3); } -}; \ No newline at end of file +}; +} \ No newline at end of file diff --git a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/AccentCallout3Type.h b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/AccentCallout3Type.h index 7a796b49f5..9ad750fbed 100644 --- a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/AccentCallout3Type.h +++ b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/AccentCallout3Type.h @@ -2,6 +2,9 @@ #include "../CustomShape.h" // 46 +namespace NSCustomShapesConvert +{ + class CAccentCallout3Type : public CCustomShape { public: @@ -50,4 +53,5 @@ public: oHandle4.position = _T("#6,#7"); m_arHandles.push_back(oHandle4); } -}; \ No newline at end of file +}; +} \ No newline at end of file diff --git a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/AccentCallout90Type.h b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/AccentCallout90Type.h index ca0b3008e0..8e4aae22ae 100644 --- a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/AccentCallout90Type.h +++ b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/AccentCallout90Type.h @@ -2,6 +2,8 @@ #include "../CustomShape.h" // 179 +namespace NSCustomShapesConvert +{ class CAccentCallout90Type : public CCustomShape { public: @@ -34,4 +36,5 @@ public: oHandle2.position = _T("#2,#3"); m_arHandles.push_back(oHandle2); } -}; \ No newline at end of file +}; +} \ No newline at end of file diff --git a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/ActionButtonBack.h b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/ActionButtonBack.h index 1a24abc791..6c107d88b0 100644 --- a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/ActionButtonBack.h +++ b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/ActionButtonBack.h @@ -2,6 +2,9 @@ #include "../CustomShape.h" // 194 +namespace NSCustomShapesConvert +{ + class CActionButtonBackType : public CCustomShape { public: @@ -45,4 +48,5 @@ public: m_lLimoX = 10800; m_lLimoY = 10800; } -}; \ No newline at end of file +}; +} \ No newline at end of file diff --git a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/ActionButtonBeginning.h b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/ActionButtonBeginning.h index 1383e86651..bb3ba2fb70 100644 --- a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/ActionButtonBeginning.h +++ b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/ActionButtonBeginning.h @@ -2,6 +2,9 @@ #include "../CustomShape.h" // 196 +namespace NSCustomShapesConvert +{ + class CActionButtonBeginType : public CCustomShape { public: @@ -52,4 +55,5 @@ public: m_lLimoX = 10800; m_lLimoY = 10800; } -}; \ No newline at end of file +}; +} \ No newline at end of file diff --git a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/ActionButtonBlank.h b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/ActionButtonBlank.h index 8dbc94a6bc..5db24b3635 100644 --- a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/ActionButtonBlank.h +++ b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/ActionButtonBlank.h @@ -2,6 +2,9 @@ #include "../CustomShape.h" // 189 +namespace NSCustomShapesConvert +{ + class CActionButtonBlankType : public CCustomShape { public: @@ -36,4 +39,5 @@ public: m_lLimoX = 10800; m_lLimoY = 10800; } -}; \ No newline at end of file +}; +} \ No newline at end of file diff --git a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/ActionButtonDocument.h b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/ActionButtonDocument.h index 766746b527..2166448e5e 100644 --- a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/ActionButtonDocument.h +++ b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/ActionButtonDocument.h @@ -2,6 +2,9 @@ #include "../CustomShape.h" // 198 +namespace NSCustomShapesConvert +{ + class CActionButtonDocType : public CCustomShape { public: @@ -49,4 +52,5 @@ public: m_lLimoX = 10800; m_lLimoY = 10800; } -}; \ No newline at end of file +}; +} \ No newline at end of file diff --git a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/ActionButtonEnd.h b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/ActionButtonEnd.h index 9e37b7bdae..a050cc92ba 100644 --- a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/ActionButtonEnd.h +++ b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/ActionButtonEnd.h @@ -2,6 +2,9 @@ #include "../CustomShape.h" // 195 +namespace NSCustomShapesConvert +{ + class CActionButtonEndType : public CCustomShape { public: @@ -52,4 +55,5 @@ public: m_lLimoX = 10800; m_lLimoY = 10800; } -}; \ No newline at end of file +}; +} \ No newline at end of file diff --git a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/ActionButtonHelp.h b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/ActionButtonHelp.h index 6d22184558..7d4b7000e5 100644 --- a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/ActionButtonHelp.h +++ b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/ActionButtonHelp.h @@ -2,6 +2,9 @@ #include "../CustomShape.h" // 191 +namespace NSCustomShapesConvert +{ + class CActionButtonHelpType : public CCustomShape { public: @@ -89,4 +92,5 @@ public: m_lLimoX = 10800; m_lLimoY = 10800; } -}; \ No newline at end of file +}; +} \ No newline at end of file diff --git a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/ActionButtonHome.h b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/ActionButtonHome.h index 91e6494c3c..0704a3459d 100644 --- a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/ActionButtonHome.h +++ b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/ActionButtonHome.h @@ -2,6 +2,9 @@ #include "../CustomShape.h" // 190 +namespace NSCustomShapesConvert +{ + class CActionButtonHomeType : public CCustomShape { public: @@ -77,4 +80,5 @@ public: m_lLimoX = 10800; m_lLimoY = 10800; } -}; \ No newline at end of file +}; +} \ No newline at end of file diff --git a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/ActionButtonInfo.h b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/ActionButtonInfo.h index 9fba902f7a..723abb6840 100644 --- a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/ActionButtonInfo.h +++ b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/ActionButtonInfo.h @@ -2,6 +2,8 @@ #include "../CustomShape.h" // 192 +namespace NSCustomShapesConvert +{ class CActionButtonInfoType : public CCustomShape { public: @@ -84,4 +86,5 @@ public: m_lLimoX = 10800; m_lLimoY = 10800; } -}; \ No newline at end of file +}; +} \ No newline at end of file diff --git a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/ActionButtonMovie.h b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/ActionButtonMovie.h index 58df518711..ea7088dd86 100644 --- a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/ActionButtonMovie.h +++ b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/ActionButtonMovie.h @@ -2,6 +2,8 @@ #include "../CustomShape.h" // 200 +namespace NSCustomShapesConvert +{ class CActionButtonMovieType : public CCustomShape { public: @@ -98,4 +100,5 @@ public: m_lLimoX = 10800; m_lLimoY = 10800; } -}; \ No newline at end of file +}; +} \ No newline at end of file diff --git a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/ActionButtonNext.h b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/ActionButtonNext.h index 3226a0081a..88cdbbda79 100644 --- a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/ActionButtonNext.h +++ b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/ActionButtonNext.h @@ -2,6 +2,8 @@ #include "../CustomShape.h" // 193 +namespace NSCustomShapesConvert +{ class CActionButtonNextType : public CCustomShape { public: @@ -45,4 +47,5 @@ public: m_lLimoX = 10800; m_lLimoY = 10800; } -}; \ No newline at end of file +}; +} \ No newline at end of file diff --git a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/ActionButtonReturn.h b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/ActionButtonReturn.h index f9ebe316e1..2ec71840a7 100644 --- a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/ActionButtonReturn.h +++ b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/ActionButtonReturn.h @@ -2,6 +2,8 @@ #include "../CustomShape.h" // 197 +namespace NSCustomShapesConvert +{ class CActionButtonReturnType : public CCustomShape { public: @@ -67,4 +69,5 @@ public: m_lLimoX = 10800; m_lLimoY = 10800; } -}; \ No newline at end of file +}; +} \ No newline at end of file diff --git a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/ActionButtonSound.h b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/ActionButtonSound.h index 588457cd04..d9d2c163e6 100644 --- a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/ActionButtonSound.h +++ b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/ActionButtonSound.h @@ -2,6 +2,8 @@ #include "../CustomShape.h" // 199 +namespace NSCustomShapesConvert +{ class CActionButtonSoundType : public CCustomShape { public: @@ -66,4 +68,5 @@ public: m_lLimoX = 10800; m_lLimoY = 10800; } -}; \ No newline at end of file +}; +} \ No newline at end of file diff --git a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/BentArrowType.h b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/BentArrowType.h index 9579347f93..f00f7c94d6 100644 --- a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/BentArrowType.h +++ b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/BentArrowType.h @@ -2,6 +2,8 @@ #include "../CustomShape.h" // 91 +namespace NSCustomShapesConvert +{ class CBentArrowType : public CCustomShape { public: @@ -40,3 +42,4 @@ public: m_arHandles.push_back(oHandle1); } }; +} \ No newline at end of file diff --git a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/BentConnector.h b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/BentConnector.h index b17d361eec..c24eca1017 100644 --- a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/BentConnector.h +++ b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/BentConnector.h @@ -2,6 +2,8 @@ #include "../CustomShape.h" // 34 +namespace NSCustomShapesConvert +{ class CBentConnectorType : public CCustomShape { public: @@ -20,4 +22,5 @@ public: LoadConnectorsList(_T("0,0;21600,21600")); } -}; \ No newline at end of file +}; +} \ No newline at end of file diff --git a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/BentUpArrowType.h b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/BentUpArrowType.h index 47c6840202..471d27a9fa 100644 --- a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/BentUpArrowType.h +++ b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/BentUpArrowType.h @@ -2,6 +2,8 @@ #include "../CustomShape.h" // 90 +namespace NSCustomShapesConvert +{ class CBentUpArrowType : public CCustomShape { public: @@ -57,3 +59,4 @@ public: m_arHandles.push_back(oHandle2); } }; +} diff --git a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/BevelType.h b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/BevelType.h index b0ee3c1ea5..9466f1dae5 100644 --- a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/BevelType.h +++ b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/BevelType.h @@ -2,6 +2,8 @@ #include "../CustomShape.h" // 84 +namespace NSCustomShapesConvert +{ class CBevelType : public CCustomShape { public: @@ -41,4 +43,5 @@ public: m_lLimoX = 10800; m_lLimoY = 10800; } -}; \ No newline at end of file +}; +} \ No newline at end of file diff --git a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/BlockArcType.h b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/BlockArcType.h index f16eddbdf9..ee0404b866 100644 --- a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/BlockArcType.h +++ b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/BlockArcType.h @@ -2,6 +2,8 @@ #include "../CustomShape.h" // 95 +namespace NSCustomShapesConvert +{ class CBlockArcType : public CCustomShape { public: @@ -72,3 +74,4 @@ public: m_arHandles.push_back(oHandle1); } }; +} \ No newline at end of file diff --git a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/BorderCallout1Type.h b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/BorderCallout1Type.h index 5750056262..9d568084f7 100644 --- a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/BorderCallout1Type.h +++ b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/BorderCallout1Type.h @@ -2,6 +2,8 @@ #include "../CustomShape.h" // 47 +namespace NSCustomShapesConvert +{ class CBorderCallout1Type : public CCustomShape { public: @@ -34,4 +36,5 @@ public: oHandle2.position = _T("#2,#3"); m_arHandles.push_back(oHandle2); } -}; \ No newline at end of file +}; +} \ No newline at end of file diff --git a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/BorderCallout2Type.h b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/BorderCallout2Type.h index 61fd4b18ea..6f17dc5f55 100644 --- a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/BorderCallout2Type.h +++ b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/BorderCallout2Type.h @@ -2,6 +2,8 @@ #include "../CustomShape.h" // 48 +namespace NSCustomShapesConvert +{ class CBorderCallout2Type : public CCustomShape { public: @@ -42,4 +44,5 @@ public: oHandle3.position = _T("#4,#5"); m_arHandles.push_back(oHandle3); } -}; \ No newline at end of file +}; +} \ No newline at end of file diff --git a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/BorderCallout3Type.h b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/BorderCallout3Type.h index 5ebb22e295..1a2f757286 100644 --- a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/BorderCallout3Type.h +++ b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/BorderCallout3Type.h @@ -2,6 +2,8 @@ #include "../CustomShape.h" // 49 +namespace NSCustomShapesConvert +{ class CBorderCallout3Type : public CCustomShape { public: @@ -50,4 +52,5 @@ public: oHandle4.position = _T("#6,#7"); m_arHandles.push_back(oHandle4); } -}; \ No newline at end of file +}; +} \ No newline at end of file diff --git a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/BorderCallout90Type.h b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/BorderCallout90Type.h index 36df156b94..249e4907b5 100644 --- a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/BorderCallout90Type.h +++ b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/BorderCallout90Type.h @@ -2,6 +2,8 @@ #include "../CustomShape.h" // 180 +namespace NSCustomShapesConvert +{ class CBorderCallout90Type : public CCustomShape { public: @@ -34,4 +36,5 @@ public: oHandle2.position = _T("#2,#3"); m_arHandles.push_back(oHandle2); } -}; \ No newline at end of file +}; +} \ No newline at end of file diff --git a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/BracePairType.h b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/BracePairType.h index 05a0fe0798..bc6e382e93 100644 --- a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/BracePairType.h +++ b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/BracePairType.h @@ -2,6 +2,8 @@ #include "../CustomShape.h" // 186 +namespace NSCustomShapesConvert +{ class CBracePairType : public CCustomShape { public: @@ -45,3 +47,4 @@ public: m_lLimoY = 10800; } }; +} \ No newline at end of file diff --git a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/BracketPairType.h b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/BracketPairType.h index b70718bc96..339f175a39 100644 --- a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/BracketPairType.h +++ b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/BracketPairType.h @@ -2,6 +2,8 @@ #include "../CustomShape.h" // 185 +namespace NSCustomShapesConvert +{ class CBracketPairType : public CCustomShape { public: @@ -40,3 +42,4 @@ public: m_lLimoY = 10800; } }; +} \ No newline at end of file diff --git a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/Callout1Type.h b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/Callout1Type.h index a6eb8e39ec..c1bcdb46c4 100644 --- a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/Callout1Type.h +++ b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/Callout1Type.h @@ -2,6 +2,8 @@ #include "../CustomShape.h" // 41 +namespace NSCustomShapesConvert +{ class CCallout1Type : public CCustomShape { public: @@ -34,4 +36,5 @@ public: oHandle2.position = _T("#2,#3"); m_arHandles.push_back(oHandle2); } -}; \ No newline at end of file +}; +} \ No newline at end of file diff --git a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/Callout2Type.h b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/Callout2Type.h index a35ced4ca8..1247dc57ff 100644 --- a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/Callout2Type.h +++ b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/Callout2Type.h @@ -2,6 +2,8 @@ #include "../CustomShape.h" // 42 +namespace NSCustomShapesConvert +{ class CCallout2Type : public CCustomShape { public: @@ -42,4 +44,5 @@ public: oHandle3.position = _T("#4,#5"); m_arHandles.push_back(oHandle3); } -}; \ No newline at end of file +}; +} \ No newline at end of file diff --git a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/Callout3Type.h b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/Callout3Type.h index 2cdc7bf8e1..63e52ccf9e 100644 --- a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/Callout3Type.h +++ b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/Callout3Type.h @@ -2,6 +2,8 @@ #include "../CustomShape.h" // 43 +namespace NSCustomShapesConvert +{ class CCallout3Type : public CCustomShape { public: @@ -50,4 +52,5 @@ public: oHandle4.position = _T("#6,#7"); m_arHandles.push_back(oHandle4); } -}; \ No newline at end of file +}; +} \ No newline at end of file diff --git a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/Callout90Type.h b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/Callout90Type.h index 84c16d1461..4f7faa65e7 100644 --- a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/Callout90Type.h +++ b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/Callout90Type.h @@ -2,6 +2,8 @@ #include "../CustomShape.h" // 178 +namespace NSCustomShapesConvert +{ class CCallout90Type : public CCustomShape { public: @@ -34,4 +36,5 @@ public: oHandle2.position = _T("#2,#3"); m_arHandles.push_back(oHandle2); } -}; \ No newline at end of file +}; +} \ No newline at end of file diff --git a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/CanType.h b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/CanType.h index e85b9374aa..1ed4f4ec51 100644 --- a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/CanType.h +++ b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/CanType.h @@ -2,6 +2,8 @@ #include "../CustomShape.h" // 22 +namespace NSCustomShapesConvert +{ class CCanType : public CCustomShape { public: @@ -32,4 +34,5 @@ public: oHandle1.yrange = _T("0,10800"); m_arHandles.push_back(oHandle1); } -}; \ No newline at end of file +}; +} \ No newline at end of file diff --git a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/ChevronType.h b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/ChevronType.h index 5635bb0d49..dd42516a45 100644 --- a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/ChevronType.h +++ b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/ChevronType.h @@ -2,6 +2,8 @@ #include "../CustomShape.h" // 55 +namespace NSCustomShapesConvert +{ class CChevronType : public CCustomShape { public: @@ -33,3 +35,4 @@ public: } }; +} \ No newline at end of file diff --git a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/CircularArrowType.h b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/CircularArrowType.h index f56a69696e..5c6ca79997 100644 --- a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/CircularArrowType.h +++ b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/CircularArrowType.h @@ -2,6 +2,8 @@ #include "../CustomShape.h" // 99 +namespace NSCustomShapesConvert +{ class CCircularArrowType : public CCustomShape { public: @@ -81,5 +83,4 @@ public: m_arHandles.push_back(oHandle2); } }; - - +} \ No newline at end of file diff --git a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/CloudCalloutType.h b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/CloudCalloutType.h index 63b03d83d7..fced8e4f63 100644 --- a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/CloudCalloutType.h +++ b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/CloudCalloutType.h @@ -1,7 +1,10 @@ #pragma once #include "../CustomShape.h" + // 106 +namespace NSCustomShapesConvert +{ class CCloudCalloutType : public CCustomShape { public: @@ -64,4 +67,5 @@ public: oHandle1.position = _T("#0,#1"); m_arHandles.push_back(oHandle1); } -}; \ No newline at end of file +}; +} \ No newline at end of file diff --git a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/CubeType.h b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/CubeType.h index 3a8da3a090..0acd365158 100644 --- a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/CubeType.h +++ b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/CubeType.h @@ -2,6 +2,8 @@ #include "../CustomShape.h" // 16 +namespace NSCustomShapesConvert +{ class CCubeType : public CCustomShape { public: @@ -44,3 +46,4 @@ public: m_lLimoY = 10800; } }; +} \ No newline at end of file diff --git a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/CurvedConnector.h b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/CurvedConnector.h index e58d9a820a..c95fe9cd7a 100644 --- a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/CurvedConnector.h +++ b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/CurvedConnector.h @@ -2,6 +2,8 @@ #include "../CustomShape.h" // 38 +namespace NSCustomShapesConvert +{ class CCurvedConnectorType : public CCustomShape { public: @@ -24,4 +26,5 @@ public: LoadConnectorsList(_T("0,0;21600,21600")); } -}; \ No newline at end of file +}; +} \ No newline at end of file diff --git a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/CurvedDownArrowType.h b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/CurvedDownArrowType.h index f69dcd95d6..b818edffcb 100644 --- a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/CurvedDownArrowType.h +++ b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/CurvedDownArrowType.h @@ -2,6 +2,8 @@ #include "../CustomShape.h" // 105 +namespace NSCustomShapesConvert +{ class CCurvedDownArrowType : public CCustomShape { public: @@ -92,3 +94,4 @@ public: m_arHandles.push_back(oHandle3); } }; +} \ No newline at end of file diff --git a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/CurvedLeftArrowType.h b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/CurvedLeftArrowType.h index 2af99fc672..fa7f0b417c 100644 --- a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/CurvedLeftArrowType.h +++ b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/CurvedLeftArrowType.h @@ -2,6 +2,8 @@ #include "../CustomShape.h" // 103 +namespace NSCustomShapesConvert +{ class CCurvedLeftArrowType : public CCustomShape { public: @@ -88,3 +90,4 @@ public: m_arHandles.push_back(oHandle3); } }; +} diff --git a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/CurvedRightArrowType.h b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/CurvedRightArrowType.h index 44c2c0a605..26129ca3e8 100644 --- a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/CurvedRightArrowType.h +++ b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/CurvedRightArrowType.h @@ -2,6 +2,8 @@ #include "../CustomShape.h" // 102 +namespace NSCustomShapesConvert +{ class CCurvedRightArrowType : public CCustomShape { public: @@ -92,3 +94,4 @@ public: m_arHandles.push_back(oHandle3); } }; +} \ No newline at end of file diff --git a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/CurvedUpArrowType.h b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/CurvedUpArrowType.h index 8b7b500504..c28e2ce01e 100644 --- a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/CurvedUpArrowType.h +++ b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/CurvedUpArrowType.h @@ -2,6 +2,8 @@ #include "../CustomShape.h" //104 +namespace NSCustomShapesConvert +{ class CCurvedUpArrowType : public CCustomShape { public: @@ -88,3 +90,4 @@ public: m_arHandles.push_back(oHandle3); } }; +} \ No newline at end of file diff --git a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/DiamondType.h b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/DiamondType.h index caeafced82..488af1bcec 100644 --- a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/DiamondType.h +++ b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/DiamondType.h @@ -2,6 +2,8 @@ #include "../CustomShape.h" // 4 +namespace NSCustomShapesConvert +{ class CDiamondType : public CCustomShape { public: @@ -17,4 +19,5 @@ public: LoadTextRect(_T("5400,5400,16200,16200")); } -}; \ No newline at end of file +}; +} \ No newline at end of file diff --git a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/DonutType.h b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/DonutType.h index 701b3e49cc..5d3306cbbf 100644 --- a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/DonutType.h +++ b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/DonutType.h @@ -2,6 +2,8 @@ #include "../CustomShape.h" // 23 +namespace NSCustomShapesConvert +{ class CDonutType : public CCustomShape { public: @@ -29,3 +31,4 @@ public: m_arHandles.push_back(oHandle1); } }; +} \ No newline at end of file diff --git a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/DownArrowCalloutType.h b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/DownArrowCalloutType.h index 9436869e5c..a4b6e29474 100644 --- a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/DownArrowCalloutType.h +++ b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/DownArrowCalloutType.h @@ -2,6 +2,8 @@ #include "../CustomShape.h" // 80 +namespace NSCustomShapesConvert +{ class CDownArrowCalloutType : public CCustomShape { public: @@ -53,5 +55,5 @@ public: } }; - +} diff --git a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/DownArrowType.h b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/DownArrowType.h index e78c2b7f06..ef5c6578ba 100644 --- a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/DownArrowType.h +++ b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/DownArrowType.h @@ -2,6 +2,8 @@ #include "../CustomShape.h" // 67 +namespace NSCustomShapesConvert +{ class CDownArrowType : public CCustomShape { public: @@ -40,3 +42,4 @@ public: m_arHandles.push_back(oHandle1); } }; +} \ No newline at end of file diff --git a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/EllipseRibbon2Type.h b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/EllipseRibbon2Type.h index 27478371e4..2aeee18845 100644 --- a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/EllipseRibbon2Type.h +++ b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/EllipseRibbon2Type.h @@ -2,6 +2,8 @@ #include "../CustomShape.h" // 108 +namespace NSCustomShapesConvert +{ class CEllipceRibbon2Type : public CCustomShape { public: @@ -87,3 +89,4 @@ public: m_arHandles.push_back(oHandle3); } }; +} \ No newline at end of file diff --git a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/EllipseRibbonType.h b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/EllipseRibbonType.h index adb7d859ac..21a1be5b7f 100644 --- a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/EllipseRibbonType.h +++ b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/EllipseRibbonType.h @@ -2,6 +2,8 @@ #include "../CustomShape.h" // 107 +namespace NSCustomShapesConvert +{ class CEllipceRibbonType : public CCustomShape { public: @@ -90,4 +92,5 @@ public: oHandle3.yrange = _T("@27,@45"); m_arHandles.push_back(oHandle3); } -}; \ No newline at end of file +}; +} \ No newline at end of file diff --git a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/EllipseType.h b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/EllipseType.h index 3a224a79f6..2b2964421b 100644 --- a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/EllipseType.h +++ b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/EllipseType.h @@ -2,6 +2,8 @@ #include "../CustomShape.h" // 3 +namespace NSCustomShapesConvert +{ class CEllipseType : public CCustomShape { public: @@ -13,4 +15,5 @@ public: m_strPath = _T("m,10800qy10800,,21600,10800,10800,21600,,10800xe"); LoadTextRect(_T("3233,3233,18367,18367")); } -}; \ No newline at end of file +}; +} \ No newline at end of file diff --git a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/FlowChartAlternateProcessType.h b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/FlowChartAlternateProcessType.h index 70747076d7..ac8dc08f33 100644 --- a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/FlowChartAlternateProcessType.h +++ b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/FlowChartAlternateProcessType.h @@ -2,6 +2,8 @@ #include "../CustomShape.h" // 176 +namespace NSCustomShapesConvert +{ class CFlowChartAlternateProcessType : public CCustomShape { public: @@ -33,3 +35,4 @@ public: m_lLimoY = 10800; } }; +} \ No newline at end of file diff --git a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/FlowChartCollateType.h b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/FlowChartCollateType.h index d35e81432a..fea80d9eeb 100644 --- a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/FlowChartCollateType.h +++ b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/FlowChartCollateType.h @@ -2,6 +2,8 @@ #include "../CustomShape.h" // 125 +namespace NSCustomShapesConvert +{ class CFlowChartCollateType : public CCustomShape { public: @@ -16,4 +18,4 @@ public: } }; - +} diff --git a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/FlowChartConnectorType.h b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/FlowChartConnectorType.h index e06178c245..c942168a0e 100644 --- a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/FlowChartConnectorType.h +++ b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/FlowChartConnectorType.h @@ -2,6 +2,8 @@ #include "../CustomShape.h" // 120 +namespace NSCustomShapesConvert +{ class CFlowChartConnectorType : public CCustomShape { public: @@ -18,3 +20,4 @@ public: LoadTextRect(_T("3163,3163,18437,18437")); } }; +} diff --git a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/FlowChartDecisionType.h b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/FlowChartDecisionType.h index 488306328a..42dc19c558 100644 --- a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/FlowChartDecisionType.h +++ b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/FlowChartDecisionType.h @@ -2,6 +2,8 @@ #include "../CustomShape.h" // 110 +namespace NSCustomShapesConvert +{ class CFlowChartDecisionType : public CCustomShape { public: @@ -18,3 +20,4 @@ public: LoadTextRect(_T("5400,5400,16200,16200")); } }; +} \ No newline at end of file diff --git a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/FlowChartDelayType.h b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/FlowChartDelayType.h index 439cb126c9..968cb24e14 100644 --- a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/FlowChartDelayType.h +++ b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/FlowChartDelayType.h @@ -2,6 +2,8 @@ #include "../CustomShape.h" // 135 +namespace NSCustomShapesConvert +{ class CFlowChartDelayType : public CCustomShape { public: @@ -15,5 +17,5 @@ public: LoadTextRect(_T("0,3163,18437,18437")); } }; - +} diff --git a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/FlowChartDisplayType.h b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/FlowChartDisplayType.h index cc1218ece7..08ac5b31f8 100644 --- a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/FlowChartDisplayType.h +++ b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/FlowChartDisplayType.h @@ -2,6 +2,8 @@ #include "../CustomShape.h" // 134 +namespace NSCustomShapesConvert +{ class CFlowChartDisplayType : public CCustomShape { public: @@ -15,5 +17,5 @@ public: LoadTextRect(_T("3567,0,17955,21600")); } }; - +} diff --git a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/FlowChartDocumentType.h b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/FlowChartDocumentType.h index c357693ee6..4d71849e90 100644 --- a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/FlowChartDocumentType.h +++ b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/FlowChartDocumentType.h @@ -2,6 +2,8 @@ #include "../CustomShape.h" //114 +namespace NSCustomShapesConvert +{ class CFlowChartDocumentType : public CCustomShape { public: @@ -17,3 +19,4 @@ public: LoadTextRect(_T("0,0,21600,17322")); } }; +} \ No newline at end of file diff --git a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/FlowChartExtractType.h b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/FlowChartExtractType.h index f574cad50b..df15042e2b 100644 --- a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/FlowChartExtractType.h +++ b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/FlowChartExtractType.h @@ -2,6 +2,8 @@ #include "../CustomShape.h" // 127 +namespace NSCustomShapesConvert +{ class CFlowChartExtractType : public CCustomShape { public: @@ -15,5 +17,4 @@ public: LoadTextRect(_T("5400,10800,16200,21600")); } }; - - +} \ No newline at end of file diff --git a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/FlowChartInputOutputType.h b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/FlowChartInputOutputType.h index 2bd1cbf7ed..c53fdeaabf 100644 --- a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/FlowChartInputOutputType.h +++ b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/FlowChartInputOutputType.h @@ -2,6 +2,8 @@ #include "../CustomShape.h" // 111 +namespace NSCustomShapesConvert +{ class CFlowChartInputOutputType : public CCustomShape { public: @@ -18,3 +20,4 @@ public: LoadTextRect(_T("4321,0,17204,21600")); } }; +} diff --git a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/FlowChartInternalStorageType.h b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/FlowChartInternalStorageType.h index 8dc779258a..815bd1fb2f 100644 --- a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/FlowChartInternalStorageType.h +++ b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/FlowChartInternalStorageType.h @@ -2,6 +2,8 @@ #include "../CustomShape.h" // 113 +namespace NSCustomShapesConvert +{ class CFlowChartInternalStorageType : public CCustomShape { public: @@ -18,3 +20,4 @@ public: LoadTextRect(_T("4236,4236,21600,21600")); } }; +} \ No newline at end of file diff --git a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/FlowChartMagneticDiskType.h b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/FlowChartMagneticDiskType.h index f0f7e809af..db3622e52e 100644 --- a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/FlowChartMagneticDiskType.h +++ b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/FlowChartMagneticDiskType.h @@ -2,6 +2,8 @@ #include "../CustomShape.h" // 132 +namespace NSCustomShapesConvert +{ class CFlowChartMagneticDiskType : public CCustomShape { public: @@ -22,5 +24,5 @@ public: LoadTextRect(_T("0,6782,21600,18209")); } }; - +} diff --git a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/FlowChartMagneticDrumType.h b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/FlowChartMagneticDrumType.h index 87efe0452c..95a2f3dc05 100644 --- a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/FlowChartMagneticDrumType.h +++ b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/FlowChartMagneticDrumType.h @@ -2,6 +2,8 @@ #include "../CustomShape.h" // 133 +namespace NSCustomShapesConvert +{ class CFlowChartMagneticDrumType : public CCustomShape { public: @@ -22,5 +24,6 @@ public: LoadTextRect(_T("3581,0,14438,21600")); } }; +} diff --git a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/FlowChartMagneticTapeType.h b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/FlowChartMagneticTapeType.h index b626c0a948..82a4a4d9b7 100644 --- a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/FlowChartMagneticTapeType.h +++ b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/FlowChartMagneticTapeType.h @@ -2,6 +2,8 @@ #include "../CustomShape.h" // 131 +namespace NSCustomShapesConvert +{ class CFlowChartMagneticTapeType : public CCustomShape { public: @@ -15,5 +17,6 @@ public: LoadTextRect(_T("3163,3163,18437,18437")); } }; +} diff --git a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/FlowChartManualInputType.h b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/FlowChartManualInputType.h index 5b5ae5b450..d0e9142566 100644 --- a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/FlowChartManualInputType.h +++ b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/FlowChartManualInputType.h @@ -2,6 +2,8 @@ #include "../CustomShape.h" // 118 +namespace NSCustomShapesConvert +{ class CFlowChartManualInputType : public CCustomShape { public: @@ -17,4 +19,5 @@ public: LoadTextRect(_T("0,4291,21600,21600")); } -}; \ No newline at end of file +}; +} \ No newline at end of file diff --git a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/FlowChartManualOperationType.h b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/FlowChartManualOperationType.h index 9757f9f592..4b58a0e170 100644 --- a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/FlowChartManualOperationType.h +++ b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/FlowChartManualOperationType.h @@ -2,6 +2,8 @@ #include "../CustomShape.h" // 119 +namespace NSCustomShapesConvert +{ class CFlowChartManualOperationType : public CCustomShape { public: @@ -17,3 +19,4 @@ public: LoadTextRect(_T("4321,0,17204,21600")); } }; +} \ No newline at end of file diff --git a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/FlowChartMergeType.h b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/FlowChartMergeType.h index f171484758..f77575f767 100644 --- a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/FlowChartMergeType.h +++ b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/FlowChartMergeType.h @@ -2,6 +2,8 @@ #include "../CustomShape.h" // 128 +namespace NSCustomShapesConvert +{ class CFlowChartMergeType : public CCustomShape { public: @@ -15,5 +17,6 @@ public: LoadTextRect(_T("5400,0,16200,10800")); } }; +} diff --git a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/FlowChartMultidocumentType.h b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/FlowChartMultidocumentType.h index e65c291ee1..1b86be6243 100644 --- a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/FlowChartMultidocumentType.h +++ b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/FlowChartMultidocumentType.h @@ -2,6 +2,8 @@ #include "../CustomShape.h" // 115 +namespace NSCustomShapesConvert +{ class CFlowChartMultidocumentType : public CCustomShape { public: @@ -17,3 +19,4 @@ public: LoadTextRect(_T("0,3675,18595,18022")); } }; +} \ No newline at end of file diff --git a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/FlowChartOffpageConnectorType.h b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/FlowChartOffpageConnectorType.h index 1237c30b00..337bfb087a 100644 --- a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/FlowChartOffpageConnectorType.h +++ b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/FlowChartOffpageConnectorType.h @@ -2,6 +2,8 @@ #include "../CustomShape.h" // 177 +namespace NSCustomShapesConvert +{ class CFlowChartOffpageConnectorType : public CCustomShape { public: @@ -16,3 +18,4 @@ public: } }; +} \ No newline at end of file diff --git a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/FlowChartOnlineStorageType.h b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/FlowChartOnlineStorageType.h index ef46304928..14689b0393 100644 --- a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/FlowChartOnlineStorageType.h +++ b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/FlowChartOnlineStorageType.h @@ -2,6 +2,8 @@ #include "../CustomShape.h" // 130 +namespace NSCustomShapesConvert +{ class CFlowChartOnlineStorageType : public CCustomShape { public: @@ -15,5 +17,5 @@ public: LoadTextRect(_T("3600,0,17997,21600")); } }; - +} diff --git a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/FlowChartOrType.h b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/FlowChartOrType.h index 8db305929e..e4629fff00 100644 --- a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/FlowChartOrType.h +++ b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/FlowChartOrType.h @@ -2,6 +2,8 @@ #include "../CustomShape.h" // 124 +namespace NSCustomShapesConvert +{ class CFlowChartOrType : public CCustomShape { public: @@ -17,3 +19,4 @@ public: }; +} \ No newline at end of file diff --git a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/FlowChartPredefinedProcessType.h b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/FlowChartPredefinedProcessType.h index 0a31f7a964..91a9ac4471 100644 --- a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/FlowChartPredefinedProcessType.h +++ b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/FlowChartPredefinedProcessType.h @@ -2,6 +2,8 @@ #include "../CustomShape.h" // 112 +namespace NSCustomShapesConvert +{ class CFlowChartPredefinedProcessType : public CCustomShape { public: @@ -17,3 +19,4 @@ public: LoadTextRect(_T("2610,0,18990,21600")); } }; +} \ No newline at end of file diff --git a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/FlowChartPreparationType.h b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/FlowChartPreparationType.h index 7f66b1c220..7f4b74f14a 100644 --- a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/FlowChartPreparationType.h +++ b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/FlowChartPreparationType.h @@ -2,6 +2,8 @@ #include "../CustomShape.h" // 117 +namespace NSCustomShapesConvert +{ class CFlowChartPreparationType : public CCustomShape { public: @@ -16,4 +18,5 @@ public: LoadConnectorsList(_T("Rectangle")); LoadTextRect(_T("4353,0,17214,21600")); } -}; \ No newline at end of file +}; +} \ No newline at end of file diff --git a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/FlowChartProcessType.h b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/FlowChartProcessType.h index 31a14fb504..980323f703 100644 --- a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/FlowChartProcessType.h +++ b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/FlowChartProcessType.h @@ -2,6 +2,8 @@ #include "../CustomShape.h" // 109 +namespace NSCustomShapesConvert +{ class CFlowChartProcessType : public CCustomShape { public: @@ -15,3 +17,4 @@ public: LoadConnectorsList(_T("Rectangle")); } }; +} \ No newline at end of file diff --git a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/FlowChartPunchedCardType.h b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/FlowChartPunchedCardType.h index b2ec3cd41f..309638ee40 100644 --- a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/FlowChartPunchedCardType.h +++ b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/FlowChartPunchedCardType.h @@ -2,6 +2,8 @@ #include "../CustomShape.h" // 121 +namespace NSCustomShapesConvert +{ class CFlowChartPunchedCardType : public CCustomShape { public: @@ -16,4 +18,4 @@ public: } }; - +} diff --git a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/FlowChartPunchedTapeType.h b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/FlowChartPunchedTapeType.h index f182f06a74..d15b46a661 100644 --- a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/FlowChartPunchedTapeType.h +++ b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/FlowChartPunchedTapeType.h @@ -2,6 +2,8 @@ #include "../CustomShape.h" // 122 +namespace NSCustomShapesConvert +{ class CFlowChartPunchedTapeType : public CCustomShape { public: @@ -15,5 +17,5 @@ public: LoadTextRect(_T("0,4337,21600,17260")); } }; - +} diff --git a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/FlowChartSortType.h b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/FlowChartSortType.h index 637b9a7731..47333e0ab8 100644 --- a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/FlowChartSortType.h +++ b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/FlowChartSortType.h @@ -2,6 +2,8 @@ #include "../CustomShape.h" // 126 +namespace NSCustomShapesConvert +{ class CFlowChartSortType : public CCustomShape { public: @@ -15,5 +17,5 @@ public: LoadTextRect(_T("5400,5400,16200,16200")); } }; - +} diff --git a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/FlowChartSummingJunctionType.h b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/FlowChartSummingJunctionType.h index 9e23aeda75..9530db282d 100644 --- a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/FlowChartSummingJunctionType.h +++ b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/FlowChartSummingJunctionType.h @@ -2,6 +2,8 @@ #include "../CustomShape.h" // 123 +namespace NSCustomShapesConvert +{ class CFlowChartSummingJunctionType : public CCustomShape { public: @@ -15,5 +17,5 @@ public: LoadTextRect(_T("3163,3163,18437,18437")); } }; - +} diff --git a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/FlowChartTerminatorType.h b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/FlowChartTerminatorType.h index d9e9fe8c18..6afd3ca4b9 100644 --- a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/FlowChartTerminatorType.h +++ b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/FlowChartTerminatorType.h @@ -2,6 +2,8 @@ #include "../CustomShape.h" // 116 +namespace NSCustomShapesConvert +{ class CFlowChartTerminatorType : public CCustomShape { public: @@ -17,3 +19,4 @@ public: LoadTextRect(_T("1018,3163,20582,18437")); } }; +} \ No newline at end of file diff --git a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/FoldedCornerType.h b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/FoldedCornerType.h index ee5657d5dd..a9137677b3 100644 --- a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/FoldedCornerType.h +++ b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/FoldedCornerType.h @@ -2,6 +2,8 @@ #include "../CustomShape.h" // 65 +namespace NSCustomShapesConvert +{ class CFoldedCornerType : public CCustomShape { public: @@ -39,4 +41,5 @@ public: m_arHandles.push_back(oHandle1); } -}; \ No newline at end of file +}; +} \ No newline at end of file diff --git a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/HeartType.h b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/HeartType.h index 08d6fbbe12..554faee770 100644 --- a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/HeartType.h +++ b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/HeartType.h @@ -2,6 +2,8 @@ #include "../CustomShape.h" // 74 +namespace NSCustomShapesConvert +{ class CHeartType : public CCustomShape { public: @@ -22,7 +24,7 @@ public: LoadTextRect(_T("5037,2277,16557,13677")); } }; - +} diff --git a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/HexagonType.h b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/HexagonType.h index 71875b5445..2e5347659b 100644 --- a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/HexagonType.h +++ b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/HexagonType.h @@ -2,6 +2,8 @@ #include "../CustomShape.h" // 9 +namespace NSCustomShapesConvert +{ class CHexagonType : public CCustomShape { public: @@ -32,3 +34,4 @@ public: } }; +} \ No newline at end of file diff --git a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/HomePlateType.h b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/HomePlateType.h index 09faf7d12f..e227d30824 100644 --- a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/HomePlateType.h +++ b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/HomePlateType.h @@ -2,6 +2,8 @@ #include "../CustomShape.h" // 15 +namespace NSCustomShapesConvert +{ class CHomePlateType : public CCustomShape { public: @@ -32,5 +34,4 @@ public: m_arHandles.push_back(oHandle1); } }; - - +} \ No newline at end of file diff --git a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/HorisontalScrollType.h b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/HorisontalScrollType.h index dda41840ae..cddeb4987c 100644 --- a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/HorisontalScrollType.h +++ b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/HorisontalScrollType.h @@ -2,6 +2,8 @@ #include "../CustomShape.h" // 98 +namespace NSCustomShapesConvert +{ class CHorizontalScrollType : public CCustomShape { public: @@ -48,4 +50,5 @@ public: m_lLimoX = 10800; m_lLimoY = 10800; } -}; \ No newline at end of file +}; +} \ No newline at end of file diff --git a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/IrregularSealOneType.h b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/IrregularSealOneType.h index 2ee9ea6590..472fc9d519 100644 --- a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/IrregularSealOneType.h +++ b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/IrregularSealOneType.h @@ -2,6 +2,8 @@ #include "../CustomShape.h" // 71 +namespace NSCustomShapesConvert +{ class CIrregularSealOneType : public CCustomShape { public: @@ -23,3 +25,4 @@ public: LoadTextRect(_T("4627,6320,16702,13937")); } }; +} \ No newline at end of file diff --git a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/IrregularSealTwo.h b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/IrregularSealTwo.h index 56a6f4dfb4..5aafd6a84e 100644 --- a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/IrregularSealTwo.h +++ b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/IrregularSealTwo.h @@ -2,6 +2,8 @@ #include "../CustomShape.h" // 72 +namespace NSCustomShapesConvert +{ class CIrregularSealTwo : public CCustomShape { public: @@ -24,3 +26,4 @@ public: } }; +} \ No newline at end of file diff --git a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/IsoscelesTriangleType.h b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/IsoscelesTriangleType.h index 28d632886c..c1064cfcbb 100644 --- a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/IsoscelesTriangleType.h +++ b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/IsoscelesTriangleType.h @@ -2,6 +2,8 @@ #include "../CustomShape.h" // 5 +namespace NSCustomShapesConvert +{ class CIsoscelesTriangleType : public CCustomShape { public: @@ -28,4 +30,5 @@ public: oHandle1.xrange = _T("0,21600"); m_arHandles.push_back(oHandle1); } -}; \ No newline at end of file +}; +} \ No newline at end of file diff --git a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/LeftArrowCalloutType.h b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/LeftArrowCalloutType.h index 7bd2558b88..78f4872cea 100644 --- a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/LeftArrowCalloutType.h +++ b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/LeftArrowCalloutType.h @@ -2,6 +2,8 @@ #include "../CustomShape.h" // 77 +namespace NSCustomShapesConvert +{ class CLeftArrowCalloutType : public CCustomShape { public: @@ -52,5 +54,4 @@ public: m_arHandles.push_back(oHandle3); } }; - - +} \ No newline at end of file diff --git a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/LeftArrowType.h b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/LeftArrowType.h index 10666f9467..b29352f58f 100644 --- a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/LeftArrowType.h +++ b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/LeftArrowType.h @@ -2,6 +2,8 @@ #include "../CustomShape.h" // 66 +namespace NSCustomShapesConvert +{ class CLeftArrowType : public CCustomShape { public: @@ -40,3 +42,4 @@ public: m_arHandles.push_back(oHandle1); } }; +} \ No newline at end of file diff --git a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/LeftBraceType.h b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/LeftBraceType.h index 61b39d2641..5e25380b3c 100644 --- a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/LeftBraceType.h +++ b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/LeftBraceType.h @@ -2,6 +2,8 @@ #include "../CustomShape.h" // 87 +namespace NSCustomShapesConvert +{ class CLeftBraceType : public CCustomShape { public: @@ -44,4 +46,5 @@ public: m_arHandles.push_back(oHandle1); m_arHandles.push_back(oHandle2); } -}; \ No newline at end of file +}; +} \ No newline at end of file diff --git a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/LeftBracketType.h b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/LeftBracketType.h index 2220c3c08d..025190eb97 100644 --- a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/LeftBracketType.h +++ b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/LeftBracketType.h @@ -2,6 +2,8 @@ #include "../CustomShape.h" // 85 +namespace NSCustomShapesConvert +{ class CLeftBracketType : public CCustomShape { public: @@ -30,3 +32,4 @@ public: m_arHandles.push_back(oHandle1); } }; +} diff --git a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/LeftRightArrowCalloutType.h b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/LeftRightArrowCalloutType.h index 8c2bed72a3..529160f2a8 100644 --- a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/LeftRightArrowCalloutType.h +++ b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/LeftRightArrowCalloutType.h @@ -2,6 +2,8 @@ #include "../CustomShape.h" // 81 +namespace NSCustomShapesConvert +{ class CLeftRightArrowCalloutType : public CCustomShape { public: @@ -54,5 +56,5 @@ public: m_arHandles.push_back(oHandle3); } }; - +} diff --git a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/LeftRightArrowType.h b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/LeftRightArrowType.h index 1b25348bab..99e0823a27 100644 --- a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/LeftRightArrowType.h +++ b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/LeftRightArrowType.h @@ -2,6 +2,8 @@ #include "../CustomShape.h" // 69 +namespace NSCustomShapesConvert +{ class CLeftRightArrowType : public CCustomShape { public: @@ -45,3 +47,4 @@ public: } }; +} \ No newline at end of file diff --git a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/LeftRightUpArrow.h b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/LeftRightUpArrow.h index f51b388ac9..33e5829adc 100644 --- a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/LeftRightUpArrow.h +++ b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/LeftRightUpArrow.h @@ -2,6 +2,8 @@ #include "../CustomShape.h" // 182 +namespace NSCustomShapesConvert +{ class CLeftRightUpArrow : public CCustomShape { public: @@ -56,3 +58,4 @@ public: m_arHandles.push_back(oHandle2); } }; +} \ No newline at end of file diff --git a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/LeftUpArrowType.h b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/LeftUpArrowType.h index a6a080d5b9..88dd184f8e 100644 --- a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/LeftUpArrowType.h +++ b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/LeftUpArrowType.h @@ -2,6 +2,8 @@ #include "../CustomShape.h" // 89 +namespace NSCustomShapesConvert +{ class CLeftUpArrowType : public CCustomShape { public: @@ -55,3 +57,4 @@ public: m_arHandles.push_back(oHandle2); } }; +} \ No newline at end of file diff --git a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/LightningBoltType.h b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/LightningBoltType.h index 5d4be58759..aaec3d5818 100644 --- a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/LightningBoltType.h +++ b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/LightningBoltType.h @@ -2,6 +2,8 @@ #include "../CustomShape.h" // 73 +namespace NSCustomShapesConvert +{ class CLightningBoltType : public CCustomShape { public: @@ -25,3 +27,4 @@ public: LoadTextRect(_T("8757,7437,13917,14277")); } }; +} \ No newline at end of file diff --git a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/LineType.h b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/LineType.h index 195be5d2b4..6592da00f3 100644 --- a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/LineType.h +++ b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/LineType.h @@ -2,6 +2,8 @@ #include "../CustomShape.h" // 20 +namespace NSCustomShapesConvert +{ class CLineType : public CCustomShape { public: @@ -14,4 +16,5 @@ public: LoadConnectorsList(_T("0,0;21600,21600;10800,10800")); } -}; \ No newline at end of file +}; +} \ No newline at end of file diff --git a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/MoonType.h b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/MoonType.h index 9b5f935be6..1ac3e9d8df 100644 --- a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/MoonType.h +++ b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/MoonType.h @@ -2,6 +2,8 @@ #include "../CustomShape.h" // 184 +namespace NSCustomShapesConvert +{ class CMoonType : public CCustomShape { public: @@ -47,3 +49,4 @@ public: m_arHandles.push_back(oHandle1); } }; +} \ No newline at end of file diff --git a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/NoSmokingType.h b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/NoSmokingType.h index d6582671de..b5dde55cdd 100644 --- a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/NoSmokingType.h +++ b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/NoSmokingType.h @@ -2,6 +2,8 @@ #include "../CustomShape.h" // 57 +namespace NSCustomShapesConvert +{ class CNoSmokingType : public CCustomShape { public: @@ -43,3 +45,4 @@ public: } }; +} \ No newline at end of file diff --git a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/NotchedRightArrowType.h b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/NotchedRightArrowType.h index 195df40858..6a9d811dcf 100644 --- a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/NotchedRightArrowType.h +++ b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/NotchedRightArrowType.h @@ -2,6 +2,8 @@ #include "../CustomShape.h" // 94 +namespace NSCustomShapesConvert +{ class CNotchedRightArrowType : public CCustomShape { public: @@ -39,3 +41,4 @@ public: m_arHandles.push_back(oHandle1); } }; +} \ No newline at end of file diff --git a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/OctagonType.h b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/OctagonType.h index 699498ef68..52cb5391a7 100644 --- a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/OctagonType.h +++ b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/OctagonType.h @@ -2,6 +2,8 @@ #include "../CustomShape.h" // 10 +namespace NSCustomShapesConvert +{ class COctagonType : public CCustomShape { public: @@ -38,4 +40,5 @@ public: m_lLimoX = 10800; m_lLimoY = 10800; } -}; \ No newline at end of file +}; +} \ No newline at end of file diff --git a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/ParallelogramType.h b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/ParallelogramType.h index 1fb3d1581c..5f5dca9baa 100644 --- a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/ParallelogramType.h +++ b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/ParallelogramType.h @@ -2,6 +2,8 @@ #include "../CustomShape.h" // 7 +namespace NSCustomShapesConvert +{ class CParallelogramType : public CCustomShape { public: @@ -38,3 +40,4 @@ public: m_arHandles.push_back(oHandle1); } }; +} \ No newline at end of file diff --git a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/PentagonType.h b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/PentagonType.h index 426965d356..59b0885e62 100644 --- a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/PentagonType.h +++ b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/PentagonType.h @@ -2,6 +2,8 @@ #include "../CustomShape.h" // 56 +namespace NSCustomShapesConvert +{ class CPentagonType : public CCustomShape { public: @@ -24,3 +26,4 @@ public: LoadTextRect(_T("4200,5077,17400,21600")); } }; +} \ No newline at end of file diff --git a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/PlaqueType.h b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/PlaqueType.h index 9ca575e711..bf1090a9af 100644 --- a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/PlaqueType.h +++ b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/PlaqueType.h @@ -2,6 +2,8 @@ #include "../CustomShape.h" // 21 +namespace NSCustomShapesConvert +{ class CPlaqueType : public CCustomShape { public: @@ -38,3 +40,4 @@ public: m_lLimoY = 10800; } }; +} \ No newline at end of file diff --git a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/PlusType.h b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/PlusType.h index 82a4c58151..e65e34563e 100644 --- a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/PlusType.h +++ b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/PlusType.h @@ -2,6 +2,8 @@ #include "../CustomShape.h" // 11 +namespace NSCustomShapesConvert +{ class CPlusType : public CCustomShape { public: @@ -39,3 +41,4 @@ public: m_lLimoY = 10800; } }; +} \ No newline at end of file diff --git a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/QuadArrowCalloutType.h b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/QuadArrowCalloutType.h index 75c066c0d5..1f5deac883 100644 --- a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/QuadArrowCalloutType.h +++ b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/QuadArrowCalloutType.h @@ -2,6 +2,8 @@ #include "../CustomShape.h" // 83 +namespace NSCustomShapesConvert +{ class CQuadArrowCalloutType : public CCustomShape { public: @@ -49,5 +51,4 @@ public: m_arHandles.push_back(oHandle3); } }; - - +} \ No newline at end of file diff --git a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/QuadArrowType.h b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/QuadArrowType.h index 9aacca258e..2aade1af5c 100644 --- a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/QuadArrowType.h +++ b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/QuadArrowType.h @@ -2,6 +2,8 @@ #include "../CustomShape.h" // 76 +namespace NSCustomShapesConvert +{ class CQuadArrowType : public CCustomShape { public: @@ -43,3 +45,4 @@ public: m_arHandles.push_back(oHandle2); } }; +} \ No newline at end of file diff --git a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/RectangleType.h b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/RectangleType.h index 6f2834ee74..3430069751 100644 --- a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/RectangleType.h +++ b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/RectangleType.h @@ -2,6 +2,8 @@ #include "../CustomShape.h" // 1 +namespace NSCustomShapesConvert +{ class CRectangleType : public CCustomShape { public: @@ -13,3 +15,4 @@ public: m_strPath = _T("m,l,21600r21600,l21600,xe"); } }; +} diff --git a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/RibbonDownType.h b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/RibbonDownType.h index 32923954c5..9134469c9e 100644 --- a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/RibbonDownType.h +++ b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/RibbonDownType.h @@ -2,6 +2,8 @@ #include "../CustomShape.h" // 53 +namespace NSCustomShapesConvert +{ class CRibbonDownType : public CCustomShape { public: @@ -61,3 +63,4 @@ public: m_arHandles.push_back(oHandle2); } }; +} \ No newline at end of file diff --git a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/RibbonUpType.h b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/RibbonUpType.h index e8274355ea..30769193c7 100644 --- a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/RibbonUpType.h +++ b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/RibbonUpType.h @@ -2,6 +2,8 @@ #include "../CustomShape.h" // 54 +namespace NSCustomShapesConvert +{ class CRibbonUpType : public CCustomShape { public: @@ -66,3 +68,4 @@ public: m_arHandles.push_back(oHandle2); } }; +} \ No newline at end of file diff --git a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/RightArrowCalloutType.h b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/RightArrowCalloutType.h index 406579715b..735cc0abf3 100644 --- a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/RightArrowCalloutType.h +++ b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/RightArrowCalloutType.h @@ -2,6 +2,8 @@ #include "../CustomShape.h" // 78 +namespace NSCustomShapesConvert +{ class CRightArrowCalloutType : public CCustomShape { public: @@ -51,5 +53,6 @@ public: m_arHandles.push_back(oHandle3); } }; +} diff --git a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/RightArrowType.h b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/RightArrowType.h index b17ef02343..929c0ff48b 100644 --- a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/RightArrowType.h +++ b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/RightArrowType.h @@ -2,6 +2,8 @@ #include "../CustomShape.h" // 13 +namespace NSCustomShapesConvert +{ class CRightArrowType : public CCustomShape { public: @@ -40,3 +42,4 @@ public: m_arHandles.push_back(oHandle1); } }; +} \ No newline at end of file diff --git a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/RightBracetype.h b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/RightBracetype.h index 2f0b7a3973..f134020cf8 100644 --- a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/RightBracetype.h +++ b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/RightBracetype.h @@ -2,6 +2,8 @@ #include "../CustomShape.h" // 88 +namespace NSCustomShapesConvert +{ class CRightBracetype : public CCustomShape { public: @@ -42,3 +44,4 @@ public: m_arHandles.push_back(oHandle2); } }; +} \ No newline at end of file diff --git a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/RightBracketType.h b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/RightBracketType.h index e7c432b22c..2ac500e7d7 100644 --- a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/RightBracketType.h +++ b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/RightBracketType.h @@ -2,6 +2,8 @@ #include "../CustomShape.h" // 86 +namespace NSCustomShapesConvert +{ class CRightBracketType : public CCustomShape { public: @@ -30,3 +32,4 @@ public: m_arHandles.push_back(oHandle1); } }; +} diff --git a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/RightTriangleType.h b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/RightTriangleType.h index d1c3d2e481..d34c60e125 100644 --- a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/RightTriangleType.h +++ b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/RightTriangleType.h @@ -2,6 +2,8 @@ #include "../CustomShape.h" // 6 +namespace NSCustomShapesConvert +{ class CRightTriangleType : public CCustomShape { public: @@ -17,3 +19,4 @@ public: LoadTextRect(_T("1800,12600,12600,19800")); } }; +} diff --git a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/RoundedRectangleType.h b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/RoundedRectangleType.h index 74a1ddef31..c8e83f3313 100644 --- a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/RoundedRectangleType.h +++ b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/RoundedRectangleType.h @@ -2,6 +2,8 @@ #include "../CustomShape.h" // 2 +namespace NSCustomShapesConvert +{ class CRoundedRectangleType : public CCustomShape { public: @@ -28,4 +30,5 @@ public: m_lLimoX = 10800; m_lLimoY = 10800; } -}; \ No newline at end of file +}; +} \ No newline at end of file diff --git a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/Seal16Type.h b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/Seal16Type.h index 26fc5adcae..72f607c467 100644 --- a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/Seal16Type.h +++ b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/Seal16Type.h @@ -2,6 +2,8 @@ #include "../CustomShape.h" // 59 +namespace NSCustomShapesConvert +{ class CSeal16Type : public CCustomShape { public: @@ -40,5 +42,4 @@ public: m_arHandles.push_back(oHandle1); } }; - - +} diff --git a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/Seal24Type.h b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/Seal24Type.h index 15de38b21f..99b753b1ee 100644 --- a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/Seal24Type.h +++ b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/Seal24Type.h @@ -2,6 +2,8 @@ #include "../CustomShape.h" // 92 +namespace NSCustomShapesConvert +{ class CSeal24Type : public CCustomShape { public: @@ -46,5 +48,5 @@ public: m_arHandles.push_back(oHandle1); } }; - +} diff --git a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/Seal32Type.h b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/Seal32Type.h index 726018bb64..c368dab50c 100644 --- a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/Seal32Type.h +++ b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/Seal32Type.h @@ -2,6 +2,8 @@ #include "../CustomShape.h" // 60 +namespace NSCustomShapesConvert +{ class CSeal32Type : public CCustomShape { public: @@ -52,5 +54,5 @@ public: m_arHandles.push_back(oHandle1); } }; - +} diff --git a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/Seal4Type.h b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/Seal4Type.h index 56e2a4f82f..bfb65c1a82 100644 --- a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/Seal4Type.h +++ b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/Seal4Type.h @@ -2,6 +2,8 @@ #include "../CustomShape.h" // 187 +namespace NSCustomShapesConvert +{ class CSeal4Type : public CCustomShape { public: @@ -30,3 +32,4 @@ public: }; +} \ No newline at end of file diff --git a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/Seal8Type.h b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/Seal8Type.h index dc242a60b7..7e5b77adbf 100644 --- a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/Seal8Type.h +++ b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/Seal8Type.h @@ -2,6 +2,9 @@ #include "../CustomShape.h" // 58 +namespace NSCustomShapesConvert +{ + class CSeal8Type : public CCustomShape { public: @@ -34,5 +37,6 @@ public: m_arHandles.push_back(oHandle1); } }; +} diff --git a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/SmileyFaceType.h b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/SmileyFaceType.h index 0f226a28b3..ec20d9eda9 100644 --- a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/SmileyFaceType.h +++ b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/SmileyFaceType.h @@ -2,6 +2,9 @@ #include "../CustomShape.h" // 96 +namespace NSCustomShapesConvert +{ + class CSmileyFaceType : public CCustomShape { public: @@ -28,4 +31,5 @@ public: oHandle1.yrange = _T("15510,17520"); m_arHandles.push_back(oHandle1); } -}; \ No newline at end of file +}; +} \ No newline at end of file diff --git a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/Startype.h b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/Startype.h index 3934c31a82..e128cf2cfb 100644 --- a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/Startype.h +++ b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/Startype.h @@ -2,6 +2,9 @@ #include "../CustomShape.h" // 12 +namespace NSCustomShapesConvert +{ + class CStarType : public CCustomShape { public: @@ -17,3 +20,4 @@ public: LoadTextRect(_T("6720,8259,14880,15628")); } }; +} \ No newline at end of file diff --git a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/StraightConnectorType.h b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/StraightConnectorType.h index b122e89bcd..e998969689 100644 --- a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/StraightConnectorType.h +++ b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/StraightConnectorType.h @@ -2,6 +2,9 @@ #include "../CustomShape.h" // 32 +namespace NSCustomShapesConvert +{ + class CStraightConnectorType : public CCustomShape { public: @@ -12,3 +15,4 @@ public: LoadConnectorsList(_T("0,0;21600,21600")); } }; +} diff --git a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/StripedRightArrowType.h b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/StripedRightArrowType.h index b36552d793..110d69423c 100644 --- a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/StripedRightArrowType.h +++ b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/StripedRightArrowType.h @@ -2,6 +2,9 @@ #include "../CustomShape.h" // 93 +namespace NSCustomShapesConvert +{ + class CStripedRightArrowType : public CCustomShape { public: @@ -40,3 +43,4 @@ public: m_arHandles.push_back(oHandle1); } }; +} \ No newline at end of file diff --git a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/SunType.h b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/SunType.h index 225ecf314b..d3dbe13e9a 100644 --- a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/SunType.h +++ b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/SunType.h @@ -2,6 +2,9 @@ #include "../CustomShape.h" // 183 +namespace NSCustomShapesConvert +{ + class CSunType : public CCustomShape { public: @@ -44,3 +47,4 @@ public: m_arHandles.push_back(oHandle1); } }; +} \ No newline at end of file diff --git a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/TextboxType.h b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/TextboxType.h index 816d013c1d..b6d9915d5f 100644 --- a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/TextboxType.h +++ b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/TextboxType.h @@ -3,6 +3,9 @@ ///////// !!!!!!!!!!!!!!!!!!!! ///////////// // 202 +namespace NSCustomShapesConvert +{ + class CTextboxType : public CCustomShape { public: @@ -14,3 +17,4 @@ public: m_strPath = _T("m,l,21600r21600,l21600,xe"); } }; +} \ No newline at end of file diff --git a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/TrapezoidType.h b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/TrapezoidType.h index 76537649fe..a97a593a87 100644 --- a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/TrapezoidType.h +++ b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/TrapezoidType.h @@ -2,6 +2,9 @@ #include "../CustomShape.h" // 8 +namespace NSCustomShapesConvert +{ + class CTrapezoidType : public CCustomShape { public: @@ -37,3 +40,4 @@ public: m_arHandles.push_back(oHandle1); } }; +} \ No newline at end of file diff --git a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/UpArrowCalloutType.h b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/UpArrowCalloutType.h index ffc8764a1b..4f7fc52c24 100644 --- a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/UpArrowCalloutType.h +++ b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/UpArrowCalloutType.h @@ -2,6 +2,9 @@ #include "../CustomShape.h" // 79 +namespace NSCustomShapesConvert +{ + class CUpArrowCalloutType : public CCustomShape { public: @@ -52,5 +55,4 @@ public: m_arHandles.push_back(oHandle3); } }; - - +} \ No newline at end of file diff --git a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/UpArrowType.h b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/UpArrowType.h index 6253fc1d5e..d8ffbd8914 100644 --- a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/UpArrowType.h +++ b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/UpArrowType.h @@ -2,6 +2,9 @@ #include "../CustomShape.h" // 68 +namespace NSCustomShapesConvert +{ + class CUpArrowType : public CCustomShape { public: @@ -37,3 +40,4 @@ public: m_arHandles.push_back(oHandle1); } }; +} \ No newline at end of file diff --git a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/UpDownArrowCalloutType.h b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/UpDownArrowCalloutType.h index a949719e19..8f1876652c 100644 --- a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/UpDownArrowCalloutType.h +++ b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/UpDownArrowCalloutType.h @@ -2,6 +2,9 @@ #include "../CustomShape.h" // 82 +namespace NSCustomShapesConvert +{ + class CUpDownArrowCalloutType : public CCustomShape { public: @@ -54,5 +57,4 @@ public: m_arHandles.push_back(oHandle3); } }; - - +} \ No newline at end of file diff --git a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/UpDownArrowType.h b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/UpDownArrowType.h index f70a1ede69..73c90e98c6 100644 --- a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/UpDownArrowType.h +++ b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/UpDownArrowType.h @@ -2,6 +2,9 @@ #include "../CustomShape.h" // 70 +namespace NSCustomShapesConvert +{ + class CUpDownArrowType : public CCustomShape { public: @@ -43,3 +46,4 @@ public: m_arHandles.push_back(oHandle1); } }; +} \ No newline at end of file diff --git a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/UturnArrowType.h b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/UturnArrowType.h index 674732f677..a0653352fe 100644 --- a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/UturnArrowType.h +++ b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/UturnArrowType.h @@ -2,6 +2,9 @@ #include "../CustomShape.h" // 101 +namespace NSCustomShapesConvert +{ + class CUturnArrowType : public CCustomShape { public: @@ -22,4 +25,5 @@ public: LoadTextRect(_T("0,8310,6110,21600")); } -}; \ No newline at end of file +}; +} \ No newline at end of file diff --git a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/VerticalScrollType.h b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/VerticalScrollType.h index 5b29580ef5..33dd7ea2c0 100644 --- a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/VerticalScrollType.h +++ b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/VerticalScrollType.h @@ -2,6 +2,9 @@ #include "../CustomShape.h" // 97 +namespace NSCustomShapesConvert +{ + class CVerticalScrollType : public CCustomShape { public: @@ -48,4 +51,5 @@ public: m_lLimoX = 10800; m_lLimoY = 10800; } -}; \ No newline at end of file +}; +} \ No newline at end of file diff --git a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/WaveDoubleType.h b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/WaveDoubleType.h index de0ed7b489..3a6412e19a 100644 --- a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/WaveDoubleType.h +++ b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/WaveDoubleType.h @@ -2,6 +2,9 @@ #include "../CustomShape.h" // 188 +namespace NSCustomShapesConvert +{ + class CWaveDoubleType : public CCustomShape { public: @@ -88,4 +91,5 @@ public: oHandle2.xrange = _T("8640,12960"); m_arHandles.push_back(oHandle2); } -}; \ No newline at end of file +}; +} \ No newline at end of file diff --git a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/WaveType.h b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/WaveType.h index faaedcc1c6..8e489dd744 100644 --- a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/WaveType.h +++ b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/WaveType.h @@ -2,6 +2,9 @@ #include "../CustomShape.h" // 64 +namespace NSCustomShapesConvert +{ + class CWaveType : public CCustomShape { public: @@ -75,4 +78,5 @@ public: oHandle2.xrange = _T("8640,12960"); m_arHandles.push_back(oHandle2); } -}; \ No newline at end of file +}; +} \ No newline at end of file diff --git a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/WedgeEllipseCalloutType.h b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/WedgeEllipseCalloutType.h index 5a10edb600..59ca35a7b1 100644 --- a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/WedgeEllipseCalloutType.h +++ b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/WedgeEllipseCalloutType.h @@ -2,6 +2,9 @@ #include "../CustomShape.h" // 63 +namespace NSCustomShapesConvert +{ + class CWedgeEllipseCalloutType : public CCustomShape { public: @@ -46,4 +49,5 @@ public: oHandle1.position = _T("#0,#1"); m_arHandles.push_back(oHandle1); } -}; \ No newline at end of file +}; +} \ No newline at end of file diff --git a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/WedgeRectCalloutType.h b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/WedgeRectCalloutType.h index 6cdbfaf883..aae42692eb 100644 --- a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/WedgeRectCalloutType.h +++ b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/WedgeRectCalloutType.h @@ -2,6 +2,9 @@ #include "../CustomShape.h" // 61 +namespace NSCustomShapesConvert +{ + class CWedgeRectCalloutType : public CCustomShape { public: @@ -59,3 +62,4 @@ public: m_arHandles.push_back(oHandle1); } }; +} \ No newline at end of file diff --git a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/WedgeRoundedRectCalloutType.h b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/WedgeRoundedRectCalloutType.h index e7b9a096aa..d6c35becb2 100644 --- a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/WedgeRoundedRectCalloutType.h +++ b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/WedgeRoundedRectCalloutType.h @@ -2,6 +2,9 @@ #include "../CustomShape.h" // 62 +namespace NSCustomShapesConvert +{ + class CWedgeRoundedRectCalloutType : public CCustomShape { public: @@ -60,3 +63,4 @@ public: m_arHandles.push_back(oHandle1); } }; +} \ No newline at end of file diff --git a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/accentbordercallout1type.h b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/accentbordercallout1type.h index b0277308d3..4e50fc3d62 100644 --- a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/accentbordercallout1type.h +++ b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/accentbordercallout1type.h @@ -2,6 +2,9 @@ #include "../CustomShape.h" // 50 +namespace NSCustomShapesConvert +{ + class CAccentBorderCallout1Type : public CCustomShape { public: @@ -34,4 +37,5 @@ public: oHandle2.position = _T("#2,#3"); m_arHandles.push_back(oHandle2); } -}; \ No newline at end of file +}; +} \ No newline at end of file diff --git a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/accentbordercallout3type.h b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/accentbordercallout3type.h index cd455cdaaa..1bb58f4477 100644 --- a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/accentbordercallout3type.h +++ b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/accentbordercallout3type.h @@ -2,6 +2,8 @@ #include "../CustomShape.h" // 52 +namespace NSCustomShapesConvert +{ class CAccentBorderCallout3Type : public CCustomShape { public: @@ -49,4 +51,5 @@ public: oHandle4.position = _T("#6,#7"); m_arHandles.push_back(oHandle4); } -}; \ No newline at end of file +}; +} \ No newline at end of file diff --git a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/accentbordercallout90type.h b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/accentbordercallout90type.h index 3635377173..221465a4b2 100644 --- a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/accentbordercallout90type.h +++ b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/accentbordercallout90type.h @@ -2,6 +2,9 @@ #include "../CustomShape.h" // 181 +namespace NSCustomShapesConvert +{ + class CAccentBorderCallout90Type : public CCustomShape { public: @@ -33,4 +36,5 @@ public: oHandle2.position = _T("#2,#3"); m_arHandles.push_back(oHandle2); } -}; \ No newline at end of file +}; +} \ No newline at end of file diff --git a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/arctype.h b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/arctype.h index 665a16e8ef..766f5756e5 100644 --- a/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/arctype.h +++ b/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/arctype.h @@ -2,6 +2,8 @@ #include "../CustomShape.h" // 19 +namespace NSCustomShapesConvert +{ class CArcType : public CCustomShape { public: @@ -34,4 +36,5 @@ public: oHandle2.polar = _T("@0,@1"); m_arHandles.push_back(oHandle2); } -}; \ No newline at end of file +}; +} \ No newline at end of file diff --git a/ASCOfficeXlsFile2/source/XlsXlsxConverter/XlsConverter.cpp b/ASCOfficeXlsFile2/source/XlsXlsxConverter/XlsConverter.cpp index 410092153c..a73a3ceb71 100644 --- a/ASCOfficeXlsFile2/source/XlsXlsxConverter/XlsConverter.cpp +++ b/ASCOfficeXlsFile2/source/XlsXlsxConverter/XlsConverter.cpp @@ -866,7 +866,6 @@ void XlsConverter::convert(ODRAW::OfficeArtRecord * art) art->serialize(strm); xlsx_context->get_drawing_context().set_sheet_anchor(strm.str()); - xlsx_context->get_drawing_context().set_child_anchor(ch->_x, ch->_y, ch->_cx, ch->_cy); }break; } } diff --git a/ASCOfficeXlsFile2/source/XlsXlsxConverter/xlsx_comments_context.cpp b/ASCOfficeXlsFile2/source/XlsXlsxConverter/xlsx_comments_context.cpp index 91e51d616d..0c843c4ab4 100644 --- a/ASCOfficeXlsFile2/source/XlsXlsxConverter/xlsx_comments_context.cpp +++ b/ASCOfficeXlsFile2/source/XlsXlsxConverter/xlsx_comments_context.cpp @@ -127,7 +127,7 @@ void xlsx_comments_context::start_comment () { impl_->current_.ref_ = L""; impl_->current_.visibly_ = false; - impl_->current_.fill_ = L"ffff3f"; + impl_->current_.fill_ = L"FFFFE1"; impl_->current_.line_ = L"3465af"; } void xlsx_comments_context::set_size (double width_pt, double height_pt, double x_pt, double y_pt) diff --git a/ASCOfficeXlsFile2/source/XlsXlsxConverter/xlsx_drawing_context.cpp b/ASCOfficeXlsFile2/source/XlsXlsxConverter/xlsx_drawing_context.cpp index ab92856424..a320f75cf7 100644 --- a/ASCOfficeXlsFile2/source/XlsXlsxConverter/xlsx_drawing_context.cpp +++ b/ASCOfficeXlsFile2/source/XlsXlsxConverter/xlsx_drawing_context.cpp @@ -750,8 +750,7 @@ void xlsx_drawing_context::serialize_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; @@ -773,7 +772,7 @@ std::wstring xlsx_drawing_context::convert_custom_shape(_drawing_state_ptr & dra for (int i = 0 ; i < drawing_state->custom_guides.size(); i++) {//todooo объеденить/срастить !! - NSCustomVML::CGuide guid; + NSCustomShapesConvert::CGuide guid; guid.m_eType = drawing_state->custom_guides[i].m_eType; guid.m_param_type1 = drawing_state->custom_guides[i].m_param_type1; @@ -790,10 +789,10 @@ std::wstring xlsx_drawing_context::convert_custom_shape(_drawing_state_ptr & dra { if (0 == drawing_state->custom_segments[i].m_nCount) { - if ((NSGuidesVML::rtEnd != drawing_state->custom_segments[i].m_eRuler) && - (NSGuidesVML::rtNoFill != drawing_state->custom_segments[i].m_eRuler) && - (NSGuidesVML::rtNoStroke != drawing_state->custom_segments[i].m_eRuler) && - (NSGuidesVML::rtClose != drawing_state->custom_segments[i].m_eRuler)) + if ((NSCustomShapesConvert::rtEnd != drawing_state->custom_segments[i].m_eRuler) && + (NSCustomShapesConvert::rtNoFill != drawing_state->custom_segments[i].m_eRuler) && + (NSCustomShapesConvert::rtNoStroke != drawing_state->custom_segments[i].m_eRuler) && + (NSCustomShapesConvert::rtClose != drawing_state->custom_segments[i].m_eRuler)) { continue; } @@ -809,7 +808,7 @@ std::wstring xlsx_drawing_context::convert_custom_shape(_drawing_state_ptr & dra } } if (drawing_state->custom_path >=0) - shape->m_oCustomVML.SetPath((NSGuidesVML::RulesType)drawing_state->custom_path); + shape->m_oCustomVML.SetPath((NSCustomShapesConvert::RulesType)drawing_state->custom_path); shape->m_oCustomVML.ToCustomShape(shape, shape->m_oManager); shape->ReCalculate(); @@ -822,12 +821,12 @@ std::wstring xlsx_drawing_context::convert_custom_shape(_drawing_state_ptr & dra shape->m_oPath.SetCoordsize(drawing_state->custom_rect.cx, drawing_state->custom_rect.cy); } - NSGuidesVML::CFormParam pParamCoef; - pParamCoef.m_eType = NSGuidesVML::ptValue; + NSCustomShapesConvert::CFormParam pParamCoef; + pParamCoef.m_eType = NSCustomShapesConvert::ptValue; pParamCoef.m_lParam = 65536; pParamCoef.m_lCoef = 65536; - NSGuidesVML::CFormulaConverter pFormulaConverter; + NSCustomShapesConvert::CFormulaConverter pFormulaConverter; //coeff pFormulaConverter.ConvertCoef(pParamCoef);