pengjunjie/core
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/core.git synced 2026-02-10 18:05:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

add xml convert from param

Browse Source
This commit is contained in:
Elena.Subbotina
2023-05-31 10:11:14 +03:00
parent a623458a0c
commit 8762ec12ff
4 changed files with 42 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
OOXML/Projects/Windows/BinaryFormatLib/BinaryFormatLib.vcxproj
View File

@ -45,6 +45,10 @@
<ClCompile Include="..\..\..\Binary\Presentation\XmlWriter.cpp" />
<ClCompile Include="..\..\..\Binary\Sheets\Common\Common.cpp" />
<ClCompile Include="..\..\..\Binary\Sheets\Reader\BinaryWriter.cpp" />
<ClCompile Include="..\..\..\Binary\Sheets\Reader\CellFormatController\CellFormatController.cpp" />
<ClCompile Include="..\..\..\Binary\Sheets\Reader\CellFormatController\CurrencyReader.cpp" />
<ClCompile Include="..\..\..\Binary\Sheets\Reader\CellFormatController\DateReader.cpp" />
<ClCompile Include="..\..\..\Binary\Sheets\Reader\CellFormatController\DigitReader.cpp" />
<ClCompile Include="..\..\..\Binary\Sheets\Reader\ChartFromToBinary.cpp" />
<ClCompile Include="..\..\..\Binary\Sheets\Reader\CommonWriter.cpp" />
<ClCompile Include="..\..\..\Binary\Sheets\Reader\CSVReader.cpp" />
@ -92,6 +96,10 @@
<ClInclude Include="..\..\..\Binary\Sheets\Common\BinReaderWriterDefines.h" />
<ClInclude Include="..\..\..\Binary\Sheets\Common\Common.h" />
<ClInclude Include="..\..\..\Binary\Sheets\Reader\BinaryWriter.h" />
<ClInclude Include="..\..\..\Binary\Sheets\Reader\CellFormatController\CellFormatController.h" />
<ClInclude Include="..\..\..\Binary\Sheets\Reader\CellFormatController\CurrencyReader.h" />
<ClInclude Include="..\..\..\Binary\Sheets\Reader\CellFormatController\DateReader.h" />
<ClInclude Include="..\..\..\Binary\Sheets\Reader\CellFormatController\DigitReader.h" />
<ClInclude Include="..\..\..\Binary\Sheets\Reader\ChartFromToBinary.h" />
<ClInclude Include="..\..\..\Binary\Sheets\Reader\CommonWriter.h" />
<ClInclude Include="..\..\..\Binary\Sheets\Reader\CSVReader.h" />

27
OOXML/Projects/Windows/BinaryFormatLib/BinaryFormatLib.vcxproj.filters
View File

@ -28,6 +28,9 @@
<Filter Include="Sheets\Reader\XML">
<UniqueIdentifier>{47d28884-9f95-479a-a812-cf3b0e0a6ac9}</UniqueIdentifier>
</Filter>
<Filter Include="Sheets\Reader\CellFormat">
<UniqueIdentifier>{3bf431c7-ab39-40bb-a5ce-dbc6008ae5e5}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\..\Binary\Document\DocWrapper\DocxSerializer.cpp">
@ -144,6 +147,18 @@
<ClCompile Include="..\..\..\Binary\Sheets\Reader\XMLReader\XMLReader2.cpp">
<Filter>Sheets\Reader\XML</Filter>
</ClCompile>
<ClCompile Include="..\..\..\Binary\Sheets\Reader\CellFormatController\CellFormatController.cpp">
<Filter>Sheets\Reader\CellFormat</Filter>
</ClCompile>
<ClCompile Include="..\..\..\Binary\Sheets\Reader\CellFormatController\CurrencyReader.cpp">
<Filter>Sheets\Reader\CellFormat</Filter>
</ClCompile>
<ClCompile Include="..\..\..\Binary\Sheets\Reader\CellFormatController\DateReader.cpp">
<Filter>Sheets\Reader\CellFormat</Filter>
</ClCompile>
<ClCompile Include="..\..\..\Binary\Sheets\Reader\CellFormatController\DigitReader.cpp">
<Filter>Sheets\Reader\CellFormat</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\Binary\Document\DocWrapper\ChartWriter.h">
@ -281,5 +296,17 @@
<ClInclude Include="..\..\..\Binary\Sheets\Reader\XMLReader\XMLReader.h">
<Filter>Sheets\Reader\XML</Filter>
</ClInclude>
<ClInclude Include="..\..\..\Binary\Sheets\Reader\CellFormatController\CellFormatController.h">
<Filter>Sheets\Reader\CellFormat</Filter>
</ClInclude>
<ClInclude Include="..\..\..\Binary\Sheets\Reader\CellFormatController\CurrencyReader.h">
<Filter>Sheets\Reader\CellFormat</Filter>
</ClInclude>
<ClInclude Include="..\..\..\Binary\Sheets\Reader\CellFormatController\DateReader.h">
<Filter>Sheets\Reader\CellFormat</Filter>
</ClInclude>
<ClInclude Include="..\..\..\Binary\Sheets\Reader\CellFormatController\DigitReader.h">
<Filter>Sheets\Reader\CellFormat</Filter>
</ClInclude>
</ItemGroup>
</Project>

4
X2tConverter/src/ASCConverters.cpp
View File

@ -4624,6 +4624,10 @@ namespace NExtractTools
nRes = csv2xlsx_dir(sFrom, sXlsxDir, sTemp, params);
*params.m_nFormatFrom = AVS_OFFICESTUDIO_FILE_SPREADSHEET_XLSX;
}
else if (AVS_OFFICESTUDIO_FILE_DOCUMENT_XML == nFormatFrom)
{
nRes = xml2xlsx_dir(sFrom, sXlsxDir, sTemp, params);
}
else
nRes = AVS_FILEUTILS_ERROR_CONVERT_PARAMS;
if(SUCCEEDED_X2T(nRes))

4
X2tConverter/src/cextracttools.h
View File

@ -921,7 +921,9 @@ namespace NExtractTools
if(NULL != m_oMailMergeSend)
eRes = TCD_MAILMERGE;
else if(0 != (AVS_OFFICESTUDIO_FILE_DOCUMENT & nFormatFrom))
else if ((AVS_OFFICESTUDIO_FILE_DOCUMENT_XML == nFormatFrom) && 0 != (AVS_OFFICESTUDIO_FILE_SPREADSHEET & nFormatTo))
eRes = TCD_SPREADSHEET2;
else if(0 != (AVS_OFFICESTUDIO_FILE_DOCUMENT & nFormatFrom))
eRes = TCD_DOCUMENT2;
else if(0 != (AVS_OFFICESTUDIO_FILE_SPREADSHEET & nFormatFrom))
eRes = TCD_SPREADSHEET2;