From 3b54172c0a0634f702240d250e7efba2a6622b23 Mon Sep 17 00:00:00 2001
From: "Elena.Subbotina" <Elena.Subbotina@onlyoffice.com>
Date: Mon, 29 May 2023 15:15:39 +0300
Subject: [PATCH] .

---
 .../Reader/XMLReader/XLSXTableController.cpp  | 10 ++---
 .../Reader/XMLReader/XML2TableConverter.h     |  2 +-
 .../Sheets/Reader/XMLReader/XMLConverter2.h   |  2 +-
 OOXML/Binary/Sheets/Reader/XMLReader/XMLMap.h |  2 +-
 .../Sheets/Reader/XMLReader/XMLReader.cpp     |  8 ++--
 .../Sheets/Reader/XMLReader/XMLReader2.cpp    | 11 +++--
 .../BinaryFormatLib/BinaryFormatLib.vcxproj   | 13 ++++++
 .../BinaryFormatLib.vcxproj.filters           | 42 +++++++++++++++++++
 8 files changed, 72 insertions(+), 18 deletions(-)

diff --git a/OOXML/Binary/Sheets/Reader/XMLReader/XLSXTableController.cpp b/OOXML/Binary/Sheets/Reader/XMLReader/XLSXTableController.cpp
index 7d02d8f811..49af0cf6f2 100644
--- a/OOXML/Binary/Sheets/Reader/XMLReader/XLSXTableController.cpp
+++ b/OOXML/Binary/Sheets/Reader/XMLReader/XLSXTableController.cpp
@@ -32,12 +32,12 @@
 #include "XlSXTableController.h"
 
 #include "../../../../XlsxFormat/Workbook/Sheets.h"
-#include "../../../XlsxFormat/Workbook/Workbook.h"
-#include "../../../../Common/OfficeFileErrorDescription.h"
+#include "../../../../XlsxFormat/Workbook/Workbook.h"
+#include "../../../../../Common/OfficeFileErrorDescription.h"
 
-#include "../../../XlsxFormat/Styles/Styles.h"
-#include "../../../XlsxFormat/Styles/NumFmts.h"
-#include "../../../XlsxFormat/Styles/Xfs.h"
+#include "../../../../XlsxFormat/Styles/Styles.h"
+#include "../../../../XlsxFormat/Styles/NumFmts.h"
+#include "../../../../XlsxFormat/Styles/Xfs.h"
 
 constexpr auto SheetName = L"Sheet";
 
diff --git a/OOXML/Binary/Sheets/Reader/XMLReader/XML2TableConverter.h b/OOXML/Binary/Sheets/Reader/XMLReader/XML2TableConverter.h
index 3114ee8e8c..c7d67a16da 100644
--- a/OOXML/Binary/Sheets/Reader/XMLReader/XML2TableConverter.h
+++ b/OOXML/Binary/Sheets/Reader/XMLReader/XML2TableConverter.h
@@ -34,7 +34,7 @@
 
 #include "columnNamesController.h"
 
-#include "../../../../DesktopEditor/xml/include/xmlutils.h"
+#include "../../../../../DesktopEditor/xml/include/xmlutils.h"
 #include "../../../../Base/Base.h"
 
 #include <string>
diff --git a/OOXML/Binary/Sheets/Reader/XMLReader/XMLConverter2.h b/OOXML/Binary/Sheets/Reader/XMLReader/XMLConverter2.h
index 65108111e6..12841d8b96 100644
--- a/OOXML/Binary/Sheets/Reader/XMLReader/XMLConverter2.h
+++ b/OOXML/Binary/Sheets/Reader/XMLReader/XMLConverter2.h
@@ -35,7 +35,7 @@
 #include "XMLMap.h"
 #include "XLSXTableController.h"
 
-#include "../../../../DesktopEditor/xml/include/xmlutils.h"
+#include "../../../../../DesktopEditor/xml/include/xmlutils.h"
 #include "../../../../Base/Base.h"
 
 #include <string>
diff --git a/OOXML/Binary/Sheets/Reader/XMLReader/XMLMap.h b/OOXML/Binary/Sheets/Reader/XMLReader/XMLMap.h
index 69b415ba06..864679f610 100644
--- a/OOXML/Binary/Sheets/Reader/XMLReader/XMLMap.h
+++ b/OOXML/Binary/Sheets/Reader/XMLReader/XMLMap.h
@@ -34,7 +34,7 @@
 
 #include "columnNamesController.h"
 
-#include "../../../../DesktopEditor/xml/include/xmlutils.h"
+#include "../../../../../DesktopEditor/xml/include/xmlutils.h"
 #include "../../../../Base/Base.h"
 
 #include <string>
diff --git a/OOXML/Binary/Sheets/Reader/XMLReader/XMLReader.cpp b/OOXML/Binary/Sheets/Reader/XMLReader/XMLReader.cpp
index a3f03b65bd..047a522924 100644
--- a/OOXML/Binary/Sheets/Reader/XMLReader/XMLReader.cpp
+++ b/OOXML/Binary/Sheets/Reader/XMLReader/XMLReader.cpp
@@ -33,10 +33,10 @@
 #include "XLSXTableController.h"
 #include "XML2TableConverter.h"
 
-#include "../../../../DesktopEditor/common/File.h"
-#include "../../../Base/unicode_util.h"
-#include "../../../../Common/OfficeFileErrorDescription.h"
-#include "../../../XlsxFormat/Workbook/Workbook.h"
+#include "../../../../../DesktopEditor/common/File.h"
+#include "../../../../Base/unicode_util.h"
+#include "../../../../../Common/OfficeFileErrorDescription.h"
+#include "../../../../XlsxFormat/Workbook/Workbook.h"
 
 #include <memory>
 
diff --git a/OOXML/Binary/Sheets/Reader/XMLReader/XMLReader2.cpp b/OOXML/Binary/Sheets/Reader/XMLReader/XMLReader2.cpp
index e60f7efd19..d0fded47fd 100644
--- a/OOXML/Binary/Sheets/Reader/XMLReader/XMLReader2.cpp
+++ b/OOXML/Binary/Sheets/Reader/XMLReader/XMLReader2.cpp
@@ -34,13 +34,12 @@
 #include "XMLConverter2.h"
 #include "XMLMap.h"
 
-#include "../../../../DesktopEditor/common/File.h"
-#include "../../../Base/unicode_util.h"
-#include "../../../../Common/OfficeFileErrorDescription.h"
-#include "../../../XlsxFormat/Workbook/Workbook.h"
+#include "../../../../../DesktopEditor/common/File.h"
+#include "../../../../Base/unicode_util.h"
+#include "../../../../../Common/OfficeFileErrorDescription.h"
+#include "../../../../XlsxFormat/Workbook/Workbook.h"
 
-
-#include "../../../../DesktopEditor/xml/include/xmlutils.h"
+#include "../../../../../DesktopEditor/xml/include/xmlutils.h"
 
 #include <memory>
 
diff --git a/OOXML/Projects/Windows/BinaryFormatLib/BinaryFormatLib.vcxproj b/OOXML/Projects/Windows/BinaryFormatLib/BinaryFormatLib.vcxproj
index b6b599645b..2466afcdb4 100644
--- a/OOXML/Projects/Windows/BinaryFormatLib/BinaryFormatLib.vcxproj
+++ b/OOXML/Projects/Windows/BinaryFormatLib/BinaryFormatLib.vcxproj
@@ -48,6 +48,13 @@
     <ClCompile Include="..\..\..\Binary\Sheets\Reader\ChartFromToBinary.cpp" />
     <ClCompile Include="..\..\..\Binary\Sheets\Reader\CommonWriter.cpp" />
     <ClCompile Include="..\..\..\Binary\Sheets\Reader\CSVReader.cpp" />
+    <ClCompile Include="..\..\..\Binary\Sheets\Reader\XMLReader\columnNameController.cpp" />
+    <ClCompile Include="..\..\..\Binary\Sheets\Reader\XMLReader\XLSXTableController.cpp" />
+    <ClCompile Include="..\..\..\Binary\Sheets\Reader\XMLReader\XML2TableConverter.cpp" />
+    <ClCompile Include="..\..\..\Binary\Sheets\Reader\XMLReader\XMLConverter2.cpp" />
+    <ClCompile Include="..\..\..\Binary\Sheets\Reader\XMLReader\XMLMap.cpp" />
+    <ClCompile Include="..\..\..\Binary\Sheets\Reader\XMLReader\XMLReader.cpp" />
+    <ClCompile Include="..\..\..\Binary\Sheets\Reader\XMLReader\XMLReader2.cpp" />
     <ClCompile Include="..\..\..\Binary\Sheets\Writer\BinaryReader.cpp" />
     <ClCompile Include="..\..\..\Binary\Sheets\Writer\CSVWriter.cpp" />
   </ItemGroup>
@@ -88,6 +95,12 @@
     <ClInclude Include="..\..\..\Binary\Sheets\Reader\ChartFromToBinary.h" />
     <ClInclude Include="..\..\..\Binary\Sheets\Reader\CommonWriter.h" />
     <ClInclude Include="..\..\..\Binary\Sheets\Reader\CSVReader.h" />
+    <ClInclude Include="..\..\..\Binary\Sheets\Reader\XMLReader\columnNamesController.h" />
+    <ClInclude Include="..\..\..\Binary\Sheets\Reader\XMLReader\XLSXTableController.h" />
+    <ClInclude Include="..\..\..\Binary\Sheets\Reader\XMLReader\XML2TableConverter.h" />
+    <ClInclude Include="..\..\..\Binary\Sheets\Reader\XMLReader\XMLConverter2.h" />
+    <ClInclude Include="..\..\..\Binary\Sheets\Reader\XMLReader\XMLMap.h" />
+    <ClInclude Include="..\..\..\Binary\Sheets\Reader\XMLReader\XMLReader.h" />
     <ClInclude Include="..\..\..\Binary\Sheets\Writer\BinaryCommonReader.h" />
     <ClInclude Include="..\..\..\Binary\Sheets\Writer\BinaryReader.h" />
     <ClInclude Include="..\..\..\Binary\Sheets\Writer\CSVWriter.h" />
diff --git a/OOXML/Projects/Windows/BinaryFormatLib/BinaryFormatLib.vcxproj.filters b/OOXML/Projects/Windows/BinaryFormatLib/BinaryFormatLib.vcxproj.filters
index 7b303ae293..df60740587 100644
--- a/OOXML/Projects/Windows/BinaryFormatLib/BinaryFormatLib.vcxproj.filters
+++ b/OOXML/Projects/Windows/BinaryFormatLib/BinaryFormatLib.vcxproj.filters
@@ -25,6 +25,9 @@
     <Filter Include="Common">
       <UniqueIdentifier>{02739917-e580-44c9-9b2c-8e80c7a2164d}</UniqueIdentifier>
     </Filter>
+    <Filter Include="Sheets\Reader\XML">
+      <UniqueIdentifier>{47d28884-9f95-479a-a812-cf3b0e0a6ac9}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\..\Binary\Document\DocWrapper\DocxSerializer.cpp">
@@ -120,6 +123,27 @@
     <ClCompile Include="..\..\..\Binary\Presentation\XmlWriter.cpp">
       <Filter>Common</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\Binary\Sheets\Reader\XMLReader\columnNameController.cpp">
+      <Filter>Sheets\Reader\XML</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Binary\Sheets\Reader\XMLReader\XLSXTableController.cpp">
+      <Filter>Sheets\Reader\XML</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Binary\Sheets\Reader\XMLReader\XML2TableConverter.cpp">
+      <Filter>Sheets\Reader\XML</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Binary\Sheets\Reader\XMLReader\XMLConverter2.cpp">
+      <Filter>Sheets\Reader\XML</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Binary\Sheets\Reader\XMLReader\XMLMap.cpp">
+      <Filter>Sheets\Reader\XML</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Binary\Sheets\Reader\XMLReader\XMLReader.cpp">
+      <Filter>Sheets\Reader\XML</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Binary\Sheets\Reader\XMLReader\XMLReader2.cpp">
+      <Filter>Sheets\Reader\XML</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\..\Binary\Document\DocWrapper\ChartWriter.h">
@@ -239,5 +263,23 @@
     <ClInclude Include="..\..\..\Binary\Presentation\XmlWriter.h">
       <Filter>Common</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\Binary\Sheets\Reader\XMLReader\columnNamesController.h">
+      <Filter>Sheets\Reader\XML</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Binary\Sheets\Reader\XMLReader\XLSXTableController.h">
+      <Filter>Sheets\Reader\XML</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Binary\Sheets\Reader\XMLReader\XML2TableConverter.h">
+      <Filter>Sheets\Reader\XML</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Binary\Sheets\Reader\XMLReader\XMLConverter2.h">
+      <Filter>Sheets\Reader\XML</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Binary\Sheets\Reader\XMLReader\XMLMap.h">
+      <Filter>Sheets\Reader\XML</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Binary\Sheets\Reader\XMLReader\XMLReader.h">
+      <Filter>Sheets\Reader\XML</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
\ No newline at end of file