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

fix build

Browse Source
This commit is contained in:
Elena.Subbotina
2022-10-28 10:32:48 +03:00
parent 33890472f3
commit 5a3a5a37ab
14 changed files with 61 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Common/cfcpp/cfcpp.pro
View File

@ -1,6 +1,6 @@
QT -= core gui
TARGET = CompaundLib
TARGET = CompoundFileLib
TEMPLATE = lib
CONFIG += staticlib

4
Common/cfcpp/cfitem.cpp
View File

@ -110,12 +110,12 @@ void CFItem::setDataTime(const DataTime &value)
throw CFException(L"Modify Date can only be set on storage entries");
}
GUID CFItem::getStorageCLSID() const
_GUID_ CFItem::getStorageCLSID() const
{
return dirEntry.lock()->getStorageCLSID();
}
void CFItem::setStorageCLSID(GUID value)
void CFItem::setStorageCLSID(_GUID_ value)
{
dirEntry.lock()->setStorageCLSID(value);
}

4
Common/cfcpp/cfitem.h
View File

@ -64,8 +64,8 @@ public:
DataTime getDataTime()const;
void setDataTime(const DataTime& value);
GUID getStorageCLSID() const;
void setStorageCLSID(GUID value);
_GUID_ getStorageCLSID() const;
void setStorageCLSID(_GUID_ value);
int CompareTo(const CFItem& other);
std::wstring ToString() const;

12
Common/cfcpp/compoundfile.cpp
View File

@ -98,11 +98,11 @@ std::vector<BYTE> CompoundFile::GetDataBySID(int sid)
{
return _impl->GetDataBySID(sid);
}
GUID CompoundFile::getGuidBySID(int sid)
_GUID_ CompoundFile::getGuidBySID(int sid)
{
return _impl->getGuidBySID(sid);
}
GUID CompoundFile::getGuidForStream(int sid)
_GUID_ CompoundFile::getGuidForStream(int sid)
{
return _impl->getGuidForStream(sid);
}
@ -1272,7 +1272,7 @@ void CompoundFile_impl::ResetDirectoryEntry(int sid)
directoryEntries[sid]->setParent({});
directoryEntries[sid]->setStgType(StgType::StgInvalid);
directoryEntries[sid]->setStartSetc(DirectoryEntry::ZERO);
directoryEntries[sid]->setStorageCLSID(GUID());
directoryEntries[sid]->setStorageCLSID(_GUID_());
directoryEntries[sid]->setSize(0);
directoryEntries[sid]->setStateBits(0);
directoryEntries[sid]->setColor(RedBlackTree::RED);
@ -1717,7 +1717,7 @@ std::vector<BYTE> CompoundFile_impl::GetDataBySID(int sid)
return result;
}
GUID CompoundFile_impl::getGuidBySID(int sid)
_GUID_ CompoundFile_impl::getGuidBySID(int sid)
{
if (isDisposed)
throw CFDisposedException("Compound File closed: cannot access data");
@ -1727,14 +1727,14 @@ GUID CompoundFile_impl::getGuidBySID(int sid)
return de->getStorageCLSID();
}
GUID CompoundFile_impl::getGuidForStream(int sid)
_GUID_ CompoundFile_impl::getGuidForStream(int sid)
{
if (isDisposed)
throw CFDisposedException("Compound File closed: cannot access data");
if (sid < 0)
throw CFException("Invalid SID");
GUID guid;
_GUID_ guid;
for (int i = sid - 1; i >= 0; i--)
{

6
Common/cfcpp/compoundfile.h
View File

@ -61,8 +61,6 @@ public:
CompoundFile(Stream stream);
CompoundFile();
~CompoundFile();
std::shared_ptr<CFStorage> RootStorage();
void Save(std::wstring wFileName);
@ -75,8 +73,8 @@ public:
void Close();
std::vector<BYTE> GetDataBySID(int sid);
GUID getGuidBySID(int sid);
GUID getGuidForStream(int sid);
_GUID_ getGuidBySID(int sid);
_GUID_ getGuidForStream(int sid);
private:
std::shared_ptr<CompoundFile_impl> _impl;

4
Common/cfcpp/compoundfile_impl.h
View File

@ -68,8 +68,8 @@ public:
void Close();
std::vector<BYTE> GetDataBySID(int sid);
GUID getGuidBySID(int sid);
GUID getGuidForStream(int sid);
_GUID_ getGuidBySID(int sid);
_GUID_ getGuidForStream(int sid);
// internal methods
static std::shared_ptr<RedBlackTree::RBTree> CreateNewTree();

6
Common/cfcpp/directoryentry.h
View File

@ -102,8 +102,8 @@ public:
inline void setStgColor(StgColor value) override {stgColor = value;}
inline StgType getStgType() const override {return stgType;}
inline void setStgType(StgType value) override {stgType = value;}
inline GUID getStorageCLSID() const override {return storageCLSID;}
inline void setStorageCLSID(GUID value) override {storageCLSID = value;}
inline _GUID_ getStorageCLSID() const override {return storageCLSID;}
inline void setStorageCLSID(_GUID_ value) override {storageCLSID = value;}
int GetHashCode() const override;
inline std::wstring Name() const {return GetEntryName();}
@ -133,7 +133,7 @@ private:
SVector<IDirectoryEntry> emptyDir;
SVector<IDirectoryEntry>& dirRepository;
std::weak_ptr<RedBlackTree::IRBNode> parent;
GUID storageCLSID;
_GUID_ storageCLSID;
};
}

13
Common/cfcpp/guid.h
View File

@ -31,8 +31,7 @@
*/
#pragma once
struct GUID
struct _GUID_
{
unsigned int Data1 = 0;
unsigned short Data2 = 0;
@ -44,11 +43,11 @@ struct GUID
return reinterpret_cast<unsigned char*>(&Data4);
}
GUID (const GUID& o) : Data1(o.Data1), Data2(o.Data2), Data3(o.Data3)
_GUID_(const _GUID_& o) : Data1(o.Data1), Data2(o.Data2), Data3(o.Data3)
{
}
GUID& operator=(const GUID& o)
_GUID_& operator=(const _GUID_& o)
{
Data1 = o.Data1;
Data2 = o.Data2;
@ -58,15 +57,15 @@ struct GUID
return *this;
}
bool operator!=(const GUID& oth)const
bool operator!=(const _GUID_& oth)const
{
return Data1 != oth.Data1 || Data2 != oth.Data2 || Data3 != oth.Data3 || Data4 != oth.Data4;
}
bool operator==(const GUID& oth)const
bool operator==(const _GUID_& oth)const
{
return !operator!=(oth);
}
GUID (){}
_GUID_(){}
};

4
Common/cfcpp/idirectoryentry.h
View File

@ -98,8 +98,8 @@ public:
virtual void setStgColor(StgColor value) = 0;
virtual StgType getStgType() const = 0;
virtual void setStgType(StgType value) = 0;
virtual GUID getStorageCLSID() const = 0;
virtual void setStorageCLSID(GUID value) = 0;
virtual _GUID_ getStorageCLSID() const = 0;
virtual void setStorageCLSID(_GUID_ value) = 0;
virtual int GetHashCode() const = 0;
};
}

2
Common/cfcpp/test/tst_compondfile.h
View File

@ -1,7 +1,7 @@
#pragma once
#include "global.h"
#include "compoundfile.h"
#include "../compoundfile.h"
#include <iostream>
#include <iomanip>

5
OfficeCryptReader/win32/ECMACryptReader.vcxproj
View File

@ -148,6 +148,11 @@
<ClInclude Include="..\source\CryptTransform.h" />
<ClInclude Include="..\source\ECMACryptFile.h" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\Common\cfcpp\CompoundFileLib.vcxproj">
<Project>{fa22bab4-e93e-459d-8a5f-16764fbbed40}</Project>
</ProjectReference>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>

6
X2tConverter/build/Qt/X2tSLN.pri
View File

@ -18,7 +18,7 @@ SUBDIRS = \
OdfFileReaderLib \
OdfFileWriterLib \
XlsFormatLib \
CompaundLib \
CompoundFileLib \
X2tConverter
XlsbFormatLib.file = ../../../Common/DocxFormat/DocxFormatLib/XlsbFormatLib.pro
@ -33,7 +33,7 @@ OdfFileReaderLib.file = ../../../ASCOfficeOdfFile/linux/OdfFileReaderLib.pro
OdfFileWriterLib.file = ../../../ASCOfficeOdfFileW/linux/OdfFileWriterLib.pro
XlsFormatLib.file = ../../../ASCOfficeXlsFile2/source/linux/XlsFormatLib.pro
VbaFormatLib.file = ../../../ASCOfficeXlsFile2/source/linux/VbaFormatLib.pro
CompaundLib.file = ../../../Common/cfcpp/cfcpp.pro
CompoundFileLib.file = ../../../Common/cfcpp/cfcpp.pro
X2tConverter.depends = \
XlsbFormatLib \
@ -48,7 +48,7 @@ X2tConverter.depends = \
OdfFileWriterLib \
VbaFormatLib \
XlsFormatLib \
CompaundLib
CompoundFileLib
# build the project sequentially as listed in SUBDIRS !
CONFIG += ordered

24
X2tConverter/test/win32Test/X2tConverter_win_test.sln
View File

@ -41,7 +41,9 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "XlsbFormatLib", "..\..\..\C
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{7C53A1E0-F93F-4E32-88B5-6274AF921ABE}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VbaFormat", "..\..\..\ASCOfficeXlsFile2\source\win32\VbaFormat.vcxproj", "{041DD428-2D5C-4D97-8AB7-7207F3D5B801}"
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VbaFormatLib", "..\..\..\ASCOfficeXlsFile2\source\win32\VbaFormat.vcxproj", "{041DD428-2D5C-4D97-8AB7-7207F3D5B801}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CompoundFileLib", "..\..\..\Common\cfcpp\CompoundFileLib.vcxproj", "{FA22BAB4-E93E-459D-8A5F-16764FBBED40}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@ -434,6 +436,26 @@ Global
{041DD428-2D5C-4D97-8AB7-7207F3D5B801}.ReleaseOpenSource|Win32.Build.0 = Release|Win32
{041DD428-2D5C-4D97-8AB7-7207F3D5B801}.ReleaseOpenSource|x64.ActiveCfg = Release|x64
{041DD428-2D5C-4D97-8AB7-7207F3D5B801}.ReleaseOpenSource|x64.Build.0 = Release|x64
{FA22BAB4-E93E-459D-8A5F-16764FBBED40}.Debug|Win32.ActiveCfg = Debug|Win32
{FA22BAB4-E93E-459D-8A5F-16764FBBED40}.Debug|Win32.Build.0 = Debug|Win32
{FA22BAB4-E93E-459D-8A5F-16764FBBED40}.Debug|x64.ActiveCfg = Debug|x64
{FA22BAB4-E93E-459D-8A5F-16764FBBED40}.Debug|x64.Build.0 = Debug|x64
{FA22BAB4-E93E-459D-8A5F-16764FBBED40}.DLL-Import Debug|Win32.ActiveCfg = Debug|Win32
{FA22BAB4-E93E-459D-8A5F-16764FBBED40}.DLL-Import Debug|Win32.Build.0 = Debug|Win32
{FA22BAB4-E93E-459D-8A5F-16764FBBED40}.DLL-Import Debug|x64.ActiveCfg = Debug|x64
{FA22BAB4-E93E-459D-8A5F-16764FBBED40}.DLL-Import Debug|x64.Build.0 = Debug|x64
{FA22BAB4-E93E-459D-8A5F-16764FBBED40}.DLL-Import Release|Win32.ActiveCfg = Release|Win32
{FA22BAB4-E93E-459D-8A5F-16764FBBED40}.DLL-Import Release|Win32.Build.0 = Release|Win32
{FA22BAB4-E93E-459D-8A5F-16764FBBED40}.DLL-Import Release|x64.ActiveCfg = Release|x64
{FA22BAB4-E93E-459D-8A5F-16764FBBED40}.DLL-Import Release|x64.Build.0 = Release|x64
{FA22BAB4-E93E-459D-8A5F-16764FBBED40}.Release|Win32.ActiveCfg = Release|Win32
{FA22BAB4-E93E-459D-8A5F-16764FBBED40}.Release|Win32.Build.0 = Release|Win32
{FA22BAB4-E93E-459D-8A5F-16764FBBED40}.Release|x64.ActiveCfg = Release|x64
{FA22BAB4-E93E-459D-8A5F-16764FBBED40}.Release|x64.Build.0 = Release|x64
{FA22BAB4-E93E-459D-8A5F-16764FBBED40}.ReleaseOpenSource|Win32.ActiveCfg = Release|Win32
{FA22BAB4-E93E-459D-8A5F-16764FBBED40}.ReleaseOpenSource|Win32.Build.0 = Release|Win32
{FA22BAB4-E93E-459D-8A5F-16764FBBED40}.ReleaseOpenSource|x64.ActiveCfg = Release|x64
{FA22BAB4-E93E-459D-8A5F-16764FBBED40}.ReleaseOpenSource|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE

3
X2tConverter/test/win32Test/X2tTest.vcxproj
View File

@ -328,6 +328,9 @@
<ProjectReference Include="..\..\..\Common\3dParty\cryptopp\cryptlib.vcxproj">
<Project>{3423ec9a-52e4-4a4d-9753-edebc38785ef}</Project>
</ProjectReference>
<ProjectReference Include="..\..\..\Common\cfcpp\CompoundFileLib.vcxproj">
<Project>{fa22bab4-e93e-459d-8a5f-16764fbbed40}</Project>
</ProjectReference>
<ProjectReference Include="..\..\..\Common\DocxFormat\Projects\DocxFormatLib.vcxproj">
<Project>{a100103a-353e-45e8-a9b8-90b87cc5c0b0}</Project>
</ProjectReference>