Commit 563364b7 authored by Elen.Subbotina's avatar Elen.Subbotina Committed by Alexander Trofimov

linux build

git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@59059 954022d7-b5bf-4e40-9824-e11837661b57
parent 6b161579
...@@ -4,6 +4,10 @@ ...@@ -4,6 +4,10 @@
#include "../../DesktopEditor/graphics/IRenderer.h" #include "../../DesktopEditor/graphics/IRenderer.h"
#include "../../ASCPresentationEditor/OfficeDrawing/Shapes/BaseShape/Common.h" #include "../../ASCPresentationEditor/OfficeDrawing/Shapes/BaseShape/Common.h"
#ifndef WIN32
#include <boost/locale.hpp>
#endif
namespace NSBinPptxRW namespace NSBinPptxRW
{ {
static std::wstring g_bstr_nodeopen = L"<"; static std::wstring g_bstr_nodeopen = L"<";
...@@ -555,12 +559,12 @@ namespace NSBinPptxRW ...@@ -555,12 +559,12 @@ namespace NSBinPptxRW
int nLength = strData.GetLength(); int nLength = strData.GetLength();
CStringA saStr; CStringA saStr;
#ifdef WIN32
#ifdef UNICODE #ifdef UNICODE
// Encoding Unicode to UTF-8 // Encoding Unicode to UTF-8
WideCharToMultiByte(CP_UTF8, 0, strData.GetBuffer(), nLength + 1, saStr.GetBuffer(nLength*3 + 1), nLength*3, NULL, NULL); WideCharToMultiByte(CP_UTF8, 0, strData.GetBuffer(), nLength + 1, saStr.GetBuffer(nLength*3 + 1), nLength*3, NULL, NULL);
saStr.ReleaseBuffer(); saStr.ReleaseBuffer();
#else #else
wchar_t* pWStr = new wchar_t[nLength + 1]; wchar_t* pWStr = new wchar_t[nLength + 1];
if (!pWStr) if (!pWStr)
return; return;
...@@ -578,6 +582,9 @@ namespace NSBinPptxRW ...@@ -578,6 +582,9 @@ namespace NSBinPptxRW
saStr.ReleaseBuffer(); saStr.ReleaseBuffer();
delete[] pWStr; delete[] pWStr;
#endif
#else
saStr = boost::locale::conv::to_utf(strData);
#endif #endif
CFile oFile; CFile oFile;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment