pengjunjie/core
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/core.git synced 2026-04-07 13:55:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/release/v8.2.0' into develop

Browse Source
This commit is contained in:
Elena Subbotina
2024-08-06 09:38:42 +03:00
parent 9d750ad3d4 6586fc39ee
commit 6ba96b0ae8
161 changed files with 9586 additions and 3726 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OOXML/Projects/Windows/PPTXFormatLib/PPTXFormat.vcxproj
View File

@ -289,10 +289,8 @@
<ClInclude Include="..\..\..\Binary\Presentation\imagemanager.h" />
<ClInclude Include="..\..\..\Binary\Presentation\pptxwriter.h" />
<ClInclude Include="..\..\..\Binary\Presentation\WMFToImageConverter.h" />
<ClInclude Include="..\..\..\PPTXFormat\App.h" />
<ClInclude Include="..\..\..\PPTXFormat\CommentAuthors.h" />
<ClInclude Include="..\..\..\PPTXFormat\Comments.h" />
<ClInclude Include="..\..\..\PPTXFormat\Core.h" />
<ClInclude Include="..\..\..\PPTXFormat\DrawingConverter\ASCOfficeDrawingConverter.h" />
<ClInclude Include="..\..\..\PPTXFormat\DrawingConverter\ASCOfficePPTXFile.h" />
<ClInclude Include="..\..\..\PPTXFormat\FileContainer.h" />
@ -922,10 +920,8 @@
<ClCompile Include="..\..\..\Binary\Presentation\FontPicker.cpp" />
<ClCompile Include="..\..\..\Binary\Presentation\imagemanager.cpp" />
<ClCompile Include="..\..\..\Binary\Presentation\PPTXWriter.cpp" />
<ClCompile Include="..\..\..\PPTXFormat\App.cpp" />
<ClCompile Include="..\..\..\PPTXFormat\CommentAuthors.cpp" />
<ClCompile Include="..\..\..\PPTXFormat\Comments.cpp" />
<ClCompile Include="..\..\..\PPTXFormat\Core.cpp" />
<ClCompile Include="..\..\..\PPTXFormat\DrawingConverter\ASCOfficeDrawingConverter.cpp" />
<ClCompile Include="..\..\..\PPTXFormat\DrawingConverter\ASCOfficePPTXFileRealization.cpp" />
<ClCompile Include="..\..\..\PPTXFormat\FileContainer.cpp" />

4
OOXML/Projects/Windows/PPTXFormatLib/PPTXFormat.vcxproj.filters
View File

@ -1,10 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<ClInclude Include="..\..\..\PPTXFormat\App.h" />
<ClInclude Include="..\..\..\PPTXFormat\CommentAuthors.h" />
<ClInclude Include="..\..\..\PPTXFormat\Comments.h" />
<ClInclude Include="..\..\..\PPTXFormat\Core.h" />
<ClInclude Include="..\..\..\PPTXFormat\FileContainer.h" />
<ClInclude Include="..\..\..\PPTXFormat\FileFactory.h" />
<ClInclude Include="..\..\..\PPTXFormat\FileMap.h" />
@ -1932,10 +1930,8 @@
<ClCompile Include="..\..\..\PPTXFormat\Logic\Transitions\TransitionBase.cpp">
<Filter>Logic\Transition</Filter>
</ClCompile>
<ClCompile Include="..\..\..\PPTXFormat\App.cpp" />
<ClCompile Include="..\..\..\PPTXFormat\CommentAuthors.cpp" />
<ClCompile Include="..\..\..\PPTXFormat\Comments.cpp" />
<ClCompile Include="..\..\..\PPTXFormat\Core.cpp" />
<ClCompile Include="..\..\..\PPTXFormat\HandoutMaster.cpp" />
<ClCompile Include="..\..\..\PPTXFormat\LegacyDiagramText.cpp" />
<ClCompile Include="..\..\..\PPTXFormat\Namespaces.cpp" />