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-pivot-hierarchies

Browse Source
This commit is contained in:
Viktor Andreev
2024-09-26 13:53:16 +06:00
parent 296dba3a4e 3d38fdd005
commit c67b78508e
332 changed files with 10101 additions and 20665 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OOXML/Projects/Linux/PPTXFormatLib/PPTXFormatLib.pro
View File

@ -107,7 +107,7 @@ SOURCES += \
../../../PPTXFormat/Theme/FontScheme.cpp \
../../../PPTXFormat/Theme/ThemeElements.cpp \
\
../../../PPTXFormat/ShowPr/ShowPr.cpp \
../../../PPTXFormat/ShowPr/PresentationPr.cpp \
../../../PPTXFormat/ShowPr/Present.cpp \
../../../PPTXFormat/ShowPr/Kiosk.cpp \
../../../PPTXFormat/ShowPr/CustShow.cpp \
@ -202,6 +202,6 @@ HEADERS += \
../../../PPTXFormat/ShowPr/CustShow.h \
../../../PPTXFormat/ShowPr/Kiosk.h \
../../../PPTXFormat/ShowPr/Present.h \
../../../PPTXFormat/ShowPr/ShowPr.h \
../../../PPTXFormat/ShowPr/PresentationPr.h \
../../../PPTXFormat/ShowPr/SldAll.h \
../../../PPTXFormat/ShowPr/SldRg.h

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

@ -635,7 +635,7 @@
<ClInclude Include="..\..\..\PPTXFormat\ShowPr\CustShow.h" />
<ClInclude Include="..\..\..\PPTXFormat\ShowPr\Kiosk.h" />
<ClInclude Include="..\..\..\PPTXFormat\ShowPr\Present.h" />
<ClInclude Include="..\..\..\PPTXFormat\ShowPr\ShowPr.h" />
<ClInclude Include="..\..\..\PPTXFormat\ShowPr\PresentationPr.h" />
<ClInclude Include="..\..\..\PPTXFormat\ShowPr\SldAll.h" />
<ClInclude Include="..\..\..\PPTXFormat\ShowPr\SldRg.h" />
<ClInclude Include="..\..\..\PPTXFormat\Slide.h" />
@ -1266,7 +1266,7 @@
<ClCompile Include="..\..\..\PPTXFormat\ShowPr\CustShow.cpp" />
<ClCompile Include="..\..\..\PPTXFormat\ShowPr\Kiosk.cpp" />
<ClCompile Include="..\..\..\PPTXFormat\ShowPr\Present.cpp" />
<ClCompile Include="..\..\..\PPTXFormat\ShowPr\ShowPr.cpp" />
<ClCompile Include="..\..\..\PPTXFormat\ShowPr\PresentationPr.cpp" />
<ClCompile Include="..\..\..\PPTXFormat\ShowPr\SldAll.cpp" />
<ClCompile Include="..\..\..\PPTXFormat\ShowPr\SldRg.cpp" />
<ClCompile Include="..\..\..\PPTXFormat\Slide.cpp" />

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

@ -708,25 +708,25 @@
<Filter>Presentation</Filter>
</ClInclude>
<ClInclude Include="..\..\..\PPTXFormat\ShowPr\Browse.h">
<Filter>ShowPr</Filter>
<Filter>PresentationPr</Filter>
</ClInclude>
<ClInclude Include="..\..\..\PPTXFormat\ShowPr\CustShow.h">
<Filter>ShowPr</Filter>
<Filter>PresentationPr</Filter>
</ClInclude>
<ClInclude Include="..\..\..\PPTXFormat\ShowPr\Kiosk.h">
<Filter>ShowPr</Filter>
<Filter>PresentationPr</Filter>
</ClInclude>
<ClInclude Include="..\..\..\PPTXFormat\ShowPr\Present.h">
<Filter>ShowPr</Filter>
<Filter>PresentationPr</Filter>
</ClInclude>
<ClInclude Include="..\..\..\PPTXFormat\ShowPr\ShowPr.h">
<Filter>ShowPr</Filter>
<ClInclude Include="..\..\..\PPTXFormat\ShowPr\PresentationPr.h">
<Filter>PresentationPr</Filter>
</ClInclude>
<ClInclude Include="..\..\..\PPTXFormat\ShowPr\SldAll.h">
<Filter>ShowPr</Filter>
<Filter>PresentationPr</Filter>
</ClInclude>
<ClInclude Include="..\..\..\PPTXFormat\ShowPr\SldRg.h">
<Filter>ShowPr</Filter>
<Filter>PresentationPr</Filter>
</ClInclude>
<ClInclude Include="..\..\..\PPTXFormat\Theme\ClrScheme.h">
<Filter>Theme</Filter>
@ -2471,25 +2471,25 @@
<Filter>Presentation</Filter>
</ClCompile>
<ClCompile Include="..\..\..\PPTXFormat\ShowPr\Browse.cpp">
<Filter>ShowPr</Filter>
<Filter>PresentationPr</Filter>
</ClCompile>
<ClCompile Include="..\..\..\PPTXFormat\ShowPr\CustShow.cpp">
<Filter>ShowPr</Filter>
<Filter>PresentationPr</Filter>
</ClCompile>
<ClCompile Include="..\..\..\PPTXFormat\ShowPr\Kiosk.cpp">
<Filter>ShowPr</Filter>
<Filter>PresentationPr</Filter>
</ClCompile>
<ClCompile Include="..\..\..\PPTXFormat\ShowPr\Present.cpp">
<Filter>ShowPr</Filter>
<Filter>PresentationPr</Filter>
</ClCompile>
<ClCompile Include="..\..\..\PPTXFormat\ShowPr\ShowPr.cpp">
<Filter>ShowPr</Filter>
<ClCompile Include="..\..\..\PPTXFormat\ShowPr\PresentationPr.cpp">
<Filter>PresentationPr</Filter>
</ClCompile>
<ClCompile Include="..\..\..\PPTXFormat\ShowPr\SldAll.cpp">
<Filter>ShowPr</Filter>
<Filter>PresentationPr</Filter>
</ClCompile>
<ClCompile Include="..\..\..\PPTXFormat\ShowPr\SldRg.cpp">
<Filter>ShowPr</Filter>
<Filter>PresentationPr</Filter>
</ClCompile>
<ClCompile Include="..\..\..\PPTXFormat\Theme\ClrScheme.cpp">
<Filter>Theme</Filter>
@ -3769,9 +3769,6 @@
<Filter Include="Presentation">
<UniqueIdentifier>{1bccfc22-686e-4d82-8fd1-353cbc5479f2}</UniqueIdentifier>
</Filter>
<Filter Include="ShowPr">
<UniqueIdentifier>{47677fd9-1e35-4520-bcb1-bf87d1fec730}</UniqueIdentifier>
</Filter>
<Filter Include="Theme">
<UniqueIdentifier>{200ee36f-100d-4ba7-b62c-2dccbb924a09}</UniqueIdentifier>
</Filter>
@ -3802,5 +3799,8 @@
<Filter Include="Common\Xml">
<UniqueIdentifier>{1461f41f-a436-4c57-bb70-199577dca246}</UniqueIdentifier>
</Filter>
<Filter Include="PresentationPr">
<UniqueIdentifier>{47677fd9-1e35-4520-bcb1-bf87d1fec730}</UniqueIdentifier>
</Filter>
</ItemGroup>
</Project>