mirror of
https://github.com/ONLYOFFICE/core.git
synced 2026-07-11 01:52:24 +08:00
x2t linux build - OdfFile исправления по результатам тестирования
git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@63414 954022d7-b5bf-4e40-9824-e11837661b57
This commit is contained in:
committed by
Alexander Trofimov
parent
b474b9608c
commit
9ec160883f
@ -119,7 +119,24 @@ namespace FileSystem {
|
||||
std::string sRes = pcRes;
|
||||
return stringUtf8ToWString (sRes);
|
||||
}
|
||||
std::wstring Directory::CreateTempFileWithUniqueName (const std::wstring & strFolderPathRoot, std::wstring Prefix)
|
||||
{
|
||||
char pcRes[MAX_PATH];
|
||||
if (NULL == pcRes) return _T("");
|
||||
|
||||
Prefix = strFolderPathRoot + FILE_SEPARATOR_STR + Prefix + _T("_XXXXXX");
|
||||
|
||||
std::wstring w_str = Prefix.c_str();
|
||||
std::string a_str = stringWstingToUtf8String(w_str);
|
||||
|
||||
memcpy(pcRes, a_str.c_str(), a_str.length());
|
||||
pcRes[a_str.length()] = '\0';
|
||||
|
||||
int res = mkstemp( pcRes);
|
||||
|
||||
std::string sRes = pcRes;
|
||||
return stringUtf8ToWString (sRes);
|
||||
}
|
||||
bool Directory::CreateDirectory (String strFolderPathRoot, String strFolderName)
|
||||
{
|
||||
String strFolder = strFolderPathRoot;
|
||||
|
||||
@ -5586,7 +5586,7 @@ namespace BinXlsxRW{
|
||||
CT_RotX* poVal = static_cast<CT_RotX*>(poResult);
|
||||
if(c_oserct_rotxVAL == type)
|
||||
{
|
||||
char* pNewElem = new char;
|
||||
signed char* pNewElem = new signed char;
|
||||
*pNewElem = m_oBufferedStream.GetUChar();
|
||||
poVal->m_val = pNewElem;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user