.

MsBinaryFile/Common/Vml/PPTShape/ElementSettings.cpp

@@ -100,7 +100,7 @@ void CProperty::ComplexFromStream(POLE::Stream* pStream)
 		{
 		case ODRAW::fillBlip:
 		{
-			SRecordHeader oHeader;
+			PPT_FORMAT::SRecordHeader oHeader;
 			if (oHeader.ReadFromStream(pStream) == false)
 			{
 				return;
@@ -115,7 +115,7 @@ void CProperty::ComplexFromStream(POLE::Stream* pStream)
 			case RECORD_TYPE_ESCHER_BLIP_DIB:
 			case RECORD_TYPE_ESCHER_BLIP_TIFF:
 			{
-				CRecordOfficeArtBlip art_blip;
+				PPT_FORMAT::CRecordOfficeArtBlip art_blip;
 				art_blip.ReadFromStream(oHeader, pStream);
 			}
 			}

MsBinaryFile/DocFile/VMLPictureMapping.cpp

@@ -321,7 +321,7 @@ namespace DocFileFormat
 			ODRAW::OfficeArtFOPTEPtr & iter = options[i];
 			switch (iter->opid)
 			{
-			case wzEquationXML:
+			case ODRAW::wzEquationXML:
 				{
 					ODRAW::XmlString *pXml = dynamic_cast<ODRAW::XmlString*>(iter.get());
 					if (pXml)

MsBinaryFile/PptFile/Reader/ExtXmlUtils.hpp

@@ -0,0 +1,46 @@
+#pragma once
+
+#include <string>
+#include <vector>
+#include <algorithm>
+
+
+namespace XmlUtils {
+std::vector<std::wstring> FindAttrValues(const std::wstring& xml, std::wstring attrName)
+{
+    attrName += L"=\"";
+    std::vector<std::wstring> values;
+    size_t posBeg = xml.find(attrName);
+    auto endTagPos = posBeg + attrName.size();
+    size_t posEnd = xml.find(L"\"", endTagPos);
+
+    // Repeat till end is reached
+    while( posBeg != std::string::npos)
+    {
+        auto strValue = xml.substr(endTagPos, posEnd - (endTagPos));
+        values.push_back(strValue);
+
+        // Get the next occurrence from the current position
+        posBeg = xml.find(attrName, endTagPos);
+        endTagPos = posBeg + attrName.size();
+        posEnd = xml.find(L"\"", endTagPos);
+    }
+    return values;
+}
+
+std::vector<int> FindAttrValuesInt(const std::wstring& xml, std::wstring attrName)
+{
+    auto vecStrValues = FindAttrValues(xml, attrName);
+    std::vector<int> vecIntValues;
+    for (const auto& strValue : vecStrValues)
+    {
+        try {
+            vecIntValues.push_back(std::stoi(strValue));
+        } catch (...) {
+        }
+    }
+    return vecIntValues;
+}
+
+}
+

OOXML/Binary/Document/DocWrapper/ChartSerializer.cpp

@@ -29,7 +29,7 @@
  * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
  *
  */
-#include "ChartWriter.h"
+#include "ChartSerializer.h"
 
 #include <algorithm>
 

OOXML/Binary/Document/DocWrapper/XlsxSerializer.cpp

@@ -39,7 +39,7 @@
 #include "../../Presentation/FontPicker.h"
 
 #include "../../../../OfficeUtils/src/OfficeUtils.h"
-#include "ChartWriter.h"
+#include "ChartSerializer.h"
 
 #include "../BinReader/DefaultThemeWriter.h"
 

OOXML/DocxFormat/Bibliography.cpp

@@ -31,7 +31,7 @@
  */
 
 #include "Bibliography.h"
-#include "../../../../DesktopEditor/common/File.h"
+#include "../../DesktopEditor/common/File.h"
 #include "FileTypes.h"
 
 namespace OOX

OOXML/DocxFormat/FontTable.cpp

@@ -32,7 +32,7 @@
 
 #include "FontTable.h"
 
-#include "../../../../DesktopEditor/common/Directory.h"
+#include "../../DesktopEditor/common/Directory.h"
 #include "FileTypes.h"
 #include "Docx.h"
 

OOXML/DocxFormat/Numbering.cpp

@@ -32,7 +32,7 @@
 
 #include "Numbering.h"
 #include "Docx.h"
-#include "../../../../DesktopEditor/common/File.h"
+#include "../../DesktopEditor/common/File.h"
 
 namespace ComplexTypes
 {

OOXML/DocxFormat/Settings/WebSettings.cpp

@@ -31,7 +31,7 @@
  */
 
 #include "WebSettings.h"
-#include "../../../../DesktopEditor/common/File.h"
+#include "../../../DesktopEditor/common/File.h"
 #include "../FileTypes.h"
 
 namespace ComplexTypes

OOXML/Projects/Linux/BinDocument/BinDocument.pro

@@ -30,7 +30,7 @@ SOURCES += \
 	../../../Binary/Document/DocWrapper/DocxSerializer.cpp \
 	../../../Binary/Document/DocWrapper/FontProcessor.cpp \
 	../../../Binary/Document/DocWrapper/XlsxSerializer.cpp \
-	../../../Binary/Document/DocWrapper/ChartWriter.cpp \
+        ../../../Binary/Document/DocWrapper/ChartSerializer.cpp \
 	../../../Binary/Document/BinWriter/BinWriters.cpp \
 	../../../Binary/Document/BinWriter/BinEquationWriter.cpp \
 	../../../Binary/Sheets/Common/Common.cpp \

OOXML/Projects/Linux/DocxFormatLib/DocxFormatLib.pro

@@ -86,7 +86,7 @@ SOURCES += \
 	../../../XlsxFormat/Worksheets/ConditionalFormatting.cpp \
 	../../../XlsxFormat/Worksheets/DataValidation.cpp \
 	../../../XlsxFormat/Worksheets/Cols.cpp \
-	../../../XlsxFormat/Worksheets/Hyperlinks.cpp \
+        ../../../XlsxFormat/Worksheets/XlsxHyperlinks.cpp \
 	../../../XlsxFormat/Worksheets/MergeCells.cpp \
 	../../../XlsxFormat/Worksheets/Sparkline.cpp \
 	../../../XlsxFormat/Worksheets/WorksheetChildOther.cpp \
@@ -140,9 +140,9 @@ SOURCES += \
 	../../../Common/SimpleTypes_Vml.cpp \
 	../../../Common/ComplexTypes.cpp \
 	../../../SystemUtility/SystemUtility.cpp \
-	../../../SystemUtility/File.cpp \
+        ../../../SystemUtility/FileUtils.cpp \
 	../../../XML/XmlSimple.cpp \
-	../../../XlsxFormat/Styles/Styles.cpp \
+        ../../../XlsxFormat/Styles/XlsxStyles.cpp \
 	../../../XlsxFormat/Styles/rPr.cpp \
 	../../../XlsxFormat/Styles/Borders.cpp \
 	../../../XlsxFormat/Styles/CellStyles.cpp \
@@ -156,7 +156,7 @@ SOURCES += \
 	../../../XlsxFormat/SharedStrings/Si.cpp \
 	../../../XlsxFormat/SharedStrings/Text.cpp \
 	../../../XlsxFormat/SharedStrings/PhoneticPr.cpp \
-	../../../XlsxFormat/SharedStrings/Run.cpp \
+        ../../../XlsxFormat/SharedStrings/XlsxRun.cpp \
 	../../../XlsxFormat/SharedStrings/SharedStrings.cpp \
 	../../../XlsxFormat/Pivot/Pivots.cpp \
 	../../../XlsxFormat/Slicer/SlicerCache.cpp \
@@ -175,7 +175,7 @@ SOURCES += \
 	../../../XlsxFormat/Comments/Comments.cpp \
 	../../../XlsxFormat/Comments/ThreadedComments.cpp \
 	../../../XlsxFormat/Drawing/CellAnchor.cpp \
-	../../../XlsxFormat/Drawing/Drawing.cpp \
+        ../../../XlsxFormat/Drawing/XlsxDrawing.cpp \
 	../../../XlsxFormat/Drawing/FromTo.cpp \
 	../../../XlsxFormat/Drawing/Pos.cpp \
 	../../../XlsxFormat/ExternalLinks/ExternalLinkPath.cpp \

OOXML/Projects/Linux/DocxFormatLib/common_format.cpp

@@ -41,5 +41,5 @@
 #include "../../../Common/ComplexTypes.cpp"
 
 #include "../../../SystemUtility/SystemUtility.cpp"
-#include "../../../SystemUtility/File.cpp"
+#include "../../../SystemUtility/FileUtils.cpp"
 #include "../../../XML/XmlSimple.cpp"

OOXML/Projects/Linux/DocxFormatLib/xlsx_format_logic.cpp

@@ -48,7 +48,7 @@
 #include "../../../XlsxFormat/Worksheets/ConditionalFormatting.cpp"
 #include "../../../XlsxFormat/Worksheets/DataValidation.cpp"
 #include "../../../XlsxFormat/Worksheets/Cols.cpp"
-#include "../../../XlsxFormat/Worksheets/Hyperlinks.cpp"
+#include "../../../XlsxFormat/Worksheets/XlsxHyperlinks.cpp"
 #include "../../../XlsxFormat/Worksheets/MergeCells.cpp"
 #include "../../../XlsxFormat/Worksheets/Sparkline.cpp"
 #include "../../../XlsxFormat/Worksheets/WorksheetChildOther.cpp"
@@ -57,7 +57,7 @@
 #include "../../../XlsxFormat/Table/Connections.cpp"
 #include "../../../XlsxFormat/Controls/Controls.cpp"
 #include "../../../XlsxFormat/Styles/rPr.cpp"
-#include "../../../XlsxFormat/Styles/Styles.cpp"
+#include "../../../XlsxFormat/Styles/XlsxStyles.cpp"
 #include "../../../XlsxFormat/Styles/Borders.cpp"
 #include "../../../XlsxFormat/Styles/CellStyles.cpp"
 #include "../../../XlsxFormat/Styles/Colors.cpp"
@@ -85,12 +85,12 @@
 #include "../../../XlsxFormat/Comments/Comments.cpp"
 #include "../../../XlsxFormat/Comments/ThreadedComments.cpp"
 #include "../../../XlsxFormat/Drawing/CellAnchor.cpp"
-#include "../../../XlsxFormat/Drawing/Drawing.cpp"
+#include "../../../XlsxFormat/Drawing/XlsxDrawing.cpp"
 #include "../../../XlsxFormat/Drawing/FromTo.cpp"
 #include "../../../XlsxFormat/Drawing/Pos.cpp"
 #include "../../../XlsxFormat/ExternalLinks/ExternalLinkPath.cpp"
 #include "../../../XlsxFormat/ExternalLinks/ExternalLinks.cpp"
 #include "../../../XlsxFormat/Ole/OleObjects.cpp"
 #include "../../../XlsxFormat/SharedStrings/PhoneticPr.cpp"
-#include "../../../XlsxFormat/SharedStrings/Run.cpp"
+#include "../../../XlsxFormat/SharedStrings/XlsxRun.cpp"
 #include "../../../XlsxFormat/SharedStrings/SharedStrings.cpp"

OOXML/Projects/Windows/BinaryFormatLib/BinaryFormatLib.vcxproj

@@ -27,19 +27,37 @@
     <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTXShape\PptxFormula.cpp" />
     <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTXShape\PptxShape.cpp" />
     <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\toVmlConvert.cpp" />
+    <ClCompile Include="..\..\..\Binary\Document\BinReader\ChartWriter.cpp" />
+    <ClCompile Include="..\..\..\Binary\Document\BinReader\CommentsWriter.cpp" />
     <ClCompile Include="..\..\..\Binary\Document\BinReader\CustomXmlWriter.cpp" />
+    <ClCompile Include="..\..\..\Binary\Document\BinReader\DefaultThemeWriter.cpp" />
+    <ClCompile Include="..\..\..\Binary\Document\BinReader\DocumentRelsWriter.cpp" />
+    <ClCompile Include="..\..\..\Binary\Document\BinReader\DocumentWriter.cpp" />
     <ClCompile Include="..\..\..\Binary\Document\BinReader\FileWriter.cpp" />
+    <ClCompile Include="..\..\..\Binary\Document\BinReader\fontTableWriter.cpp" />
+    <ClCompile Include="..\..\..\Binary\Document\BinReader\HeaderFooterWriter.cpp" />
+    <ClCompile Include="..\..\..\Binary\Document\BinReader\MediaWriter.cpp" />
+    <ClCompile Include="..\..\..\Binary\Document\BinReader\NumberingWriter.cpp" />
     <ClCompile Include="..\..\..\Binary\Document\BinReader\ReaderClasses.cpp" />
     <ClCompile Include="..\..\..\Binary\Document\BinReader\Readers.cpp" />
+    <ClCompile Include="..\..\..\Binary\Document\BinReader\SettingWriter.cpp" />
+    <ClCompile Include="..\..\..\Binary\Document\BinReader\StylesWriter.cpp" />
+    <ClCompile Include="..\..\..\Binary\Document\BinReader\webSettingsWriter.cpp" />
     <ClCompile Include="..\..\..\Binary\Document\BinWriter\BinWriters.cpp" />
-    <ClCompile Include="..\..\..\Binary\Document\DocWrapper\ChartWriter.cpp" />
+    <ClCompile Include="..\..\..\Binary\Document\DocWrapper\ChartSerializer.cpp" />
     <ClCompile Include="..\..\..\Binary\Document\DocWrapper\DocxSerializer.cpp" />
     <ClCompile Include="..\..\..\Binary\Document\DocWrapper\FontProcessor.cpp" />
     <ClCompile Include="..\..\..\Binary\Document\DocWrapper\XlsxSerializer.cpp" />
     <ClCompile Include="..\..\..\Binary\MathEquation\MathEquation.cpp" />
     <ClCompile Include="..\..\..\Binary\Presentation\BinaryFileReaderWriter.cpp" />
+    <ClCompile Include="..\..\..\Binary\Presentation\CalculatorCRC32.cpp" />
+    <ClCompile Include="..\..\..\Binary\Presentation\Converter.cpp" />
+    <ClCompile Include="..\..\..\Binary\Presentation\DefaultNotesMaster.cpp" />
+    <ClCompile Include="..\..\..\Binary\Presentation\DefaultNotesTheme.cpp" />
+    <ClCompile Include="..\..\..\Binary\Presentation\FontCutter.cpp" />
     <ClCompile Include="..\..\..\Binary\Presentation\FontPicker.cpp" />
     <ClCompile Include="..\..\..\Binary\Presentation\imagemanager.cpp" />
+    <ClCompile Include="..\..\..\Binary\Presentation\PPTXWriter.cpp" />
     <ClCompile Include="..\..\..\Binary\Sheets\Common\Common.cpp" />
     <ClCompile Include="..\..\..\Binary\Sheets\Reader\BinaryWriter.cpp" />
     <ClCompile Include="..\..\..\Binary\Sheets\Reader\ChartFromToBinary.cpp" />
@@ -546,6 +564,7 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <IncludePath>..\..\..\..\Common\3dParty\boost\build\win_32\include;$(VC_IncludePath);$(WindowsSDK_IncludePath);</IncludePath>
     <LibraryPath>..\..\..\..\Common\3dParty\boost\build\win_32\lib;$(VC_LibraryPath_x86);$(WindowsSDK_LibraryPath_x86);$(NETFXKitsDir)Lib\um\x86</LibraryPath>
+    <OutDir>$(SolutionDir)$(Configuration)</OutDir>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>

OOXML/Projects/Windows/BinaryFormatLib/BinaryFormatLib.vcxproj.filters

@@ -48,9 +48,6 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\..\Binary\Document\DocWrapper\ChartWriter.cpp">
-      <Filter>Document</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\Binary\Document\DocWrapper\DocxSerializer.cpp">
       <Filter>Document</Filter>
     </ClCompile>
@@ -87,9 +84,6 @@
     <ClCompile Include="..\..\..\Binary\Sheets\Reader\CSVReader.cpp">
       <Filter>Sheets\Writer</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\Binary\Sheets\Writer\BinaryReader.cpp">
-      <Filter>Sheets\Reader</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\Binary\Sheets\Writer\CSVWriter.cpp">
       <Filter>Sheets\Reader</Filter>
     </ClCompile>
@@ -138,6 +132,66 @@
     <ClCompile Include="..\..\..\..\MsBinaryFile\Common\Vml\PPTShape\ElementSettings.cpp">
       <Filter>Common\Vml\PptShape</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\Binary\Presentation\CalculatorCRC32.cpp">
+      <Filter>Presentation</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Binary\Presentation\Converter.cpp">
+      <Filter>Presentation</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Binary\Presentation\DefaultNotesMaster.cpp">
+      <Filter>Presentation</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Binary\Presentation\DefaultNotesTheme.cpp">
+      <Filter>Presentation</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Binary\Presentation\FontCutter.cpp">
+      <Filter>Presentation</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Binary\Presentation\PPTXWriter.cpp">
+      <Filter>Presentation</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Binary\Document\BinReader\ChartWriter.cpp">
+      <Filter>Document\Reader</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Binary\Document\BinReader\CommentsWriter.cpp">
+      <Filter>Document\Reader</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Binary\Document\BinReader\DefaultThemeWriter.cpp">
+      <Filter>Document\Reader</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Binary\Document\BinReader\DocumentRelsWriter.cpp">
+      <Filter>Document\Reader</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Binary\Document\BinReader\DocumentWriter.cpp">
+      <Filter>Document\Reader</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Binary\Document\BinReader\fontTableWriter.cpp">
+      <Filter>Document\Reader</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Binary\Document\BinReader\HeaderFooterWriter.cpp">
+      <Filter>Document\Reader</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Binary\Document\BinReader\MediaWriter.cpp">
+      <Filter>Document\Reader</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Binary\Document\BinReader\NumberingWriter.cpp">
+      <Filter>Document\Reader</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Binary\Document\BinReader\SettingWriter.cpp">
+      <Filter>Document\Reader</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Binary\Document\BinReader\StylesWriter.cpp">
+      <Filter>Document\Reader</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Binary\Document\BinReader\webSettingsWriter.cpp">
+      <Filter>Document\Reader</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Binary\Sheets\Writer\BinaryReader.cpp">
+      <Filter>Sheets\Reader</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Binary\Document\DocWrapper\ChartSerializer.cpp">
+      <Filter>Document</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\..\Binary\Document\DocWrapper\ChartWriter.h">

OOXML/Projects/Windows/DocxFormatLib/DocxFormatLib.vcxproj

@@ -432,6 +432,8 @@
     <ClCompile Include="..\..\..\DocxFormat\Drawing\Drawing.cpp" />
     <ClCompile Include="..\..\..\DocxFormat\Drawing\DrawingExt.cpp" />
     <ClCompile Include="..\..\..\DocxFormat\Endnote.cpp" />
+    <ClCompile Include="..\..\..\DocxFormat\External\External.cpp" />
+    <ClCompile Include="..\..\..\DocxFormat\External\HyperLink.cpp" />
     <ClCompile Include="..\..\..\DocxFormat\File.cpp" />
     <ClCompile Include="..\..\..\DocxFormat\FileFactory.cpp" />
     <ClCompile Include="..\..\..\DocxFormat\FileType.cpp" />
@@ -469,19 +471,24 @@
     <ClCompile Include="..\..\..\DocxFormat\Math\oMathContent.cpp" />
     <ClCompile Include="..\..\..\DocxFormat\Math\oMathPara.cpp" />
     <ClCompile Include="..\..\..\DocxFormat\Media\ActiveX.cpp" />
+    <ClCompile Include="..\..\..\DocxFormat\Media\Audio.cpp" />
+    <ClCompile Include="..\..\..\DocxFormat\Media\Image.cpp" />
     <ClCompile Include="..\..\..\DocxFormat\Media\JsaProject.cpp" />
     <ClCompile Include="..\..\..\DocxFormat\Media\Media.cpp" />
+    <ClCompile Include="..\..\..\DocxFormat\Media\OleObject.cpp" />
     <ClCompile Include="..\..\..\DocxFormat\Media\VbaProject.cpp" />
+    <ClCompile Include="..\..\..\DocxFormat\Media\Video.cpp" />
     <ClCompile Include="..\..\..\DocxFormat\Namespaces.cpp" />
     <ClCompile Include="..\..\..\DocxFormat\Numbering.cpp" />
     <ClCompile Include="..\..\..\DocxFormat\Rels.cpp" />
     <ClCompile Include="..\..\..\DocxFormat\RId.cpp" />
     <ClCompile Include="..\..\..\DocxFormat\Settings\Settings.cpp" />
+    <ClCompile Include="..\..\..\DocxFormat\Settings\WebSettings.cpp" />
     <ClCompile Include="..\..\..\DocxFormat\Styles.cpp" />
     <ClCompile Include="..\..\..\DocxFormat\UnknowTypeFile.cpp" />
     <ClCompile Include="..\..\..\DocxFormat\VmlDrawing.cpp" />
     <ClCompile Include="..\..\..\DocxFormat\WritingElement.cpp" />
-    <ClCompile Include="..\..\..\SystemUtility\File.cpp" />
+    <ClCompile Include="..\..\..\SystemUtility\FileUtils.cpp" />
     <ClCompile Include="..\..\..\SystemUtility\SystemUtility.cpp" />
     <ClCompile Include="..\..\..\XlsxFormat\CalcChain\CalcChain.cpp" />
     <ClCompile Include="..\..\..\XlsxFormat\Chart\Chart.cpp" />
@@ -490,13 +497,13 @@
     <ClCompile Include="..\..\..\XlsxFormat\Chart\ChartSerialize.cpp" />
     <ClCompile Include="..\..\..\XlsxFormat\Chart\ChartSerializeEx.cpp" />
     <ClCompile Include="..\..\..\XlsxFormat\Chart\ChartStyle.cpp" />
-    <ClCompile Include="..\..\..\XlsxFormat\Comments\Comments.cpp" />
+    <ClCompile Include="..\..\..\XlsxFormat\Comments\XlsxComments.cpp" />
     <ClCompile Include="..\..\..\XlsxFormat\Comments\ThreadedComments.cpp" />
     <ClCompile Include="..\..\..\XlsxFormat\Common.cpp" />
     <ClCompile Include="..\..\..\XlsxFormat\ComplexTypes_Spreadsheet.cpp" />
     <ClCompile Include="..\..\..\XlsxFormat\Controls\Controls.cpp" />
     <ClCompile Include="..\..\..\XlsxFormat\Drawing\CellAnchor.cpp" />
-    <ClCompile Include="..\..\..\XlsxFormat\Drawing\Drawing.cpp" />
+    <ClCompile Include="..\..\..\XlsxFormat\Drawing\XlsxDrawing.cpp" />
     <ClCompile Include="..\..\..\XlsxFormat\Drawing\FromTo.cpp" />
     <ClCompile Include="..\..\..\XlsxFormat\Drawing\Pos.cpp" />
     <ClCompile Include="..\..\..\XlsxFormat\ExternalLinks\ExternalLinkPath.cpp" />
@@ -508,7 +515,7 @@
     <ClCompile Include="..\..\..\XlsxFormat\Pivot\PivotCacheDefinitionExt.cpp" />
     <ClCompile Include="..\..\..\XlsxFormat\Pivot\Pivots.cpp" />
     <ClCompile Include="..\..\..\XlsxFormat\SharedStrings\PhoneticPr.cpp" />
-    <ClCompile Include="..\..\..\XlsxFormat\SharedStrings\Run.cpp" />
+    <ClCompile Include="..\..\..\XlsxFormat\SharedStrings\XlsxRun.cpp" />
     <ClCompile Include="..\..\..\XlsxFormat\SharedStrings\SharedStrings.cpp" />
     <ClCompile Include="..\..\..\XlsxFormat\SharedStrings\Si.cpp" />
     <ClCompile Include="..\..\..\XlsxFormat\SharedStrings\Text.cpp" />
@@ -523,7 +530,7 @@
     <ClCompile Include="..\..\..\XlsxFormat\Styles\Fonts.cpp" />
     <ClCompile Include="..\..\..\XlsxFormat\Styles\NumFmts.cpp" />
     <ClCompile Include="..\..\..\XlsxFormat\Styles\rPr.cpp" />
-    <ClCompile Include="..\..\..\XlsxFormat\Styles\Styles.cpp" />
+    <ClCompile Include="..\..\..\XlsxFormat\Styles\XlsxStyles.cpp" />
     <ClCompile Include="..\..\..\XlsxFormat\Styles\TableStyles.cpp" />
     <ClCompile Include="..\..\..\XlsxFormat\Styles\Xfs.cpp" />
     <ClCompile Include="..\..\..\XlsxFormat\Table\Autofilter.cpp" />
@@ -539,7 +546,7 @@
     <ClCompile Include="..\..\..\XlsxFormat\Worksheets\Cols.cpp" />
     <ClCompile Include="..\..\..\XlsxFormat\Worksheets\ConditionalFormatting.cpp" />
     <ClCompile Include="..\..\..\XlsxFormat\Worksheets\DataValidation.cpp" />
-    <ClCompile Include="..\..\..\XlsxFormat\Worksheets\Hyperlinks.cpp" />
+    <ClCompile Include="..\..\..\XlsxFormat\Worksheets\XlsxHyperlinks.cpp" />
     <ClCompile Include="..\..\..\XlsxFormat\Worksheets\MergeCells.cpp" />
     <ClCompile Include="..\..\..\XlsxFormat\Worksheets\SheetData.cpp" />
     <ClCompile Include="..\..\..\XlsxFormat\Worksheets\Sparkline.cpp" />
@@ -549,6 +556,9 @@
     <ClCompile Include="..\..\..\XlsxFormat\XlsxFlat.cpp" />
     <ClCompile Include="..\..\..\XML\XmlSimple.cpp" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="ClassDiagram.cd" />
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>

OOXML/Projects/Windows/DocxFormatLib/DocxFormatLib.vcxproj.filters

@@ -597,9 +597,6 @@
     <ClCompile Include="..\..\..\XlsxFormat\Styles\rPr.cpp">
       <Filter>XlsxFormat\Styles</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\XlsxFormat\Styles\Styles.cpp">
-      <Filter>XlsxFormat\Styles</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\XlsxFormat\Slicer\Slicer.cpp">
       <Filter>XlsxFormat\Slicer</Filter>
     </ClCompile>
@@ -756,9 +753,6 @@
     <ClCompile Include="..\..\..\Common\SimpleTypes_Word.cpp">
       <Filter>Common</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\SystemUtility\File.cpp">
-      <Filter>Utils</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\SystemUtility\SystemUtility.cpp">
       <Filter>Utils</Filter>
     </ClCompile>
@@ -809,9 +803,6 @@
     <ClCompile Include="..\..\..\XlsxFormat\Worksheets\Cols.cpp">
       <Filter>XlsxFormat\Worksheets</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\XlsxFormat\Worksheets\Hyperlinks.cpp">
-      <Filter>XlsxFormat\Worksheets</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\XlsxFormat\Worksheets\MergeCells.cpp">
       <Filter>XlsxFormat\Worksheets</Filter>
     </ClCompile>
@@ -875,9 +866,6 @@
     <ClCompile Include="..\..\..\XlsxFormat\SharedStrings\PhoneticPr.cpp">
       <Filter>XlsxFormat\SharedStrings</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\XlsxFormat\SharedStrings\Run.cpp">
-      <Filter>XlsxFormat\SharedStrings</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\XlsxFormat\SharedStrings\SharedStrings.cpp">
       <Filter>XlsxFormat\SharedStrings</Filter>
     </ClCompile>
@@ -890,18 +878,12 @@
     <ClCompile Include="..\..\..\XlsxFormat\Drawing\CellAnchor.cpp">
       <Filter>XlsxFormat\Drawing</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\XlsxFormat\Drawing\Drawing.cpp">
-      <Filter>XlsxFormat\Drawing</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\XlsxFormat\Drawing\FromTo.cpp">
       <Filter>XlsxFormat\Drawing</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\XlsxFormat\Drawing\Pos.cpp">
       <Filter>XlsxFormat\Drawing</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\XlsxFormat\Comments\Comments.cpp">
-      <Filter>XlsxFormat\Comments</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\XlsxFormat\Comments\ThreadedComments.cpp">
       <Filter>XlsxFormat\Comments</Filter>
     </ClCompile>
@@ -920,5 +902,47 @@
     <ClCompile Include="..\..\..\XlsxFormat\CalcChain\CalcChain.cpp">
       <Filter>XlsxFormat\CalcChain</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\XlsxFormat\Styles\XlsxStyles.cpp">
+      <Filter>XlsxFormat\Styles</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\XlsxFormat\Comments\XlsxComments.cpp">
+      <Filter>XlsxFormat\Comments</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\XlsxFormat\Drawing\XlsxDrawing.cpp">
+      <Filter>XlsxFormat\Drawing</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\XlsxFormat\SharedStrings\XlsxRun.cpp">
+      <Filter>XlsxFormat\SharedStrings</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\DocxFormat\Settings\WebSettings.cpp">
+      <Filter>Settings</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\DocxFormat\Media\Audio.cpp">
+      <Filter>Media</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\DocxFormat\Media\Image.cpp">
+      <Filter>Media</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\DocxFormat\Media\OleObject.cpp">
+      <Filter>Media</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\DocxFormat\Media\Video.cpp">
+      <Filter>Media</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\SystemUtility\FileUtils.cpp">
+      <Filter>Utils</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\DocxFormat\External\External.cpp">
+      <Filter>External</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\DocxFormat\External\HyperLink.cpp">
+      <Filter>External</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\XlsxFormat\Worksheets\XlsxHyperlinks.cpp">
+      <Filter>XlsxFormat\Worksheets</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="ClassDiagram.cd" />
   </ItemGroup>
 </Project>

OOXML/Projects/Windows/PPTXFormatLib/PPTXFormat.vcxproj

@@ -400,11 +400,17 @@
     <ClInclude Include="..\..\..\PPTXFormat\WritingVector.h" />
   </ItemGroup>
   <ItemGroup>
+    <ClCompile Include="..\..\..\PPTXFormat\App.cpp" />
+    <ClCompile Include="..\..\..\PPTXFormat\CommentAuthors.cpp" />
+    <ClCompile Include="..\..\..\PPTXFormat\Comments.cpp" />
+    <ClCompile Include="..\..\..\PPTXFormat\Core.cpp" />
     <ClCompile Include="..\..\..\PPTXFormat\FileContainer.cpp" />
     <ClCompile Include="..\..\..\PPTXFormat\FileFactory.cpp" />
     <ClCompile Include="..\..\..\PPTXFormat\FileMap.cpp" />
     <ClCompile Include="..\..\..\PPTXFormat\FileTypes.cpp" />
     <ClCompile Include="..\..\..\PPTXFormat\Folder.cpp" />
+    <ClCompile Include="..\..\..\PPTXFormat\HandoutMaster.cpp" />
+    <ClCompile Include="..\..\..\PPTXFormat\LegacyDiagramText.cpp" />
     <ClCompile Include="..\..\..\PPTXFormat\Logic\Bg.cpp" />
     <ClCompile Include="..\..\..\PPTXFormat\Logic\CNvGrpSpPr.cpp" />
     <ClCompile Include="..\..\..\PPTXFormat\Logic\Colors\SchemeClr.cpp" />
@@ -440,7 +446,18 @@
     <ClCompile Include="..\..\..\PPTXFormat\Logic\UniColor.cpp" />
     <ClCompile Include="..\..\..\PPTXFormat\Logic\UniEffect.cpp" />
     <ClCompile Include="..\..\..\PPTXFormat\Logic\UniFill.cpp" />
+    <ClCompile Include="..\..\..\PPTXFormat\Namespaces.cpp" />
+    <ClCompile Include="..\..\..\PPTXFormat\NotesMaster.cpp" />
+    <ClCompile Include="..\..\..\PPTXFormat\NotesSlide.cpp" />
     <ClCompile Include="..\..\..\PPTXFormat\Presentation.cpp" />
+    <ClCompile Include="..\..\..\PPTXFormat\PresProps.cpp" />
+    <ClCompile Include="..\..\..\PPTXFormat\Slide.cpp" />
+    <ClCompile Include="..\..\..\PPTXFormat\SlideLayout.cpp" />
+    <ClCompile Include="..\..\..\PPTXFormat\SlideMaster.cpp" />
+    <ClCompile Include="..\..\..\PPTXFormat\TableStyles.cpp" />
+    <ClCompile Include="..\..\..\PPTXFormat\Theme.cpp" />
+    <ClCompile Include="..\..\..\PPTXFormat\ViewProps.cpp" />
+    <ClCompile Include="..\..\..\PPTXFormat\WrapperFile.cpp" />
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{36636678-AE25-4BE6-9A34-2561D1BCF302}</ProjectGuid>

OOXML/Projects/Windows/PPTXFormatLib/PPTXFormat.vcxproj.filters

@@ -1197,6 +1197,23 @@
     <ClCompile Include="..\..\..\PPTXFormat\Logic\Transitions\TransitionBase.cpp">
       <Filter>Logic\Transition</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\PPTXFormat\App.cpp" />
+    <ClCompile Include="..\..\..\PPTXFormat\CommentAuthors.cpp" />
+    <ClCompile Include="..\..\..\PPTXFormat\Comments.cpp" />
+    <ClCompile Include="..\..\..\PPTXFormat\Core.cpp" />
+    <ClCompile Include="..\..\..\PPTXFormat\HandoutMaster.cpp" />
+    <ClCompile Include="..\..\..\PPTXFormat\LegacyDiagramText.cpp" />
+    <ClCompile Include="..\..\..\PPTXFormat\Namespaces.cpp" />
+    <ClCompile Include="..\..\..\PPTXFormat\NotesMaster.cpp" />
+    <ClCompile Include="..\..\..\PPTXFormat\NotesSlide.cpp" />
+    <ClCompile Include="..\..\..\PPTXFormat\PresProps.cpp" />
+    <ClCompile Include="..\..\..\PPTXFormat\Slide.cpp" />
+    <ClCompile Include="..\..\..\PPTXFormat\SlideLayout.cpp" />
+    <ClCompile Include="..\..\..\PPTXFormat\SlideMaster.cpp" />
+    <ClCompile Include="..\..\..\PPTXFormat\TableStyles.cpp" />
+    <ClCompile Include="..\..\..\PPTXFormat\Theme.cpp" />
+    <ClCompile Include="..\..\..\PPTXFormat\ViewProps.cpp" />
+    <ClCompile Include="..\..\..\PPTXFormat\WrapperFile.cpp" />
   </ItemGroup>
   <ItemGroup>
     <Filter Include="Limits">

OOXML/XlsxFormat/Comments/Comments.h

@@ -31,23 +31,10 @@
  */
 #pragma once
 
-#include "../Xlsx.h"
+
-#include "../../XlsbFormat/Xlsb.h"
 #include "../Worksheets/Worksheet.h"
 #include "../SharedStrings/Si.h"
 
-#include "../../XlsbFormat/CommentsStream.h"
-
-#include "../../XlsbFormat/Biff12_unions/COMMENTS.h"
-#include "../../XlsbFormat/Biff12_unions/COMMENTAUTHORS.h"
-#include "../../XlsbFormat/Biff12_unions/COMMENTLIST.h"
-#include "../../XlsbFormat/Biff12_unions/COMMENT.h"
-
-#include "../../XlsbFormat/Biff12_records/CommentAuthor.h"
-#include "../../XlsbFormat/Biff12_records/BeginComment.h"
-#include "../../XlsbFormat/Biff12_records/CommentText.h"
-#include "../../XlsbFormat/Biff12_records/LegacyDrawing.h"
-
 #include "../Styles/Styles.h"
 
 namespace OOX

OOXML/XlsxFormat/Comments/ThreadedComments.h

@@ -30,8 +30,6 @@
  *
  */
 #pragma once
-#ifndef OOX_XLSXTREADEDCOMMENTS_FILE_INCLUDE_H_
-#define OOX_XLSXTREADEDCOMMENTS_FILE_INCLUDE_H_
 
 #include <unordered_map>
 
@@ -213,5 +211,3 @@ namespace OOX
 
 	} //Spreadsheet
 } // namespace OOX
-
-#endif // OOX_XLSXTREADEDCOMMENTS_FILE_INCLUDE_H_

OOXML/XlsxFormat/Comments/XlsxComments.cpp

@@ -32,6 +32,21 @@
 
 #include "Comments.h"
 
+#include "../Xlsx.h"
+#include "../../XlsbFormat/Xlsb.h"
+
+#include "../../XlsbFormat/CommentsStream.h"
+
+#include "../../XlsbFormat/Biff12_unions/COMMENTS.h"
+#include "../../XlsbFormat/Biff12_unions/COMMENTAUTHORS.h"
+#include "../../XlsbFormat/Biff12_unions/COMMENTLIST.h"
+#include "../../XlsbFormat/Biff12_unions/COMMENT.h"
+
+#include "../../XlsbFormat/Biff12_records/CommentAuthor.h"
+#include "../../XlsbFormat/Biff12_records/BeginComment.h"
+#include "../../XlsbFormat/Biff12_records/CommentText.h"
+#include "../../XlsbFormat/Biff12_records/LegacyDrawing.h"
+
 namespace OOX
 {
 	namespace Spreadsheet

OOXML/XlsxFormat/SharedStrings/SharedStrings.cpp

@@ -33,6 +33,7 @@
 #include "SharedStrings.h"
 #include "../../XlsbFormat/Biff12_records/BeginSst.h"
 #include "../../XlsbFormat/Biff12_unions/SHAREDSTRINGS.h"
+#include "../../XlsbFormat/Biff12_records/SSTItem.h"
 
 namespace OOX
 {

OOXML/XlsxFormat/Styles/Borders.cpp

@@ -32,6 +32,8 @@
 
 #include "Borders.h"
 
+#include "../../XlsbFormat/Biff12_records/Border.h"
+
 namespace OOX
 {
 	namespace Spreadsheet

OOXML/XlsxFormat/Styles/Borders.h

@@ -34,7 +34,6 @@
 #include "../CommonInclude.h"
 
 #include "rPr.h"
-#include "../../XlsbFormat/Biff12_records/Border.h"
 
 namespace OOX
 {

OOXML/XlsxFormat/Styles/CellStyles.cpp

@@ -31,6 +31,7 @@
  */
 
 #include "CellStyles.h"
+#include "../../XlsbFormat/Biff12_records/Style.h"
 
 namespace OOX
 {

OOXML/XlsxFormat/Styles/CellStyles.h

@@ -32,7 +32,6 @@
 #pragma once
 
 #include "../CommonInclude.h"
-#include "../../XlsbFormat/Biff12_records/Style.h"
 
 namespace OOX
 {

OOXML/XlsxFormat/Styles/Colors.cpp

@@ -32,6 +32,10 @@
 
 #include "Colors.h"
 
+#include "../../XlsbFormat/Biff12_unions/COLORPALETTE.h"
+#include "../../XlsbFormat/Biff12_unions/INDEXEDCOLORS.h"
+#include "../../XlsbFormat/Biff12_unions/MRUCOLORS.h"
+
 namespace OOX
 {
 	namespace Spreadsheet

OOXML/XlsxFormat/Styles/Colors.h

@@ -33,9 +33,7 @@
 #include "../CommonInclude.h"
 
 #include "rPr.h"
-#include "../../XlsbFormat/Biff12_unions/COLORPALETTE.h"
+
-#include "../../XlsbFormat/Biff12_unions/INDEXEDCOLORS.h"
-#include "../../XlsbFormat/Biff12_unions/MRUCOLORS.h"
 
 namespace OOX
 {

OOXML/XlsxFormat/Styles/Fills.cpp

@@ -32,6 +32,7 @@
 
 #include "Fills.h"
 
+#include "../../XlsbFormat/Biff12_records/Fill.h"
 namespace OOX
 {
 	namespace Spreadsheet

OOXML/XlsxFormat/Styles/Fills.h

@@ -34,7 +34,6 @@
 
 #include "rPr.h"
 
-#include "../../XlsbFormat/Biff12_records/Fill.h"
 
 namespace OOX
 {

OOXML/XlsxFormat/Styles/Fonts.cpp

@@ -31,6 +31,7 @@
  */
 
 #include "Fonts.h"
+#include "../../XlsbFormat/Biff12_records/CommonRecords.h"
 
 namespace OOX
 {

OOXML/XlsxFormat/Styles/Fonts.h

@@ -34,7 +34,6 @@
 #include "../CommonInclude.h"
 
 #include "rPr.h"
-#include "../../XlsbFormat/Biff12_records/CommonRecords.h"
 
 namespace OOX
 {

OOXML/XlsxFormat/Styles/NumFmts.cpp

@@ -32,6 +32,8 @@
 
 #include "NumFmts.h"
 
+#include "../../XlsbFormat/Biff12_records/Fmt.h"
+#include "../../XlsbFormat/Biff12_unions/ACFMT.h"
 namespace OOX
 {
 	namespace Spreadsheet

OOXML/XlsxFormat/Styles/NumFmts.h

@@ -33,8 +33,6 @@
 #include "../CommonInclude.h"
 
 #include "rPr.h"
-#include "../../XlsbFormat/Biff12_records/Fmt.h"
-#include "../../XlsbFormat/Biff12_unions/ACFMT.h"
 
 namespace OOX
 {

OOXML/XlsxFormat/Styles/TableStyles.cpp

@@ -32,6 +32,9 @@
 
 #include "TableStyles.h"
 
+#include "../../XlsbFormat/Biff12_records/CommonRecords.h"
+#include "../../XlsbFormat/Biff12_unions/TABLESTYLES.h"
+#include "../../XlsbFormat/Biff12_unions/TABLESTYLE.h"
 namespace OOX
 {
 	namespace Spreadsheet

OOXML/XlsxFormat/Styles/TableStyles.h

@@ -35,9 +35,6 @@
 
 #include "rPr.h"
 
-#include "../../XlsbFormat/Biff12_records/CommonRecords.h"
-#include "../../XlsbFormat/Biff12_unions/TABLESTYLES.h"
-#include "../../XlsbFormat/Biff12_unions/TABLESTYLE.h"
 
 namespace OOX
 {

OOXML/XlsxFormat/Styles/Xfs.cpp

@@ -31,6 +31,7 @@
  */
 
 #include "Xfs.h"
+#include "../../XlsbFormat/Biff12_records/CommonRecords.h"
 
 namespace OOX
 {

OOXML/XlsxFormat/Styles/Xfs.h

@@ -32,7 +32,6 @@
 #pragma once
 
 #include "../CommonInclude.h"
-#include "../../XlsbFormat/Biff12_records/CommonRecords.h"
 
 namespace OOX
 {

OOXML/XlsxFormat/Styles/dxf.cpp

@@ -32,6 +32,9 @@
 
 #include "dxf.h"
 
+#include "../../XlsbFormat/Biff12_unions/DXF.h"
+#include "../../XlsbFormat/Biff12_unions/FRTDXF.h"
+#include "../../XlsbFormat/Biff12_records/CommonRecords.h"
 namespace OOX
 {
 	namespace Spreadsheet

OOXML/XlsxFormat/Styles/dxf.h

@@ -30,8 +30,6 @@
  *
  */
 #pragma once
-#ifndef OOX_DXFS_FILE_INCLUDE_H_
-#define OOX_DXFS_FILE_INCLUDE_H_
 
 #include "../CommonInclude.h"
 
@@ -41,9 +39,6 @@
 #include "NumFmts.h"
 #include "Xfs.h"
 
-#include "../../XlsbFormat/Biff12_unions/DXF.h"
-#include "../../XlsbFormat/Biff12_unions/FRTDXF.h"
-#include "../../XlsbFormat/Biff12_records/CommonRecords.h"
 
 namespace OOX
 {
@@ -110,5 +105,3 @@ namespace OOX
 
 	} //Spreadsheet
 } // namespace OOX
-
-#endif // OOX_DXFS_FILE_INCLUDE_H_

OOXML/XlsxFormat/Styles/rPr.cpp

@@ -34,6 +34,9 @@
 #include "../../Binary/Presentation/BinaryFileReaderWriter.h"
 #include "Fonts.h"
 
+#include "../../XlsbFormat/Biff12_records/Color.h"
+#include "../../XlsbFormat/Biff12_records/IndexedColor.h"
+#include "../../XlsbFormat/Biff12_records/MRUColor.h"
 namespace OOX
 {
 	namespace Spreadsheet

OOXML/XlsxFormat/Styles/rPr.h

@@ -32,9 +32,6 @@
 #pragma once
 
 #include "../CommonInclude.h"
-#include "../../XlsbFormat/Biff12_records/Color.h"
-#include "../../XlsbFormat/Biff12_records/IndexedColor.h"
-#include "../../XlsbFormat/Biff12_records/MRUColor.h"
 
 namespace NSBinPptxRW
 {

OOXML/XlsxFormat/Table/Autofilter.h

@@ -30,8 +30,6 @@
  *
  */
 #pragma once
-#ifndef OOX_AUTOFILTER_FILE_INCLUDE_H_
-#define OOX_AUTOFILTER_FILE_INCLUDE_H_
 
 #include "../CommonInclude.h"
 
@@ -391,5 +389,3 @@ namespace OOX
 		};
 	} //Spreadsheet
 } // namespace OOX
-
-#endif // OOX_AUTOFILTER_FILE_INCLUDE_H_

OOXML/XlsxFormat/Workbook/BookViews.h

@@ -30,9 +30,6 @@
  *
  */
 #pragma once
-#ifndef OOX_BOOKVIEWS_FILE_INCLUDE_H_
-#define OOX_BOOKVIEWS_FILE_INCLUDE_H_
-
 #include "../CommonInclude.h"
 
 
@@ -101,6 +98,4 @@ namespace OOX
 		};
 
 	} //Spreadsheet
-} // namespace OOX
+} // namespace OOX
-
-#endif // OOX_BOOKVIEWS_FILE_INCLUDE_H_

OOXML/XlsxFormat/Workbook/CalcPr.cpp

@@ -31,6 +31,7 @@
  */
 
 #include "CalcPr.h"
+#include "../../XlsbFormat/Biff12_records/CalcProp.h"
 
 namespace OOX
 {

OOXML/XlsxFormat/Workbook/CalcPr.h

@@ -30,11 +30,8 @@
  *
  */
 #pragma once
-#ifndef OOX_CALCPR_FILE_INCLUDE_H_
-#define OOX_CALCPR_FILE_INCLUDE_H_
 
 #include "../CommonInclude.h"
-#include "../../XlsbFormat/Biff12_records/CalcProp.h"
 
 namespace OOX
 {
@@ -80,4 +77,3 @@ namespace OOX
 	} //Spreadsheet
 } // namespace OOX
 
-#endif // OOX_CALCPR_FILE_INCLUDE_H_

OOXML/XlsxFormat/Workbook/ExternalReferences.cpp

@@ -31,6 +31,8 @@
  */
 
 #include "ExternalReferences.h"
+#include "../../XlsbFormat/Biff12_unions/SUP.h"
+#include "../../XlsbFormat/Biff12_records/SupBookSrc.h"
 
 namespace OOX
 {

OOXML/XlsxFormat/Workbook/ExternalReferences.h

@@ -30,12 +30,9 @@
  *
  */
 #pragma once
-#ifndef OOX_ExternalReferences_FILE_INCLUDE_H_
-#define OOX_ExternalReferences_FILE_INCLUDE_H_
 
 #include "../CommonInclude.h"
-#include "../../XlsbFormat/Biff12_unions/SUP.h"
+
-#include "../../XlsbFormat/Biff12_records/SupBookSrc.h"
 
 namespace OOX
 {
@@ -90,5 +87,3 @@ namespace OOX
 
 	} //ExternalReference
 } // namespace OOX
-
-#endif // OOX_ExternalReferences_FILE_INCLUDE_H_

OOXML/XlsxFormat/Workbook/Sheets.cpp

@@ -31,6 +31,7 @@
  */
 
 #include "Sheets.h"
+#include "../../XlsbFormat/Biff12_records/BundleSh.h"
 
 namespace OOX
 {

OOXML/XlsxFormat/Workbook/Sheets.h

@@ -33,9 +33,6 @@
 
 #include "../CommonInclude.h"
 
-#include "../../XlsbFormat/Biff12_records/BundleSh.h"
-
-
 namespace OOX
 {
 	namespace Spreadsheet

OOXML/XlsxFormat/Workbook/Workbook.cpp

@@ -33,6 +33,15 @@
 
 #include "Workbook.h"
 
+#include "../../XlsbFormat/WorkBookStream.h"
+
+#include "../../XlsbFormat/Biff12_unions/BOOKVIEWS.h"
+#include "../../XlsbFormat/Biff12_unions/BUNDLESHS.h"
+#include "../../XlsbFormat/Biff12_unions/EXTERNALS.h"
+#include "../../XlsbFormat/Biff12_unions/PIVOTCACHEIDS.h"
+#include "../../XlsbFormat/Biff12_unions/PIVOTCACHEID.h"
+#include "../../XlsbFormat/Biff12_records/FileVersion.h"
+#include "../../XlsbFormat/Biff12_records/BeginPivotCacheID.h"
 namespace OOX
 {
 	namespace Spreadsheet

OOXML/XlsxFormat/Workbook/Workbook.h

@@ -44,16 +44,6 @@
 #include "WorkbookPr.h"
 #include "ExternalReferences.h"
 
-#include "../../XlsbFormat/WorkBookStream.h"
-
-#include "../../XlsbFormat/Biff12_unions/BOOKVIEWS.h"
-#include "../../XlsbFormat/Biff12_unions/BUNDLESHS.h"
-#include "../../XlsbFormat/Biff12_unions/EXTERNALS.h"
-#include "../../XlsbFormat/Biff12_unions/PIVOTCACHEIDS.h"
-#include "../../XlsbFormat/Biff12_unions/PIVOTCACHEID.h"
-#include "../../XlsbFormat/Biff12_records/FileVersion.h"
-#include "../../XlsbFormat/Biff12_records/BeginPivotCacheID.h"
-
 namespace OOX
 {
 	namespace Spreadsheet

OOXML/XlsxFormat/Workbook/WorkbookPr.cpp

@@ -32,6 +32,10 @@
 
 #include "WorkbookPr.h"
 
+#include "../../XlsbFormat/Biff12_records/WbProp.h"
+#include "../../XlsbFormat/Biff12_records/BookProtectionIso.h"
+#include "../../XlsbFormat/Biff12_records/BookProtection.h"
+
 namespace OOX
 {
 	namespace Spreadsheet

OOXML/XlsxFormat/Workbook/WorkbookPr.h

@@ -30,15 +30,9 @@
  *
  */
 #pragma once
-#ifndef OOX_WORKBOOKPR_FILE_INCLUDE_H_
-#define OOX_WORKBOOKPR_FILE_INCLUDE_H_
 
 #include "../CommonInclude.h"
 
-#include "../../XlsbFormat/Biff12_records/WbProp.h"
-#include "../../XlsbFormat/Biff12_records/BookProtectionIso.h"
-#include "../../XlsbFormat/Biff12_records/BookProtection.h"
-
 namespace OOX
 {
 	namespace Spreadsheet
@@ -124,5 +118,3 @@ namespace OOX
 		};
 	} //Spreadsheet
 } // namespace OOX
-
-#endif // OOX_WORKBOOKPR_FILE_INCLUDE_H_

OOXML/XlsxFormat/Worksheets/Cols.cpp

@@ -33,6 +33,8 @@
 #include "Cols.h"
 #include "../XlsxFlat.h"
 
+#include "../../XlsbFormat/Biff12_unions/COLINFOS.h"
+
 namespace OOX
 {
 	namespace Spreadsheet

OOXML/XlsxFormat/Worksheets/Cols.h

@@ -30,11 +30,8 @@
  *
  */
 #pragma once
-#ifndef OOX_COLS_FILE_INCLUDE_H_
-#define OOX_COLS_FILE_INCLUDE_H_
 
 #include "../CommonInclude.h"
-#include "../../XlsbFormat/Biff12_unions/COLINFOS.h"
 
 namespace OOX
 {
@@ -98,5 +95,3 @@ namespace OOX
 
 	} //Spreadsheet
 } // namespace OOX
-
-#endif // OOX_COLS_FILE_INCLUDE_H_

OOXML/XlsxFormat/Worksheets/ConditionalFormatting.cpp

@@ -30,38 +30,40 @@
  *
  */
 #include "ConditionalFormatting.h"
+
 #include "../../XlsbFormat/Biff12_unions/CONDITIONALFORMATTING.h"
+#include "../../XlsbFormat/Biff12_unions/CONDITIONALFORMATTING14.h"
 #include "../../XlsbFormat/Biff12_unions/CFRULE.h"
+#include "../../XlsbFormat/Biff12_unions/CFRULE14.h"
+#include "../../XlsbFormat/Biff12_unions/uCFVO.h"
+#include "../../XlsbFormat/Biff12_unions/uCFVO14.h"
+#include "../../XlsbFormat/Biff12_unions/COLORSCALE14.h"
+#include "../../XlsbFormat/Biff12_unions/COLORSCALE.h"
+#include "../../XlsbFormat/Biff12_unions/DATABAR.h"
+#include "../../XlsbFormat/Biff12_unions/DATABAR14.h"
+#include "../../XlsbFormat/Biff12_unions/ICONSET.h"
+#include "../../XlsbFormat/Biff12_unions/ICONSET14.h"
+#include "../../XlsbFormat/Biff12_unions/FRTCFRULE.h"
+
 #include "../../XlsbFormat/Biff12_records/BeginConditionalFormatting.h"
+#include "../../XlsbFormat/Biff12_records/BeginConditionalFormatting14.h"
 #include "../../XlsbFormat/Biff12_records/BeginCFRule.h"
+#include "../../XlsbFormat/Biff12_records/BeginCFRule14.h"
+#include "../../XlsbFormat/Biff12_records/BeginDatabar.h"
+#include "../../XlsbFormat/Biff12_records/BeginDatabar14.h"
+#include "../../XlsbFormat/Biff12_records/BeginIconSet.h"
+#include "../../XlsbFormat/Biff12_records/BeginIconSet14.h"
+
 #include "../../XlsbFormat/Biff12_structures/CFOper.h"
 #include "../../XlsbFormat/Biff12_structures/CFTextOper.h"
 #include "../../XlsbFormat/Biff12_structures/CFDateOper.h"
 #include "../../XlsbFormat/Biff12_structures/CFVOtype.h"
-#include "../../XlsbFormat/Biff12_unions/COLORSCALE.h"
-#include "../../XlsbFormat/Biff12_unions/DATABAR.h"
-#include "../../XlsbFormat/Biff12_unions/ICONSET.h"
-#include "../../XlsbFormat/Biff12_unions/uCFVO.h"
-#include "../../XlsbFormat/Biff12_records/CFVO.h"
-#include "../../XlsbFormat/Biff12_records/BeginDatabar.h"
-#include "../../XlsbFormat/Biff12_records/BeginIconSet.h"
-#include "../../XlsbFormat/Biff12_unions/FRTCFRULE.h"
-#include "../../XlsbFormat/Biff12_records/CFRuleExt.h"
 
-#include "../../XlsbFormat/Biff12_unions/CONDITIONALFORMATTING14.h"
+#include "../../XlsbFormat/Biff12_records/CFVO.h"
-#include "../../XlsbFormat/Biff12_unions/CFRULE14.h"
+#include "../../XlsbFormat/Biff12_records/CFRuleExt.h"
-#include "../../XlsbFormat/Biff12_records/BeginConditionalFormatting14.h"
-#include "../../XlsbFormat/Biff12_records/BeginCFRule14.h"
-#include "../../XlsbFormat/Biff12_structures/CFVOType14.h"
-#include "../../XlsbFormat/Biff12_unions/COLORSCALE14.h"
-#include "../../XlsbFormat/Biff12_records/Color14.h"
-#include "../../XlsbFormat/Biff12_unions/DATABAR14.h"
-#include "../../XlsbFormat/Biff12_unions/ICONSET14.h"
-#include "../../XlsbFormat/Biff12_records/CFIcon.h"
-#include "../../XlsbFormat/Biff12_unions/uCFVO14.h"
 #include "../../XlsbFormat/Biff12_records/CFVO14.h"
-#include "../../XlsbFormat/Biff12_records/BeginDatabar14.h"
+#include "../../XlsbFormat/Biff12_records/Color14.h"
-#include "../../XlsbFormat/Biff12_records/BeginIconSet14.h"
+#include "../../XlsbFormat/Biff12_records/CFIcon.h"
 
 using namespace XLS;
 

OOXML/XlsxFormat/Worksheets/DataValidation.cpp

@@ -30,6 +30,7 @@
  *
  */
 #include "DataValidation.h"
+
 #include "../../XlsbFormat/Biff12_unions/DVALS.h"
 #include "../../XlsbFormat/Biff12_unions/DVALS14.h"
 #include "../../XlsbFormat/Biff12_records/BeginDVals.h"

OOXML/XlsxFormat/Worksheets/Hyperlinks.h

@@ -31,7 +31,6 @@
  */
 #pragma once
 #include "../CommonInclude.h"
-#include "../../XlsbFormat/Biff12_records/HLink.h"
 
 namespace OOX
 {

OOXML/XlsxFormat/Worksheets/MergeCells.cpp

@@ -32,6 +32,8 @@
 
 #include "MergeCells.h"
 
+#include "../../XlsbFormat/Biff12_records/MergeCell.h"
+
 namespace OOX
 {
 	namespace Spreadsheet

OOXML/XlsxFormat/Worksheets/MergeCells.h

@@ -31,7 +31,6 @@
  */
 #pragma once
 #include "../CommonInclude.h"
-#include "../../XlsbFormat/Biff12_records/MergeCell.h"
 
 namespace OOX
 {

OOXML/XlsxFormat/Worksheets/Sparkline.cpp

@@ -32,6 +32,11 @@
 
 #include "Sparkline.h"
 
+#include "../../XlsbFormat/Biff12_unions/SPARKLINEGROUPS.h"
+#include "../../XlsbFormat/Biff12_unions/SPARKLINEGROUP.h"
+#include "../../XlsbFormat/Biff12_records/BeginSparklineGroup.h"
+#include "../../XlsbFormat/Biff12_records/Sparkline.h"
+
 namespace OOX
 {
 	namespace Spreadsheet

OOXML/XlsxFormat/Worksheets/Sparkline.h

@@ -30,18 +30,11 @@
  *
  */
 #pragma once
-#ifndef OOX_SPARKLINE_FILE_INCLUDE_H_
-#define OOX_SPARKLINE_FILE_INCLUDE_H_
 
 #include "../CommonInclude.h"
 #include "../Chart/ChartSerialize.h"
 #include "../Styles/rPr.h"
 
-#include "../../XlsbFormat/Biff12_unions/SPARKLINEGROUPS.h"
-#include "../../XlsbFormat/Biff12_unions/SPARKLINEGROUP.h"
-#include "../../XlsbFormat/Biff12_records/BeginSparklineGroup.h"
-#include "../../XlsbFormat/Biff12_records/Sparkline.h"
-
 namespace OOX
 {
 	namespace Spreadsheet
@@ -169,4 +162,3 @@ namespace OOX
 	} //Spreadsheet
 } // namespace OOX
 
-#endif // OOX_SPARKLINE_FILE_INCLUDE_H_

OOXML/XlsxFormat/Worksheets/XlsxHyperlinks.cpp

@@ -31,6 +31,7 @@
  */
 
 #include "Hyperlinks.h"
+#include "../../XlsbFormat/Biff12_records/HLink.h"
 
 namespace OOX
 {