diff --git a/MsBinaryFile/Common/Vml/BaseShape.h b/MsBinaryFile/Common/Vml/BaseShape.h
index 23cde0ec65..e97ede41a8 100644
--- a/MsBinaryFile/Common/Vml/BaseShape.h
+++ b/MsBinaryFile/Common/Vml/BaseShape.h
@@ -31,7 +31,7 @@
  */
 #pragma once
 
-#include "Path.h"
+#include "VmlPath.h"
 #include "../../../OOXML/Common/SimpleTypes_Base.h"
 
 #include <boost/shared_ptr.hpp>
diff --git a/MsBinaryFile/Common/Vml/PPTShape/Ppt2PptxShapeConverter.h b/MsBinaryFile/Common/Vml/PPTShape/Ppt2PptxShapeConverter.h
index fdeb8f6654..f9b218f97c 100644
--- a/MsBinaryFile/Common/Vml/PPTShape/Ppt2PptxShapeConverter.h
+++ b/MsBinaryFile/Common/Vml/PPTShape/Ppt2PptxShapeConverter.h
@@ -31,7 +31,7 @@
  */
 #pragma once
 #include "PptFormula.h"
-#include "../Path.h"
+#include "../VmlPath.h"
 #include "../PPTShape/PptShape.h"
 #include "../PPTXShape/PptxShape.h"
 
diff --git a/MsBinaryFile/Common/Vml/Path.cpp b/MsBinaryFile/Common/Vml/VmlPath.cpp
similarity index 99%
rename from MsBinaryFile/Common/Vml/Path.cpp
rename to MsBinaryFile/Common/Vml/VmlPath.cpp
index b2972f7862..9aa74eb573 100644
--- a/MsBinaryFile/Common/Vml/Path.cpp
+++ b/MsBinaryFile/Common/Vml/VmlPath.cpp
@@ -30,7 +30,7 @@
  *
  */
 
-#include "Path.h"
+#include "VmlPath.h"
 
 namespace ODRAW
 {    
diff --git a/MsBinaryFile/Common/Vml/Path.h b/MsBinaryFile/Common/Vml/VmlPath.h
similarity index 100%
rename from MsBinaryFile/Common/Vml/Path.h
rename to MsBinaryFile/Common/Vml/VmlPath.h
diff --git a/MsBinaryFile/Projects/PPTFormatLib/Windows/PPTFormatLib.vcxproj b/MsBinaryFile/Projects/PPTFormatLib/Windows/PPTFormatLib.vcxproj
index 384d75ff20..f45015e29a 100644
--- a/MsBinaryFile/Projects/PPTFormatLib/Windows/PPTFormatLib.vcxproj
+++ b/MsBinaryFile/Projects/PPTFormatLib/Windows/PPTFormatLib.vcxproj
@@ -234,156 +234,6 @@
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\..\Common\ODraw\BaseShape.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\CustomGeomShape.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\CustomShape.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\CustomShapeConvert.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\FormulaShape.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\GraphicsPath.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\accentbordercallout1type.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\AccentBorderCallout2Type.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\accentbordercallout3type.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\accentbordercallout90type.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\AccentCallout1Type.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\AccentCallout2Type.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\AccentCallout3Type.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\AccentCallout90Type.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\ActionButtonBack.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\ActionButtonBeginning.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\ActionButtonBlank.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\ActionButtonDocument.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\ActionButtonEnd.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\ActionButtonHelp.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\ActionButtonHome.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\ActionButtonInfo.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\ActionButtonMovie.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\ActionButtonNext.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\ActionButtonReturn.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\ActionButtonSound.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\arctype.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\BentArrowType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\BentConnector.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\BentUpArrowType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\BevelType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\BlockArcType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\BorderCallout1Type.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\BorderCallout2Type.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\BorderCallout3Type.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\BorderCallout90Type.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\BracePairType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\BracketPairType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\Callout1Type.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\Callout2Type.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\Callout3Type.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\Callout90Type.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\CanType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\ChevronType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\CircularArrowType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\CloudCalloutType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\CubeType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\CurvedConnector.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\CurvedDownArrowType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\CurvedLeftArrowType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\CurvedRightArrowType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\CurvedUpArrowType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\DiamondType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\DonutType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\DownArrowCalloutType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\DownArrowType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\EllipseRibbon2Type.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\EllipseRibbonType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\EllipseType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartAlternateProcessType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartCollateType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartConnectorType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartDecisionType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartDelayType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartDisplayType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartDocumentType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartExtractType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartInputOutputType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartInternalStorageType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartMagneticDiskType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartMagneticDrumType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartMagneticTapeType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartManualInputType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartManualOperationType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartMergeType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartMultidocumentType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartOffpageConnectorType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartOnlineStorageType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartOrType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartPredefinedProcessType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartPreparationType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartProcessType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartPunchedCardType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartPunchedTapeType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartSortType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartSummingJunctionType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartTerminatorType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\FoldedCornerType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\HeartType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\HexagonType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\HomePlateType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\HorisontalScrollType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\IrregularSealOneType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\IrregularSealTwo.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\IsoscelesTriangleType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\LeftArrowCalloutType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\LeftArrowType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\LeftBraceType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\LeftBracketType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\LeftRightArrowCalloutType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\LeftRightArrowType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\LeftRightUpArrow.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\LeftUpArrowType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\LightningBoltType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\LineType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\MoonType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\NoSmokingType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\NotchedRightArrowType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\OctagonType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\ParallelogramType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\PentagonType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\PlaqueType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\PlusType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\QuadArrowCalloutType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\QuadArrowType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\RectangleType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\RibbonDownType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\RibbonUpType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\RightArrowCalloutType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\RightArrowType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\RightBracetype.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\RightBracketType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\RightTriangleType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\RoundedRectangleType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\Seal16Type.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\Seal24Type.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\Seal32Type.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\Seal4Type.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\Seal8Type.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\SmileyFaceType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\Startype.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\StraightConnectorType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\StripedRightArrowType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\SunType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\TextboxType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\TrapezoidType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\UpArrowCalloutType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\UpArrowType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\UpDownArrowCalloutType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\UpDownArrowType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\UturnArrowType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\VerticalScrollType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\WaveDoubleType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\WaveType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\WedgeEllipseCalloutType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\WedgeRectCalloutType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\WedgeRoundedRectCalloutType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\PathShape.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\PresetShapesHeader.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\XmlWriter.h" />
     <ClInclude Include="..\..\..\PptFile\Converter\Animation\AnimationParser.h" />
     <ClInclude Include="..\..\..\PptFile\Converter\Animation\Animation_1995.h" />
     <ClInclude Include="..\..\..\PptFile\Converter\Animation\hashcode10.h" />
@@ -638,155 +488,6 @@
     <ClInclude Include="..\..\..\PptFile\Structures\_includer.h" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\..\Common\ODraw\BaseShape.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\CustomGeomShape.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\CustomShape.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\CustomShapeConvert.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\FormulaShape.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\GraphicsPath.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\accentbordercallout1type.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\AccentBorderCallout2Type.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\accentbordercallout3type.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\accentbordercallout90type.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\AccentCallout1Type.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\AccentCallout2Type.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\AccentCallout3Type.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\AccentCallout90Type.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\ActionButtonBack.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\ActionButtonBeginning.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\ActionButtonBlank.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\ActionButtonDocument.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\ActionButtonEnd.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\ActionButtonHelp.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\ActionButtonHome.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\ActionButtonInfo.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\ActionButtonMovie.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\ActionButtonNext.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\ActionButtonReturn.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\ActionButtonSound.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\arctype.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\BentArrowType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\BentConnector.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\BentUpArrowType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\BevelType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\BlockArcType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\BorderCallout1Type.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\BorderCallout2Type.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\BorderCallout3Type.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\BorderCallout90Type.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\BracePairType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\BracketPairType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\Callout1Type.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\Callout2Type.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\Callout3Type.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\Callout90Type.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\CanType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\ChevronType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\CircularArrowType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\CloudCalloutType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\CubeType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\CurvedConnector.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\CurvedDownArrowType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\CurvedLeftArrowType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\CurvedRightArrowType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\CurvedUpArrowType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\DiamondType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\DonutType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\DownArrowCalloutType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\DownArrowType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\EllipseRibbon2Type.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\EllipseRibbonType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\EllipseType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartAlternateProcessType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartCollateType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartConnectorType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartDecisionType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartDelayType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartDisplayType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartDocumentType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartExtractType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartInputOutputType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartInternalStorageType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartMagneticDiskType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartMagneticDrumType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartMagneticTapeType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartManualInputType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartManualOperationType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartMergeType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartMultidocumentType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartOffpageConnectorType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartOnlineStorageType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartOrType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartPredefinedProcessType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartPreparationType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartProcessType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartPunchedCardType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartPunchedTapeType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartSortType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartSummingJunctionType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartTerminatorType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\FoldedCornerType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\HeartType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\HexagonType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\HomePlateType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\HorisontalScrollType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\IrregularSealOneType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\IrregularSealTwo.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\IsoscelesTriangleType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\LeftArrowCalloutType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\LeftArrowType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\LeftBraceType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\LeftBracketType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\LeftRightArrowCalloutType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\LeftRightArrowType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\LeftRightUpArrow.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\LeftUpArrowType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\LightningBoltType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\LineType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\MoonType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\NoSmokingType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\NotchedRightArrowType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\OctagonType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\ParallelogramType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\PentagonType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\PlaqueType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\PlusType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\QuadArrowCalloutType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\QuadArrowType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\RectangleType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\RibbonDownType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\RibbonUpType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\RightArrowCalloutType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\RightArrowType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\RightBracetype.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\RightBracketType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\RightTriangleType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\RoundedRectangleType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\Seal16Type.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\Seal24Type.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\Seal32Type.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\Seal4Type.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\Seal8Type.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\SmileyFaceType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\Startype.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\StraightConnectorType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\StripedRightArrowType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\SunType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\TextboxType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\TrapezoidType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\UpArrowCalloutType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\UpArrowType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\UpDownArrowCalloutType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\UpDownArrowType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\UturnArrowType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\VerticalScrollType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\WaveDoubleType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\WaveType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\WedgeEllipseCalloutType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\WedgeRectCalloutType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\WedgeRoundedRectCalloutType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\PathShape.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\XmlWriter.cpp" />
     <ClCompile Include="..\..\..\PptFile\Converter\Animation\AnimationParser.cpp" />
     <ClCompile Include="..\..\..\PptFile\Converter\Animation\Animation_1995.cpp" />
     <ClCompile Include="..\..\..\PptFile\Converter\Animation\hashcode10.cpp" />
diff --git a/MsBinaryFile/Projects/PPTFormatLib/Windows/PPTFormatLib.vcxproj.filters b/MsBinaryFile/Projects/PPTFormatLib/Windows/PPTFormatLib.vcxproj.filters
index 6fff818d37..646a618746 100644
--- a/MsBinaryFile/Projects/PPTFormatLib/Windows/PPTFormatLib.vcxproj.filters
+++ b/MsBinaryFile/Projects/PPTFormatLib/Windows/PPTFormatLib.vcxproj.filters
@@ -31,12 +31,6 @@
     <Filter Include="OOXElements\PptShape\ppt shapes">
       <UniqueIdentifier>{07ef31dd-8f40-4607-8b27-6104a24bc093}</UniqueIdentifier>
     </Filter>
-    <Filter Include="ODraw">
-      <UniqueIdentifier>{351cd85f-4a78-46e6-9e66-9f894302175e}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="ODraw\oldAutoShapes">
-      <UniqueIdentifier>{89f6a1ff-e7eb-47d9-845c-06f4ebb7c62b}</UniqueIdentifier>
-    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\..\PptFile\Structures\_includer.h">
@@ -787,456 +781,6 @@
     <ClInclude Include="..\..\..\PptFile\Reader\ExtXmlUtils.h">
       <Filter>Reader</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\accentbordercallout1type.h">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\AccentBorderCallout2Type.h">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\accentbordercallout3type.h">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\accentbordercallout90type.h">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\AccentCallout1Type.h">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\AccentCallout2Type.h">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\AccentCallout3Type.h">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\AccentCallout90Type.h">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\ActionButtonBack.h">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\ActionButtonBeginning.h">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\ActionButtonBlank.h">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\ActionButtonDocument.h">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\ActionButtonEnd.h">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\ActionButtonHelp.h">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\ActionButtonHome.h">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\ActionButtonInfo.h">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\ActionButtonMovie.h">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\ActionButtonNext.h">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\ActionButtonReturn.h">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\ActionButtonSound.h">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\arctype.h">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\BentArrowType.h">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\BentConnector.h">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\BentUpArrowType.h">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\BevelType.h">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\BlockArcType.h">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\BorderCallout1Type.h">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\BorderCallout2Type.h">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\BorderCallout3Type.h">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\BorderCallout90Type.h">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\BracePairType.h">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\BracketPairType.h">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\Callout1Type.h">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\Callout2Type.h">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\Callout3Type.h">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\Callout90Type.h">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\CanType.h">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\ChevronType.h">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\CircularArrowType.h">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\CloudCalloutType.h">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\CubeType.h">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\CurvedConnector.h">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\CurvedDownArrowType.h">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\CurvedLeftArrowType.h">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\CurvedRightArrowType.h">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\CurvedUpArrowType.h">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\DiamondType.h">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\DonutType.h">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\DownArrowCalloutType.h">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\DownArrowType.h">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\EllipseRibbon2Type.h">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\EllipseRibbonType.h">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\EllipseType.h">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartAlternateProcessType.h">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartCollateType.h">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartConnectorType.h">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartDecisionType.h">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartDelayType.h">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartDisplayType.h">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartDocumentType.h">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartExtractType.h">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartInputOutputType.h">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartInternalStorageType.h">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartMagneticDiskType.h">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartMagneticDrumType.h">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartMagneticTapeType.h">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartManualInputType.h">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartManualOperationType.h">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartMergeType.h">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartMultidocumentType.h">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartOffpageConnectorType.h">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartOnlineStorageType.h">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartOrType.h">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartPredefinedProcessType.h">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartPreparationType.h">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartProcessType.h">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartPunchedCardType.h">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartPunchedTapeType.h">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartSortType.h">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartSummingJunctionType.h">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartTerminatorType.h">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\FoldedCornerType.h">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\HeartType.h">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\HexagonType.h">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\HomePlateType.h">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\HorisontalScrollType.h">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\IrregularSealOneType.h">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\IrregularSealTwo.h">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\IsoscelesTriangleType.h">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\LeftArrowCalloutType.h">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\LeftArrowType.h">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\LeftBraceType.h">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\LeftBracketType.h">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\LeftRightArrowCalloutType.h">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\LeftRightArrowType.h">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\LeftRightUpArrow.h">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\LeftUpArrowType.h">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\LightningBoltType.h">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\LineType.h">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\MoonType.h">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\NoSmokingType.h">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\NotchedRightArrowType.h">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\OctagonType.h">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\ParallelogramType.h">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\PentagonType.h">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\PlaqueType.h">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\PlusType.h">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\QuadArrowCalloutType.h">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\QuadArrowType.h">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\RectangleType.h">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\RibbonDownType.h">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\RibbonUpType.h">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\RightArrowCalloutType.h">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\RightArrowType.h">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\RightBracetype.h">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\RightBracketType.h">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\RightTriangleType.h">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\RoundedRectangleType.h">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\Seal16Type.h">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\Seal24Type.h">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\Seal32Type.h">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\Seal4Type.h">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\Seal8Type.h">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\SmileyFaceType.h">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\Startype.h">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\StraightConnectorType.h">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\StripedRightArrowType.h">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\SunType.h">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\TextboxType.h">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\TrapezoidType.h">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\UpArrowCalloutType.h">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\UpArrowType.h">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\UpDownArrowCalloutType.h">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\UpDownArrowType.h">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\UturnArrowType.h">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\VerticalScrollType.h">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\WaveDoubleType.h">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\WaveType.h">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\WedgeEllipseCalloutType.h">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\WedgeRectCalloutType.h">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\WedgeRoundedRectCalloutType.h">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\BaseShape.h">
-      <Filter>ODraw</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\CustomGeomShape.h">
-      <Filter>ODraw</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\CustomShape.h">
-      <Filter>ODraw</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\CustomShapeConvert.h">
-      <Filter>ODraw</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\FormulaShape.h">
-      <Filter>ODraw</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\GraphicsPath.h">
-      <Filter>ODraw</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\PathShape.h">
-      <Filter>ODraw</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\PresetShapesHeader.h">
-      <Filter>ODraw</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\XmlWriter.h">
-      <Filter>ODraw</Filter>
-    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\..\PptFile\Reader\PPTDocumentInfoOneUser.cpp">
@@ -1913,452 +1457,5 @@
     <ClCompile Include="..\..\..\PptFile\Drawing\Theme.cpp">
       <Filter>OOXElements</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\accentbordercallout1type.cpp">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\AccentBorderCallout2Type.cpp">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\accentbordercallout3type.cpp">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\accentbordercallout90type.cpp">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\AccentCallout1Type.cpp">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\AccentCallout2Type.cpp">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\AccentCallout3Type.cpp">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\AccentCallout90Type.cpp">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\ActionButtonBack.cpp">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\ActionButtonBeginning.cpp">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\ActionButtonBlank.cpp">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\ActionButtonDocument.cpp">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\ActionButtonEnd.cpp">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\ActionButtonHelp.cpp">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\ActionButtonHome.cpp">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\ActionButtonInfo.cpp">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\ActionButtonMovie.cpp">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\ActionButtonNext.cpp">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\ActionButtonReturn.cpp">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\ActionButtonSound.cpp">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\arctype.cpp">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\BentArrowType.cpp">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\BentConnector.cpp">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\BentUpArrowType.cpp">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\BevelType.cpp">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\BlockArcType.cpp">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\BorderCallout1Type.cpp">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\BorderCallout2Type.cpp">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\BorderCallout3Type.cpp">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\BorderCallout90Type.cpp">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\BracePairType.cpp">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\BracketPairType.cpp">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\Callout1Type.cpp">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\Callout2Type.cpp">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\Callout3Type.cpp">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\Callout90Type.cpp">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\CanType.cpp">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\ChevronType.cpp">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\CircularArrowType.cpp">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\CloudCalloutType.cpp">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\CubeType.cpp">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\CurvedConnector.cpp">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\CurvedDownArrowType.cpp">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\CurvedLeftArrowType.cpp">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\CurvedRightArrowType.cpp">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\CurvedUpArrowType.cpp">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\DiamondType.cpp">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\DonutType.cpp">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\DownArrowCalloutType.cpp">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\DownArrowType.cpp">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\EllipseRibbon2Type.cpp">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\EllipseRibbonType.cpp">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\EllipseType.cpp">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartAlternateProcessType.cpp">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartCollateType.cpp">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartConnectorType.cpp">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartDecisionType.cpp">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartDelayType.cpp">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartDisplayType.cpp">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartDocumentType.cpp">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartExtractType.cpp">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartInputOutputType.cpp">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartInternalStorageType.cpp">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartMagneticDiskType.cpp">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartMagneticDrumType.cpp">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartMagneticTapeType.cpp">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartManualInputType.cpp">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartManualOperationType.cpp">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartMergeType.cpp">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartMultidocumentType.cpp">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartOffpageConnectorType.cpp">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartOnlineStorageType.cpp">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartOrType.cpp">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartPredefinedProcessType.cpp">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartPreparationType.cpp">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartProcessType.cpp">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartPunchedCardType.cpp">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartPunchedTapeType.cpp">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartSortType.cpp">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartSummingJunctionType.cpp">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartTerminatorType.cpp">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\FoldedCornerType.cpp">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\HeartType.cpp">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\HexagonType.cpp">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\HomePlateType.cpp">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\HorisontalScrollType.cpp">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\IrregularSealOneType.cpp">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\IrregularSealTwo.cpp">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\IsoscelesTriangleType.cpp">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\LeftArrowCalloutType.cpp">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\LeftArrowType.cpp">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\LeftBraceType.cpp">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\LeftBracketType.cpp">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\LeftRightArrowCalloutType.cpp">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\LeftRightArrowType.cpp">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\LeftRightUpArrow.cpp">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\LeftUpArrowType.cpp">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\LightningBoltType.cpp">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\LineType.cpp">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\MoonType.cpp">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\NoSmokingType.cpp">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\NotchedRightArrowType.cpp">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\OctagonType.cpp">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\ParallelogramType.cpp">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\PentagonType.cpp">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\PlaqueType.cpp">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\PlusType.cpp">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\QuadArrowCalloutType.cpp">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\QuadArrowType.cpp">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\RectangleType.cpp">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\RibbonDownType.cpp">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\RibbonUpType.cpp">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\RightArrowCalloutType.cpp">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\RightArrowType.cpp">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\RightBracetype.cpp">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\RightBracketType.cpp">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\RightTriangleType.cpp">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\RoundedRectangleType.cpp">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\Seal16Type.cpp">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\Seal24Type.cpp">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\Seal32Type.cpp">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\Seal4Type.cpp">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\Seal8Type.cpp">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\SmileyFaceType.cpp">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\Startype.cpp">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\StraightConnectorType.cpp">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\StripedRightArrowType.cpp">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\SunType.cpp">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\TextboxType.cpp">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\TrapezoidType.cpp">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\UpArrowCalloutType.cpp">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\UpArrowType.cpp">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\UpDownArrowCalloutType.cpp">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\UpDownArrowType.cpp">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\UturnArrowType.cpp">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\VerticalScrollType.cpp">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\WaveDoubleType.cpp">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\WaveType.cpp">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\WedgeEllipseCalloutType.cpp">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\WedgeRectCalloutType.cpp">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\WedgeRoundedRectCalloutType.cpp">
-      <Filter>ODraw\oldAutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\BaseShape.cpp">
-      <Filter>ODraw</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\CustomGeomShape.cpp">
-      <Filter>ODraw</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\CustomShape.cpp">
-      <Filter>ODraw</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\CustomShapeConvert.cpp">
-      <Filter>ODraw</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\FormulaShape.cpp">
-      <Filter>ODraw</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\GraphicsPath.cpp">
-      <Filter>ODraw</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\PathShape.cpp">
-      <Filter>ODraw</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\XmlWriter.cpp">
-      <Filter>ODraw</Filter>
-    </ClCompile>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/MsBinaryFile/Projects/XlsFormatLib/Windows/XlsXlsxConverter.vcxproj b/MsBinaryFile/Projects/XlsFormatLib/Windows/XlsXlsxConverter.vcxproj
index 10f6dc21ce..8b3f3a6561 100644
--- a/MsBinaryFile/Projects/XlsFormatLib/Windows/XlsXlsxConverter.vcxproj
+++ b/MsBinaryFile/Projects/XlsFormatLib/Windows/XlsXlsxConverter.vcxproj
@@ -19,149 +19,6 @@
     </ProjectConfiguration>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\..\Common\ODraw\CustomShape.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\FormulaShape.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\accentbordercallout1type.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\AccentBorderCallout2Type.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\accentbordercallout3type.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\accentbordercallout90type.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\AccentCallout1Type.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\AccentCallout2Type.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\AccentCallout3Type.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\AccentCallout90Type.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\ActionButtonBack.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\ActionButtonBeginning.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\ActionButtonBlank.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\ActionButtonDocument.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\ActionButtonEnd.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\ActionButtonHelp.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\ActionButtonHome.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\ActionButtonInfo.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\ActionButtonMovie.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\ActionButtonNext.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\ActionButtonReturn.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\ActionButtonSound.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\arctype.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\BentArrowType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\BentConnector.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\BentUpArrowType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\BevelType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\BlockArcType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\BorderCallout1Type.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\BorderCallout2Type.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\BorderCallout3Type.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\BorderCallout90Type.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\BracePairType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\BracketPairType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\Callout1Type.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\Callout2Type.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\Callout3Type.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\Callout90Type.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\CanType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\ChevronType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\CircularArrowType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\CloudCalloutType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\CubeType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\CurvedConnector.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\CurvedDownArrowType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\CurvedLeftArrowType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\CurvedRightArrowType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\CurvedUpArrowType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\DiamondType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\DonutType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\DownArrowCalloutType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\DownArrowType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\EllipseRibbon2Type.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\EllipseRibbonType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\EllipseType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartAlternateProcessType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartCollateType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartConnectorType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartDecisionType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartDelayType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartDisplayType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartDocumentType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartExtractType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartInputOutputType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartInternalStorageType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartMagneticDiskType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartMagneticDrumType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartMagneticTapeType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartManualInputType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartManualOperationType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartMergeType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartMultidocumentType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartOffpageConnectorType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartOnlineStorageType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartOrType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartPredefinedProcessType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartPreparationType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartProcessType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartPunchedCardType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartPunchedTapeType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartSortType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartSummingJunctionType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartTerminatorType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\FoldedCornerType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\HeartType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\HexagonType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\HomePlateType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\HorisontalScrollType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\IrregularSealOneType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\IrregularSealTwo.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\IsoscelesTriangleType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\LeftArrowCalloutType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\LeftArrowType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\LeftBraceType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\LeftBracketType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\LeftRightArrowCalloutType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\LeftRightArrowType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\LeftRightUpArrow.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\LeftUpArrowType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\LightningBoltType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\LineType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\MoonType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\NoSmokingType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\NotchedRightArrowType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\OctagonType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\ParallelogramType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\PentagonType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\PlaqueType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\PlusType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\QuadArrowCalloutType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\QuadArrowType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\RectangleType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\RibbonDownType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\RibbonUpType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\RightArrowCalloutType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\RightArrowType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\RightBracetype.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\RightBracketType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\RightTriangleType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\RoundedRectangleType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\Seal16Type.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\Seal24Type.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\Seal32Type.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\Seal4Type.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\Seal8Type.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\SmileyFaceType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\Startype.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\StraightConnectorType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\StripedRightArrowType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\SunType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\TextboxType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\TrapezoidType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\UpArrowCalloutType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\UpArrowType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\UpDownArrowCalloutType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\UpDownArrowType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\UturnArrowType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\VerticalScrollType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\WaveDoubleType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\WaveType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\WedgeEllipseCalloutType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\WedgeRectCalloutType.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\WedgeRoundedRectCalloutType.cpp" />
     <ClCompile Include="..\..\..\XlsFile\Converter\ConvertXls2Xlsx.cpp" />
     <ClCompile Include="..\..\..\XlsFile\Converter\external_items.cpp" />
     <ClCompile Include="..\..\..\XlsFile\Converter\mediaitems_utils.cpp" />
@@ -188,156 +45,6 @@
     <ClCompile Include="..\..\..\XlsFile\Converter\xlsx_textcontext.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\..\Common\ODraw\BaseShape.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\CustomGeomShape.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\CustomShape.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\CustomShapeConvert.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\FormulaShape.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\GraphicsPath.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\accentbordercallout1type.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\AccentBorderCallout2Type.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\accentbordercallout3type.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\accentbordercallout90type.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\AccentCallout1Type.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\AccentCallout2Type.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\AccentCallout3Type.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\AccentCallout90Type.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\ActionButtonBack.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\ActionButtonBeginning.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\ActionButtonBlank.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\ActionButtonDocument.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\ActionButtonEnd.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\ActionButtonHelp.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\ActionButtonHome.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\ActionButtonInfo.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\ActionButtonMovie.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\ActionButtonNext.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\ActionButtonReturn.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\ActionButtonSound.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\arctype.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\BentArrowType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\BentConnector.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\BentUpArrowType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\BevelType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\BlockArcType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\BorderCallout1Type.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\BorderCallout2Type.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\BorderCallout3Type.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\BorderCallout90Type.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\BracePairType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\BracketPairType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\Callout1Type.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\Callout2Type.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\Callout3Type.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\Callout90Type.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\CanType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\ChevronType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\CircularArrowType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\CloudCalloutType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\CubeType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\CurvedConnector.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\CurvedDownArrowType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\CurvedLeftArrowType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\CurvedRightArrowType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\CurvedUpArrowType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\DiamondType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\DonutType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\DownArrowCalloutType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\DownArrowType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\EllipseRibbon2Type.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\EllipseRibbonType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\EllipseType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartAlternateProcessType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartCollateType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartConnectorType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartDecisionType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartDelayType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartDisplayType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartDocumentType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartExtractType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartInputOutputType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartInternalStorageType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartMagneticDiskType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartMagneticDrumType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartMagneticTapeType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartManualInputType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartManualOperationType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartMergeType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartMultidocumentType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartOffpageConnectorType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartOnlineStorageType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartOrType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartPredefinedProcessType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartPreparationType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartProcessType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartPunchedCardType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartPunchedTapeType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartSortType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartSummingJunctionType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartTerminatorType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\FoldedCornerType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\HeartType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\HexagonType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\HomePlateType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\HorisontalScrollType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\IrregularSealOneType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\IrregularSealTwo.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\IsoscelesTriangleType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\LeftArrowCalloutType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\LeftArrowType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\LeftBraceType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\LeftBracketType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\LeftRightArrowCalloutType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\LeftRightArrowType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\LeftRightUpArrow.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\LeftUpArrowType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\LightningBoltType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\LineType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\MoonType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\NoSmokingType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\NotchedRightArrowType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\OctagonType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\ParallelogramType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\PentagonType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\PlaqueType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\PlusType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\QuadArrowCalloutType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\QuadArrowType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\RectangleType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\RibbonDownType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\RibbonUpType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\RightArrowCalloutType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\RightArrowType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\RightBracetype.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\RightBracketType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\RightTriangleType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\RoundedRectangleType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\Seal16Type.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\Seal24Type.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\Seal32Type.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\Seal4Type.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\Seal8Type.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\SmileyFaceType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\Startype.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\StraightConnectorType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\StripedRightArrowType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\SunType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\TextboxType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\TrapezoidType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\UpArrowCalloutType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\UpArrowType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\UpDownArrowCalloutType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\UpDownArrowType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\UturnArrowType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\VerticalScrollType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\WaveDoubleType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\WaveType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\WedgeEllipseCalloutType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\WedgeRectCalloutType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\WedgeRoundedRectCalloutType.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\PathShape.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\PresetShapesHeader.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\XmlWriter.h" />
     <ClInclude Include="..\..\..\XlsFile\Converter\ConvertXls2Xlsx.h" />
     <ClInclude Include="..\..\..\XlsFile\Converter\external_items.h" />
     <ClInclude Include="..\..\..\XlsFile\Converter\mediaitems_utils.h" />
diff --git a/MsBinaryFile/Projects/XlsFormatLib/Windows/XlsXlsxConverter.vcxproj.filters b/MsBinaryFile/Projects/XlsFormatLib/Windows/XlsXlsxConverter.vcxproj.filters
index 2492fa8d00..a63fa620c5 100644
--- a/MsBinaryFile/Projects/XlsFormatLib/Windows/XlsXlsxConverter.vcxproj.filters
+++ b/MsBinaryFile/Projects/XlsFormatLib/Windows/XlsXlsxConverter.vcxproj.filters
@@ -25,435 +25,6 @@
     <ClCompile Include="..\..\..\XlsFile\Converter\xlsx_sheet_context.cpp" />
     <ClCompile Include="..\..\..\XlsFile\Converter\xlsx_tablecontext.cpp" />
     <ClCompile Include="..\..\..\XlsFile\Converter\xlsx_textcontext.cpp" />
-    <ClCompile Include="..\..\..\Common\ODraw\CustomShape.cpp">
-      <Filter>DrawConverting</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\FormulaShape.cpp">
-      <Filter>DrawConverting</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\accentbordercallout1type.cpp">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\AccentBorderCallout2Type.cpp">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\accentbordercallout3type.cpp">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\accentbordercallout90type.cpp">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\AccentCallout1Type.cpp">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\AccentCallout2Type.cpp">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\AccentCallout3Type.cpp">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\AccentCallout90Type.cpp">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\ActionButtonBack.cpp">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\ActionButtonBeginning.cpp">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\ActionButtonBlank.cpp">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\ActionButtonDocument.cpp">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\ActionButtonEnd.cpp">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\ActionButtonHelp.cpp">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\ActionButtonHome.cpp">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\ActionButtonInfo.cpp">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\ActionButtonMovie.cpp">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\ActionButtonNext.cpp">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\ActionButtonReturn.cpp">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\ActionButtonSound.cpp">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\arctype.cpp">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\BentArrowType.cpp">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\BentConnector.cpp">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\BentUpArrowType.cpp">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\BevelType.cpp">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\BlockArcType.cpp">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\BorderCallout1Type.cpp">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\BorderCallout2Type.cpp">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\BorderCallout3Type.cpp">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\BorderCallout90Type.cpp">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\BracePairType.cpp">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\BracketPairType.cpp">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\Callout1Type.cpp">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\Callout2Type.cpp">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\Callout3Type.cpp">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\Callout90Type.cpp">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\CanType.cpp">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\ChevronType.cpp">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\CircularArrowType.cpp">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\CloudCalloutType.cpp">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\CubeType.cpp">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\CurvedConnector.cpp">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\CurvedDownArrowType.cpp">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\CurvedLeftArrowType.cpp">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\CurvedRightArrowType.cpp">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\CurvedUpArrowType.cpp">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\DiamondType.cpp">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\DonutType.cpp">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\DownArrowCalloutType.cpp">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\DownArrowType.cpp">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\EllipseRibbon2Type.cpp">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\EllipseRibbonType.cpp">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\EllipseType.cpp">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartAlternateProcessType.cpp">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartCollateType.cpp">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartConnectorType.cpp">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartDecisionType.cpp">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartDelayType.cpp">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartDisplayType.cpp">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartDocumentType.cpp">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartExtractType.cpp">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartInputOutputType.cpp">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartInternalStorageType.cpp">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartMagneticDiskType.cpp">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartMagneticDrumType.cpp">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartMagneticTapeType.cpp">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartManualInputType.cpp">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartManualOperationType.cpp">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartMergeType.cpp">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartMultidocumentType.cpp">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartOffpageConnectorType.cpp">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartOnlineStorageType.cpp">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartOrType.cpp">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartPredefinedProcessType.cpp">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartPreparationType.cpp">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartProcessType.cpp">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartPunchedCardType.cpp">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartPunchedTapeType.cpp">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartSortType.cpp">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartSummingJunctionType.cpp">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartTerminatorType.cpp">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\FoldedCornerType.cpp">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\HeartType.cpp">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\HexagonType.cpp">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\HomePlateType.cpp">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\HorisontalScrollType.cpp">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\IrregularSealOneType.cpp">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\IrregularSealTwo.cpp">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\IsoscelesTriangleType.cpp">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\LeftArrowCalloutType.cpp">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\LeftArrowType.cpp">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\LeftBraceType.cpp">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\LeftBracketType.cpp">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\LeftRightArrowCalloutType.cpp">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\LeftRightArrowType.cpp">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\LeftRightUpArrow.cpp">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\LeftUpArrowType.cpp">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\LightningBoltType.cpp">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\LineType.cpp">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\MoonType.cpp">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\NoSmokingType.cpp">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\NotchedRightArrowType.cpp">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\OctagonType.cpp">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\ParallelogramType.cpp">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\PentagonType.cpp">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\PlaqueType.cpp">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\PlusType.cpp">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\QuadArrowCalloutType.cpp">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\QuadArrowType.cpp">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\RectangleType.cpp">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\RibbonDownType.cpp">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\RibbonUpType.cpp">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\RightArrowCalloutType.cpp">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\RightArrowType.cpp">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\RightBracetype.cpp">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\RightBracketType.cpp">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\RightTriangleType.cpp">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\RoundedRectangleType.cpp">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\Seal4Type.cpp">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\Seal8Type.cpp">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\Seal16Type.cpp">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\Seal24Type.cpp">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\Seal32Type.cpp">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\SmileyFaceType.cpp">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\Startype.cpp">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\StraightConnectorType.cpp">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\StripedRightArrowType.cpp">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\SunType.cpp">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\TextboxType.cpp">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\TrapezoidType.cpp">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\UpArrowCalloutType.cpp">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\UpArrowType.cpp">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\UpDownArrowCalloutType.cpp">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\UpDownArrowType.cpp">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\UturnArrowType.cpp">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\VerticalScrollType.cpp">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\WaveDoubleType.cpp">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\WaveType.cpp">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\WedgeEllipseCalloutType.cpp">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\WedgeRectCalloutType.cpp">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Common\ODraw\oldAutoShapes\WedgeRoundedRectCalloutType.cpp">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\..\XlsFile\Converter\ConvertXls2Xlsx.h" />
@@ -482,463 +53,5 @@
     <ClInclude Include="..\..\..\XlsFile\Converter\xlsx_sheet_context.h" />
     <ClInclude Include="..\..\..\XlsFile\Converter\xlsx_tablecontext.h" />
     <ClInclude Include="..\..\..\XlsFile\Converter\xlsx_textcontext.h" />
-    <ClInclude Include="..\..\..\Common\ODraw\BaseShape.h">
-      <Filter>DrawConverting</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\CustomGeomShape.h">
-      <Filter>DrawConverting</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\CustomShape.h">
-      <Filter>DrawConverting</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\CustomShapeConvert.h">
-      <Filter>DrawConverting</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\FormulaShape.h">
-      <Filter>DrawConverting</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\GraphicsPath.h">
-      <Filter>DrawConverting</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\PathShape.h">
-      <Filter>DrawConverting</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\PresetShapesHeader.h">
-      <Filter>DrawConverting</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\XmlWriter.h">
-      <Filter>DrawConverting</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\accentbordercallout1type.h">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\AccentBorderCallout2Type.h">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\accentbordercallout3type.h">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\accentbordercallout90type.h">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\AccentCallout1Type.h">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\AccentCallout2Type.h">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\AccentCallout3Type.h">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\AccentCallout90Type.h">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\ActionButtonBack.h">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\ActionButtonBeginning.h">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\ActionButtonBlank.h">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\ActionButtonDocument.h">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\ActionButtonEnd.h">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\ActionButtonHelp.h">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\ActionButtonHome.h">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\ActionButtonInfo.h">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\ActionButtonMovie.h">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\ActionButtonNext.h">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\ActionButtonReturn.h">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\ActionButtonSound.h">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\arctype.h">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\BentArrowType.h">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\BentConnector.h">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\BentUpArrowType.h">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\BevelType.h">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\BlockArcType.h">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\BorderCallout1Type.h">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\BorderCallout2Type.h">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\BorderCallout3Type.h">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\BorderCallout90Type.h">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\BracePairType.h">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\BracketPairType.h">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\Callout1Type.h">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\Callout2Type.h">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\Callout3Type.h">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\Callout90Type.h">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\CanType.h">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\ChevronType.h">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\CircularArrowType.h">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\CloudCalloutType.h">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\CubeType.h">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\CurvedConnector.h">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\CurvedDownArrowType.h">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\CurvedLeftArrowType.h">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\CurvedRightArrowType.h">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\CurvedUpArrowType.h">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\DiamondType.h">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\DonutType.h">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\DownArrowCalloutType.h">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\DownArrowType.h">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\EllipseRibbon2Type.h">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\EllipseRibbonType.h">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\EllipseType.h">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartAlternateProcessType.h">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartCollateType.h">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartConnectorType.h">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartDecisionType.h">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartDelayType.h">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartDisplayType.h">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartDocumentType.h">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartExtractType.h">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartInputOutputType.h">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartInternalStorageType.h">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartMagneticDiskType.h">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartMagneticDrumType.h">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartMagneticTapeType.h">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartManualInputType.h">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartManualOperationType.h">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartMergeType.h">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartMultidocumentType.h">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartOffpageConnectorType.h">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartOnlineStorageType.h">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartOrType.h">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartPredefinedProcessType.h">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartPreparationType.h">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartProcessType.h">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartPunchedCardType.h">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartPunchedTapeType.h">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartSortType.h">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartSummingJunctionType.h">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\FlowChartTerminatorType.h">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\FoldedCornerType.h">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\HeartType.h">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\HexagonType.h">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\HomePlateType.h">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\HorisontalScrollType.h">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\IrregularSealOneType.h">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\IrregularSealTwo.h">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\IsoscelesTriangleType.h">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\LeftArrowCalloutType.h">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\LeftArrowType.h">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\LeftBraceType.h">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\LeftBracketType.h">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\LeftRightArrowCalloutType.h">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\LeftRightArrowType.h">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\LeftRightUpArrow.h">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\LeftUpArrowType.h">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\LightningBoltType.h">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\LineType.h">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\MoonType.h">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\NoSmokingType.h">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\NotchedRightArrowType.h">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\OctagonType.h">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\ParallelogramType.h">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\PentagonType.h">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\PlaqueType.h">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\PlusType.h">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\QuadArrowCalloutType.h">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\QuadArrowType.h">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\RectangleType.h">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\RibbonDownType.h">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\RibbonUpType.h">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\RightArrowCalloutType.h">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\RightArrowType.h">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\RightBracetype.h">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\RightBracketType.h">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\RightTriangleType.h">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\RoundedRectangleType.h">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\Seal4Type.h">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\Seal8Type.h">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\Seal16Type.h">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\Seal24Type.h">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\Seal32Type.h">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\SmileyFaceType.h">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\Startype.h">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\StraightConnectorType.h">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\StripedRightArrowType.h">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\SunType.h">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\TextboxType.h">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\TrapezoidType.h">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\UpArrowCalloutType.h">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\UpArrowType.h">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\UpDownArrowCalloutType.h">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\UpDownArrowType.h">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\UturnArrowType.h">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\VerticalScrollType.h">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\WaveDoubleType.h">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\WaveType.h">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\WedgeEllipseCalloutType.h">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\WedgeRectCalloutType.h">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Common\ODraw\oldAutoShapes\WedgeRoundedRectCalloutType.h">
-      <Filter>DrawConverting\oldShapes</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <Filter Include="DrawConverting">
-      <UniqueIdentifier>{281869f4-b2aa-4a93-a4a4-74f543ce809b}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="DrawConverting\oldShapes">
-      <UniqueIdentifier>{34abdc1c-7f65-47a6-8cd6-786d5dd2cef7}</UniqueIdentifier>
-    </Filter>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/OOXML/Projects/Linux/PPTXFormatLib/PPTXFormatLib.pro b/OOXML/Projects/Linux/PPTXFormatLib/PPTXFormatLib.pro
index eb33515589..6d7f0d0746 100644
--- a/OOXML/Projects/Linux/PPTXFormatLib/PPTXFormatLib.pro
+++ b/OOXML/Projects/Linux/PPTXFormatLib/PPTXFormatLib.pro
@@ -54,7 +54,7 @@ SOURCES += \
 	\
 	../../../../MsBinaryFile/Common/Vml/BaseShape.cpp \
 	../../../../MsBinaryFile/Common/Vml/GraphicsPath.cpp \
-	../../../../MsBinaryFile/Common/Vml/Path.cpp \
+        ../../../../MsBinaryFile/Common/Vml/VmlPath.cpp \
 	../../../../MsBinaryFile/Common/Vml/toVmlConvert.cpp \
 	\
 	../../../../MsBinaryFile/Common/Vml/PPTShape/PptShape.cpp \
@@ -135,7 +135,7 @@ HEADERS += \
 	../../../../MsBinaryFile/Common/Vml/Common.h \
 	../../../../MsBinaryFile/Common/Vml/BaseShape.h \
 	../../../../MsBinaryFile/Common/Vml/toVmlConvert.h \
-	../../../../MsBinaryFile/Common/Vml/Path.h \
+        ../../../../MsBinaryFile/Common/Vml/VmlPath.h \
 	../../../../MsBinaryFile/Common/Vml/GraphicsPath.h \	
 	\
 	../../../../MsBinaryFile/Common/Vml/PPTShape/PptShape.h \
diff --git a/OOXML/Projects/Windows/PPTXFormatLib/PPTXFormat.vcxproj b/OOXML/Projects/Windows/PPTXFormatLib/PPTXFormat.vcxproj
index 2e44b2b212..7c4db5a0a5 100644
--- a/OOXML/Projects/Windows/PPTXFormatLib/PPTXFormat.vcxproj
+++ b/OOXML/Projects/Windows/PPTXFormatLib/PPTXFormat.vcxproj
@@ -34,153 +34,12 @@
     <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\BaseShape.h" />
     <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\Common.h" />
     <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\GraphicsPath.h" />
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\Path.h" />
+    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\VmlPath.h" />
     <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\BinaryReader.h" />
     <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\CustomGeomShape.h" />
     <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\ElementSettings.h" />
     <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\Enums.h" />
     <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\Ppt2PptxShapeConverter.h" />
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\accentbordercallout1type.h" />
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\AccentBorderCallout2Type.h" />
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\accentbordercallout3type.h" />
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\accentbordercallout90type.h" />
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\AccentCallout1Type.h" />
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\AccentCallout2Type.h" />
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\AccentCallout3Type.h" />
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\AccentCallout90Type.h" />
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\ActionButtonBack.h" />
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\ActionButtonBeginning.h" />
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\ActionButtonBlank.h" />
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\ActionButtonDocument.h" />
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\ActionButtonEnd.h" />
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\ActionButtonHelp.h" />
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\ActionButtonHome.h" />
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\ActionButtonInfo.h" />
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\ActionButtonMovie.h" />
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\ActionButtonNext.h" />
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\ActionButtonReturn.h" />
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\ActionButtonSound.h" />
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\arctype.h" />
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\BentArrowType.h" />
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\BentConnector.h" />
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\BentUpArrowType.h" />
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\BevelType.h" />
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\BlockArcType.h" />
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\BorderCallout1Type.h" />
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\BorderCallout2Type.h" />
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\BorderCallout3Type.h" />
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\BorderCallout90Type.h" />
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\BracePairType.h" />
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\BracketPairType.h" />
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\Callout1Type.h" />
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\Callout2Type.h" />
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\Callout3Type.h" />
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\Callout90Type.h" />
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\CanType.h" />
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\ChevronType.h" />
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\CircularArrowType.h" />
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\CloudCalloutType.h" />
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\CubeType.h" />
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\CurvedConnector.h" />
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\CurvedDownArrowType.h" />
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\CurvedLeftArrowType.h" />
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\CurvedRightArrowType.h" />
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\CurvedUpArrowType.h" />
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\DiamondType.h" />
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\DonutType.h" />
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\DownArrowCalloutType.h" />
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\DownArrowType.h" />
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\EllipseRibbon2Type.h" />
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\EllipseRibbonType.h" />
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\EllipseType.h" />
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\FlowChartAlternateProcessType.h" />
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\FlowChartCollateType.h" />
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\FlowChartConnectorType.h" />
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\FlowChartDecisionType.h" />
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\FlowChartDelayType.h" />
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\FlowChartDisplayType.h" />
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\FlowChartDocumentType.h" />
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\FlowChartExtractType.h" />
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\FlowChartInputOutputType.h" />
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\FlowChartInternalStorageType.h" />
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\FlowChartMagneticDiskType.h" />
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\FlowChartMagneticDrumType.h" />
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\FlowChartMagneticTapeType.h" />
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\FlowChartManualInputType.h" />
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\FlowChartManualOperationType.h" />
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\FlowChartMergeType.h" />
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\FlowChartMultidocumentType.h" />
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\FlowChartOffpageConnectorType.h" />
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\FlowChartOnlineStorageType.h" />
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\FlowChartOrType.h" />
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\FlowChartPredefinedProcessType.h" />
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\FlowChartPreparationType.h" />
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\FlowChartProcessType.h" />
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\FlowChartPunchedCardType.h" />
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\FlowChartPunchedTapeType.h" />
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\FlowChartSortType.h" />
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\FlowChartSummingJunctionType.h" />
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\FlowChartTerminatorType.h" />
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\FoldedCornerType.h" />
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\HeartType.h" />
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\HexagonType.h" />
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\HomePlateType.h" />
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\HorisontalScrollType.h" />
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\IrregularSealOneType.h" />
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\IrregularSealTwo.h" />
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\IsoscelesTriangleType.h" />
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\LeftArrowCalloutType.h" />
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\LeftArrowType.h" />
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\LeftBraceType.h" />
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\LeftBracketType.h" />
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\LeftRightArrowCalloutType.h" />
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\LeftRightArrowType.h" />
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\LeftRightUpArrow.h" />
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\LeftUpArrowType.h" />
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\LightningBoltType.h" />
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\LineType.h" />
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\MoonType.h" />
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\NoSmokingType.h" />
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\NotchedRightArrowType.h" />
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\OctagonType.h" />
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\ParallelogramType.h" />
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\PentagonType.h" />
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\PlaqueType.h" />
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\PlusType.h" />
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\QuadArrowCalloutType.h" />
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\QuadArrowType.h" />
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\RectangleType.h" />
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\RibbonDownType.h" />
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\RibbonUpType.h" />
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\RightArrowCalloutType.h" />
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\RightArrowType.h" />
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\RightBracetype.h" />
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\RightBracketType.h" />
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\RightTriangleType.h" />
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\RoundedRectangleType.h" />
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\Seal16Type.h" />
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\Seal24Type.h" />
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\Seal32Type.h" />
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\Seal4Type.h" />
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\Seal8Type.h" />
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\SmileyFaceType.h" />
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\Startype.h" />
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\StraightConnectorType.h" />
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\StripedRightArrowType.h" />
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\SunType.h" />
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\TextboxType.h" />
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\TrapezoidType.h" />
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\UpArrowCalloutType.h" />
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\UpArrowType.h" />
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\UpDownArrowCalloutType.h" />
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\UpDownArrowType.h" />
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\UturnArrowType.h" />
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\VerticalScrollType.h" />
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\WaveDoubleType.h" />
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\WaveType.h" />
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\WedgeEllipseCalloutType.h" />
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\WedgeRectCalloutType.h" />
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\WedgeRoundedRectCalloutType.h" />
     <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PptFormula.h" />
     <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PptShape.h" />
     <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PptShapeEnum.h" />
@@ -815,151 +674,12 @@
     <ClCompile Include="..\..\..\..\HtmlRenderer\src\ASCSVGWriter.cpp" />
     <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Base\XmlTools.cpp" />
     <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\BaseShape.cpp" />
+    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\GraphicsPath.cpp" />
+    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\VmlPath.cpp" />
     <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\BinaryReader.cpp" />
     <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\CustomGeomShape.cpp" />
     <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\ElementSettings.cpp" />
     <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\Ppt2PptxShapeConverter.cpp" />
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\accentbordercallout1type.cpp" />
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\AccentBorderCallout2Type.cpp" />
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\accentbordercallout3type.cpp" />
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\accentbordercallout90type.cpp" />
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\AccentCallout1Type.cpp" />
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\AccentCallout2Type.cpp" />
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\AccentCallout3Type.cpp" />
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\AccentCallout90Type.cpp" />
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\ActionButtonBack.cpp" />
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\ActionButtonBeginning.cpp" />
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\ActionButtonBlank.cpp" />
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\ActionButtonDocument.cpp" />
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\ActionButtonEnd.cpp" />
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\ActionButtonHelp.cpp" />
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\ActionButtonHome.cpp" />
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\ActionButtonInfo.cpp" />
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\ActionButtonMovie.cpp" />
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\ActionButtonNext.cpp" />
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\ActionButtonReturn.cpp" />
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\ActionButtonSound.cpp" />
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\arctype.cpp" />
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\BentArrowType.cpp" />
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\BentConnector.cpp" />
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\BentUpArrowType.cpp" />
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\BevelType.cpp" />
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\BlockArcType.cpp" />
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\BorderCallout1Type.cpp" />
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\BorderCallout2Type.cpp" />
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\BorderCallout3Type.cpp" />
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\BorderCallout90Type.cpp" />
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\BracePairType.cpp" />
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\BracketPairType.cpp" />
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\Callout1Type.cpp" />
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\Callout2Type.cpp" />
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\Callout3Type.cpp" />
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\Callout90Type.cpp" />
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\CanType.cpp" />
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\ChevronType.cpp" />
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\CircularArrowType.cpp" />
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\CloudCalloutType.cpp" />
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\CubeType.cpp" />
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\CurvedConnector.cpp" />
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\CurvedDownArrowType.cpp" />
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\CurvedLeftArrowType.cpp" />
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\CurvedRightArrowType.cpp" />
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\CurvedUpArrowType.cpp" />
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\DiamondType.cpp" />
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\DonutType.cpp" />
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\DownArrowCalloutType.cpp" />
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\DownArrowType.cpp" />
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\EllipseRibbon2Type.cpp" />
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\EllipseRibbonType.cpp" />
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\EllipseType.cpp" />
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\FlowChartAlternateProcessType.cpp" />
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\FlowChartCollateType.cpp" />
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\FlowChartConnectorType.cpp" />
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\FlowChartDecisionType.cpp" />
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\FlowChartDelayType.cpp" />
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\FlowChartDisplayType.cpp" />
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\FlowChartDocumentType.cpp" />
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\FlowChartExtractType.cpp" />
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\FlowChartInputOutputType.cpp" />
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\FlowChartInternalStorageType.cpp" />
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\FlowChartMagneticDiskType.cpp" />
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\FlowChartMagneticDrumType.cpp" />
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\FlowChartMagneticTapeType.cpp" />
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\FlowChartManualInputType.cpp" />
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\FlowChartManualOperationType.cpp" />
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\FlowChartMergeType.cpp" />
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\FlowChartMultidocumentType.cpp" />
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\FlowChartOffpageConnectorType.cpp" />
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\FlowChartOnlineStorageType.cpp" />
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\FlowChartOrType.cpp" />
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\FlowChartPredefinedProcessType.cpp" />
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\FlowChartPreparationType.cpp" />
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\FlowChartProcessType.cpp" />
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\FlowChartPunchedCardType.cpp" />
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\FlowChartPunchedTapeType.cpp" />
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\FlowChartSortType.cpp" />
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\FlowChartSummingJunctionType.cpp" />
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\FlowChartTerminatorType.cpp" />
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\FoldedCornerType.cpp" />
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\HeartType.cpp" />
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\HexagonType.cpp" />
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\HomePlateType.cpp" />
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\HorisontalScrollType.cpp" />
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\IrregularSealOneType.cpp" />
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\IrregularSealTwo.cpp" />
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\IsoscelesTriangleType.cpp" />
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\LeftArrowCalloutType.cpp" />
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\LeftArrowType.cpp" />
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\LeftBraceType.cpp" />
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\LeftBracketType.cpp" />
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\LeftRightArrowCalloutType.cpp" />
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\LeftRightArrowType.cpp" />
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\LeftRightUpArrow.cpp" />
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\LeftUpArrowType.cpp" />
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\LightningBoltType.cpp" />
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\LineType.cpp" />
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\MoonType.cpp" />
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\NoSmokingType.cpp" />
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\NotchedRightArrowType.cpp" />
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\OctagonType.cpp" />
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\ParallelogramType.cpp" />
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\PentagonType.cpp" />
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\PlaqueType.cpp" />
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\PlusType.cpp" />
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\QuadArrowCalloutType.cpp" />
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\QuadArrowType.cpp" />
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\RectangleType.cpp" />
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\RibbonDownType.cpp" />
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\RibbonUpType.cpp" />
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\RightArrowCalloutType.cpp" />
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\RightArrowType.cpp" />
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\RightBracetype.cpp" />
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\RightBracketType.cpp" />
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\RightTriangleType.cpp" />
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\RoundedRectangleType.cpp" />
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\Seal16Type.cpp" />
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\Seal24Type.cpp" />
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\Seal32Type.cpp" />
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\Seal4Type.cpp" />
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\Seal8Type.cpp" />
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\SmileyFaceType.cpp" />
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\Startype.cpp" />
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\StraightConnectorType.cpp" />
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\StripedRightArrowType.cpp" />
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\SunType.cpp" />
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\TextboxType.cpp" />
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\TrapezoidType.cpp" />
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\UpArrowCalloutType.cpp" />
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\UpArrowType.cpp" />
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\UpDownArrowCalloutType.cpp" />
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\UpDownArrowType.cpp" />
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\UturnArrowType.cpp" />
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\VerticalScrollType.cpp" />
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\WaveDoubleType.cpp" />
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\WaveType.cpp" />
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\WedgeEllipseCalloutType.cpp" />
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\WedgeRectCalloutType.cpp" />
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\WedgeRoundedRectCalloutType.cpp" />
     <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PptFormula.cpp" />
     <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PptShape.cpp" />
     <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTXShape\OOXMLShapes\CAccentBorderCallout1.cpp" />
diff --git a/OOXML/Projects/Windows/PPTXFormatLib/PPTXFormat.vcxproj.filters b/OOXML/Projects/Windows/PPTXFormatLib/PPTXFormat.vcxproj.filters
index 32d64731ed..afedba31ab 100644
--- a/OOXML/Projects/Windows/PPTXFormatLib/PPTXFormat.vcxproj.filters
+++ b/OOXML/Projects/Windows/PPTXFormatLib/PPTXFormat.vcxproj.filters
@@ -1129,9 +1129,6 @@
     <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\GraphicsPath.h">
       <Filter>Vml</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\Path.h">
-      <Filter>Vml</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\toVmlConvert.h">
       <Filter>Vml</Filter>
     </ClInclude>
@@ -1858,429 +1855,6 @@
     <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PresetShapesHeader.h">
       <Filter>Vml\PptShape</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\accentbordercallout1type.h">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\AccentBorderCallout2Type.h">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\accentbordercallout3type.h">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\accentbordercallout90type.h">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\AccentCallout1Type.h">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\AccentCallout2Type.h">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\AccentCallout3Type.h">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\AccentCallout90Type.h">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\ActionButtonBack.h">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\ActionButtonBeginning.h">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\ActionButtonBlank.h">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\ActionButtonDocument.h">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\ActionButtonEnd.h">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\ActionButtonHelp.h">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\ActionButtonHome.h">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\ActionButtonInfo.h">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\ActionButtonMovie.h">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\ActionButtonNext.h">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\ActionButtonReturn.h">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\ActionButtonSound.h">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\arctype.h">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\BentArrowType.h">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\BentConnector.h">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\BentUpArrowType.h">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\BevelType.h">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\BlockArcType.h">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\BorderCallout1Type.h">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\BorderCallout2Type.h">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\BorderCallout3Type.h">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\BorderCallout90Type.h">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\BracePairType.h">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\BracketPairType.h">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\Callout1Type.h">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\Callout2Type.h">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\Callout3Type.h">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\Callout90Type.h">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\CanType.h">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\ChevronType.h">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\CircularArrowType.h">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\CloudCalloutType.h">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\CubeType.h">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\CurvedConnector.h">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\CurvedDownArrowType.h">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\CurvedLeftArrowType.h">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\CurvedRightArrowType.h">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\CurvedUpArrowType.h">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\DiamondType.h">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\DonutType.h">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\DownArrowCalloutType.h">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\DownArrowType.h">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\EllipseRibbon2Type.h">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\EllipseRibbonType.h">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\EllipseType.h">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\FlowChartAlternateProcessType.h">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\FlowChartCollateType.h">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\FlowChartConnectorType.h">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\FlowChartDecisionType.h">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\FlowChartDelayType.h">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\FlowChartDisplayType.h">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\FlowChartDocumentType.h">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\FlowChartExtractType.h">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\FlowChartInputOutputType.h">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\FlowChartInternalStorageType.h">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\FlowChartMagneticDiskType.h">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\FlowChartMagneticDrumType.h">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\FlowChartMagneticTapeType.h">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\FlowChartManualInputType.h">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\FlowChartManualOperationType.h">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\FlowChartMergeType.h">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\FlowChartMultidocumentType.h">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\FlowChartOffpageConnectorType.h">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\FlowChartOnlineStorageType.h">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\FlowChartOrType.h">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\FlowChartPredefinedProcessType.h">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\FlowChartPreparationType.h">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\FlowChartProcessType.h">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\FlowChartPunchedCardType.h">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\FlowChartPunchedTapeType.h">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\FlowChartSortType.h">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\FlowChartSummingJunctionType.h">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\FlowChartTerminatorType.h">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\FoldedCornerType.h">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\HeartType.h">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\HexagonType.h">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\HomePlateType.h">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\HorisontalScrollType.h">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\IrregularSealOneType.h">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\IrregularSealTwo.h">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\IsoscelesTriangleType.h">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\LeftArrowCalloutType.h">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\LeftArrowType.h">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\LeftBraceType.h">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\LeftBracketType.h">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\LeftRightArrowCalloutType.h">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\LeftRightArrowType.h">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\LeftRightUpArrow.h">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\LeftUpArrowType.h">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\LightningBoltType.h">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\LineType.h">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\MoonType.h">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\NoSmokingType.h">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\NotchedRightArrowType.h">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\OctagonType.h">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\ParallelogramType.h">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\PentagonType.h">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\PlaqueType.h">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\PlusType.h">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\QuadArrowCalloutType.h">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\QuadArrowType.h">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\RectangleType.h">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\RibbonDownType.h">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\RibbonUpType.h">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\RightArrowCalloutType.h">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\RightArrowType.h">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\RightBracetype.h">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\RightBracketType.h">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\RightTriangleType.h">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\RoundedRectangleType.h">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\Seal16Type.h">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\Seal24Type.h">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\Seal32Type.h">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\Seal4Type.h">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\Seal8Type.h">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\SmileyFaceType.h">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\Startype.h">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\StraightConnectorType.h">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\StripedRightArrowType.h">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\SunType.h">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\TextboxType.h">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\TrapezoidType.h">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\UpArrowCalloutType.h">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\UpArrowType.h">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\UpDownArrowCalloutType.h">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\UpDownArrowType.h">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\UturnArrowType.h">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\VerticalScrollType.h">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\WaveDoubleType.h">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\WaveType.h">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\WedgeEllipseCalloutType.h">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\WedgeRectCalloutType.h">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\WedgeRoundedRectCalloutType.h">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Base\Aggregat.h">
       <Filter>Common</Filter>
     </ClInclude>
@@ -2320,6 +1894,9 @@
     <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Base\XmlTools.h">
       <Filter>Common\Xml</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\..\MsBinaryFile\Common\Vml\VmlPath.h">
+      <Filter>Vml</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\..\PPTXFormat\FileContainer.cpp" />
@@ -4140,429 +3717,6 @@
     <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\Ppt2PptxShapeConverter.cpp">
       <Filter>Vml\PptShape</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\accentbordercallout1type.cpp">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\AccentBorderCallout2Type.cpp">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\accentbordercallout3type.cpp">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\accentbordercallout90type.cpp">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\AccentCallout1Type.cpp">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\AccentCallout2Type.cpp">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\AccentCallout3Type.cpp">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\AccentCallout90Type.cpp">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\ActionButtonBack.cpp">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\ActionButtonBeginning.cpp">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\ActionButtonBlank.cpp">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\ActionButtonDocument.cpp">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\ActionButtonEnd.cpp">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\ActionButtonHelp.cpp">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\ActionButtonHome.cpp">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\ActionButtonInfo.cpp">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\ActionButtonMovie.cpp">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\ActionButtonNext.cpp">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\ActionButtonReturn.cpp">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\ActionButtonSound.cpp">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\arctype.cpp">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\BentArrowType.cpp">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\BentConnector.cpp">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\BentUpArrowType.cpp">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\BevelType.cpp">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\BlockArcType.cpp">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\BorderCallout1Type.cpp">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\BorderCallout2Type.cpp">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\BorderCallout3Type.cpp">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\BorderCallout90Type.cpp">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\BracePairType.cpp">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\BracketPairType.cpp">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\Callout1Type.cpp">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\Callout2Type.cpp">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\Callout3Type.cpp">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\Callout90Type.cpp">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\CanType.cpp">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\ChevronType.cpp">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\CircularArrowType.cpp">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\CloudCalloutType.cpp">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\CubeType.cpp">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\CurvedConnector.cpp">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\CurvedDownArrowType.cpp">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\CurvedLeftArrowType.cpp">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\CurvedRightArrowType.cpp">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\CurvedUpArrowType.cpp">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\DiamondType.cpp">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\DonutType.cpp">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\DownArrowCalloutType.cpp">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\DownArrowType.cpp">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\EllipseRibbon2Type.cpp">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\EllipseRibbonType.cpp">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\EllipseType.cpp">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\FlowChartAlternateProcessType.cpp">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\FlowChartCollateType.cpp">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\FlowChartConnectorType.cpp">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\FlowChartDecisionType.cpp">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\FlowChartDelayType.cpp">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\FlowChartDisplayType.cpp">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\FlowChartDocumentType.cpp">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\FlowChartExtractType.cpp">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\FlowChartInputOutputType.cpp">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\FlowChartInternalStorageType.cpp">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\FlowChartMagneticDiskType.cpp">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\FlowChartMagneticDrumType.cpp">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\FlowChartMagneticTapeType.cpp">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\FlowChartManualInputType.cpp">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\FlowChartManualOperationType.cpp">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\FlowChartMergeType.cpp">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\FlowChartMultidocumentType.cpp">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\FlowChartOffpageConnectorType.cpp">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\FlowChartOnlineStorageType.cpp">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\FlowChartOrType.cpp">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\FlowChartPredefinedProcessType.cpp">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\FlowChartPreparationType.cpp">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\FlowChartProcessType.cpp">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\FlowChartPunchedCardType.cpp">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\FlowChartPunchedTapeType.cpp">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\FlowChartSortType.cpp">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\FlowChartSummingJunctionType.cpp">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\FlowChartTerminatorType.cpp">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\FoldedCornerType.cpp">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\HeartType.cpp">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\HexagonType.cpp">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\HomePlateType.cpp">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\HorisontalScrollType.cpp">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\IrregularSealOneType.cpp">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\IrregularSealTwo.cpp">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\IsoscelesTriangleType.cpp">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\LeftArrowCalloutType.cpp">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\LeftArrowType.cpp">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\LeftBraceType.cpp">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\LeftBracketType.cpp">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\LeftRightArrowCalloutType.cpp">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\LeftRightArrowType.cpp">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\LeftRightUpArrow.cpp">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\LeftUpArrowType.cpp">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\LightningBoltType.cpp">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\LineType.cpp">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\MoonType.cpp">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\NoSmokingType.cpp">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\NotchedRightArrowType.cpp">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\OctagonType.cpp">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\ParallelogramType.cpp">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\PentagonType.cpp">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\PlaqueType.cpp">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\PlusType.cpp">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\QuadArrowCalloutType.cpp">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\QuadArrowType.cpp">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\RectangleType.cpp">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\RibbonDownType.cpp">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\RibbonUpType.cpp">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\RightArrowCalloutType.cpp">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\RightArrowType.cpp">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\RightBracetype.cpp">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\RightBracketType.cpp">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\RightTriangleType.cpp">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\RoundedRectangleType.cpp">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\Seal16Type.cpp">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\Seal24Type.cpp">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\Seal32Type.cpp">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\Seal4Type.cpp">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\Seal8Type.cpp">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\SmileyFaceType.cpp">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\Startype.cpp">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\StraightConnectorType.cpp">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\StripedRightArrowType.cpp">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\SunType.cpp">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\TextboxType.cpp">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\TrapezoidType.cpp">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\UpArrowCalloutType.cpp">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\UpArrowType.cpp">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\UpDownArrowCalloutType.cpp">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\UpDownArrowType.cpp">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\UturnArrowType.cpp">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\VerticalScrollType.cpp">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\WaveDoubleType.cpp">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\WaveType.cpp">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\WedgeEllipseCalloutType.cpp">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\WedgeRectCalloutType.cpp">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\PPTAutoShapes\WedgeRoundedRectCalloutType.cpp">
-      <Filter>Vml\PptShape\AutoShapes</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\PPTXFormat\DrawingConverter\ASCOfficeDrawingConverter.cpp">
       <Filter>Common</Filter>
     </ClCompile>
@@ -4575,6 +3729,12 @@
     <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTXShape\Pptx2PptShapeConverter.cpp">
       <Filter>Vml\PptxShape</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\GraphicsPath.cpp">
+      <Filter>Vml</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\VmlPath.cpp">
+      <Filter>Vml</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <Filter Include="Limits">
@@ -4640,9 +3800,6 @@
     <Filter Include="Vml\PptShape">
       <UniqueIdentifier>{725cbeb1-b00a-4b91-bb3c-e08004908675}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Vml\PptShape\AutoShapes">
-      <UniqueIdentifier>{56740ec9-f9a8-4a73-b90e-a99a0d0f0d6c}</UniqueIdentifier>
-    </Filter>
     <Filter Include="Common">
       <UniqueIdentifier>{b5bd29c4-aaa3-42c1-bcb4-7ef80a910b35}</UniqueIdentifier>
     </Filter>