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

.

Browse Source
This commit is contained in:
ElenaSubbotina
2020-10-21 13:13:20 +03:00
parent 3ed7e53fc5
commit 5680ea4c96
5 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ASCOfficePPTXFile/PPTXLib/PPTXFormat.vcxproj
View File

@ -165,6 +165,7 @@
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
</PrecompiledHeader> </PrecompiledHeader>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\DesktopEditor\raster\exif.cpp" />
<ClCompile Include="..\..\HtmlRenderer\src\ASCSVGWriter.cpp" /> <ClCompile Include="..\..\HtmlRenderer\src\ASCSVGWriter.cpp" />
<ClCompile Include="..\ASCOfficeDrawingConverter.cpp"> <ClCompile Include="..\ASCOfficeDrawingConverter.cpp">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Disabled</Optimization> <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Disabled</Optimization>
@ -342,6 +343,7 @@
<ClInclude Include="..\..\Common\DocxFormat\Source\DocxFormat\WritingVector.h" /> <ClInclude Include="..\..\Common\DocxFormat\Source\DocxFormat\WritingVector.h" />
<ClInclude Include="..\..\Common\DocxFormat\Source\SystemUtility\File.h" /> <ClInclude Include="..\..\Common\DocxFormat\Source\SystemUtility\File.h" />
<ClInclude Include="..\..\Common\DocxFormat\Source\SystemUtility\SystemUtility.h" /> <ClInclude Include="..\..\Common\DocxFormat\Source\SystemUtility\SystemUtility.h" />
<ClInclude Include="..\..\DesktopEditor\raster\exif.h" />
<ClInclude Include="..\ASCOfficeDrawingConverter.h" /> <ClInclude Include="..\ASCOfficeDrawingConverter.h" />
<ClInclude Include="..\ASCOfficePPTXFile.h" /> <ClInclude Include="..\ASCOfficePPTXFile.h" />
<ClInclude Include="..\Editor\BinaryFileReaderWriter.h" /> <ClInclude Include="..\Editor\BinaryFileReaderWriter.h" />

6
ASCOfficePPTXFile/PPTXLib/PPTXFormat.vcxproj.filters
View File

@ -272,6 +272,9 @@
</ClCompile> </ClCompile>
<ClCompile Include="..\ASCOfficeDrawingConverter.cpp" /> <ClCompile Include="..\ASCOfficeDrawingConverter.cpp" />
<ClCompile Include="..\ASCOfficePPTXFileRealization.cpp" /> <ClCompile Include="..\ASCOfficePPTXFileRealization.cpp" />
<ClCompile Include="..\..\DesktopEditor\raster\exif.cpp">
<Filter>BinaryReaderWriter</Filter>
</ClCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="..\Editor\BinaryFileReaderWriter.h"> <ClInclude Include="..\Editor\BinaryFileReaderWriter.h">
@ -1476,5 +1479,8 @@
</ClInclude> </ClInclude>
<ClInclude Include="..\ASCOfficeDrawingConverter.h" /> <ClInclude Include="..\ASCOfficeDrawingConverter.h" />
<ClInclude Include="..\ASCOfficePPTXFile.h" /> <ClInclude Include="..\ASCOfficePPTXFile.h" />
<ClInclude Include="..\..\DesktopEditor\raster\exif.h">
<Filter>BinaryReaderWriter</Filter>
</ClInclude>
</ItemGroup> </ItemGroup>
</Project> </Project>

2
Fb2File/Fb2File.pro
View File

@ -12,7 +12,7 @@ CONFIG += core_static_link_libstd
DEFINES += FB2FILE_USE_DYNAMIC_LIBRARY DEFINES += FB2FILE_USE_DYNAMIC_LIBRARY
CORE_ROOT_DIR = $$PWD/../../core CORE_ROOT_DIR = $$PWD/..
PWD_ROOT_DIR = $$PWD PWD_ROOT_DIR = $$PWD
include($$CORE_ROOT_DIR/Common/base.pri) include($$CORE_ROOT_DIR/Common/base.pri)

2
HtmlFile2/HtmlFile2.pro
View File

@ -12,7 +12,7 @@ CONFIG += core_static_link_libstd
DEFINES += HTMLFILE2_USE_DYNAMIC_LIBRARY DEFINES += HTMLFILE2_USE_DYNAMIC_LIBRARY
DEFINES += CSSCALCULATOR_LIBRARY_STATIC DEFINES += CSSCALCULATOR_LIBRARY_STATIC
CORE_ROOT_DIR = $$PWD/../../core CORE_ROOT_DIR = $$PWD/..
PWD_ROOT_DIR = $$PWD PWD_ROOT_DIR = $$PWD
include($$CORE_ROOT_DIR/Common/base.pri) include($$CORE_ROOT_DIR/Common/base.pri)

5
X2tConverter/src/cextracttools.cpp
View File

@ -58,10 +58,9 @@ namespace NExtractTools
nSeparator2Pos = sFile2.rfind(_T('\\')); nSeparator2Pos = sFile2.rfind(_T('\\'));
} }
// check for directory in name // check for directory in name
bool bIsFile1Directory = ((std::wstring::npos != nSeparator1Pos) && (nExt1Pos < nSeparator1Pos)); // i.e: /root1/child1.lalala/folder bool bIsFile1Directory = (std::wstring::npos != nExt1Pos) ? ((std::wstring::npos != nSeparator1Pos) && (nExt1Pos < nSeparator1Pos)) : (std::wstring::npos != nSeparator1Pos); // i.e: /root1/child1.lalala/folder
bool bIsFile2Directory = ((std::wstring::npos != nSeparator2Pos) && (nExt2Pos < nSeparator2Pos)); bool bIsFile2Directory = (std::wstring::npos != nExt2Pos) ? ((std::wstring::npos != nSeparator2Pos) && (nExt2Pos < nSeparator2Pos)) : (std::wstring::npos != nSeparator2Pos);
// automatic zip/unzip task detection // automatic zip/unzip task detection
if (bIsFile1Directory) if (bIsFile1Directory)