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

linux build

Browse Source 
git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@58967 954022d7-b5bf-4e40-9824-e11837661b57
This commit is contained in:
Ivan.Shulga
2014-10-16 15:32:40 +00:00
committed by Alexander Trofimov
parent bb502aac17
commit 5863355573
3 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ASCOfficePPTXFile/Editor/imagemanager.h
View File

@ -231,7 +231,7 @@ namespace NSShapeImageGen
return GenerateImageID(punkImage, max(1.0, width), max(1.0, height));
}
CImageInfo WriteImage(CString& strFile, double& x, double& y, double& width, double& height)
CImageInfo WriteImage(const CString& strFile, double& x, double& y, double& width, double& height)
{
bool bIsDownload = false;
int n1 = strFile.Find(_T("www"));

6
ASCOfficePPTXFile/PPTXFormat/Logic/Fills/BlipFill.h
View File

@ -8,6 +8,7 @@
#include "Tile.h"
#include "Stretch.h"
#include "../Effects/AlphaModFix.h"
#include "../../../../Common/DocxFormat/Source/SystemUtility/File.h"
namespace PPTX
{
@ -316,7 +317,8 @@ namespace PPTX
// -------------------
if (strTempFile != _T(""))
{
::DeleteFile(strTempFile);
CDirectory::DeleteFile(strTempFile);
//::DeleteFile(strTempFile);
}
// -------------------
@ -399,4 +401,4 @@ namespace PPTX
} // namespace Logic
} // namespace PPTX
#endif // PPTX_LOGIC_BLIPFILL_INCLUDE_H_
#endif // PPTX_LOGIC_BLIPFILL_INCLUDE_H_

10
ASCPresentationEditor/OfficeDrawing/Elements.h
View File

@ -1764,9 +1764,13 @@ namespace NSStrings
AVSINLINE void SetText(BSTR& bsText)
{
ClearNoAttack();
#ifdef _WIN32
size_t nLen = GetStringLen(bsText);
WriteString(bsText, nLen);
WriteString(bsText, nLen);
#else
size_t nLen = bsText.length();
WriteString(bsText.c_str(), nLen);
#endif
for (size_t i = 0; i < nLen; ++i)
{
@ -1814,7 +1818,7 @@ namespace NSStrings
}
public:
AVSINLINE void WriteString(wchar_t* pString, const size_t& nLen)
AVSINLINE void WriteString(const wchar_t* pString, const size_t& nLen)
{
AddSize(nLen);
memcpy(m_pDataCur, pString, nLen * sizeof(wchar_t));