x2t - исправление путей к OfficeUtils

ASCOfficeDocFile/DocDocxConverter/OfficeDrawing/MetafilePictBlip.h

 #pragma once
 
 #include "Record.h"
-#include "../../../ASCOfficeUtils/ASCOfficeUtilsLib/OfficeUtils.h"
+#include "../../../OfficeUtils/src/OfficeUtils.h"
 #include "../../../Common/DocxFormat/Source/Base/Types_32.h"
 
 

ASCOfficeDocFile/DocFormatLib/DocFormatLib.cpp

@@ -4,7 +4,7 @@
 //#include "../DocxDocConverter/FileConverter.h"
 
 #include "../../Common/DocxFormat/Source/SystemUtility/FileSystem/Directory.h"
-#include "../../ASCOfficeUtils/ASCOfficeUtilsLib/OfficeUtils.h"
+#include "../../OfficeUtils/src/OfficeUtils.h"
 
 HRESULT COfficeDocFile::LoadFromFile(std::wstring bsDocFile, std::wstring bsDocxDirectory, ProgressCallback *ffCallBack )
 {

ASCOfficeDocxFile2/DocWrapper/DocxSerializer.cpp

@@ -6,7 +6,7 @@
 #include "../BinWriter/BinWriters.h"
 #include "../BinReader/Readers.h"
 #include "../../ASCOfficePPTXFile/Editor/FontPicker.h"
-#include "../../ASCOfficeUtils/ASCOfficeUtilsLib/OfficeUtils.h"
+#include "../../OfficeUtils/src/OfficeUtils.h"
 
 int BinDocxRW::g_nCurFormatVersion = 0;
 

ASCOfficeDocxFile2/DocWrapper/XlsxSerializer.cpp

@@ -143,7 +143,7 @@ namespace BinXlsxRW{
 		}
 		return bRes;
 	}
-	bool CXlsxSerializer::saveChart(NSBinPptxRW::CBinaryFileReader& oBufferedStream, long lLength, CString& sFilepath, CString& sContentTypePath, CString** sContentTypeElement, const LONG& lChartNumber)
+    bool CXlsxSerializer::saveChart(NSBinPptxRW::CBinaryFileReader& oBufferedStream, long lLength, CString& sFilepath, CString& sContentTypePath, CString** sContentTypeElement, const long& lChartNumber)
 	{
 		bool bRes = false;
 		*sContentTypeElement = NULL;

ASCOfficeDocxFile2/DocWrapper/XlsxSerializer.h

@@ -41,7 +41,7 @@ namespace BinXlsxRW {
         bool saveToFile(const CString& sSrcFileName, const CString& sDstPath, const CString& sXMLOptions);
 		
 		bool loadChart(CString& sChartPath, NSBinPptxRW::CBinaryFileWriter& oBufferedStream, long& lDataSize);
-		bool saveChart(NSBinPptxRW::CBinaryFileReader& oBufferedStream, long lLength, CString& sFilename, CString& sContentTypePath, CString** sContentTypeElement, const LONG& lChartNumber);
+        bool saveChart(NSBinPptxRW::CBinaryFileReader& oBufferedStream, long lLength, CString& sFilename, CString& sContentTypePath, CString** sContentTypeElement, const long& lChartNumber);
 		
 		void setFontDir(CString& sFontDir);
 		void setEmbeddedFontsDir(CString& sEmbeddedFontsDir);

ASCOfficePPTFile/PPTFormatLib/PPTFormatLib.cpp

@@ -5,7 +5,7 @@
 #include "./Reader/PPTFileReader.h"
 #include "./PPTXWriter/Converter.h"
 
-#include "../../../ASCOfficeUtils/ASCOfficeUtilsLib/OfficeUtils.h"
+#include "../../../OfficeUtils/src/OfficeUtils.h"
 
 #ifndef READMODE
     #define READMODE 1

ASCOfficeTxtFile/TxtXmlFormatLib/Source/TxtXmlFile.cpp

@@ -21,7 +21,7 @@ namespace NSBinPptxRW
 //    }
 //#endif
 
-#include "../../../ASCOfficeUtils/ASCOfficeUtilsLib/OfficeUtils.h"
+#include "../../../OfficeUtils/src/OfficeUtils.h"
 #include "../../../Common/OfficeDefines.h"
 
 #include "../../../Common/DocxFormat/Source/SystemUtility/File.h"

ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/ODRAW/OfficeArtBStoreContainerFileBlock.cpp

 
 #include "OfficeArtBStoreContainerFileBlock.h"
 
-#include "../../../ASCOfficeUtils/ASCOfficeUtilsLib/OfficeUtils.h"
+#include "../../../OfficeUtils/src/OfficeUtils.h"
 
 namespace ODRAW
 {

ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/ODRAW/OfficeArtBlip.cpp

@@ -2,7 +2,7 @@
 #include "OfficeArtBlip.h"
 #include <Binary/CFRecord.h>
 
-#include "../../../ASCOfficeUtils/ASCOfficeUtilsLib/OfficeUtils.h"
+#include "../../../OfficeUtils/src/OfficeUtils.h"
 
 namespace ODRAW
 {

X2tConverter/src/ASCConverters.cpp

 
 #include "ASCConverters.h"
 //todo убрать ошибки компиляции если переместить include ниже
-#include "../../../ServerComponents/PdfWriter/OnlineOfficeBinToPdf.h"
+#include "../../PdfWriter/OnlineOfficeBinToPdf.h"
 #include "cextracttools.h"
 
-#include "../../../ServerComponents/DesktopEditor/common/Path.h"
-#include "../../../ServerComponents/DesktopEditor/common/Directory.h"
-#include "../../../ServerComponents/ASCOfficeUtils/ASCOfficeUtilsLib/OfficeUtils.h"
-
-#include "../../../ServerComponents/ASCOfficeDocxFile2/DocWrapper/DocxSerializer.h"
-#include "../../../ServerComponents/ASCOfficeDocxFile2/DocWrapper/XlsxSerializer.h"
-#include "../../../ServerComponents/ASCOfficePPTXFile/ASCOfficePPTXFile.h"
-#include "../../../ServerComponents/ASCOfficeRtfFile/RtfFormatLib/source/ConvertationManager.h"
-#include "../../../ServerComponents/ASCOfficeRtfFile/RtfFormatLib/source/ConvertationManager.h"
-#include "../../../ServerComponents/ASCOfficeDocFile/DocFormatLib/DocFormatLib.h"
-#include "../../../ServerComponents/ASCOfficeTxtFile/TxtXmlFormatLib/Source/TxtXmlFile.h"
-#include "../../../ServerComponents/ASCOfficePPTFile/PPTFormatLib/PPTFormatLib.h"
-#include "../../../ServerComponents/ASCOfficeOdfFile/src/ConvertOO2OOX.h"
-#include "../../../ServerComponents/ASCOfficeOdfFileW/source/Oox2OdfConverter/Oox2OdfConverter.h"
-#include "../../../ServerComponents/DesktopEditor/doctrenderer/doctrenderer.h"
-#include "../../../ServerComponents/DesktopEditor/fontengine/ApplicationFonts.h"
-#include "../../../ServerComponents/PdfReader/PdfReader.h"
-#include "../../../ServerComponents/DjVuFile/DjVu.h"
-#include "../../../ServerComponents/XpsFile/XpsFile.h"
-#include "../../../ServerComponents/HtmlRenderer/include/HTMLRenderer3.h"
-#include "../../../ServerComponents/HtmlFile/HtmlFile.h"
-#include "../../../ServerComponents/ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertXls2Xlsx.h"
+#include "../../DesktopEditor/common/Path.h"
+#include "../../DesktopEditor/common/Directory.h"
+#include "../../OfficeUtils/src/OfficeUtils.h"
+
+#include "../../ASCOfficeDocxFile2/DocWrapper/DocxSerializer.h"
+#include "../../ASCOfficeDocxFile2/DocWrapper/XlsxSerializer.h"
+#include "../../ASCOfficePPTXFile/ASCOfficePPTXFile.h"
+#include "../../ASCOfficeRtfFile/RtfFormatLib/source/ConvertationManager.h"
+#include "../../ASCOfficeRtfFile/RtfFormatLib/source/ConvertationManager.h"
+#include "../../ASCOfficeDocFile/DocFormatLib/DocFormatLib.h"
+#include "../../ASCOfficeTxtFile/TxtXmlFormatLib/Source/TxtXmlFile.h"
+#include "../../ASCOfficePPTFile/PPTFormatLib/PPTFormatLib.h"
+#include "../../ASCOfficeOdfFile/src/ConvertOO2OOX.h"
+#include "../../ASCOfficeOdfFileW/source/Oox2OdfConverter/Oox2OdfConverter.h"
+#include "../../DesktopEditor/doctrenderer/doctrenderer.h"
+#include "../../DesktopEditor/fontengine/ApplicationFonts.h"
+#include "../../PdfReader/PdfReader.h"
+#include "../../DjVuFile/DjVu.h"
+#include "../../XpsFile/XpsFile.h"
+#include "../../HtmlRenderer/include/HTMLRenderer3.h"
+#include "../../HtmlFile/HtmlFile.h"
+#include "../../ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertXls2Xlsx.h"
 
 #include <iostream>
 #include <fstream>

X2tConverter/src/cextracttools.cpp

 #include "cextracttools.h"
-#include "../../../ServerComponents/DesktopEditor/common/StringBuilder.h"
-#include "../../../ServerComponents/DesktopEditor/common/Directory.h"
-#include "../../../ServerComponents/DesktopEditor/common/Path.h"
-#include "../../../ServerComponents/ASCOfficeUtils/ASCOfficeUtilsLib/OfficeUtils.h"
+#include "../../DesktopEditor/common/StringBuilder.h"
+#include "../../DesktopEditor/common/Directory.h"
+#include "../../DesktopEditor/common/Path.h"
+#include "../../OfficeUtils/src/OfficeUtils.h"
 
 namespace NExtractTools
 {

X2tConverter/src/cextracttools.h

 #ifndef CEXTRACTTOOLS_H
 #define CEXTRACTTOOLS_H
 
-#include "../../../ServerComponents/Common/OfficeFileErrorDescription.h"
-#include "../../../ServerComponents/Common/OfficeFileFormatChecker.h"
-#include "../../../ServerComponents/Common/DocxFormat/Source/SystemUtility/SystemUtility.h"
-#include "../../../ServerComponents/Common/DocxFormat/Source/SystemUtility/FileSystem/Directory.h"
-#include "../../../ServerComponents/Common/DocxFormat/Source/XML/stringcommon.h"
-#include "../../../ServerComponents/Common/DocxFormat/Source/XML/xmlutils.h"
-#include "../../../ServerComponents/DesktopEditor/doctrenderer/doctrenderer.h"
-#include "../../../ServerComponents/DesktopEditor/common/StringBuilder.h"
-#include "../../../ServerComponents/DesktopEditor/common/Path.h"
+#include "../../Common/OfficeFileErrorDescription.h"
+#include "../../Common/OfficeFileFormatChecker.h"
+#include "../../Common/DocxFormat/Source/SystemUtility/SystemUtility.h"
+#include "../../Common/DocxFormat/Source/SystemUtility/FileSystem/Directory.h"
+#include "../../Common/DocxFormat/Source/XML/stringcommon.h"
+#include "../../Common/DocxFormat/Source/XML/xmlutils.h"
+#include "../../DesktopEditor/doctrenderer/doctrenderer.h"
+#include "../../DesktopEditor/common/StringBuilder.h"
+#include "../../DesktopEditor/common/Path.h"
 
 #include <iostream>
 #include <fstream>

X2tConverter/src/main.cpp

@@ -2,8 +2,8 @@
 #include "cextracttools.h"
 #include "ASCConverters.h"
 
-#include "../../../ServerComponents/Common/DocxFormat/Source/SystemUtility/FileSystem/Directory.h"
-#include "../../../ServerComponents/DesktopEditor/common/Directory.h"
+#include "../../Common/DocxFormat/Source/SystemUtility/FileSystem/Directory.h"
+#include "../../DesktopEditor/common/Directory.h"
 
 //#include <iostream>