From 9ec160883fbb3ed54e4c16400171f165acd37a85 Mon Sep 17 00:00:00 2001 From: "Elen.Subbotina" Date: Thu, 9 Jul 2015 11:23:08 +0000 Subject: [PATCH] =?UTF-8?q?x2t=20linux=20build=20=20-=20OdfFile=20=20?= =?UTF-8?q?=D0=B8=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=D0=B8?= =?UTF-8?q?=D1=8F=20=D0=BF=D0=BE=20=D1=80=D0=B5=D0=B7=D1=83=D0=BB=D1=8C?= =?UTF-8?q?=D1=82=D0=B0=D1=82=D0=B0=D0=BC=20=D1=82=D0=B5=D1=81=D1=82=D0=B8?= =?UTF-8?q?=D1=80=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@63414 954022d7-b5bf-4e40-9824-e11837661b57 --- .../SystemUtility/FileSystem/DirectoryPosix.cpp | 17 +++++++++++++++++ XlsxSerializerCom/Reader/ChartFromToBinary.cpp | 2 +- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/Common/DocxFormat/Source/SystemUtility/FileSystem/DirectoryPosix.cpp b/Common/DocxFormat/Source/SystemUtility/FileSystem/DirectoryPosix.cpp index d53ad9c121..2732ec1c8f 100644 --- a/Common/DocxFormat/Source/SystemUtility/FileSystem/DirectoryPosix.cpp +++ b/Common/DocxFormat/Source/SystemUtility/FileSystem/DirectoryPosix.cpp @@ -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; diff --git a/XlsxSerializerCom/Reader/ChartFromToBinary.cpp b/XlsxSerializerCom/Reader/ChartFromToBinary.cpp index 7f76a6f47e..5cc2668096 100644 --- a/XlsxSerializerCom/Reader/ChartFromToBinary.cpp +++ b/XlsxSerializerCom/Reader/ChartFromToBinary.cpp @@ -5586,7 +5586,7 @@ namespace BinXlsxRW{ CT_RotX* poVal = static_cast(poResult); if(c_oserct_rotxVAL == type) { - char* pNewElem = new char; + signed char* pNewElem = new signed char; *pNewElem = m_oBufferedStream.GetUChar(); poVal->m_val = pNewElem; }