From 7382845517deb4a340191a17e08562d83d3aa7c2 Mon Sep 17 00:00:00 2001 From: "Elena.Subbotina" Date: Thu, 12 Jan 2023 22:02:50 +0300 Subject: [PATCH] . --- .../Windows/XlsXlsxConverter.vcxproj | 141 ++++++ .../Windows/XlsXlsxConverter.vcxproj.filters | 423 ++++++++++++++++++ .../Document/DocWrapper/ChartSerializer.cpp | 6 +- .../Document/DocWrapper/ChartSerializer.h | 6 +- .../Binary/Sheets/Reader/ChartFromToBinary.h | 3 +- OOXML/Common/SimpleTypes_Vml.h | 4 + OOXML/XlsxFormat/Worksheets/SheetData.cpp | 2 +- OdfFile/Writer/Converter/ConverterChart.cpp | 5 +- X2tConverter/src/ASCConverters.cpp | 8 +- 9 files changed, 583 insertions(+), 15 deletions(-) diff --git a/MsBinaryFile/Projects/XlsFormatLib/Windows/XlsXlsxConverter.vcxproj b/MsBinaryFile/Projects/XlsFormatLib/Windows/XlsXlsxConverter.vcxproj index 1b8638e734..61f60a6839 100644 --- a/MsBinaryFile/Projects/XlsFormatLib/Windows/XlsXlsxConverter.vcxproj +++ b/MsBinaryFile/Projects/XlsFormatLib/Windows/XlsXlsxConverter.vcxproj @@ -22,6 +22,147 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/MsBinaryFile/Projects/XlsFormatLib/Windows/XlsXlsxConverter.vcxproj.filters b/MsBinaryFile/Projects/XlsFormatLib/Windows/XlsXlsxConverter.vcxproj.filters index efb0730109..adf48d482b 100644 --- a/MsBinaryFile/Projects/XlsFormatLib/Windows/XlsXlsxConverter.vcxproj.filters +++ b/MsBinaryFile/Projects/XlsFormatLib/Windows/XlsXlsxConverter.vcxproj.filters @@ -34,6 +34,429 @@ DrawConverting + + DrawConverting\oldShapes + + + DrawConverting\oldShapes + + + DrawConverting\oldShapes + + + DrawConverting\oldShapes + + + DrawConverting\oldShapes + + + DrawConverting\oldShapes + + + DrawConverting\oldShapes + + + DrawConverting\oldShapes + + + DrawConverting\oldShapes + + + DrawConverting\oldShapes + + + DrawConverting\oldShapes + + + DrawConverting\oldShapes + + + DrawConverting\oldShapes + + + DrawConverting\oldShapes + + + DrawConverting\oldShapes + + + DrawConverting\oldShapes + + + DrawConverting\oldShapes + + + DrawConverting\oldShapes + + + DrawConverting\oldShapes + + + DrawConverting\oldShapes + + + DrawConverting\oldShapes + + + DrawConverting\oldShapes + + + DrawConverting\oldShapes + + + DrawConverting\oldShapes + + + DrawConverting\oldShapes + + + DrawConverting\oldShapes + + + DrawConverting\oldShapes + + + DrawConverting\oldShapes + + + DrawConverting\oldShapes + + + DrawConverting\oldShapes + + + DrawConverting\oldShapes + + + DrawConverting\oldShapes + + + DrawConverting\oldShapes + + + DrawConverting\oldShapes + + + DrawConverting\oldShapes + + + DrawConverting\oldShapes + + + DrawConverting\oldShapes + + + DrawConverting\oldShapes + + + DrawConverting\oldShapes + + + DrawConverting\oldShapes + + + DrawConverting\oldShapes + + + DrawConverting\oldShapes + + + DrawConverting\oldShapes + + + DrawConverting\oldShapes + + + DrawConverting\oldShapes + + + DrawConverting\oldShapes + + + DrawConverting\oldShapes + + + DrawConverting\oldShapes + + + DrawConverting\oldShapes + + + DrawConverting\oldShapes + + + DrawConverting\oldShapes + + + DrawConverting\oldShapes + + + DrawConverting\oldShapes + + + DrawConverting\oldShapes + + + DrawConverting\oldShapes + + + DrawConverting\oldShapes + + + DrawConverting\oldShapes + + + DrawConverting\oldShapes + + + DrawConverting\oldShapes + + + DrawConverting\oldShapes + + + DrawConverting\oldShapes + + + DrawConverting\oldShapes + + + DrawConverting\oldShapes + + + DrawConverting\oldShapes + + + DrawConverting\oldShapes + + + DrawConverting\oldShapes + + + DrawConverting\oldShapes + + + DrawConverting\oldShapes + + + DrawConverting\oldShapes + + + DrawConverting\oldShapes + + + DrawConverting\oldShapes + + + DrawConverting\oldShapes + + + DrawConverting\oldShapes + + + DrawConverting\oldShapes + + + DrawConverting\oldShapes + + + DrawConverting\oldShapes + + + DrawConverting\oldShapes + + + DrawConverting\oldShapes + + + DrawConverting\oldShapes + + + DrawConverting\oldShapes + + + DrawConverting\oldShapes + + + DrawConverting\oldShapes + + + DrawConverting\oldShapes + + + DrawConverting\oldShapes + + + DrawConverting\oldShapes + + + DrawConverting\oldShapes + + + DrawConverting\oldShapes + + + DrawConverting\oldShapes + + + DrawConverting\oldShapes + + + DrawConverting\oldShapes + + + DrawConverting\oldShapes + + + DrawConverting\oldShapes + + + DrawConverting\oldShapes + + + DrawConverting\oldShapes + + + DrawConverting\oldShapes + + + DrawConverting\oldShapes + + + DrawConverting\oldShapes + + + DrawConverting\oldShapes + + + DrawConverting\oldShapes + + + DrawConverting\oldShapes + + + DrawConverting\oldShapes + + + DrawConverting\oldShapes + + + DrawConverting\oldShapes + + + DrawConverting\oldShapes + + + DrawConverting\oldShapes + + + DrawConverting\oldShapes + + + DrawConverting\oldShapes + + + DrawConverting\oldShapes + + + DrawConverting\oldShapes + + + DrawConverting\oldShapes + + + DrawConverting\oldShapes + + + DrawConverting\oldShapes + + + DrawConverting\oldShapes + + + DrawConverting\oldShapes + + + DrawConverting\oldShapes + + + DrawConverting\oldShapes + + + DrawConverting\oldShapes + + + DrawConverting\oldShapes + + + DrawConverting\oldShapes + + + DrawConverting\oldShapes + + + DrawConverting\oldShapes + + + DrawConverting\oldShapes + + + DrawConverting\oldShapes + + + DrawConverting\oldShapes + + + DrawConverting\oldShapes + + + DrawConverting\oldShapes + + + DrawConverting\oldShapes + + + DrawConverting\oldShapes + + + DrawConverting\oldShapes + + + DrawConverting\oldShapes + + + DrawConverting\oldShapes + + + DrawConverting\oldShapes + + + DrawConverting\oldShapes + + + DrawConverting\oldShapes + + + DrawConverting\oldShapes + + + DrawConverting\oldShapes + + + DrawConverting\oldShapes + + + DrawConverting\oldShapes + + + DrawConverting\oldShapes + + + DrawConverting\oldShapes + + + DrawConverting\oldShapes + diff --git a/OOXML/Binary/Document/DocWrapper/ChartSerializer.cpp b/OOXML/Binary/Document/DocWrapper/ChartSerializer.cpp index 121ca556f9..96a403639a 100644 --- a/OOXML/Binary/Document/DocWrapper/ChartSerializer.cpp +++ b/OOXML/Binary/Document/DocWrapper/ChartSerializer.cpp @@ -29,10 +29,11 @@ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode * */ -#include "ChartSerializer.h" - #include +#include "ChartSerializer.h" +#include "../../../XlsxFormat/Chart/ChartSerialize.h" + #include "../../../XlsxFormat/Xlsx.h" #include "../../../XlsxFormat/Workbook/Workbook.h" #include "../../../XlsxFormat/SharedStrings/SharedStrings.h" @@ -42,7 +43,6 @@ #include "../../../XlsxFormat/Styles/dxf.h" #include "../../../XlsxFormat/Styles/Borders.h" #include "../../../XlsxFormat/Worksheets/Worksheet.h" -#include "../../../XlsxFormat/Chart/ChartSerialize.h" #define NUMID_START 160 const wchar_t* gc_Cat = L"cat"; diff --git a/OOXML/Binary/Document/DocWrapper/ChartSerializer.h b/OOXML/Binary/Document/DocWrapper/ChartSerializer.h index df7e3a8195..33732321c5 100644 --- a/OOXML/Binary/Document/DocWrapper/ChartSerializer.h +++ b/OOXML/Binary/Document/DocWrapper/ChartSerializer.h @@ -29,8 +29,7 @@ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode * */ -#ifndef CHART_WRITER -#define CHART_WRITER +#pragma once #include #include @@ -88,5 +87,4 @@ namespace BinXlsxRW { void parseAxDataSource(const OOX::Spreadsheet::CT_AxDataSource* pAxDataSource, bool bUpdateRange, const wchar_t* cRangeName); void parseNumDataSource(const OOX::Spreadsheet::CT_NumDataSource* pNumDataSource, bool bUpdateRange, const wchar_t* cRangeName); }; -} -#endif // #ifndef CHART_WRITER +} \ No newline at end of file diff --git a/OOXML/Binary/Sheets/Reader/ChartFromToBinary.h b/OOXML/Binary/Sheets/Reader/ChartFromToBinary.h index 83ed8053e1..8f3c06be4f 100644 --- a/OOXML/Binary/Sheets/Reader/ChartFromToBinary.h +++ b/OOXML/Binary/Sheets/Reader/ChartFromToBinary.h @@ -31,8 +31,9 @@ */ #pragma once -#include "CommonWriter.h" #include "../../../XlsxFormat/Chart/ChartSerialize.h" + +#include "CommonWriter.h" #include "../../../XlsxFormat/Chart/ChartStyle.h" #include "../../../XlsxFormat/Chart/ChartColors.h" #include "../Writer/BinaryCommonReader.h" diff --git a/OOXML/Common/SimpleTypes_Vml.h b/OOXML/Common/SimpleTypes_Vml.h index c5fa190c9f..a2179ed8ba 100644 --- a/OOXML/Common/SimpleTypes_Vml.h +++ b/OOXML/Common/SimpleTypes_Vml.h @@ -31,6 +31,10 @@ */ #pragma once +#include +#include +#include + #include "SimpleTypes_Drawing.h" // Here are simple types Vml from spec Office Open Xml Part4 14 diff --git a/OOXML/XlsxFormat/Worksheets/SheetData.cpp b/OOXML/XlsxFormat/Worksheets/SheetData.cpp index 108d0739d1..0badfbd9a0 100644 --- a/OOXML/XlsxFormat/Worksheets/SheetData.cpp +++ b/OOXML/XlsxFormat/Worksheets/SheetData.cpp @@ -33,7 +33,7 @@ #include "../Workbook/Workbook.h" #include "../Common.h" -#include "../../../XlsbFormat/Biff12_records/CommonRecords.h" +#include "../../XlsbFormat/Biff12_records/CommonRecords.h" #include "../../DocxFormat/VmlDrawing.h" #include "../Styles/Styles.h" diff --git a/OdfFile/Writer/Converter/ConverterChart.cpp b/OdfFile/Writer/Converter/ConverterChart.cpp index 8fbdbd4cf3..2b84792869 100644 --- a/OdfFile/Writer/Converter/ConverterChart.cpp +++ b/OdfFile/Writer/Converter/ConverterChart.cpp @@ -31,6 +31,9 @@ */ #include "Converter.h" + +#include "../../../OOXML/XlsxFormat/Chart/ChartSerializeEx.h" + #include "../../Common/utils.h" #include "XlsxConverter.h" @@ -49,8 +52,6 @@ #include "../../../OOXML/XlsxFormat/SharedStrings/SharedStrings.h" #include "../../../OOXML/XlsxFormat/Styles/Styles.h" #include "../../../OOXML/XlsxFormat/Worksheets/Worksheet.h" -#include "../../../OOXML/XlsxFormat/Chart/ChartSerialize.h" -#include "../../../OOXML/XlsxFormat/Chart/ChartSerializeEx.h" namespace Oox2Odf { diff --git a/X2tConverter/src/ASCConverters.cpp b/X2tConverter/src/ASCConverters.cpp index c6a3c8c20d..4d02377b20 100644 --- a/X2tConverter/src/ASCConverters.cpp +++ b/X2tConverter/src/ASCConverters.cpp @@ -1892,8 +1892,8 @@ namespace NExtractTools if (false == password.empty()) pdfWriter.SetPassword(password); - if (false == sResult.empty()) - pdfWriter.SetCore(sResult); +// if (false == sResult.empty()) +// pdfWriter.SetCore(sResult); int nReg = (bPaid == false) ? 0 : 1; nRes = (S_OK == pdfWriter.OnlineWordToPdfFromBinary(sPdfBinFile, sTo, &oBufferParams)) ? nRes : AVS_FILEUTILS_ERROR_CONVERT; @@ -3567,8 +3567,8 @@ namespace NExtractTools if (false == password.empty()) pdfWriter.SetPassword(password); - if (false == sResult.empty()) - pdfWriter.SetCore(sResult); +// if (false == sResult.empty()) +// pdfWriter.SetCore(sResult); int nReg = (bPaid == false) ? 0 : 1; nRes = (S_OK == pdfWriter.OnlineWordToPdfFromBinary(sFilePathIn, sFilePathOut, &oBufferParams)) ? 0 : AVS_FILEUTILS_ERROR_CONVERT;