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

Merge pull request #1439 from ONLYOFFICE/release/v8.1.0

Browse Source 
Release/v8.1.0
This commit is contained in:
Oleg Korshul
2024-03-14 20:08:12 +03:00
committed by GitHub
parent 601ba0cedc a684336b72
commit 7adcec27ff
8 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Common/3dParty/boost/boost.pri
View File

@ -10,6 +10,11 @@ core_android {
QMAKE_CXXFLAGS += -Wno-enum-constexpr-conversion
}
core_ios {
QMAKE_CFLAGS += -Wno-enum-constexpr-conversion
QMAKE_CXXFLAGS += -Wno-enum-constexpr-conversion
}
bundle_xcframeworks {
xcframework_platform_ios_simulator {
CORE_BOOST_LIBS = $$PWD/build/ios_xcframework/ios_simulator/lib/$$CORE_BUILDS_PLATFORM_PREFIX

2
Common/OfficeFileFormatChecker2.cpp
View File

@ -299,7 +299,7 @@ bool COfficeFileFormatChecker::isOleObjectFile(POLE::Storage *storage)
std::string UserType, ClipboardFormat, Program;
POLE::Stream streamCompObject(storage, L"CompObj");
if (false == streamCompObject.fail())
if (false == streamCompObject.fail() && streamCompObject.size() >= 28)
{
streamCompObject.seek(28); // skip Header

1
DesktopEditor/graphics/pro/js/wasm/src/metafile.cpp
View File

@ -39,6 +39,7 @@ namespace MetaFile
CMetaFile(NSFonts::IApplicationFonts *pAppFonts) : IMetaFile(pAppFonts) {}
virtual ~CMetaFile() {}
virtual void SetImageSize(int nWidth, int nHeight) {}
virtual bool LoadFromFile(const wchar_t* wsFilePath) { return false; }
virtual bool LoadFromBuffer(BYTE* pBuffer, unsigned int unSize) { return false; }
virtual bool DrawOnRenderer(IRenderer* pRenderer, double dX, double dY, double dWidth, double dHeight) { return false; }

2
OOXML/Binary/Sheets/Reader/BinaryWriter.cpp
View File

@ -5885,7 +5885,7 @@ void BinaryWorksheetTableWriter::WriteOleObjects(const OOX::Spreadsheet::CWorksh
}
}
}
if (pImageFileCache.IsInit() && pOleObject->m_oObjectPr.IsInit() && pOleObject->m_oObjectPr->m_oRid.IsInit())
if (false == pImageFileCache.IsInit() && pOleObject->m_oObjectPr.IsInit() && pOleObject->m_oObjectPr->m_oRid.IsInit())
{
sIdImageFileCache = pOleObject->m_oObjectPr->m_oRid->GetValue();

2
OdfFile/DataTypes/iconset_type.h
View File

@ -60,8 +60,8 @@ public:
Arrows5Gray,
Quarters5,
Rating5,
Stars3,
Triangles3,
Stars3,
Boxes5
};

2
OdfFile/Reader/Format/calcext_elements.cpp
View File

@ -238,7 +238,7 @@ void calcext_icon_set::xlsx_convert(oox::xlsx_conversion_context & Context)
}
}
// calcext_formatting_entry
/// calcext:formatting-entry
//---------------------------------------------------------------------------------------------------------
const wchar_t * calcext_formatting_entry::ns = L"calcext";
const wchar_t * calcext_formatting_entry::name = L"formatting-entry";

2
OdfFile/Writer/Format/calcext_elements.cpp
View File

@ -239,7 +239,7 @@ void calcext_icon_set::serialize(std::wostream & _Wostream)
}
}
// calcext_formatting_entry
// calcext:formatting-entry
//////////////////////////////////////////////////////////////////////////////////////////////////
const wchar_t * calcext_formatting_entry::ns = L"calcext";
const wchar_t * calcext_formatting_entry::name = L"formatting-entry";

6
PdfFile/SrcReader/RendererOutputDev.cpp
View File

@ -1608,7 +1608,7 @@ namespace PdfReader
nLen = 0;
}
}
else if (L"" != wsFileName && (pFont8bit = dynamic_cast<Gfx8BitFont*>(pFont)) && pFont8bit->getHasEncoding())
else if (L"" != wsFileName && (pFont8bit = dynamic_cast<Gfx8BitFont*>(pFont)))
{
char **ppEncoding = pFont8bit->getEncoding();
if (!ppEncoding)
@ -3945,8 +3945,8 @@ namespace PdfReader
pNewTm[1] = pTm[1] * dITextScale * pGState->getHorizScaling();
pNewTm[2] = -pTm[2] * dITextScale;
pNewTm[3] = -pTm[3] * dITextScale;
pNewTm[4] = dX;
pNewTm[5] = dY;
pNewTm[4] = dX - dOriginX;
pNewTm[5] = dY - dOriginY;
}
else
{