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

Merge branch 'develop' into feature/add-lcid-to-csv

Browse Source
This commit is contained in:
Viktor Andreev
2024-10-16 13:12:11 +06:00
parent f7607e1c92 81e075e715
commit af7cb378ac
4 changed files with 194 additions and 168 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OOXML/Projects/Windows/DocxFormatLib/DocxFormatLib.vcxproj
View File

@ -350,9 +350,11 @@
<ClInclude Include="..\..\..\XlsxFormat\FileTypes_Spreadsheet.h" />
<ClInclude Include="..\..\..\XlsxFormat\NamedSheetViews\NamedSheetViews.h" />
<ClInclude Include="..\..\..\XlsxFormat\Ole\OleObjects.h" />
<ClInclude Include="..\..\..\XlsxFormat\Pivot\PivotCacheChildOther.h" />
<ClInclude Include="..\..\..\XlsxFormat\Pivot\PivotCacheDefinition.h" />
<ClInclude Include="..\..\..\XlsxFormat\Pivot\PivotCacheDefinitionExt.h" />
<ClInclude Include="..\..\..\XlsxFormat\Pivot\PivotCacheRecords.h" />
<ClInclude Include="..\..\..\XlsxFormat\Pivot\PivotHierarchies.h" />
<ClInclude Include="..\..\..\XlsxFormat\Pivot\PivotTable.h" />
<ClInclude Include="..\..\..\XlsxFormat\RichData\RdRichValue.h" />
<ClInclude Include="..\..\..\XlsxFormat\SharedStrings\PhoneticPr.h" />
@ -513,7 +515,9 @@
<ClCompile Include="..\..\..\XlsxFormat\FileTypes_Spreadsheet.cpp" />
<ClCompile Include="..\..\..\XlsxFormat\NamedSheetViews\NamedSheetViews.cpp" />
<ClCompile Include="..\..\..\XlsxFormat\Ole\OleObjects.cpp" />
<ClCompile Include="..\..\..\XlsxFormat\Pivot\PivotCacheChildOther.cpp" />
<ClCompile Include="..\..\..\XlsxFormat\Pivot\PivotCacheDefinitionExt.cpp" />
<ClCompile Include="..\..\..\XlsxFormat\Pivot\PivotHierarchies.cpp" />
<ClCompile Include="..\..\..\XlsxFormat\Pivot\Pivots.cpp" />
<ClCompile Include="..\..\..\XlsxFormat\RichData\RdRichValue.cpp" />
<ClCompile Include="..\..\..\XlsxFormat\SharedStrings\PhoneticPr.cpp" />

12
OOXML/Projects/Windows/DocxFormatLib/DocxFormatLib.vcxproj.filters
View File

@ -547,6 +547,12 @@
<ClInclude Include="..\..\..\XlsxFormat\Workbook\Metadata.h">
<Filter>XlsxFormat\Workbook</Filter>
</ClInclude>
<ClInclude Include="..\..\..\XlsxFormat\Pivot\PivotCacheChildOther.h">
<Filter>XlsxFormat\Pivots</Filter>
</ClInclude>
<ClInclude Include="..\..\..\XlsxFormat\Pivot\PivotHierarchies.h">
<Filter>XlsxFormat\Pivots</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\..\Base\codecvt.cpp">
@ -963,5 +969,11 @@
<ClCompile Include="..\..\..\XlsxFormat\Workbook\Metadata.cpp">
<Filter>XlsxFormat\Workbook</Filter>
</ClCompile>
<ClCompile Include="..\..\..\XlsxFormat\Pivot\PivotCacheChildOther.cpp">
<Filter>XlsxFormat\Pivots</Filter>
</ClCompile>
<ClCompile Include="..\..\..\XlsxFormat\Pivot\PivotHierarchies.cpp">
<Filter>XlsxFormat\Pivots</Filter>
</ClCompile>
</ItemGroup>
</Project>