From d2a8ef12db791e458f2f9f8e795d08bcb55ac349 Mon Sep 17 00:00:00 2001
From: ElenaSubbotina <Elena.Subbotina@onlyoffice.com>
Date: Thu, 10 Dec 2020 11:51:49 +0300
Subject: [PATCH] .

---
 .../PPTFormatLib/Linux/PPTFormatLib.pro       |   2 +-
 .../Records/Animations/TimeVariant.h          |   4 +-
 .../Records/Drawing/ShapeContainer.cpp        |   2 +-
 .../PPTFormatLib/Win32/PPTFormatLib.vcxproj   |  98 +++++-
 .../Win32/PPTFormatLib.vcxproj.filters        | 303 +++++++++++++++++-
 ASCOfficePPTXFile/PPTXLib/PPTXFormat.vcxproj  |   1 -
 6 files changed, 389 insertions(+), 21 deletions(-)

diff --git a/ASCOfficePPTFile/PPTFormatLib/Linux/PPTFormatLib.pro b/ASCOfficePPTFile/PPTFormatLib/Linux/PPTFormatLib.pro
index 273d63b202..4184868a85 100644
--- a/ASCOfficePPTFile/PPTFormatLib/Linux/PPTFormatLib.pro
+++ b/ASCOfficePPTFile/PPTFormatLib/Linux/PPTFormatLib.pro
@@ -461,7 +461,7 @@ HEADERS += \
     ../Records/DocInfoListContainer.h \
     ../Records/DocProgTagsContainer.h \
     ../Records/OfficeArtClientData.h \
-    ../Records/PlaceholderAtom.h \
+    ../Records/PlaceHolderAtom.h \
     ../Records/ShapeProgBinaryTagSubContainerOrAtom.h \
     ../Records/Text/CFMasks.h \
     ../Records/ColorSchemeAtom.h \
diff --git a/ASCOfficePPTFile/PPTFormatLib/Records/Animations/TimeVariant.h b/ASCOfficePPTFile/PPTFormatLib/Records/Animations/TimeVariant.h
index cda4722d45..a96902104e 100644
--- a/ASCOfficePPTFile/PPTFormatLib/Records/Animations/TimeVariant.h
+++ b/ASCOfficePPTFile/PPTFormatLib/Records/Animations/TimeVariant.h
@@ -32,8 +32,8 @@
 #pragma once
 
 
-#include "../Reader/Records.h"
-#include "../Enums/_includer.h"
+#include "../../Reader/Records.h"
+#include "../../Enums/_includer.h"
 
 
 namespace PPT_FORMAT
diff --git a/ASCOfficePPTFile/PPTFormatLib/Records/Drawing/ShapeContainer.cpp b/ASCOfficePPTFile/PPTFormatLib/Records/Drawing/ShapeContainer.cpp
index 08067575f7..251c414a2b 100644
--- a/ASCOfficePPTFile/PPTFormatLib/Records/Drawing/ShapeContainer.cpp
+++ b/ASCOfficePPTFile/PPTFormatLib/Records/Drawing/ShapeContainer.cpp
@@ -39,7 +39,7 @@
 #include "../../../../Common/DocxFormat/Source/Base/Types_32.h"
 
 #include "../../../../OfficeUtils/src/OfficeUtils.h"
-#include "../Enums/_includer.h"
+#include "../../Enums/_includer.h"
 
 
 #define FIXED_POINT_unsigned(val) (double)((WORD)(val >> 16) + ((WORD)(val) / 65536.0))
diff --git a/ASCOfficePPTFile/PPTFormatLib/Win32/PPTFormatLib.vcxproj b/ASCOfficePPTFile/PPTFormatLib/Win32/PPTFormatLib.vcxproj
index 5eaf8f7d7b..f28c3aea49 100644
--- a/ASCOfficePPTFile/PPTFormatLib/Win32/PPTFormatLib.vcxproj
+++ b/ASCOfficePPTFile/PPTFormatLib/Win32/PPTFormatLib.vcxproj
@@ -274,10 +274,67 @@
     <ClInclude Include="..\Reader\PPTFileReader.h" />
     <ClInclude Include="..\Reader\ReadStructures.h" />
     <ClInclude Include="..\Reader\Records.h" />
+    <ClInclude Include="..\Reader\Slide.h" />
     <ClInclude Include="..\Reader\SlideInfo.h" />
     <ClInclude Include="..\Reader\SlidePersist.h" />
-    <ClInclude Include="..\Records\AnimationInfoAtom.h" />
-    <ClInclude Include="..\Records\Animations\AnimationTypes.h" />
+    <ClInclude Include="..\Records\Animations\AnimationInfoAtom.h" />
+    <ClInclude Include="..\Records\Animations\AnimationInfoContainer.h" />
+    <ClInclude Include="..\Records\Animations\BuildAtom.h" />
+    <ClInclude Include="..\Records\Animations\BuildListContainer.h" />
+    <ClInclude Include="..\Records\Animations\ChartBuildAtom.h" />
+    <ClInclude Include="..\Records\Animations\ChartBuildContainer.h" />
+    <ClInclude Include="..\Records\Animations\ClientVisualElementContainer.h" />
+    <ClInclude Include="..\Records\Animations\DiagramBuildAtom.h" />
+    <ClInclude Include="..\Records\Animations\DiagramBuildContainer.h" />
+    <ClInclude Include="..\Records\Animations\ExtTimeNodeContainer.h" />
+    <ClInclude Include="..\Records\Animations\HashCode10Atom.h" />
+    <ClInclude Include="..\Records\Animations\LevelInfoAtom.h" />
+    <ClInclude Include="..\Records\Animations\ParaBuildAtom.h" />
+    <ClInclude Include="..\Records\Animations\ParaBuildContainer.h" />
+    <ClInclude Include="..\Records\Animations\ParaBuildLevel.h" />
+    <ClInclude Include="..\Records\Animations\SubEffectContainer.h" />
+    <ClInclude Include="..\Records\Animations\TimeAnimateBehaviorAtom.h" />
+    <ClInclude Include="..\Records\Animations\TimeAnimateBehaviorContainer.h" />
+    <ClInclude Include="..\Records\Animations\TimeAnimateColor.h" />
+    <ClInclude Include="..\Records\Animations\TimeAnimateColorBy.h" />
+    <ClInclude Include="..\Records\Animations\TimeAnimationValueAtom.h" />
+    <ClInclude Include="..\Records\Animations\TimeAnimationValueListContainer.h" />
+    <ClInclude Include="..\Records\Animations\TimeAnimationValueListEntry.h" />
+    <ClInclude Include="..\Records\Animations\TimeBehaviorAtom.h" />
+    <ClInclude Include="..\Records\Animations\TimeBehaviorContainer.h" />
+    <ClInclude Include="..\Records\Animations\TimeColorBehaviorAtom.h" />
+    <ClInclude Include="..\Records\Animations\TimeColorBehaviorContainer.h" />
+    <ClInclude Include="..\Records\Animations\TimeCommandBehaviorAtom.h" />
+    <ClInclude Include="..\Records\Animations\TimeCommandBehaviorContainer.h" />
+    <ClInclude Include="..\Records\Animations\TimeConditionAtom.h" />
+    <ClInclude Include="..\Records\Animations\TimeConditionContainer.h" />
+    <ClInclude Include="..\Records\Animations\TimeEffectBehaviorAtom.h" />
+    <ClInclude Include="..\Records\Animations\TimeEffectBehaviorContainer.h" />
+    <ClInclude Include="..\Records\Animations\TimeIterateDataAtom.h" />
+    <ClInclude Include="..\Records\Animations\TimeModifierAtom.h" />
+    <ClInclude Include="..\Records\Animations\TimeMotionBehaviorAtom.h" />
+    <ClInclude Include="..\Records\Animations\TimeMotionBehaviorContainer.h" />
+    <ClInclude Include="..\Records\Animations\TimeNodeAtom.h" />
+    <ClInclude Include="..\Records\Animations\TimeNodeTimeFilter.h" />
+    <ClInclude Include="..\Records\Animations\TimePropertyList4TimeBehavior.h" />
+    <ClInclude Include="..\Records\Animations\TimePropertyList4TimeNodeContainer.h" />
+    <ClInclude Include="..\Records\Animations\TimeRotationBehaviorAtom.h" />
+    <ClInclude Include="..\Records\Animations\TimeRotationBehaviorContainer.h" />
+    <ClInclude Include="..\Records\Animations\TimeScaleBehaviorAtom.h" />
+    <ClInclude Include="..\Records\Animations\TimeScaleBehaviorContainer.h" />
+    <ClInclude Include="..\Records\Animations\TimeSequenceDataAtom.h" />
+    <ClInclude Include="..\Records\Animations\TimeSetBehaviorAtom.h" />
+    <ClInclude Include="..\Records\Animations\TimeSetBehaviorContainer.h" />
+    <ClInclude Include="..\Records\Animations\TimeStringListContainer.h" />
+    <ClInclude Include="..\Records\Animations\TimeVariant.h" />
+    <ClInclude Include="..\Records\Animations\TimeVariant4Behavior.h" />
+    <ClInclude Include="..\Records\Animations\TimeVariant4TimeNode.h" />
+    <ClInclude Include="..\Records\Animations\VisualPageAtom.h" />
+    <ClInclude Include="..\Records\Animations\VisualShapeAtom.h" />
+    <ClInclude Include="..\Records\Animations\VisualShapeChartElementAtom.h" />
+    <ClInclude Include="..\Records\Animations\VisualShapeGeneralAtom.h" />
+    <ClInclude Include="..\Records\Animations\VisualSoundAtom.h" />
+    <ClInclude Include="..\Records\Animations\_includer.h" />
     <ClInclude Include="..\Records\BlipEntityAtom.h" />
     <ClInclude Include="..\Records\BookmarkEntityAtom.h" />
     <ClInclude Include="..\Records\BookmarkSeedAtom.h" />
@@ -320,7 +377,6 @@
     <ClInclude Include="..\Records\ExWAVAudioEmbeddedContainer.h" />
     <ClInclude Include="..\Records\ExWAVAudioLinkContainer.h" />
     <ClInclude Include="..\Records\FontEntityAtom.h" />
-    <ClInclude Include="..\Records\GenericDateMCAtom.h" />
     <ClInclude Include="..\Records\GridSpacing10Atom.h" />
     <ClInclude Include="..\Records\GuideAtom.h" />
     <ClInclude Include="..\Records\HeadersFootersAtom.h" />
@@ -352,6 +408,12 @@
     <ClInclude Include="..\Records\SlideListWithText.h" />
     <ClInclude Include="..\Records\SlidePersistAtom.h" />
     <ClInclude Include="..\Records\SlideViewInfoAtom.h" />
+    <ClInclude Include="..\Records\Slide\Comment10Container.h" />
+    <ClInclude Include="..\Records\Slide\LinkedShape10Atom.h" />
+    <ClInclude Include="..\Records\Slide\LinkedSlide10Atom.h" />
+    <ClInclude Include="..\Records\Slide\SlideFlags10Atom.h" />
+    <ClInclude Include="..\Records\Slide\SlideProgTagsContainer.h" />
+    <ClInclude Include="..\Records\Slide\SlideTime10Atom.h" />
     <ClInclude Include="..\Records\SoundCollAtom.h" />
     <ClInclude Include="..\Records\SoundCollectionContainer.h" />
     <ClInclude Include="..\Records\SoundContainer.h" />
@@ -372,10 +434,38 @@
     <ClInclude Include="..\Records\TextRulerAtom.h" />
     <ClInclude Include="..\Records\TextSIExceptionAtom.h" />
     <ClInclude Include="..\Records\TextSpecInfoAtom.h" />
+    <ClInclude Include="..\Records\Text\CFMasks.h" />
+    <ClInclude Include="..\Records\Text\FontCollection10Container.h" />
+    <ClInclude Include="..\Records\Text\FontEmbedFlags10Atom.h" />
+    <ClInclude Include="..\Records\Text\OutlineTextProps9Container.h" />
+    <ClInclude Include="..\Records\Text\OutlineTextPropsHeaderExAtom.h" />
+    <ClInclude Include="..\Records\Text\PFMasks.h" />
+    <ClInclude Include="..\Records\Text\StyleTextProp10Atom.h" />
+    <ClInclude Include="..\Records\Text\StyleTextProp11Atom.h" />
+    <ClInclude Include="..\Records\Text\StyleTextProp9Atom.h" />
+    <ClInclude Include="..\Records\Text\TextCFException10.h" />
+    <ClInclude Include="..\Records\Text\TextCFException9.h" />
+    <ClInclude Include="..\Records\Text\TextDefaults9Atom.h" />
+    <ClInclude Include="..\Records\Text\TextMasterStyle9Atom.h" />
+    <ClInclude Include="..\Records\Text\TextMasterStyle9Level.h" />
+    <ClInclude Include="..\Records\Text\TextPFException9.h" />
+    <ClInclude Include="..\Records\Text\TextSIException.h" />
     <ClInclude Include="..\Records\UserEditAtom.h" />
     <ClInclude Include="..\Records\VBAInfoAtom.h" />
     <ClInclude Include="..\Records\ViewInfoAtom.h" />
     <ClInclude Include="..\Records\ZoomViewInfoAtom.h" />
+    <ClInclude Include="..\Structures\ColorIndexStruct.h" />
+    <ClInclude Include="..\Structures\ColorStruct.h" />
+    <ClInclude Include="..\Structures\DateTimeStruct.h" />
+    <ClInclude Include="..\Structures\IStruct.h" />
+    <ClInclude Include="..\Structures\PointStruct.h" />
+    <ClInclude Include="..\Structures\RatioStruct.h" />
+    <ClInclude Include="..\Structures\RectStruct.h" />
+    <ClInclude Include="..\Structures\ScalingStruct.h" />
+    <ClInclude Include="..\Structures\SmallRectStruct.h" />
+    <ClInclude Include="..\Structures\TmsfTimeStruct.h" />
+    <ClInclude Include="..\Structures\WideColorStruct.h" />
+    <ClInclude Include="..\Structures\_includer.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\..\ASCOfficePPTXFile\Editor\Drawing\Elements.cpp" />
@@ -390,7 +480,7 @@
     <ClCompile Include="..\Reader\ReadStructures.cpp" />
     <ClCompile Include="..\Reader\Records.cpp" />
     <ClCompile Include="..\Reader\SlidePersist.cpp" />
-    <ClCompile Include="..\Records\Animations\AnimationTypes.cpp" />
+    <ClCompile Include="..\Records\Animations\TimeVariant.cpp" />
     <ClCompile Include="..\Records\Drawing\ArtBlip.cpp" />
     <ClCompile Include="..\Records\Drawing\ShapeContainer.cpp" />
   </ItemGroup>
diff --git a/ASCOfficePPTFile/PPTFormatLib/Win32/PPTFormatLib.vcxproj.filters b/ASCOfficePPTFile/PPTFormatLib/Win32/PPTFormatLib.vcxproj.filters
index c21d0798d7..cf3db8516f 100644
--- a/ASCOfficePPTFile/PPTFormatLib/Win32/PPTFormatLib.vcxproj.filters
+++ b/ASCOfficePPTFile/PPTFormatLib/Win32/PPTFormatLib.vcxproj.filters
@@ -22,6 +22,15 @@
     <Filter Include="OOXWriter">
       <UniqueIdentifier>{41fc709e-386b-4e1e-80c0-546932a2a480}</UniqueIdentifier>
     </Filter>
+    <Filter Include="Records\Slide">
+      <UniqueIdentifier>{0ddad310-407e-4d05-be91-fc3f3ec4161e}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Records\Text">
+      <UniqueIdentifier>{23c362a7-0224-4e72-b344-6a6b1263dc7a}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Structures">
+      <UniqueIdentifier>{e1779537-0a9d-4f28-b34c-2fa7d962a321}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\Reader\ClassesAtom.h">
@@ -51,9 +60,6 @@
     <ClInclude Include="..\Reader\SlidePersist.h">
       <Filter>Reader</Filter>
     </ClInclude>
-    <ClInclude Include="..\Records\AnimationInfoAtom.h">
-      <Filter>Records</Filter>
-    </ClInclude>
     <ClInclude Include="..\Records\BlipEntityAtom.h">
       <Filter>Records</Filter>
     </ClInclude>
@@ -135,9 +141,6 @@
     <ClInclude Include="..\Records\FontEntityAtom.h">
       <Filter>Records</Filter>
     </ClInclude>
-    <ClInclude Include="..\Records\GenericDateMCAtom.h">
-      <Filter>Records</Filter>
-    </ClInclude>
     <ClInclude Include="..\Records\GridSpacing10Atom.h">
       <Filter>Records</Filter>
     </ClInclude>
@@ -348,9 +351,6 @@
     <ClInclude Include="..\Records\Drawing\TextBox.h">
       <Filter>Records\Drawing</Filter>
     </ClInclude>
-    <ClInclude Include="..\Records\Animations\AnimationTypes.h">
-      <Filter>Records\Animations</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\ASCOfficePPTXFile\Editor\Drawing\Animations.h">
       <Filter>OOXElements</Filter>
     </ClInclude>
@@ -460,6 +460,285 @@
       <Filter>OOXWriter</Filter>
     </ClInclude>
     <ClInclude Include="..\PPTFormatLib.h" />
+    <ClInclude Include="..\Records\Animations\_includer.h">
+      <Filter>Records\Animations</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Records\Animations\AnimationInfoAtom.h">
+      <Filter>Records\Animations</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Records\Animations\AnimationInfoContainer.h">
+      <Filter>Records\Animations</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Records\Animations\BuildAtom.h">
+      <Filter>Records\Animations</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Records\Animations\BuildListContainer.h">
+      <Filter>Records\Animations</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Records\Animations\ChartBuildAtom.h">
+      <Filter>Records\Animations</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Records\Animations\ChartBuildContainer.h">
+      <Filter>Records\Animations</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Records\Animations\ClientVisualElementContainer.h">
+      <Filter>Records\Animations</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Records\Animations\DiagramBuildAtom.h">
+      <Filter>Records\Animations</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Records\Animations\DiagramBuildContainer.h">
+      <Filter>Records\Animations</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Records\Animations\ExtTimeNodeContainer.h">
+      <Filter>Records\Animations</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Records\Animations\HashCode10Atom.h">
+      <Filter>Records\Animations</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Records\Animations\LevelInfoAtom.h">
+      <Filter>Records\Animations</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Records\Animations\ParaBuildAtom.h">
+      <Filter>Records\Animations</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Records\Animations\ParaBuildContainer.h">
+      <Filter>Records\Animations</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Records\Animations\ParaBuildLevel.h">
+      <Filter>Records\Animations</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Records\Animations\SubEffectContainer.h">
+      <Filter>Records\Animations</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Records\Animations\TimeAnimateBehaviorAtom.h">
+      <Filter>Records\Animations</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Records\Animations\TimeAnimateBehaviorContainer.h">
+      <Filter>Records\Animations</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Records\Animations\TimeAnimateColor.h">
+      <Filter>Records\Animations</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Records\Animations\TimeAnimateColorBy.h">
+      <Filter>Records\Animations</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Records\Animations\TimeAnimationValueAtom.h">
+      <Filter>Records\Animations</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Records\Animations\TimeAnimationValueListContainer.h">
+      <Filter>Records\Animations</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Records\Animations\TimeAnimationValueListEntry.h">
+      <Filter>Records\Animations</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Records\Animations\TimeBehaviorAtom.h">
+      <Filter>Records\Animations</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Records\Animations\TimeBehaviorContainer.h">
+      <Filter>Records\Animations</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Records\Animations\TimeColorBehaviorAtom.h">
+      <Filter>Records\Animations</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Records\Animations\TimeColorBehaviorContainer.h">
+      <Filter>Records\Animations</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Records\Animations\TimeCommandBehaviorAtom.h">
+      <Filter>Records\Animations</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Records\Animations\TimeCommandBehaviorContainer.h">
+      <Filter>Records\Animations</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Records\Animations\TimeConditionAtom.h">
+      <Filter>Records\Animations</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Records\Animations\TimeConditionContainer.h">
+      <Filter>Records\Animations</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Records\Animations\TimeEffectBehaviorAtom.h">
+      <Filter>Records\Animations</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Records\Animations\TimeEffectBehaviorContainer.h">
+      <Filter>Records\Animations</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Records\Animations\TimeIterateDataAtom.h">
+      <Filter>Records\Animations</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Records\Animations\TimeModifierAtom.h">
+      <Filter>Records\Animations</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Records\Animations\TimeMotionBehaviorAtom.h">
+      <Filter>Records\Animations</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Records\Animations\TimeMotionBehaviorContainer.h">
+      <Filter>Records\Animations</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Records\Animations\TimeNodeAtom.h">
+      <Filter>Records\Animations</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Records\Animations\TimeNodeTimeFilter.h">
+      <Filter>Records\Animations</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Records\Animations\TimePropertyList4TimeBehavior.h">
+      <Filter>Records\Animations</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Records\Animations\TimePropertyList4TimeNodeContainer.h">
+      <Filter>Records\Animations</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Records\Animations\TimeRotationBehaviorAtom.h">
+      <Filter>Records\Animations</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Records\Animations\TimeRotationBehaviorContainer.h">
+      <Filter>Records\Animations</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Records\Animations\TimeScaleBehaviorAtom.h">
+      <Filter>Records\Animations</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Records\Animations\TimeScaleBehaviorContainer.h">
+      <Filter>Records\Animations</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Records\Animations\TimeSequenceDataAtom.h">
+      <Filter>Records\Animations</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Records\Animations\TimeSetBehaviorAtom.h">
+      <Filter>Records\Animations</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Records\Animations\TimeSetBehaviorContainer.h">
+      <Filter>Records\Animations</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Records\Animations\TimeStringListContainer.h">
+      <Filter>Records\Animations</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Records\Animations\TimeVariant.h">
+      <Filter>Records\Animations</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Records\Animations\TimeVariant4Behavior.h">
+      <Filter>Records\Animations</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Records\Animations\TimeVariant4TimeNode.h">
+      <Filter>Records\Animations</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Records\Animations\VisualPageAtom.h">
+      <Filter>Records\Animations</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Records\Animations\VisualShapeAtom.h">
+      <Filter>Records\Animations</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Records\Animations\VisualShapeChartElementAtom.h">
+      <Filter>Records\Animations</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Records\Animations\VisualShapeGeneralAtom.h">
+      <Filter>Records\Animations</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Records\Animations\VisualSoundAtom.h">
+      <Filter>Records\Animations</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Records\Slide\Comment10Container.h">
+      <Filter>Records\Slide</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Records\Slide\LinkedShape10Atom.h">
+      <Filter>Records\Slide</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Records\Slide\LinkedSlide10Atom.h">
+      <Filter>Records\Slide</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Records\Slide\SlideFlags10Atom.h">
+      <Filter>Records\Slide</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Records\Slide\SlideProgTagsContainer.h">
+      <Filter>Records\Slide</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Records\Slide\SlideTime10Atom.h">
+      <Filter>Records\Slide</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Records\Text\CFMasks.h">
+      <Filter>Records\Text</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Records\Text\FontCollection10Container.h">
+      <Filter>Records\Text</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Records\Text\FontEmbedFlags10Atom.h">
+      <Filter>Records\Text</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Records\Text\OutlineTextProps9Container.h">
+      <Filter>Records\Text</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Records\Text\OutlineTextPropsHeaderExAtom.h">
+      <Filter>Records\Text</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Records\Text\PFMasks.h">
+      <Filter>Records\Text</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Records\Text\StyleTextProp9Atom.h">
+      <Filter>Records\Text</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Records\Text\StyleTextProp10Atom.h">
+      <Filter>Records\Text</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Records\Text\StyleTextProp11Atom.h">
+      <Filter>Records\Text</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Records\Text\TextCFException9.h">
+      <Filter>Records\Text</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Records\Text\TextCFException10.h">
+      <Filter>Records\Text</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Records\Text\TextDefaults9Atom.h">
+      <Filter>Records\Text</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Records\Text\TextMasterStyle9Atom.h">
+      <Filter>Records\Text</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Records\Text\TextMasterStyle9Level.h">
+      <Filter>Records\Text</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Records\Text\TextPFException9.h">
+      <Filter>Records\Text</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Records\Text\TextSIException.h">
+      <Filter>Records\Text</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Reader\Slide.h">
+      <Filter>Reader</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Structures\_includer.h">
+      <Filter>Structures</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Structures\ColorIndexStruct.h">
+      <Filter>Structures</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Structures\ColorStruct.h">
+      <Filter>Structures</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Structures\DateTimeStruct.h">
+      <Filter>Structures</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Structures\IStruct.h">
+      <Filter>Structures</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Structures\PointStruct.h">
+      <Filter>Structures</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Structures\RatioStruct.h">
+      <Filter>Structures</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Structures\RectStruct.h">
+      <Filter>Structures</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Structures\ScalingStruct.h">
+      <Filter>Structures</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Structures\SmallRectStruct.h">
+      <Filter>Structures</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Structures\TmsfTimeStruct.h">
+      <Filter>Structures</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Structures\WideColorStruct.h">
+      <Filter>Structures</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\Reader\PPTDocumentInfoOneUser.cpp">
@@ -483,9 +762,6 @@
     <ClCompile Include="..\Records\Drawing\ShapeContainer.cpp">
       <Filter>Records\Drawing</Filter>
     </ClCompile>
-    <ClCompile Include="..\Records\Animations\AnimationTypes.cpp">
-      <Filter>Records\Animations</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\ASCOfficePPTXFile\Editor\Drawing\Elements.cpp">
       <Filter>OOXElements</Filter>
     </ClCompile>
@@ -499,5 +775,8 @@
       <Filter>OOXWriter</Filter>
     </ClCompile>
     <ClCompile Include="..\PPTFormatLib.cpp" />
+    <ClCompile Include="..\Records\Animations\TimeVariant.cpp">
+      <Filter>Records\Animations</Filter>
+    </ClCompile>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/ASCOfficePPTXFile/PPTXLib/PPTXFormat.vcxproj b/ASCOfficePPTXFile/PPTXLib/PPTXFormat.vcxproj
index 84e7bec002..40754b5b65 100644
--- a/ASCOfficePPTXFile/PPTXLib/PPTXFormat.vcxproj
+++ b/ASCOfficePPTXFile/PPTXLib/PPTXFormat.vcxproj
@@ -167,7 +167,6 @@
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
       </PrecompiledHeader>
     </ClCompile>
-    <ClCompile Include="..\..\DesktopEditor\raster\exif.cpp" />
     <ClCompile Include="..\..\HtmlRenderer\src\ASCSVGWriter.cpp" />
     <ClCompile Include="..\ASCOfficeDrawingConverter.cpp">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Disabled</Optimization>